| @@ -1,6 +1,6 @@
diff -ru mapplauncherd/CMakeLists.txt mapplauncherd-qt5/CMakeLists.txt
--- mapplauncherd/CMakeLists.txt 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/CMakeLists.txt 2012-11-16 10:42:59.929897831 +0000
++++ mapplauncherd-qt5/CMakeLists.txt 2012-11-16 12:38:08.288160746 +0000
@@ -60,7 +60,7 @@
# Sub build: tests
# This will build the HelloWorld test library, unit tests, functional tests
@@ -10,10 +10,9 @@
endif ($ENV{BUILD_TESTS})
# Target for documentation (make doc)
-Only in mapplauncherd-qt5: qt5.patch
diff -ru mapplauncherd/src/CMakeLists.txt mapplauncherd-qt5/src/CMakeLists.txt
--- mapplauncherd/src/CMakeLists.txt 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/CMakeLists.txt 2012-11-16 10:52:14.316567683 +0000
++++ mapplauncherd-qt5/src/CMakeLists.txt 2012-11-16 12:38:08.302160617 +0000
@@ -16,6 +16,4 @@
# Sub build: qdeclarativebooster plugin
add_subdirectory(qdeclarativebooster)
@@ -21,9 +20,27 @@
-# Sub build: single-instance binary / library
-add_subdirectory(single-instance)
+diff -ru mapplauncherd/src/launcher/launcher.c mapplauncherd-qt5/src/launcher/launcher.c
+--- mapplauncherd/src/launcher/launcher.c 2012-11-15 19:02:06.000000000 +0000
++++ mapplauncherd-qt5/src/launcher/launcher.c 2012-11-16 12:38:52.275753116 +0000
+@@ -129,12 +129,13 @@
+ {
+ // Exit if DISPLAY is missing. This would result in dying
+ // boosters and applauncherd would keep on re-starting them.
++#if 0
+ if (!getenv("DISPLAY"))
+ {
+ fprintf(stderr, "FATAL!!: DISPLAY environment variable not set.\n");
+ return EXIT_FAILURE;
+ }
+-
++#endif
+ // Parse command line
+ g_debugPrinting = 0;
+
diff -ru mapplauncherd/src/launcherlib/booster.cpp mapplauncherd-qt5/src/launcherlib/booster.cpp
--- mapplauncherd/src/launcherlib/booster.cpp 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/launcherlib/booster.cpp 2012-11-16 10:55:51.466994317 +0000
++++ mapplauncherd-qt5/src/launcherlib/booster.cpp 2012-11-16 12:38:08.318160469 +0000
@@ -121,8 +121,10 @@
{
if (!pluginEntry->lockFunc(m_appData->appName().c_str()))
@@ -48,7 +65,7 @@
continue;
diff -ru mapplauncherd/src/launcherlib/booster.h mapplauncherd-qt5/src/launcherlib/booster.h
--- mapplauncherd/src/launcherlib/booster.h 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/launcherlib/booster.h 2012-11-16 10:51:15.166806247 +0000
++++ mapplauncherd-qt5/src/launcherlib/booster.h 2012-11-16 12:38:08.325160403 +0000
@@ -21,7 +21,6 @@
#define BOOSTER_H
@@ -59,7 +76,7 @@
#include <string>
diff -ru mapplauncherd/src/qdeclarativebooster/CMakeLists.txt mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt
--- mapplauncherd/src/qdeclarativebooster/CMakeLists.txt 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt 2012-11-16 11:52:58.764092928 +0000
++++ mapplauncherd-qt5/src/qdeclarativebooster/CMakeLists.txt 2012-11-16 12:38:08.326160394 +0000
@@ -1,4 +1,3 @@
-include(FindX11)
@@ -99,7 +116,7 @@
install(TARGETS mdeclarativecache DESTINATION /usr/lib)
diff -ru mapplauncherd/src/qdeclarativebooster/eventhandler.cpp mapplauncherd-qt5/src/qdeclarativebooster/eventhandler.cpp
--- mapplauncherd/src/qdeclarativebooster/eventhandler.cpp 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/qdeclarativebooster/eventhandler.cpp 2012-11-16 11:04:41.418215248 +0000
++++ mapplauncherd-qt5/src/qdeclarativebooster/eventhandler.cpp 2012-11-16 12:38:08.327160385 +0000
@@ -1,5 +1,5 @@
-#include <QtConcurrentRun>
-#include <QApplication>
@@ -110,7 +127,7 @@
#include "connection.h"
diff -ru mapplauncherd/src/qdeclarativebooster/mdeclarativecache.cpp mapplauncherd-qt5/src/qdeclarativebooster/mdeclarativecache.cpp
--- mapplauncherd/src/qdeclarativebooster/mdeclarativecache.cpp 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/qdeclarativebooster/mdeclarativecache.cpp 2012-11-16 11:53:08.995996606 +0000
++++ mapplauncherd-qt5/src/qdeclarativebooster/mdeclarativecache.cpp 2012-11-16 12:38:08.328160376 +0000
@@ -17,13 +17,12 @@
**
****************************************************************************/
@@ -146,7 +163,7 @@
// This changes argc in QCoreApplication
diff -ru mapplauncherd/src/single-instance/CMakeLists.txt mapplauncherd-qt5/src/single-instance/CMakeLists.txt
--- mapplauncherd/src/single-instance/CMakeLists.txt 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/single-instance/CMakeLists.txt 2012-11-16 10:50:09.684943553 +0000
++++ mapplauncherd-qt5/src/single-instance/CMakeLists.txt 2012-11-16 12:38:08.328160376 +0000
@@ -5,7 +5,6 @@
# Find X11
@@ -167,7 +184,7 @@
diff -ru mapplauncherd/src/single-instance/main.cpp mapplauncherd-qt5/src/single-instance/main.cpp
--- mapplauncherd/src/single-instance/main.cpp 2012-11-15 19:02:06.000000000 +0000
-+++ mapplauncherd-qt5/src/single-instance/main.cpp 2012-11-16 10:47:17.325537077 +0000
++++ mapplauncherd-qt5/src/single-instance/main.cpp 2012-11-16 12:38:08.330160356 +0000
@@ -317,6 +317,7 @@
//! Activate existing application
DECL_EXPORT bool activateExistingInstance(const char * binaryName)
|
