| 1 |
jlec 15/03/31 13:15:04 |
| 2 |
|
| 3 |
Added: merkaartor-9999-system-libs.patch |
| 4 |
merkaartor-0.18.1-system-libs.patch |
| 5 |
Log: |
| 6 |
Use system libs instead of bundled ones, bug #487512; thanks Nikoli for the patch; update live ebuild to new repo location, bug #544862 |
| 7 |
|
| 8 |
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/merkaartor/files/merkaartor-9999-system-libs.patch?rev=1.1&view=markup |
| 14 |
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 |
| 15 |
|
| 16 |
Index: merkaartor-9999-system-libs.patch |
| 17 |
=================================================================== |
| 18 |
From 1fc139ff9958039c7836ac043a7f9a91aa7785a6 Mon Sep 17 00:00:00 2001 |
| 19 |
From: Nikoli <nikoli@×××.us> |
| 20 |
Date: Thu, 10 Oct 2013 16:28:02 +0400 |
| 21 |
Subject: [PATCH] Support for building with system qtsingleapplication and |
| 22 |
quazip |
| 23 |
|
| 24 |
--- |
| 25 |
INSTALL | 2 ++ |
| 26 |
src/src.pro | 16 +++++++++++----- |
| 27 |
2 files changed, 13 insertions(+), 5 deletions(-) |
| 28 |
|
| 29 |
diff --git a/INSTALL b/INSTALL |
| 30 |
index 79ec63b..447876c 100644 |
| 31 |
--- a/INSTALL |
| 32 |
+++ b/INSTALL |
| 33 |
@@ -51,6 +51,8 @@ TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor translations be installe |
| 34 |
TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is |
| 35 |
NODEBUG=1 - release target |
| 36 |
NOUSEWEBKIT - disable use of WebKit (Yahoo adapter) |
| 37 |
+SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal |
| 38 |
+SYSTEM_QUAZIP - use system copy of quazip instead of internal |
| 39 |
|
| 40 |
|
| 41 |
3. Run your build tool, make for posix like systems, nmake for |
| 42 |
diff --git a/src/src.pro b/src/src.pro |
| 43 |
index a8a4730..c332b18 100644 |
| 44 |
--- a/src/src.pro |
| 45 |
+++ b/src/src.pro |
| 46 |
@@ -6,11 +6,17 @@ include (Config.pri) |
| 47 |
#Custom config |
| 48 |
include(Custom.pri) |
| 49 |
|
| 50 |
-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri) |
| 51 |
-DEFINES += QUAZIP_STATIC |
| 52 |
-include(../3rdparty/quazip-0.7/quazip.pri) |
| 53 |
- |
| 54 |
-#LIBS += -lquazip |
| 55 |
+isEmpty(SYSTEM_QTSA) { |
| 56 |
+ include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri) |
| 57 |
+} else { |
| 58 |
+ CONFIG += qtsingleapplication |
| 59 |
+} |
| 60 |
+isEmpty(SYSTEM_QUAZIP) { |
| 61 |
+ DEFINES += QUAZIP_STATIC |
| 62 |
+ include(../3rdparty/quazip-0.7/quazip.pri) |
| 63 |
+} else { |
| 64 |
+ LIBS += -lquazip |
| 65 |
+} |
| 66 |
|
| 67 |
#Qt Version |
| 68 |
QT_VERSION = $$[QT_VERSION] |
| 69 |
-- |
| 70 |
2.0.5 |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch |
| 76 |
|
| 77 |
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 |
| 78 |
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 |
| 79 |
|
| 80 |
Index: merkaartor-0.18.1-system-libs.patch |
| 81 |
=================================================================== |
| 82 |
From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001 |
| 83 |
From: Nikoli <nikoli@×××.us> |
| 84 |
Date: Thu, 10 Oct 2013 16:28:02 +0400 |
| 85 |
Subject: [PATCH] Support for building with system qtsingleapplication and |
| 86 |
quazip |
| 87 |
|
| 88 |
--- |
| 89 |
INSTALL | 1 + |
| 90 |
src/src.pro | 6 +++++- |
| 91 |
2 files changed, 6 insertions(+), 1 deletion(-) |
| 92 |
|
| 93 |
diff --git a/INSTALL b/INSTALL |
| 94 |
index a828c17..022e8d0 100644 |
| 95 |
--- a/INSTALL |
| 96 |
+++ b/INSTALL |
| 97 |
@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor translations be installed |
| 98 |
TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is |
| 99 |
NODEBUG=1 - release target |
| 100 |
NOUSEWEBKIT - disable use of WebKit (Yahoo adapter) |
| 101 |
+SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal |
| 102 |
|
| 103 |
see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list |
| 104 |
|
| 105 |
diff --git a/src/src.pro b/src/src.pro |
| 106 |
index f23e05e..ff228b6 100644 |
| 107 |
--- a/src/src.pro |
| 108 |
+++ b/src/src.pro |
| 109 |
@@ -6,7 +6,11 @@ include (Config.pri) |
| 110 |
#Custom config |
| 111 |
include(Custom.pri) |
| 112 |
|
| 113 |
-include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri) |
| 114 |
+isEmpty(SYSTEM_QTSA) { |
| 115 |
+ include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri) |
| 116 |
+} else { |
| 117 |
+ CONFIG += qtsingleapplication |
| 118 |
+} |
| 119 |
include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri) |
| 120 |
|
| 121 |
#Qt Version |
| 122 |
-- |
| 123 |
2.0.5 |
Archives