[arch-commits] Commit in qt5-base/trunk (PKGBUILD no-gtk-qpa-on-wayland.patch)

[Antonio Rojas]

    Date: Sunday, November 20, 2016 @ 00:38:59
  Author: arojas
Revision: 281639

tslib 1.2 rebuild

Added:
  qt5-base/trunk/no-gtk-qpa-on-wayland.patch
Modified:
  qt5-base/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   11 ++++++++---
 no-gtk-qpa-on-wayland.patch |   13 +++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-11-20 00:03:18 UTC (rev 281638)
+++ PKGBUILD	2016-11-20 00:38:59 UTC (rev 281639)
@@ -5,7 +5,7 @@
 pkgname=qt5-base
 _qtver=5.7.0
 pkgver=${_qtver/-/}
-pkgrel=3
+pkgrel=5
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL3' 'FDL' 'custom')
@@ -30,12 +30,14 @@
         qtbug-53071.patch::"https://github.com/qtproject/qtbase/commit/e9041c7fc.patch"
         qtbug-53071b.patch::"https://github.com/qtproject/qtbase/commit/cd25866f.patch"
         qtbug-53237.patch::"https://github.com/qtproject/qtbase/commit/8e889378.patch"
-        qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch")
+        qtbug-49452.patch::"https://github.com/qt/qtbase/commit/6f423555.patch"
+        no-gtk-qpa-on-wayland.patch)
 md5sums=('184f9460b40752d71b15b827260580c2'
          '462f079cd46f869def6858903a718bf5'
          'da4fd787ea877516397a027412e975e1'
          '981255fb1aea0d3c0b5c5f306fe374da'
-         '646aea77ca90031c453a65ef61db55f9')
+         '646aea77ca90031c453a65ef61db55f9'
+         '880c9d0060916888ba17b7f9ea41a8c5')
 
 prepare() {
   cd ${_pkgfqn}
@@ -63,6 +65,9 @@
 
   # Fix freetype engine performance 
   patch -p1 -i ../qtbug-49452.patch
+
+  # Don't use the GTK QPA on Wayland - file chooser segfaults
+  patch -p1 -i ../no-gtk-qpa-on-wayland.patch
 }
 
 build() {

Added: no-gtk-qpa-on-wayland.patch
===================================================================
--- no-gtk-qpa-on-wayland.patch	                        (rev 0)
+++ no-gtk-qpa-on-wayland.patch	2016-11-20 00:38:59 UTC (rev 281639)
@@ -0,0 +1,13 @@
+diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+index db264d1..e3cb2f3 100644
+--- a/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
++++ b/src/platformsupport/themes/genericunix/qgenericunixthemes.cpp
+@@ -814,7 +814,7 @@ QStringList QGenericUnixTheme::themeNames()
+ #ifndef QT_NO_SETTINGS
+                 result.push_back(QLatin1String(QKdeTheme::name));
+ #endif
+-            } else if (gtkBasedEnvironments.contains(desktopName)) {
++            } else if (gtkBasedEnvironments.contains(desktopName) && QString::fromLocal8Bit(qgetenv("XDG_SESSION_TYPE")) != QLatin1String("wayland")) {
+                 // prefer the GTK3 theme implementation with native dialogs etc.
+                 result.push_back(QStringLiteral("gtk3"));
+                 // fallback to the generic Gnome theme if loading the GTK3 theme fails