diff --git a/kf5-kinit.spec b/kf5-kinit.spec index e5f8cd8..9a6e4c7 100644 --- a/kf5-kinit.spec +++ b/kf5-kinit.spec @@ -20,9 +20,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra Source10: macros.kf5-kinit -# backport hack to workaround klauncher/SM issues, see bug http://bugzilla.redhat.com/983110 -Patch1: kinit-5.10.0-klauncher-qt_no_glib.patch - BuildRequires: libX11-devel BuildRequires: kf5-rpm-macros >= %{version} @@ -59,8 +56,6 @@ developing applications that use %{name}. %prep %setup -q -n %{framework}-%{version} -%patch1 -p1 -b .klauncher-qt_no_glib - %build mkdir %{_target_platform} diff --git a/kinit-5.10.0-klauncher-qt_no_glib.patch b/kinit-5.10.0-klauncher-qt_no_glib.patch deleted file mode 100644 index 9ac3673..0000000 --- a/kinit-5.10.0-klauncher-qt_no_glib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up kinit-5.10.0/src/klauncher/klauncher_main.cpp.qt_no_glib kinit-5.10.0/src/klauncher/klauncher_main.cpp ---- kinit-5.10.0/src/klauncher/klauncher_main.cpp.qt_no_glib 2015-05-03 10:14:51.000000000 -0500 -+++ kinit-5.10.0/src/klauncher/klauncher_main.cpp 2015-05-20 08:49:34.594814571 -0500 -@@ -152,10 +152,21 @@ extern "C" Q_DECL_EXPORT int kdemain(int - // WABA: Make sure not to enable session management. - putenv(strdup("SESSION_MANAGER=")); - -+ // Disable the GLib event loop (rh#983110) -+ bool wasQtNoGlibSet = (getenv("QT_NO_GLIB") != 0); -+ if (!wasQtNoGlibSet) { -+ setenv("QT_NO_GLIB", "1", true); -+ } -+ - // 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) { -+ unsetenv("QT_NO_GLIB"); -+ } -+ - int maxTry = 3; - while (true) { - QString service(QLatin1String("org.kde.klauncher5")); // same as ktoolinvocation.cpp