apply upstream patch to fix klaunch crash
This commit is contained in:
parent
3f48398ea9
commit
7dc464653b
|
@ -1,7 +1,7 @@
|
||||||
Index: kinit/klauncher.cpp
|
Index: kdelibs/kinit/klauncher.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- kinit/klauncher.cpp (Revision 792865)
|
--- kdelibs/kinit/klauncher.cpp (Revision 792865)
|
||||||
+++ kinit/klauncher.cpp (Revision 792866)
|
+++ kdelibs/kinit/klauncher.cpp (Revision 792866)
|
||||||
@@ -231,16 +231,19 @@
|
@@ -231,16 +231,19 @@
|
||||||
{
|
{
|
||||||
#ifdef Q_WS_X11
|
#ifdef Q_WS_X11
|
||||||
|
@ -33,10 +33,10 @@ Index: kinit/klauncher.cpp
|
||||||
}
|
}
|
||||||
requestData.resize(request_header.arg_length);
|
requestData.resize(request_header.arg_length);
|
||||||
result = read_socket(kdeinitSocket, (char *) requestData.data(),
|
result = read_socket(kdeinitSocket, (char *) requestData.data(),
|
||||||
Index: kinit/klauncher_main.cpp
|
Index: kdelibs/kinit/klauncher_main.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- kinit/klauncher_main.cpp (Revision 792865)
|
--- kdelibs/kinit/klauncher_main.cpp (Revision 792865)
|
||||||
+++ kinit/klauncher_main.cpp (Revision 792866)
|
+++ kdelibs/kinit/klauncher_main.cpp (Revision 792866)
|
||||||
@@ -35,13 +35,15 @@
|
@@ -35,13 +35,15 @@
|
||||||
#include <QtCore/QCoreApplication>
|
#include <QtCore/QCoreApplication>
|
||||||
|
|
||||||
|
@ -65,10 +65,10 @@ Index: kinit/klauncher_main.cpp
|
||||||
KCrash::setEmergencySaveFunction(sig_handler);
|
KCrash::setEmergencySaveFunction(sig_handler);
|
||||||
signal( SIGHUP, sig_handler);
|
signal( SIGHUP, sig_handler);
|
||||||
signal( SIGPIPE, SIG_IGN);
|
signal( SIGPIPE, SIG_IGN);
|
||||||
Index: kinit/klauncher.h
|
Index: kdelibs/kinit/klauncher.h
|
||||||
===================================================================
|
===================================================================
|
||||||
--- kinit/klauncher.h (Revision 792865)
|
--- kdelibs/kinit/klauncher.h (Revision 792865)
|
||||||
+++ kinit/klauncher.h (Revision 792866)
|
+++ kdelibs/kinit/klauncher.h (Revision 792866)
|
||||||
@@ -123,8 +123,10 @@
|
@@ -123,8 +123,10 @@
|
||||||
~KLauncher();
|
~KLauncher();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue