author | Felix Yan
<felixonmars@archlinux.org> 2015-10-10 10:14:26 UTC |
committer | Felix Yan
<felixonmars@archlinux.org> 2015-10-10 10:14:26 UTC |
parent | c666c7cff50b7a6c8759af90e799b218653e5d1b |
PKGBUILD | +3 | -8 |
disable-glib-event-loop.patch | +0 | -24 |
diff --git a/PKGBUILD b/PKGBUILD index b55eaaf..0b24372 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Andrea Scarpino <andrea@archlinux.org> 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') @@ -11,16 +11,11 @@ license=('LGPL') 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() { diff --git a/disable-glib-event-loop.patch b/disable-glib-event-loop.patch deleted file mode 100644 index 16ff268..0000000 --- a/disable-glib-event-loop.patch +++ /dev/null @@ -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) { -