[packages/QtSingleApplication] update to ad9bc4600ce769a8b3ad10910803cd555811b70c
glen
glen at pld-linux.org
Wed Apr 13 08:06:53 CEST 2016
commit e3b3d3a489c8fa9886251c157054a965afb298c2
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Apr 13 01:56:02 2016 +0300
update to ad9bc4600ce769a8b3ad10910803cd555811b70c
updated patches and .prf from fedora
QtSingleApplication.spec | 14 +++++++-------
qtsingleapplication-build.diff | 22 +++++++++++++---------
qtsingleapplication.prf | 5 +++--
qtsinglecoreapplication.prf | 3 +--
version.patch | 20 ++++++++++++++++++++
5 files changed, 44 insertions(+), 20 deletions(-)
---
diff --git a/QtSingleApplication.spec b/QtSingleApplication.spec
index 68f7d85..abfcb5a 100644
--- a/QtSingleApplication.spec
+++ b/QtSingleApplication.spec
@@ -5,23 +5,21 @@
# last commit to qtsingleapplication subdir in
# https://qt.gitorious.org/qt-solutions/qt-solutions/
-%define commit 841982ceec9d30a7ab7324979a0fd5c9c36fd121
+%define commit ad9bc4600ce769a8b3ad10910803cd555811b70c
Summary: Qt library to start applications only once per user
Name: QtSingleApplication
Version: 2.6.1
-Release: 2
+Release: 2.1
License: GPL v3 or LGPL v2 with exceptions
Group: Libraries
-# git clone git at gitorious.org:qt-solutions/qt-solutions.git
-# git checkout %{commit}
-# tar -cjf QtSingleApplication-%{version}.tar.bz2 -C qt-solutions/qtsingleapplication .
-Source0: %{name}-%{version}.tar.bz2
-# Source0-md5: 2442ba5536b99b4b9144bd33ea23cb17
+Source0: https://github.com/qtproject/qt-solutions/archive/%{commit}/%{name}-%{commit}.tar.gz
+# Source0-md5: 07f01898ad475c5cded2968d25bee85c
Source1: qtsingleapplication.prf
Source2: qtsinglecoreapplication.prf
Patch0: qtsingleapplication-build.diff
Patch1: qtlockedfile.patch
Patch2: clementine.patch
+Patch3: version.patch
URL: http://doc.qt.digia.com/solutions/4/qtsingleapplication/qtsingleapplication.html
BuildRequires: libstdc++-devel
%if %{with qt4}
@@ -93,9 +91,11 @@ applications that use Qt5SingleApplication.
%prep
%setup -qc
+mv qt-solutions-*/qtsingleapplication/* .
%patch0 -p0
%patch1 -p0
%patch2 -p1
+%patch3 -p1
# We already disabled bundling this external library.
# But just to make sure:
diff --git a/qtsingleapplication-build.diff b/qtsingleapplication-build.diff
index eadd24c..36365b8 100644
--- a/qtsingleapplication-build.diff
+++ b/qtsingleapplication-build.diff
@@ -16,18 +16,22 @@ diff -rupN buildlib/buildcorelib.pro.old buildlib/buildcorelib.pro
+target.path = $$DESTDIR
+INSTALLS += target
diff -rupN common.pri.old common.pri
---- common.pri.old 2014-08-14 22:46:46.597411107 +0200
-+++ common.pri 2014-08-14 22:47:33.676859489 +0200
-@@ -1,6 +1,7 @@
- exists(config.pri):infile(config.pri, SOLUTIONS_LIBRARY, yes): CONFIG += qtsingleapplication-uselib
- TEMPLATE += fakelib
--QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
-+QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
-+QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+--- common.pri.old 2015-09-13 18:29:19.955577604 +0200
++++ common.pri 2015-09-13 18:32:21.054587906 +0200
+@@ -5,10 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 5)|\
+ if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
+ if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
+ QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
+ } else {
+ QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
+ }
TEMPLATE -= fakelib
+
QTSINGLEAPPLICATION_LIBDIR = $$PWD/lib
-+QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
-unix:qtsingleapplication-uselib:!qtsingleapplication-buildlib:QMAKE_RPATHDIR += $$QTSINGLEAPPLICATION_LIBDIR
++QTSINGLECOREAPPLICATION_LIBDIR = $$PWD/lib
diff -rupN qtsingleapplication.pro.old qtsingleapplication.pro
--- qtsingleapplication.pro.old 2009-12-16 05:43:33.000000000 -0500
+++ qtsingleapplication.pro 2010-07-21 22:09:10.000000000 -0400
diff --git a/qtsingleapplication.prf b/qtsingleapplication.prf
index 40335a1..26e0fdb 100644
--- a/qtsingleapplication.prf
+++ b/qtsingleapplication.prf
@@ -1,4 +1,5 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleApplication-2.6
+QT *= widgets
QT *= network
+CONFIG *= qtlockedfile
diff --git a/qtsinglecoreapplication.prf b/qtsinglecoreapplication.prf
index ab31668..c400d53 100644
--- a/qtsinglecoreapplication.prf
+++ b/qtsinglecoreapplication.prf
@@ -1,4 +1,3 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_SingleCoreApplication-2.6
QT *= network
diff --git a/version.patch b/version.patch
new file mode 100644
index 0000000..ad3fd18
--- /dev/null
+++ b/version.patch
@@ -0,0 +1,20 @@
+use versioned soname
+
+--- ./common.pri.orig 2016-04-13 01:52:30.218251289 +0300
++++ ./common.pri 2016-04-13 01:52:30.218251289 +0300
+@@ -4,11 +4,11 @@
+ greaterThan(QT_MAJOR_VERSION, 5)|\
+ if(equals(QT_MAJOR_VERSION, 5):greaterThan(QT_MINOR_VERSION, 4))|\
+ if(equals(QT_MAJOR_VERSION, 5):equals(QT_MINOR_VERSION, 4):greaterThan(QT_PATCH_VERSION, 1)) {
+- QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-head)
+- QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-head)
++ QTSINGLEAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleApplication-2.6)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qt5LibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+ } else {
+- QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-head)
+- QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-head)
++ QTSINGLEAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleApplication-2.6)
++ QTSINGLECOREAPPLICATION_LIBNAME = $$qtLibraryTarget(QtSolutions_SingleCoreApplication-2.6)
+ }
+ TEMPLATE -= fakelib
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/QtSingleApplication.git/commitdiff/8cc770283764d0ac90de7120b323719c1abc1220
More information about the pld-cvs-commit
mailing list