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

[Antonio Rojas]

    Date: Saturday, April 10, 2021 @ 09:04:19
  Author: arojas
Revision: 412059

Revert the revert, the affected applications have been fixed

Modified:
  qt5-base/trunk/PKGBUILD

----------+
 PKGBUILD |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-10 07:58:23 UTC (rev 412058)
+++ PKGBUILD	2021-04-10 09:04:19 UTC (rev 412059)
@@ -4,7 +4,7 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 pkgver=5.15.2+kde+r171
-pkgrel=2
+pkgrel=3
 _commit=cb2da673f53815a5cfe15f50df49b98032429f9e
 arch=('x86_64')
 url='https://www.qt.io'
@@ -30,12 +30,10 @@
 _pkgfqn=qtbase
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
         qt5-base-cflags.patch
-        qt5-base-nostrip.patch
-        qsortfilterproxymodel-crash.patch::https://code.qt.io/cgit/qt/qtbase.git/patch/src/corelib/itemmodels?id=8455bfee)
+        qt5-base-nostrip.patch)
 sha256sums=('SKIP'
             'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
-            '829f8464fcd34b2c6f45636c12de35e5e440714e5ec0a235380f2bd0143455dc')
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
 
 pkgver() {
   cd $_pkgfqn
@@ -46,7 +44,6 @@
   cd ${_pkgfqn}
 
   git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-  patch -Rp1 < ../qsortfilterproxymodel-crash.patch # FS#70366 FS#70367
   patch -p1 < ../qt5-base-cflags.patch # Use system CFLAGS in qmake
   patch -p1 < ../qt5-base-nostrip.patch # Don't strip binaries with qmake
 }