commit f788d81bf99e3312c54c751252dc83aff8898d4e
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 22 19:58:27 2015 +0200
build with system qtsingleapplication
qesteidutil-0.3.0-system_qtsingleapplication.patch | 11 --------
qesteidutil.spec | 8 +++---
system_qtsingleapplication.patch | 33 ++++++++++++++++++++++
3 files changed, 37 insertions(+), 15 deletions(-)
---
diff --git a/qesteidutil.spec b/qesteidutil.spec
index 1f4685b..fea9c0f 100644
--- a/qesteidutil.spec
+++ b/qesteidutil.spec
@@ -11,7 +11,7 @@ License: LGPL v2+
Group: X11/Applications
Source0: https://installer.id.ee/media/sources/%{name}-%{version}.tar.gz
# Source0-md5: 4e5a792fa4de027d367a26b4f0b82ac1
-#Patch0: %{name}-0.3.0-system_qtsingleapplication.patch
+Patch0: system_qtsingleapplication.patch
Patch1: desktop.patch
URL: http://www.ria.ee/
BuildRequires: cmake >= 2.8
@@ -27,7 +27,7 @@ BuildRequires: qt5-qmake
%else
BuildRequires: QtGui-devel >= %{qt4ver}
BuildRequires: QtNetwork-devel >= %{qt4ver}
-BuildRequires: QtSingleApplication-devel
+BuildRequires: QtSingleApplication-devel >= 2.6.1
BuildRequires: qt4-build
BuildRequires: qt4-linguist
BuildConflicts: Qt5Widgets-devel
@@ -46,11 +46,11 @@ extract and view certificates, set up mobile ID, and
configure
%prep
%setup -q
-#%patch0 -p1
+%patch0 -p1
%patch1 -p1
# Remove bundled qtsingleapplication to make sure it isn't used
-#rm -r qtsingleapplication
+rm -r qtsingleapplication
%build
install -d build
diff --git a/qesteidutil-0.3.0-system_qtsingleapplication.patch
b/qesteidutil-0.3.0-system_qtsingleapplication.patch
deleted file mode 100644
index 0611738..0000000
--- a/qesteidutil-0.3.0-system_qtsingleapplication.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- qesteidutil-0.3.1/CMakeLists.txt~ 2011-07-06 19:50:13.000000000 +0300
-+++ qesteidutil-0.3.1/CMakeLists.txt 2012-01-08 13:51:46.645405478 +0200
-@@ -35,7 +35,7 @@
- include(${QT_USE_FILE})
-
- # try to find system copy of qtsingleapplication
--find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h
PATH_SUFFIXES QtSolutions)
-+find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h
PATH_SUFFIXES qt4/QtSolutions QtSolutions)
- find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6)
- if(QTSINGLEAPPLICATION_INCLUDE_DIRS AND QTSINGLEAPPLICATION_LIBRARIES)
- message(STATUS "Found QtSingleApplication:
${QTSINGLEAPPLICATION_LIBRARIES}")
diff --git a/system_qtsingleapplication.patch b/system_qtsingleapplication.patch
new file mode 100644
index 0000000..e60abe4
--- /dev/null
+++ b/system_qtsingleapplication.patch
@@ -0,0 +1,33 @@
+--- qesteidutil-3.8.0.1106/CMakeLists.txt~ 2013-12-02 12:10:51.000000000
+0200
++++ qesteidutil-3.8.0.1106/CMakeLists.txt 2015-02-22 19:41:23.932238031
+0200
+@@ -54,7 +54,6 @@
+ ${CMAKE_BINARY_DIR}
+ ${OPENSSL_INCLUDE_DIR}
+ ${PCSCLITE_INCLUDE_DIR}
+- qtsingleapplication/src
+ )
+
+ add_executable( ${PROGNAME} WIN32 MACOSX_BUNDLE
+--- qesteidutil-3.8.0.1106/common/CMakeLists.txt~ 2013-06-05
16:01:05.000000000 +0300
++++ qesteidutil-3.8.0.1106/common/CMakeLists.txt 2015-02-22
19:42:43.412893984 +0200
+@@ -27,8 +27,7 @@
+ endif()
+ else()
+ include_directories( ${CMAKE_SOURCE_DIR} )
+- add_subdirectory( ../qtsingleapplication
${CMAKE_BINARY_DIR}/qtsingleapplication )
+- list( APPEND LIBRARIES qtsingleapplication )
++ list( APPEND LIBRARIES QtSolutions_SingleApplication-2.6)
+ endif()
+
+ set( TS_FILES
+--- qesteidutil-3.8.0.1106/common/Common.h~ 2013-12-02 11:48:37.000000000
+0200
++++ qesteidutil-3.8.0.1106/common/Common.h 2015-02-22 20:09:05.556946877
+0200
+@@ -32,7 +32,7 @@
+ #endif
+ typedef QApplication BaseApplication;
+ #else
+-#include "qtsingleapplication/src/QtSingleApplication"
++#include "QtSolutions/QtSingleApplication"
+ typedef QtSingleApplication BaseApplication;
+ #endif
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qesteidutil.git/commitdiff/f788d81bf99e3312c54c751252dc83aff8898d4e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
