Author: glen Date: Wed Sep 22 14:58:02 2010 GMT Module: packages Tag: HEAD ---- Log message: - update patches from fc, SingleCoreApplication built now as well
---- Files affected: packages/QtSingleApplication: QtSingleApplication.spec (1.4 -> 1.5) , qtsingleapplication-build.diff (1.1 -> 1.2) , qtsingleapplication-dont-bundle-external-libs.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/QtSingleApplication/QtSingleApplication.spec diff -u packages/QtSingleApplication/QtSingleApplication.spec:1.4 packages/QtSingleApplication/QtSingleApplication.spec:1.5 --- packages/QtSingleApplication/QtSingleApplication.spec:1.4 Mon Sep 6 15:33:55 2010 +++ packages/QtSingleApplication/QtSingleApplication.spec Wed Sep 22 16:57:56 2010 @@ -2,13 +2,14 @@ Summary: Qt library to start applications only once per user Name: QtSingleApplication Version: 2.6 -Release: 3 +Release: 4 License: GPL v3 or LGPL v2 with exceptions Group: Libraries URL: http://qt.nokia.com/products/appdev/add-on-products/catalog/4/Utilities/qtsingleapplication Source0: http://get.qt.nokia.com/qt/solutions/lgpl/qtsingleapplication-%{version}_1-opensource.tar.gz # Source0-md5: 902795eb13ecedbdc112f00d7ec22949 Source1: qtsingleapplication.prf +Source2: qtsinglecoreapplication.prf Patch0: qtsingleapplication-build.diff Patch1: qtsingleapplication-dont-bundle-external-libs.patch Patch2: clementine.patch @@ -84,7 +85,7 @@ $RPM_BUILD_ROOT%{_includedir}/QtSolutions install -d $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features -cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features +cp -a %{SOURCE1} %{SOURCE2} $RPM_BUILD_ROOT%{_qt4_datadir}/mkspecs/features %clean rm -rf $RPM_BUILD_ROOT @@ -97,11 +98,14 @@ %doc LGPL_EXCEPTION.txt LICENSE.* README.TXT %attr(755,root,root) %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleApplication-%{version}.so.1 +%attr(755,root,root) %{_libdir}/libQtSolutions_SingleCoreApplication-%{version}.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libQtSolutions_SingleCoreApplication-%{version}.so.1 %files devel %defattr(644,root,root,755) %doc doc examples %{_libdir}/libQtSolutions_SingleApplication-%{version}.so +%{_libdir}/libQtSolutions_SingleCoreApplication-%{version}.so # XXX dir shared dir with QtLockedFile.spec %dir %{_includedir}/QtSolutions %{_includedir}/QtSolutions/QtSingleApplication @@ -109,6 +113,7 @@ %{_includedir}/QtSolutions/qtsingleapplication.h %{_includedir}/QtSolutions/qtsinglecoreapplication.h %{_qt4_datadir}/mkspecs/features/qtsingleapplication.prf +%{_qt4_datadir}/mkspecs/features/qtsinglecoreapplication.prf %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -116,6 +121,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2010/09/22 14:57:56 glen +- update patches from fc, SingleCoreApplication built now as well + Revision 1.4 2010/09/06 13:33:55 glen - add patch from clementine; rel 3 ================================================================ Index: packages/QtSingleApplication/qtsingleapplication-build.diff diff -u packages/QtSingleApplication/qtsingleapplication-build.diff:1.1 packages/QtSingleApplication/qtsingleapplication-build.diff:1.2 --- packages/QtSingleApplication/qtsingleapplication-build.diff:1.1 Thu Apr 22 21:49:02 2010 +++ packages/QtSingleApplication/qtsingleapplication-build.diff Wed Sep 22 16:57:56 2010 @@ -1,27 +1,72 @@ -diff -urN qtsingleapplication-2.6-opensource-orig/qtsingleapplication.pro qtsingleapplication-2.6-opensource/qtsingleapplication.pro ---- qtsingleapplication-2.6-opensource-orig/qtsingleapplication.pro 2009-04-21 13:30:29.000000000 +0300 -+++ qtsingleapplication-2.6-opensource/qtsingleapplication.pro 2009-12-03 16:28:20.000000000 +0200 -@@ -2,4 +2,3 @@ +diff -rupN qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro +--- qtsingleapplication-2.6_1-opensource.old/buildlib/buildcorelib.pro 1969-12-31 19:00:00.000000000 -0500 ++++ qtsingleapplication-2.6_1-opensource/buildlib/buildcorelib.pro 2010-07-21 22:09:10.000000000 -0400 +@@ -0,0 +1,13 @@ ++TEMPLATE=lib ++CONFIG += qt dll qtsinglecoreapplication-buildlib ++mac:CONFIG += absolute_library_soname ++win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all ++include(../src/qtsinglecoreapplication.pri) ++TARGET = $$QTSINGLECOREAPPLICATION_LIBNAME ++DESTDIR = $$QTSINGLEAPPLICATION_LIBDIR ++win32 { ++ DLLDESTDIR = $$[QT_INSTALL_BINS] ++ QMAKE_DISTCLEAN += $$[QT_INSTALL_BINS]\\$${QTSINGLECOREAPPLICATION_LIBNAME}.dll ++} ++target.path = $$DESTDIR ++INSTALLS += target +diff -rupN qtsingleapplication-2.6_1-opensource.old/common.pri qtsingleapplication-2.6_1-opensource/common.pri +--- qtsingleapplication-2.6_1-opensource.old/common.pri 2009-12-16 05:43:33.000000000 -0500 ++++ qtsingleapplication-2.6_1-opensource/common.pri 2010-07-21 22:09:10.000000000 -0400 +@@ -1,6 +1,6 @@ + infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib + TEMPLATE += fakelib + QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6) ++QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6) + TEMPLATE -= fakelib + QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib +-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR +diff -rupN qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro +--- qtsingleapplication-2.6_1-opensource.old/qtsingleapplication.pro 2009-12-16 05:43:33.000000000 -0500 ++++ qtsingleapplication-2.6_1-opensource/qtsingleapplication.pro 2010-07-21 22:09:10.000000000 -0400 +@@ -1,5 +1,4 @@ + TEMPLATE=subdirs CONFIG += ordered include(common.pri) - qtsingleapplication-uselib:SUBDIRS=buildlib +-qtsingleapplication-uselib:SUBDIRS=buildlib -SUBDIRS+=examples -diff -urN qtsingleapplication-2.6-opensource-orig/src/qtsingleapplication.pri qtsingleapplication-2.6-opensource/src/qtsingleapplication.pri ---- qtsingleapplication-2.6-opensource-orig/src/qtsingleapplication.pri 2009-04-21 13:30:29.000000000 +0300 -+++ qtsingleapplication-2.6-opensource/src/qtsingleapplication.pri 2009-12-03 16:28:13.000000000 +0200 -@@ -6,8 +6,8 @@ - qtsingleapplication-uselib:!qtsingleapplication-buildlib { - LIBS += -L$$QTSINGLEAPPLICATION_LIBDIR -l$$QTSINGLEAPPLICATION_LIBNAME - } else { -- SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtlocalpeer.cpp -- HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtlocalpeer.h -+ SOURCES += $$PWD/qtsingleapplication.cpp $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp -+ HEADERS += $$PWD/qtsingleapplication.h $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h - } - - win32 { -diff -urN qtsingleapplication-2.6-opensource-orig/src/QtSingleCoreApplication qtsingleapplication-2.6-opensource/src/QtSingleCoreApplication ---- qtsingleapplication-2.6-opensource-orig/src/QtSingleCoreApplication 1970-01-01 02:00:00.000000000 +0200 -+++ qtsingleapplication-2.6-opensource/src/QtSingleCoreApplication 2009-12-03 16:28:13.000000000 +0200 ++qtsingleapplication-uselib:SUBDIRS=buildlib/buildlib.pro buildlib/buildcorelib.pro +diff -rupN qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication +--- qtsingleapplication-2.6_1-opensource.old/src/QtSingleCoreApplication 1969-12-31 19:00:00.000000000 -0500 ++++ qtsingleapplication-2.6_1-opensource/src/QtSingleCoreApplication 2010-07-21 22:09:10.000000000 -0400 @@ -0,0 +1 @@ +#include "qtsinglecoreapplication.h" +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-07-21 22:09:52.000000000 -0400 +@@ -1,10 +1,17 @@ +-INCLUDEPATH += $$PWD +-DEPENDPATH += $$PWD +-HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h +-SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp +- ++include(../common.pri) ++INCLUDEPATH += $$PWD ++DEPENDPATH += $$PWD + QT *= network ++QT -= gui + +-win32:contains(TEMPLATE, lib):contains(CONFIG, shared) { +- DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT=__declspec(dllexport) ++qtsinglecoreapplication-uselib:!qtsinglecoreapplication-buildlib { ++ LIBS += -L$$QTSINGLECOREAPPLICATION_LIBDIR -l$$QTSINGLECOREAPPLICATION_LIBNAME ++} else { ++ SOURCES += $$PWD/qtsinglecoreapplication.cpp $$PWD/qtlocalpeer.cpp ++ HEADERS += $$PWD/qtsinglecoreapplication.h $$PWD/qtlocalpeer.h + } ++ ++win32 { ++ contains(TEMPLATE, lib):contains(CONFIG, shared):DEFINES += QT_QTSINGLECOREAPPLICATION_EXPORT ++ else:qtsinglecoreapplication-uselib:DEFINES += QT_QTSINGLECOREAPPLICATION_IMPORT ++} +\ No newline at end of file ================================================================ Index: packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch diff -u packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch:1.1 packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch:1.2 --- packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch:1.1 Thu Apr 22 23:05:47 2010 +++ packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch Wed Sep 22 16:57:56 2010 @@ -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 @@ 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 @@ 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 @@ 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 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/QtSingleApplication/QtSingleApplication.spec?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/QtSingleApplication/qtsingleapplication-build.diff?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/QtSingleApplication/qtsingleapplication-dont-bundle-external-libs.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
