[arch-commits] Commit in kinit/trunk (PKGBUILD disable-glib-event-loop.patch)

[Felix Yan]

    Date: Saturday, September 12, 2015 @ 06:42:38
  Author: fyan
Revision: 245907

upgpkg: kinit 5.14.0-1

Added:
  kinit/trunk/disable-glib-event-loop.patch
Modified:
  kinit/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   11 ++++++++---
 disable-glib-event-loop.patch |   24 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-09-12 04:36:23 UTC (rev 245906)
+++ PKGBUILD	2015-09-12 04:42:38 UTC (rev 245907)
@@ -3,7 +3,7 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 
 pkgname=kinit
-pkgver=5.13.0
+pkgver=5.14.0
 pkgrel=1
 pkgdesc='Process launcher to speed up launching KDE applications'
 arch=('i686' 'x86_64')
@@ -12,11 +12,16 @@
 depends=('kio')
 makedepends=('extra-cmake-modules' 'kdoctools')
 groups=('kf5')
-source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('72d0496c5d8d94673e875ff216fa4176')
+source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
+        disable-glib-event-loop.patch)
+md5sums=('18300dc5a57f07e7d81fba87ca55921b'
+         '9cab3a5dac8eb728550ed68678bd3091')
 
 prepare() {
   mkdir -p build
+
+  cd "$pkgname-$pkgver"
+  patch -p1 -i ../disable-glib-event-loop.patch
 }
 
 build() {

Added: disable-glib-event-loop.patch
===================================================================
--- disable-glib-event-loop.patch	                        (rev 0)
+++ disable-glib-event-loop.patch	2015-09-12 04:42:38 UTC (rev 245907)
@@ -0,0 +1,24 @@
+--- a/src/klauncher/klauncher_main.cpp
++++ b/src/klauncher/klauncher_main.cpp
+@@ -152,9 +152,20 @@
+     // WABA: Make sure not to enable session management.
+     putenv(strdup("SESSION_MANAGER="));
+ 
++    // Disable the GLib event loop (rh#983110)
++    const bool wasQtNoGlibSet = !qEnvironmentVariableIsEmpty("QT_NO_GLIB");
++    if (!wasQtNoGlibSet) {
++       qputenv("QT_NO_GLIB", "1");
++    }
++
+     // We need a QGuiApplication as we use X11
+     QGuiApplication app(argc, argv);
+     app.setApplicationName(QStringLiteral("klauncher"));
++
++    // Now get rid of QT_NO_GLIB again so launched processes don't inherit it
++    if (!wasQtNoGlibSet) {
++       qunsetenv("QT_NO_GLIB");
++    }
+ 
+     int maxTry = 3;
+     while (true) {
+