- update patches from fc, SingleCoreApplication built now as well

[packages/QtSingleApplication.git] / qtsingleapplication-dont-bundle-external-libs.patch

diff --git a/qtsingleapplication-dont-bundle-external-libs.patch b/qtsingleapplication-dont-bundle-external-libs.patch
index d277431e0eb51c794ba7fec3cf8f738c47ad0765..d7b5b76a8485a45298844ce7f4e66bb5467ec3de 100644 (file)
--- a/qtsingleapplication-dont-bundle-external-libs.patch
+++ b/qtsingleapplication-dont-bundle-external-libs.patch
@@ -1,6 +1,6 @@
 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp
 --- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp       2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp   2010-04-15 20:54:19.000000000 -0400
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp   2010-07-21 22:10:43.000000000 -0400
 @@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
  #include <time.h>
  #endif
@@ -28,7 +28,7 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.cpp qtsingle
      bool res = server->listen(socketName);
 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h
 --- qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h 2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h     2010-04-15 20:54:38.000000000 -0400
++++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.h     2010-07-21 22:10:43.000000000 -0400
 @@ -49,9 +49,7 @@
  #include <QtNetwork/QLocalSocket>
  #include <QtCore/QDir>
@@ -50,7 +50,7 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtlocalpeer.h qtsingleap
      static const char* ack;
 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri
 --- qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri       2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri   2010-04-15 20:54:19.000000000 -0400
++++ qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri   2010-07-21 22:11:08.000000000 -0400
 @@ -2,6 +2,7 @@ include(../common.pri)
  INCLUDEPATH += $$PWD
  DEPENDPATH += $$PWD
@@ -60,14 +60,13 @@ diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsingleapplication.pri
  qtsingleapplication-uselib:!qtsingleapplication-buildlib {
      LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
 diff -rupN qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri
---- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri   2009-12-16 05:43:33.000000000 -0500
-+++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri       2010-04-15 20:54:19.000000000 -0400
-@@ -2,7 +2,7 @@ INCLUDEPATH    += $$PWD
- DEPENDPATH      += $$PWD
- HEADERS               += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h
- SOURCES               += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
--
-+CONFIG *= qtlockedfile
+--- qtsingleapplication-2.6_1-opensource.old/src/qtsinglecoreapplication.pri   2010-07-21 22:12:19.000000000 -0400
++++ qtsingleapplication-2.6_1-opensource/src/qtsinglecoreapplication.pri       2010-07-21 22:10:29.000000000 -0400
+@@ -3,6 +3,7 @@ INCLUDEPATH += $$PWD
+ DEPENDPATH += $$PWD
  QT *= network
+ QT -= gui
++CONFIG *= qtlockedfile
  
- win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
+ qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib {
+     LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME