git » qt5-base.git » commit 7a7f863

Backport some fixes for Plasma taskbar crashes (FS#52907)

author Antonio Rojas
2017-02-09 07:47:04 UTC
committer Antonio Rojas
2017-02-09 07:47:04 UTC
parent ca1a0ff732c8010b3d33a560da19c8f0dc4620f1

Backport some fixes for Plasma taskbar crashes (FS#52907)

PKGBUILD +14 -3

diff --git a/PKGBUILD b/PKGBUILD
index b3f86b4..3d9e22b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.8.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -26,9 +26,15 @@ conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgname/5-/}-opensource-src-${_qtver}"
 source=("http://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
-        qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch")
+        qt5-base-journald.patch::"https://github.com/qt/qtbase/commit/0c8f3229.patch"
+        plasma-crash-1.patch::https://github.com/qt/qtbase/commit/3bd0fd8f.patch
+        plasma-crash-2.patch::https://github.com/qt/qtbase/commit/0874861b.patch
+        plasma-crash-3.patch::https://github.com/qt/qtbase/commit/baad82d2.patch)
 md5sums=('6e1f7f6fb6333eb66e563b175c4e87e9'
-         '160fde81fe882c4241f04634f53691ad')
+         '160fde81fe882c4241f04634f53691ad'
+         '078d8a051c06abf28451fd2cdb7f19ce'
+         '92daaa3ebd7cf10ee725b963e44c95a7'
+         '76ab122615f1ba2d68c83477f82e389e')
 
 prepare() {
   cd ${_pkgfqn}
@@ -46,6 +52,11 @@ prepare() {
 
   # Fix logging to systemd journal
   patch -p1 -i ../qt5-base-journald.patch
+
+  # Fix some Plasma taskbar crashes https://bugs.kde.org/show_bug.cgi?id=342763
+  patch -p1 -i ../plasma-crash-1.patch
+  patch -p1 -i ../plasma-crash-2.patch
+  patch -p1 -i ../plasma-crash-3.patch
 }
 
 build() {