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

[Antonio Rojas]

    Date: Tuesday, April 6, 2021 @ 21:02:54
  Author: arojas
Revision: 411672

Switch to KDE maintenance branch

Modified:
  qt5-svg/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-06 20:57:16 UTC (rev 411671)
+++ PKGBUILD	2021-04-06 21:02:54 UTC (rev 411672)
@@ -1,28 +1,32 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=qt5-svg
-_qtver=5.15.2
-pkgver=${_qtver/-/}
-pkgrel=2
+pkgver=5.15.2+kde+r5
+pkgrel=1
+_commit=95990cbeebc0ab9959e2a925a93ad4897416bbb7
 arch=('x86_64')
 url='https://www.qt.io'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
 pkgdesc='Classes for displaying the contents of SVG files'
 depends=('qt5-base')
+makedepends=('git')
 groups=('qt' 'qt5')
-_pkgfqn="${pkgname/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-         CVE-2021-3481a.patch::https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=aceea78c
-         CVE-2021-3481b.patch::https://code.qt.io/cgit/qt/qtsvg.git/patch/?id=0fa52290)
-sha256sums=('8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e'
-            '9e2e001d3ee7376ef1729e5fd77b662cb8632a14462b56e5b9181c7bc4e2bce4'
-            '60c37f206f855f77ac7fa5a3d42166bc349db4b31a088471d9697d297eea4763')
+_pkgfqn=qtsvg
+source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit)
+sha256sums=('SKIP')
 
+pkgver() {
+  cd $_pkgfqn
+  echo "5.15.2+kde+r"`git rev-list --count origin/5.15.2..$_commit`
+}
+
 prepare() {
   mkdir -p build
-  patch -d $_pkgfqn -p1 < CVE-2021-3481a.patch
-  patch -d $_pkgfqn -p1 < CVE-2021-3481b.patch
+
+  cd $_pkgfqn
+  git revert -n 9aac88424a1b76e0198b52437af58a6d94aff8e9 # Revert version bump
 }
 
 build() {