[Git][debian-gis-team/merkaartor][master] 3 commits: Add patch to fix FTBFS with libproxy 0.5. (closes: #1066442)
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Wed Mar 13 14:28:18 GMT 2024
Bas Couwenberg pushed to branch master at Debian GIS Project / merkaartor
Commits:
ed3f185b by Bas Couwenberg at 2024-03-13T15:12:48+01:00
Add patch to fix FTBFS with libproxy 0.5. (closes: #1066442)
- - - - -
80bb7cee by Bas Couwenberg at 2024-03-13T15:17:42+01:00
Switch from qmake to cmake.
- - - - -
b30bc2c8 by Bas Couwenberg at 2024-03-13T15:22:50+01:00
Set distribution to unstable.
- - - - -
9 changed files:
- debian/changelog
- debian/control
- − debian/lintian-overrides
- + debian/patches/gpsd.patch
- + debian/patches/libproxy.patch
- debian/patches/no-git-version.patch
- − debian/patches/qmake-config-nostrip.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-merkaartor (0.19.0+ds-5) UNRELEASED; urgency=medium
+merkaartor (0.19.0+ds-5) unstable; urgency=medium
* Team upload.
@@ -7,6 +7,10 @@ merkaartor (0.19.0+ds-5) UNRELEASED; urgency=medium
* Enable Salsa CI.
* Drop unused libspatialite-dev build dependency.
* Replace pkg-config build dependency with pkgconf.
+ * Add patch to fix FTBFS with libproxy 0.5.
+ (closes: #1066442)
+ * Switch from qmake to cmake.
+ * Update lintian overrides.
[ Pino Toscano ]
* Backport upstream commit ba8b73e6b3372a21305640baca07a991f77db119 and
@@ -14,7 +18,7 @@ merkaartor (0.19.0+ds-5) UNRELEASED; urgency=medium
0.28+; patches upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
and upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch.
- -- Bas Couwenberg <sebastic at debian.org> Sat, 12 Aug 2023 21:48:43 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Wed, 13 Mar 2024 15:22:13 +0100
merkaartor (0.19.0+ds-4) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -3,7 +3,8 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
Uploaders: Jerome Benoit <calculus at rezozer.net>
Section: science
Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
libboost-dev,
libboost-math-dev,
libboost-serialization-dev,
@@ -17,12 +18,12 @@ Build-Depends: debhelper-compat (= 13),
libxml2-dev,
libxslt1-dev,
pkgconf,
- qt5-qmake,
- qt5-qmake:native,
qtbase5-dev,
- qttools5-dev-tools,
+ qttools5-dev,
qtwebengine5-dev [amd64 arm64 armhf i386 mips64el],
sharutils,
+ xauth,
+ xvfb,
zlib1g-dev
Standards-Version: 4.6.2
Vcs-Browser: https://salsa.debian.org/debian-gis-team/merkaartor
=====================================
debian/lintian-overrides deleted
=====================================
@@ -1,3 +0,0 @@
-# False positive, string not included in source
-spelling-error-in-binary wtH with *
-
=====================================
debian/patches/gpsd.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Fix pkg-config name gpsd.
+ libgps-dev provides libgps.pc.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/294
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -510,7 +510,7 @@ if (GEOIMAGE)
+ endif()
+
+ if (GPSD)
+- list(APPEND PKGCONFIG_REQUIRED_LIBS gpsd)
++ list(APPEND PKGCONFIG_REQUIRED_LIBS libgps)
+ add_definitions(-DUSE_GPS=1)
+ endif()
+
=====================================
debian/patches/libproxy.patch
=====================================
@@ -0,0 +1,37 @@
+Description: Fix FTBFS with libproxy 0.5.
+ proxy.h includes glib-object.h which needs to be found too.
+ Use pkg-config to get these paths.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/1066442
+Forwarded: https://github.com/openstreetmap/merkaartor/pull/293
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -486,6 +486,7 @@ set(PKGCONFIG_REQUIRED_LIBS gdal proj)
+ option(ZBAR "Enable ZBar usage in MWalkingPapersBackground and Geoimage." OFF)
+ option(GEOIMAGE "Enable Geoimage Dock (requires exiv2 library)." ON )
+ option(GPSD "Enable GPS Dock (requires gpsd library)." OFF)
++option(LIBPROXY "Enable libproxy usage." OFF)
+ option(WEBENGINE "Enable the use of QtWeb engine (not supported on all platforms)" OFF)
+ option(EXTRA_TESTS "Enable extra tests that cannot be run automatically on CI build." ON )
+
+@@ -493,6 +494,7 @@ message(STATUS "Build options (use -DOPT
+ message(STATUS " * ZBAR ${ZBAR}")
+ message(STATUS " * GEOIMAGE ${GEOIMAGE}")
+ message(STATUS " * GPSD ${GPSD}")
++message(STATUS " * LIBPROXY ${LIBPROXY}")
+ message(STATUS " * WEBENGINE ${WEBENGINE}")
+ message(STATUS " * EXTRA_TESTS ${EXTRA_TESTS}")
+ message(STATUS "")
+@@ -512,6 +514,11 @@ if (GPSD)
+ add_definitions(-DUSE_GPS=1)
+ endif()
+
++if (LIBPROXY)
++ list(APPEND PKGCONFIG_REQUIRED_LIBS libproxy-1.0)
++ add_definitions(-DUSE_LIBPROXY=1)
++endif()
++
+ if (WEBENGINE)
+ add_definitions(-DUSEWEBENGINE=1) # Actual macro is USE_WEBKIT
+ # add_definitions(-DTHREADED_BROWSERIMAGEMANAGER=1) # TODO: Check if that even does something/works
=====================================
debian/patches/no-git-version.patch
=====================================
@@ -1,16 +1,13 @@
-Description: Extract version from CHANGELOG, not git.
+Description: Don't use git for version information.
Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
---- a/src/Config.pri
-+++ b/src/Config.pri
-@@ -1,7 +1,7 @@
- # see http://merkaartor.be/wiki/merkaartor/Compiling
+--- a/cmake/vcs.cmake
++++ b/cmake/vcs.cmake
+@@ -1,5 +1,5 @@
--REVISION = $$system( git describe --tags )
--VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" )
-+REVISION = ""
-+VERSION = ""
- isEmpty( REVISION ) {
- REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
- VERSION = $$REVISION
+-if (EXISTS "${CMAKE_SOURCE_DIR}/.git")
++if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND NOT EXISTS "${CMAKE_SOURCE_DIR}/debian")
+ # If git directory is present, we require git executable and gather our info from git commands.
+ find_package(Git)
+ if (NOT ${GIT_FOUND})
=====================================
debian/patches/qmake-config-nostrip.patch deleted
=====================================
@@ -1,54 +0,0 @@
-Description: Add nostrip to CONFIG for debug package.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/Merkaartor.pro
-+++ b/Merkaartor.pro
-@@ -1,4 +1,4 @@
--CONFIG += debug_and_release
-+CONFIG += debug_and_release nostrip
- TEMPLATE = subdirs
- SUBDIRS += src \
- plugins
---- a/plugins/background/background.pro
-+++ b/plugins/background/background.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = subdirs
-
--CONFIG += debug_and_release
-+CONFIG += debug_and_release nostrip
-
- #Qt Version
- QT_VERSION = $$[QT_VERSION]
---- a/plugins/common.pri
-+++ b/plugins/common.pri
-@@ -10,7 +10,7 @@ QT_VER_MIN = $$member(QT_VERSION, 1)
-
- MERKAARTOR_SRC_DIR = $$PWD/..
-
--CONFIG += debug_and_release
-+CONFIG += debug_and_release nostrip
- # avoid deprecation warnings which 5.15 introduced.
- DEFINES += QT_NO_DEPRECATED_WARNINGS
-
---- a/plugins/plugins.pro
-+++ b/plugins/plugins.pro
-@@ -1,6 +1,6 @@
- TEMPLATE = subdirs
-
--CONFIG += debug_and_release
-+CONFIG += debug_and_release nostrip
-
- SUBDIRS += background
- # qtstyle
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,7 +6,7 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
-
--CONFIG += debug_and_release c++11
-+CONFIG += debug_and_release c++11 nostrip
- # avoid deprecation warnings which 5.15 introduced.
- DEFINES += QT_NO_DEPRECATED_WARNINGS
-
=====================================
debian/patches/series
=====================================
@@ -1,4 +1,5 @@
-qmake-config-nostrip.patch
no-git-version.patch
upstream_Moved-exiv2-header-from-GeoImageDock.h-to-.cpp.patch
upstream_Replaced-use-of-AutoPtr-with-std-unique_ptr-in-GeoIm.patch
+libproxy.patch
+gpsd.patch
=====================================
debian/rules
=====================================
@@ -12,36 +12,26 @@ export QT_SELECT=5
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 armhf i386 mips64el))
-DEB_PKG_USEWEBENGINE=1
+DEB_PKG_WEBENGINE=1
else
-DEB_PKG_USEWEBENGINE=0
+DEB_PKG_WEBENGINE=0
endif
%:
- dh $@ --buildsystem=qmake
-
-execute_after_dh_auto_clean:
- cd translations && make clean
+ dh $@ --buildsystem=cmake
override_dh_auto_configure:
- cd translations && make release
- dh_auto_configure -- -recursive \
- Merkaartor.pro \
- TRANSDIR_SYSTEM="/usr/share/qt5/translations/" \
- GDAL=1 \
- GEOIMAGE=1 \
- GPSDLIB=1 \
- LIBPROXY=1 \
- NOWEBKIT=1 \
- PROJ=1 \
- SPATIALITE=0 \
- SYSTEM_QUAZIP=1 \
- SYSTEM_QUAZIP_LDFLAGS="-lquazip5" \
- USEWEBENGINE=$(DEB_PKG_USEWEBENGINE) \
- ZBAR=0 \
- NODEBUG=1 \
- RELEASE=1
+ dh_auto_configure -- \
+ -DEXTRA_TESTS=0 \
+ -DGEOIMAGE=1 \
+ -DGPSD=1 \
+ -DLIBPROXY=1 \
+ -DWEBENGINE=$(DEB_PKG_WEBENGINE) \
+ -DZBAR=0
+
+override_dh_auto_test:
+ xvfb-run -a -n 1 -s '-screen 0 1280x1024x24 -dpi 96' dh_auto_test
override_dh_installchangelogs:
dh_installchangelogs CHANGELOG
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/compare/cb9b0efbd7a896f1c425876f698fe49e56562f5b...b30bc2c8cf2f65fadcb3e59306a31f826df24a19
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/merkaartor/-/compare/cb9b0efbd7a896f1c425876f698fe49e56562f5b...b30bc2c8cf2f65fadcb3e59306a31f826df24a19
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20240313/a0efb849/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list