diff options
author | Davide Pesavento <pesa@gentoo.org> | 2014-05-24 21:33:09 +0000 |
---|---|---|
committer | Davide Pesavento <pesa@gentoo.org> | 2014-05-24 21:33:09 +0000 |
commit | 5f251180c0ba18dec990c06d61ed49c4f2865802 (patch) | |
tree | 122c95b03ac2569f38af7879af39796dfbcefba7 /dev-qt/qtsingleapplication/files | |
parent | Fix missing files in 'dodoc' call. (diff) | |
download | historical-5f251180c0ba18dec990c06d61ed49c4f2865802.tar.gz historical-5f251180c0ba18dec990c06d61ed49c4f2865802.tar.bz2 historical-5f251180c0ba18dec990c06d61ed49c4f2865802.zip |
Install also qtsinglecoreapplication.prf, as required by some packages (e.g. qbittorrent in bug 507998). Remove old.
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xDADED6B2671CB57D!
Diffstat (limited to 'dev-qt/qtsingleapplication/files')
3 files changed, 0 insertions, 101 deletions
diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch deleted file mode 100644 index 079e3435b5aa..000000000000 --- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-examples.patch +++ /dev/null @@ -1,9 +0,0 @@ -Do not build examples. - ---- qtsingleapplication.pro -+++ qtsingleapplication.pro -@@ -2,4 +2,3 @@ - CONFIG += ordered - include(common.pri) - qtsingleapplication-uselib:SUBDIRS=buildlib --SUBDIRS+=examples diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch deleted file mode 100644 index 003725e55ee8..000000000000 --- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-gcc47.patch +++ /dev/null @@ -1,15 +0,0 @@ -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"; diff --git a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch b/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch deleted file mode 100644 index ef94938b777e..000000000000 --- a/dev-qt/qtsingleapplication/files/qtsingleapplication-2.6.1-unbundle.patch +++ /dev/null @@ -1,77 +0,0 @@ -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) |