git » qt5-base.git » commit bc44538

Revert commit causing crashes in some applications (FS#70366 FS#70367)

author Antonio Rojas
2021-04-08 17:55:14 UTC
committer Antonio Rojas
2021-04-08 17:55:14 UTC
parent c4391bbf63916de3a82428ac41e8d6b606b2fa24

Revert commit causing crashes in some applications (FS#70366 FS#70367)

PKGBUILD +9 -6

diff --git a/PKGBUILD b/PKGBUILD
index 498f0c8..24551d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
 pkgver=5.15.2+kde+r171
-pkgrel=1
+pkgrel=2
 _commit=cb2da673f53815a5cfe15f50df49b98032429f9e
 arch=('x86_64')
 url='https://www.qt.io'
@@ -29,11 +29,13 @@ conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn=qtbase
 source=(git+https://invent.kde.org/qt/qt/$_pkgfqn#commit=$_commit
-         qt5-base-cflags.patch
-         qt5-base-nostrip.patch)
+        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)
 sha256sums=('SKIP'
             'cf707cd970650f8b60f8897692b36708ded9ba116723ec8fcd885576783fe85c'
-            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094')
+            '4b93f6a79039e676a56f9d6990a324a64a36f143916065973ded89adc621e094'
+            '829f8464fcd34b2c6f45636c12de35e5e440714e5ec0a235380f2bd0143455dc')
 
 pkgver() {
   cd $_pkgfqn
@@ -44,8 +46,9 @@ prepare() {
   cd ${_pkgfqn}
 
   git revert -n 6344955d17e17e2398720fe60c34cfc2a4a95208 # Revert version bump
-  patch -p1 -i ../qt5-base-cflags.patch # Use system CFLAGS in qmake
-  patch -p1 -i ../qt5-base-nostrip.patch # Don't strip binaries with qmake
+  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
 }
 
 build() {