Bas Couwenberg pushed to branch master at Debian GIS Project / libosmium
Commits: fce3db28 by Bas Couwenberg at 2025-09-01T06:15:20+02:00 Add upstream patch to fix FTBFS with CMake 4.x. (closes: #1113180) - - - - - 5481c8f9 by Bas Couwenberg at 2025-09-01T06:15:39+02:00 Set distribution to unstable. - - - - - 3 changed files: - debian/changelog - + debian/patches/cmake-4.patch - + debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,10 +1,12 @@ -libosmium (2.22.0-2) UNRELEASED; urgency=medium +libosmium (2.22.0-2) unstable; urgency=medium * Bump Standards-Version to 4.7.2, no changes. * Fix old FSF address in copyright file. * Mark libosmium2-doc as Multi-Arch: foreign. + * Add upstream patch to fix FTBFS with CMake 4.x. + (closes: #1113180) - -- Bas Couwenberg <[email protected]> Thu, 20 Mar 2025 06:08:59 +0100 + -- Bas Couwenberg <[email protected]> Mon, 01 Sep 2025 06:15:30 +0200 libosmium (2.22.0-1) unstable; urgency=medium ===================================== debian/patches/cmake-4.patch ===================================== @@ -0,0 +1,34 @@ +Description: Require a more modern CMake + So it works with CMake 4 +Author: Jochen Topf <[email protected]> +Origin: https://github.com/osmcode/libosmium/commit/7ab87418a0697ac9b7b5f005fbd64dcd99a01124 +Bug: https://github.com/osmcode/libosmium/issues/391 + + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ + # + #----------------------------------------------------------------------------- + +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.10.0 FATAL_ERROR) + list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake") + + +@@ -36,14 +36,7 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Rel + # + #----------------------------------------------------------------------------- + +-project(libosmium) +- +-set(LIBOSMIUM_VERSION_MAJOR 2) +-set(LIBOSMIUM_VERSION_MINOR 22) +-set(LIBOSMIUM_VERSION_PATCH 0) +- +-set(LIBOSMIUM_VERSION +- "${LIBOSMIUM_VERSION_MAJOR}.${LIBOSMIUM_VERSION_MINOR}.${LIBOSMIUM_VERSION_PATCH}") ++project(libosmium VERSION 2.22.0 LANGUAGES CXX C) + + set(CMAKE_EXPORT_COMPILE_COMMANDS ON) + ===================================== debian/patches/series ===================================== @@ -0,0 +1 @@ +cmake-4.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/libosmium/-/compare/285f9ccc1187a39e10aeb1ed3f28ef12d9c7c430...5481c8f953a2a7e4a3caa34ed61c50897b9c4b05 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/libosmium/-/compare/285f9ccc1187a39e10aeb1ed3f28ef12d9c7c430...5481c8f953a2a7e4a3caa34ed61c50897b9c4b05 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
