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

[Antonio Rojas]

    Date: Thursday, June 20, 2019 @ 07:50:53
  Author: arojas
Revision: 356587

Fix crash on multi-screen systems (FS#62942), fix freeze on hybrid NVIDIA systems (FS#62949)

Modified:
  qt5-base/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-06-20 04:16:56 UTC (rev 356586)
+++ PKGBUILD	2019-06-20 07:50:53 UTC (rev 356587)
@@ -3,7 +3,7 @@
 
 pkgbase=qt5-base
 pkgname=(qt5-base qt5-xcb-private-headers)
-_qtver=5.13.0
+_qtver=5.12.4
 pkgver=${_qtver/-/}
 pkgrel=2
 arch=('x86_64')
@@ -26,8 +26,12 @@
 conflicts=('qtchooser')
 groups=('qt' 'qt5')
 _pkgfqn="${pkgbase/5-/}-everywhere-src-${_qtver}"
-source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz")
-sha256sums=('ff6964b3b528cd3b1d21bcf3470006e8e5cbe69591923f982871d886ea0488fe')
+source=("https://download.qt.io/official_releases/qt/${pkgver%.*}/${_qtver}/submodules/${_pkgfqn}.tar.xz"
+        qtbase-qxcbwindow.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=0c183117"
+        qtbug-76440.patch::"https://code.qt.io/cgit/qt/qtbase.git/patch/?id=6d61b10")
+sha256sums=('20fbc7efa54ff7db9552a7a2cdf9047b80253c1933c834f35b0bc5c1ae021195'
+            '51878fdf91d3f191fb4e19cd9ec3fc4c564bbf1eabe92802b40db2ec8ad1d646'
+            '0b0bfa3490098a3e195517b68d8b602f79be4170428f882e4a7583302d4be463')
 
 prepare() {
   cd ${_pkgfqn}
@@ -38,6 +42,9 @@
     mkspecs/common/gcc-base.conf
   sed -i -e "s|^\(QMAKE_LFLAGS_RELEASE.*\)|\1 ${LDFLAGS}|" \
     mkspecs/common/g++-unix.conf
+
+  patch -p1 -i ../qtbase-qxcbwindow.patch # Fix NVIDIA freeze
+  patch -p1 -i ../qtbug-76440.patch # Fix crashes on multi-screen systems
 }
 
 build() {
@@ -60,7 +67,6 @@
     -dbus-linked \
     -system-harfbuzz \
     -journald \
-    -no-mimetype-database \
     -no-use-gold-linker \
     -reduce-relocations
   make