[merkaartor] 11/23: Switch to Qt5.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Sep 18 18:36:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository merkaartor.
commit 2ef803abd6522c0393a677e25c4ab9333a4876d3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Sep 18 03:00:22 2015 +0200
Switch to Qt5.
Disable zbar, is Qt4-only.
---
debian/changelog | 2 ++
debian/control | 10 +++---
...ompilation-issues-with-GEOIMAGE-1-and-Qt5.patch | 41 ++++++++++++++++++++++
debian/patches/quazip-qt5.patch | 15 ++++++++
debian/patches/series | 2 ++
debian/rules | 10 ++++--
6 files changed, 73 insertions(+), 7 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b904e24..2c7eb58 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
* Override dh_install to use --list-missing.
* Rename old style config sections in gbp.conf.
* Add patch to fix version detection for tarball releases.
+ * Switch to Qt5.
+ * Disable zbar, is Qt4-only.
-- Bas Couwenberg <sebastic at debian.org> Fri, 18 Sep 2015 01:17:53 +0200
diff --git a/debian/control b/debian/control
index 679c3a2..0c3ddb3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,15 @@ Build-Depends: debhelper (>= 9),
libgps-dev,
libproj-dev,
libproxy-dev,
- libqtwebkit-dev,
- libqt4-dev,
+ libqt5svg5-dev,
+ libqt5webkit5-dev,
+ libquazip-qt5-dev,
libspatialite-dev,
libxml2-dev,
libxslt1-dev,
- libzbarqt-dev,
- libzbar-dev,
+ qt5-qmake,
+ qtbase5-dev,
+ qttools5-dev-tools,
sharutils,
zlib1g-dev
Standards-Version: 3.8.4
diff --git a/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch b/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
new file mode 100644
index 0000000..70b1de3
--- /dev/null
+++ b/debian/patches/0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
@@ -0,0 +1,41 @@
+From e6d015a953a163f174e09a9b50c9bb8bc19593e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
+Date: Mon, 27 Jul 2015 14:22:37 +0200
+Subject: Fixed compilation issues with GEOIMAGE=1 and Qt5.
+Origin: https://github.com/openstreetmap/merkaartor/commit/e6d015a953a163f174e09a9b50c9bb8bc19593e4
+
+---
+ src/Docks/GeoImageDock.cpp | 4 ++--
+ src/Docks/GeoImageDock.h | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+--- a/src/Docks/GeoImageDock.cpp
++++ b/src/Docks/GeoImageDock.cpp
+@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringLis
+
+ Exiv2::Image::AutoPtr image;
+ Exiv2::ExifData exifData;
+- bool positionValid = FALSE;
++ bool positionValid = false;
+
+ Layer *theLayer;
+ if (photoLayer == NULL) {
+@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(
+ double lat = 0.0, lon = 0.0;
+ Exiv2::Image::AutoPtr image;
+ Exiv2::ExifData exifData;
+- bool positionValid = FALSE;
++ bool positionValid = false;
+
+ if (!QFile::exists(file)) {
+ return pos;
+--- a/src/Docks/GeoImageDock.h
++++ b/src/Docks/GeoImageDock.h
+@@ -9,6 +9,7 @@
+ #include <QtWidgets/QShortcut>
+ #include <exiv2/image.hpp>
+ #include <exiv2/exif.hpp>
++#include <QDrag>
+
+ class ImageView;
+
diff --git a/debian/patches/quazip-qt5.patch b/debian/patches/quazip-qt5.patch
new file mode 100644
index 0000000..7a27f9a
--- /dev/null
+++ b/debian/patches/quazip-qt5.patch
@@ -0,0 +1,15 @@
+Description: Link quazip-qt5 for Qt5 build.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug: https://github.com/openstreetmap/merkaartor/issues/66
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -15,7 +15,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 c0e662b..2820a49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
0001-Fixed-version-info-in-tarballs.patch
+0001-Fixed-compilation-issues-with-GEOIMAGE-1-and-Qt5.patch
+quazip-qt5.patch
diff --git a/debian/rules b/debian/rules
index d069f07..b20d11c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,9 @@ else
CFLAGS += -O2
endif
+# Use Qt5
+export QT_SELECT=5
+
%:
dh $@ --parallel
@@ -38,16 +41,17 @@ override_dh_clean:
override_dh_auto_configure:
echo '#define SVNREV $(SVNREV)' > src/revision.h
cd translations && make release
- qmake-qt4 Merkaartor.pro NOWEBKIT=1 \
- TRANSDIR_SYSTEM="/usr/share/qt4/translations/" \
+ qmake Merkaartor.pro NOWEBKIT=1 \
+ TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \
PREFIX=/usr \
GEOIMAGE=1 \
PROJ=1 \
GDAL=1 \
GPSDLIB=1 \
- ZBAR=1 \
+ ZBAR=0 \
SPATIALITE=1 \
LIBPROXY=1 \
+ SYSTEM_QUAZIP=1 \
$(RELEASEFLAGS)
override_dh_auto_build:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git
More information about the Pkg-grass-devel
mailing list