jlec 15/03/31 13:15:04
Added: merkaartor-9999-system-libs.patch
merkaartor-0.18.1-system-libs.patch
Log:
Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the
patch; update live ebuild to new repo location, bug #544862
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
B9D4F231BD1558AB!)
Revision Changes Path
1.1
sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch?rev=1.1&content-type=text/plain
Index: merkaartor-9999-system-libs.patch
===================================================================
>From 1fc139ff9958039c7836ac043a7f9a91aa7785a6 Mon Sep 17 00:00:00 2001
From: Nikoli <[email protected]>
Date: Thu, 10 Oct 2013 16:28:02 +0400
Subject: [PATCH] Support for building with system qtsingleapplication and
quazip
---
INSTALL | 2 ++
src/src.pro | 16 +++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/INSTALL b/INSTALL
index 79ec63b..447876c 100644
--- a/INSTALL
+++ b/INSTALL
@@ -51,6 +51,8 @@ TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor
translations be installe
TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is
NODEBUG=1 - release target
NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
+SYSTEM_QTSA - use system copy of qtsingleapplication instead
of internal
+SYSTEM_QUAZIP - use system copy of quazip instead of internal
3. Run your build tool, make for posix like systems, nmake for
diff --git a/src/src.pro b/src/src.pro
index a8a4730..c332b18 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,11 +6,17 @@ include (Config.pri)
#Custom config
include(Custom.pri)
-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-DEFINES += QUAZIP_STATIC
-include(../3rdparty/quazip-0.7/quazip.pri)
-
-#LIBS += -lquazip
+isEmpty(SYSTEM_QTSA) {
+
include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
+} else {
+ CONFIG += qtsingleapplication
+}
+isEmpty(SYSTEM_QUAZIP) {
+ DEFINES += QUAZIP_STATIC
+ include(../3rdparty/quazip-0.7/quazip.pri)
+} else {
+ LIBS += -lquazip
+}
#Qt Version
QT_VERSION = $$[QT_VERSION]
--
2.0.5
1.1
sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch?rev=1.1&content-type=text/plain
Index: merkaartor-0.18.1-system-libs.patch
===================================================================
>From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
From: Nikoli <[email protected]>
Date: Thu, 10 Oct 2013 16:28:02 +0400
Subject: [PATCH] Support for building with system qtsingleapplication and
quazip
---
INSTALL | 1 +
src/src.pro | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/INSTALL b/INSTALL
index a828c17..022e8d0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor
translations be installed
TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is
NODEBUG=1 - release target
NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
+SYSTEM_QTSA - use system copy of qtsingleapplication
instead of internal
see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete
list
diff --git a/src/src.pro b/src/src.pro
index f23e05e..ff228b6 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -6,7 +6,11 @@ include (Config.pri)
#Custom config
include(Custom.pri)
-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
+isEmpty(SYSTEM_QTSA) {
+
include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
+} else {
+ CONFIG += qtsingleapplication
+}
include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
#Qt Version
--
2.0.5
