[gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication/files: qtsingleapplication.prf qtsingleapplication-2.6.1-gcc47.patch qtsingleapplication-2.6.1-examples.patch qtsingleapplication-2.6.1-unbundle.patch

[gentoo-commits] gentoo-x86 commit in dev-qt/qtsingleapplication/files: qtsingleapplication.prf qtsingleapplication-2.6.1-gcc47.patch qtsingleapplication-2.6.1-examples.patch qtsingleapplication-2.6.1-unbundle.patch

[Michael Palimaka (kensington)]

kensington    13/09/04 14:52:13

  Added:                qtsingleapplication.prf
                        qtsingleapplication-2.6.1-gcc47.patch
                        qtsingleapplication-2.6.1-examples.patch
                        qtsingleapplication-2.6.1-unbundle.patch
  Log:
  New package wrt bug #441914.
  
  (Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

Revision  Changes    Path
1.1                  dev-qt/qtsingleapplication/files/qtsingleapplication.prf

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication.prf?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication.prf?rev=1.1&content-type=text/plain

Index: qtsingleapplication.prf
===================================================================
INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
DEPENDPATH  *= $$QMAKE_INCDIR_QT/QtSolutions
LIBS *= -lQtSolutions_SingleApplication-2.6
QT *= network



1.1                  dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch?rev=1.1&content-type=text/plain

Index: qtsingleapplication-2.6.1-gcc47.patch
===================================================================
Fix build with GCC 4.7.

Source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-gcc47.patch

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	2012-01-11 08:15:08.000000000 -0500
+++ qtsingleapplication-2.6_1-opensource/src/qtlocalpeer.cpp	2012-01-11 08:17:36.874461946 -0500
@@ -58,6 +58,7 @@ static PProcessIdToSessionId pProcessIdT
 #endif
 #if defined(Q_OS_UNIX)
 #include <time.h>
+#include <unistd.h>
 #endif
 
 const char* QtLocalPeer::ack = "ack";



1.1                  dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch?rev=1.1&content-type=text/plain

Index: qtsingleapplication-2.6.1-examples.patch
===================================================================
Do not build examples.

--- qtsingleapplication.pro
+++ qtsingleapplication.pro
@@ -2,4 +2,3 @@
 CONFIG += ordered
 include(common.pri)
 qtsingleapplication-uselib:SUBDIRS=buildlib
-SUBDIRS+=examples



1.1                  dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch?rev=1.1&content-type=text/plain

Index: qtsingleapplication-2.6.1-unbundle.patch
===================================================================
Do not bundle qtlockedfile.

Original source: http://pkgs.fedoraproject.org/cgit/qtsingleapplication.git/tree/qtsingleapplication-dont-bundle-external-libs.patch

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-07-21 22:10:43.000000000 -0400
@@ -59,15 +59,6 @@ static PProcessIdToSessionId pProcessIdT
 #include <time.h>
 #endif
 
-namespace QtLP_Private {
-#include "qtlockedfile.cpp"
-#if defined(Q_OS_WIN)
-#include "qtlockedfile_win.cpp"
-#else
-#include "qtlockedfile_unix.cpp"
-#endif
-}
-
 const char* QtLocalPeer::ack = "ack";
 
 QtLocalPeer::QtLocalPeer(QObject* parent, const QString &appId)
@@ -118,7 +109,7 @@ bool QtLocalPeer::isClient()
     if (lockFile.isLocked())
         return false;
 
-    if (!lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false))
+    if (!lockFile.lock(QtLockedFile::WriteLock, false))
         return true;
 
     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-07-21 22:10:43.000000000 -0400
@@ -49,9 +49,7 @@
 #include <QtNetwork/QLocalSocket>
 #include <QtCore/QDir>
 
-namespace QtLP_Private {
 #include "qtlockedfile.h"
-}
 
 class QtLocalPeer : public QObject
 {
@@ -74,7 +72,7 @@ protected:
     QString id;
     QString socketName;
     QLocalServer* server;
-    QtLP_Private::QtLockedFile lockFile;
+    QtLockedFile lockFile;
 
 private:
     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-07-21 22:11:08.000000000 -0400
@@ -2,6 +2,8 @@ include(../common.pri)
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 QT *= network
+CONFIG *= qtlockedfile
+LIBS+= -lQtSolutions_LockedFile-2.4
 
 qtsingleapplication-uselib:!qtsingleapplication-buildlib {
     LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME
--- a/src/qtsinglecoreapplication.pri
+++ b/src/qtsinglecoreapplication.pri
@@ -4,6 +4,8 @@
 SOURCES		+= $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp
 
 QT *= network
+CONFIG *= qtlockedfile
+LIBS+= -lQtSolutions_LockedFile-2.4
 
 win32:contains(TEMPLATE, lib):contains(CONFIG, shared) {
     DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport)