This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit 2c38403b06d8dad26fca69925d1f5d3e9ad0c9af
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sun Nov 1 16:47:54 2015 +0100
Use upstream patch for quazip-qt5 linking.
---
debian/changelog | 1 +
...ted-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch | 38 ++++++++++++++++++++++
debian/patches/quazip-qt5.patch | 15 ---------
debian/patches/series | 2 +-
debian/rules | 1 +
5 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e6fc255..d6987f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ merkaartor (0.18.2-3) UNRELEASED; urgency=medium
* Add upstream metadata.
* Add patch to fix libgps22 compatibility.
+ * Use upstream patch for quazip-qt5 linking.
-- Bas Couwenberg <sebas...@debian.org> Sun, 01 Nov 2015 12:33:20 +0100
diff --git
a/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
b/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
new file mode 100644
index 0000000..7cebb71
--- /dev/null
+++
b/debian/patches/0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
@@ -0,0 +1,38 @@
+From ba74296b66745a5cdd592e88af2252a22c6b1840 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krako...@krakonos.org>
+Date: Thu, 15 Oct 2015 15:34:56 +0200
+Subject: Implemented SYSTEM_QUAZIP_LDFLAGS, fixing issue #66.
+Origin:
https://github.com/openstreetmap/merkaartor/commit/ba74296b66745a5cdd592e88af2252a22c6b1840
+Bug: https://github.com/openstreetmap/merkaartor/issues/66
+
+---
+ INSTALL | 2 ++
+ src/src.pro | 6 +++++-
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/INSTALL
++++ b/INSTALL
+@@ -97,6 +97,8 @@ NODEBUG=1 - release ta
+ 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
++SYSTEM_QUAZIP_LDFLAGS - custom flags instead of the default "-lquazip",
if
++ your library has different name
+ SPATIALITE=1 - compile spatialite backend (not working) and
+ SpatialiteBackground plugin (state unknown). Use
+ at your own risk.
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -17,7 +17,11 @@ isEmpty(SYSTEM_QUAZIP) {
+ DEFINES += QUAZIP_STATIC
+ include(../3rdparty/quazip-0.7/quazip.pri)
+ } else {
+- LIBS += -lquazip
++ isEmpty(SYSTEM_QUAZIP_LDFLAGS) {
++ LIBS += -lquazip
++ } else {
++ LIBS += $$SYSTEM_QUAZIP_LDFLAGS
++ }
+ }
+
+ #Qt Version
diff --git a/debian/patches/quazip-qt5.patch b/debian/patches/quazip-qt5.patch
deleted file mode 100644
index ebf9541..0000000
--- a/debian/patches/quazip-qt5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Link quazip-qt5 for Qt5 build.
-Author: Bas Couwenberg <sebas...@debian.org>
-Bug: https://github.com/openstreetmap/merkaartor/issues/66
-
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -17,7 +17,7 @@ isEmpty(SYSTEM_QUAZIP) {
- DEFINES += QUAZIP_STATIC
- include(../3rdparty/quazip-0.7/quazip.pri)
- } else {
-- LIBS += -lquazip
-+ LIBS += -lquazip-qt5
- }
-
- #Qt Version
diff --git a/debian/patches/series b/debian/patches/series
index c395140..862a14d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,7 @@
0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
0001-Modified-GDAL-import-to-always-confirm-projection-be.patch
0001-Fixed-debug-build.patch
-quazip-qt5.patch
+0001-Implemented-SYSTEM_QUAZIP_LDFLAGS-fixing-issue-66.patch
various-typos.patch
hardening-buildflags.patch
desktop-keywords.patch
diff --git a/debian/rules b/debian/rules
index 592f30a..5ade8d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ override_dh_auto_configure:
PROJ=1 \
SPATIALITE=0 \
SYSTEM_QUAZIP=1 \
+ SYSTEM_QUAZIP_LDFLAGS="-lquazip-qt5" \
ZBAR=0 \
NODEBUG=1 \
RELEASE=1
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/merkaartor.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
