Date: Saturday, October 10, 2015 @ 12:14:26 Author: fyan Revision: 248780
upgpkg: kinit 5.15.0-1 KF 5.15.0 Modified: kinit/trunk/PKGBUILD Deleted: kinit/trunk/disable-glib-event-loop.patch -------------------------------+ PKGBUILD | 11 +++-------- disable-glib-event-loop.patch | 24 ------------------------ 2 files changed, 3 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-10-10 10:14:08 UTC (rev 248779) +++ PKGBUILD 2015-10-10 10:14:26 UTC (rev 248780) @@ -3,7 +3,7 @@ # Contributor: Andrea Scarpino <[email protected]> pkgname=kinit -pkgver=5.14.0 +pkgver=5.15.0 pkgrel=1 pkgdesc='Process launcher to speed up launching KDE applications' arch=('i686' 'x86_64') @@ -12,16 +12,11 @@ depends=('kio') makedepends=('extra-cmake-modules' 'kdoctools') groups=('kf5') -source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"; - disable-glib-event-loop.patch) -md5sums=('18300dc5a57f07e7d81fba87ca55921b' - '9cab3a5dac8eb728550ed68678bd3091') +source=("http://download.kde.org/stable/frameworks/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz";) +md5sums=('1c05dbaead6e59818d0bef640ed05fa3') prepare() { mkdir -p build - - cd "$pkgname-$pkgver" - patch -p1 -i ../disable-glib-event-loop.patch } build() { Deleted: disable-glib-event-loop.patch =================================================================== --- disable-glib-event-loop.patch 2015-10-10 10:14:08 UTC (rev 248779) +++ disable-glib-event-loop.patch 2015-10-10 10:14:26 UTC (rev 248780) @@ -1,24 +0,0 @@ ---- 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) { -
