drop upstreamed patch

epel9
Rex Dieter 9 years ago
parent 3dab6fd9da
commit 98c115387b

@ -20,9 +20,6 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{fra
Source10: macros.kf5-kinit 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: libX11-devel
BuildRequires: kf5-rpm-macros >= %{version} BuildRequires: kf5-rpm-macros >= %{version}
@ -59,8 +56,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q -n %{framework}-%{version} %setup -q -n %{framework}-%{version}
%patch1 -p1 -b .klauncher-qt_no_glib
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}

@ -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
Loading…
Cancel
Save