git » qt5-declarative.git » commit c835e25

Revert change that breaks display of SVG images (FS#57542, FS#57531).

author Evangelos Foutras
2018-02-18 18:58:37 UTC
committer Evangelos Foutras
2018-02-18 18:58:37 UTC
parent 7289de7018f1539d1873cb12353f7a808072700f

Revert change that breaks display of SVG images (FS#57542, FS#57531).

PKGBUILD +8 -3

diff --git a/PKGBUILD b/PKGBUILD
index 2c3f6d1..9a76eb6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5-declarative
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -16,14 +16,19 @@ groups=('qt' 'qt5')
 conflicts=('qtchooser' 'qt5-declarative-render2d')
 replaces=('qt5-declarative-render2d')
 _pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553')
+source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbug-65789.patch::"https://github.com/qt/qtdeclarative/commit/f42f1366.patch")
+sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553'
+            '4a44baeb8b08d8e9e6ac76ffc0a0baf521b09c2396ae5926f56d0794cedd2586')
 
 prepare() {
   mkdir -p build
 
   # Use python2 for Python 2.x
   find -name '*.pro' -o -name '*.pri' | xargs sed -i -e 's|python -c|python2 -c|g' -e 's|python \$|python2 \$|g'
+
+  cd ${_pkgfqn}
+  patch -Rp1 -i ../qtbug-65789.patch # https://bugreports.qt.io/browse/QTBUG-65789
 }
 
 build() {