[arch-commits] Commit in qt5-declarative/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Thursday, March 15, 2018 @ 15:13:12
  Author: foutrelis
Revision: 319304

upgpkg: qt5-declarative 5.10.1-3

Replace commit reversal with upstream fixes for SVG image display.

Modified:
  qt5-declarative/trunk/PKGBUILD

----------+
 PKGBUILD |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-15 14:38:51 UTC (rev 319303)
+++ PKGBUILD	2018-03-15 15:13:12 UTC (rev 319304)
@@ -5,21 +5,23 @@
 pkgname=qt5-declarative
 _qtver=5.10.1
 pkgver=${_qtver/-/}
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Classes for QML and JavaScript languages'
 depends=('qt5-xmlpatterns')
-makedepends=('python2')
+makedepends=('python2' 'git')
 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"
-        qtbug-65789.patch::"https://github.com/qt/qtdeclarative/commit/f42f1366.patch")
+        qtbug-65789-2.patch::"https://github.com/qt/qtdeclarative/commit/602a6589.patch"
+        qtbug-67019.patch::"https://github.com/qt/qtdeclarative/commit/b1243b8c.patch")
 sha256sums=('3af9ed51bce5b5c6f04c4a67a6008f98765ccde897c43fff670621ab70789553'
-            '4a44baeb8b08d8e9e6ac76ffc0a0baf521b09c2396ae5926f56d0794cedd2586')
+            'e516e969dcf9520a4e5f05291ffe4baef1a6e499248f342f66c39147ef06a272'
+            'eed0e2617d4d46452acc79438666bab46c0c797ec4cb9ab447037c4176d83aba')
 
 prepare() {
   mkdir -p build
@@ -28,7 +30,10 @@
   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
+
+  # Fix two issues affecting display of SVG images
+  patch -Np1 -i ../qtbug-65789-2.patch # https://bugreports.qt.io/browse/QTBUG-65789
+  git apply -v ../qtbug-67019.patch    # https://bugreports.qt.io/browse/QTBUG-67019
 }
 
 build() {