Bas Couwenberg pushed to branch master at Debian GIS Project / gmt
Commits: f8b3f5c2 by Bas Couwenberg at 2026-07-30T18:38:39+02:00 Add patch to not build & install gmt_update. (closes: #1143117, #1143119, #1143120) - - - - - 8cb07137 by Bas Couwenberg at 2026-07-30T18:38:53+02:00 Set distribution to unstable. - - - - - 7 changed files: - debian/.gitlab-ci.yml - debian/changelog - debian/control - debian/gmt.install - + debian/patches/gmt_update.patch - debian/patches/series - debian/rules Changes: ===================================== debian/.gitlab-ci.yml ===================================== @@ -3,7 +3,6 @@ include: - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml variables: - SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1 SALSA_CI_ENABLE_BUILD_PACKAGE_PROFILES: 1 SALSA_CI_ENABLE_VALIDATE_PACKAGE_CLEAN_UP: 1 ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +gmt (6.7.0+dfsg-3) unstable; urgency=medium + + * Add patch to not build & install gmt_update. + (closes: #1143117, #1143119, #1143120) + + -- Bas Couwenberg <[email protected]> Thu, 30 Jul 2026 18:38:40 +0200 + gmt (6.7.0+dfsg-2) unstable; urgency=medium * Mark non-{amd,arm}64 architectures as unsupported. ===================================== debian/control ===================================== @@ -25,7 +25,6 @@ Build-Depends: chrpath, pkgconf, texlive, texlive-latex-extra, - unsupported-architecture [!amd64 !arm64], zlib1g-dev Standards-Version: 4.7.4 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gmt ===================================== debian/gmt.install ===================================== @@ -5,6 +5,5 @@ usr/bin/fzprofiler usr/bin/gmt usr/bin/gmtswitch usr/bin/gmt_shell_functions.sh -usr/bin/gmt_update usr/bin/isogmt usr/lib/*/gmt/plugins/supplements.so ===================================== debian/patches/gmt_update.patch ===================================== @@ -0,0 +1,36 @@ +Description: Add option to not build & install gmt_update. +Author: Bas Couwenberg <[email protected]> +Bug: https://github.com/GenericMappingTools/gmt/issues/9116 + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -603,16 +603,19 @@ target_link_libraries (gshhg_version ${N + # script2verbatim for removing comments, replacing -ps from example scripts + add_executable (script2verbatim script2verbatim.c) + +-# gmt_update — standalone binary updater. Deliberately does NOT link against +-# libgmt/pslib so that those DLLs are NOT held open by this process and can be +-# replaced on Windows. Uses only libcurl + an embedded public-domain SHA-256. +-add_executable (gmt_update gmt_update.c sha256.c) +-target_include_directories (gmt_update PRIVATE ${CURL_INCLUDE_DIRS}) +-target_link_libraries (gmt_update ${CURL_LIBRARIES}) +-if (WIN32) +- target_link_libraries (gmt_update rstrtmgr) +-endif (WIN32) +-install (TARGETS gmt_update RUNTIME DESTINATION ${GMT_BINDIR} COMPONENT Runtime) ++option(WITH_GMT_UPDATE "Build and install gmt_update executable" ON) ++if (WITH_GMT_UPDATE) ++ # gmt_update — standalone binary updater. Deliberately does NOT link against ++ # libgmt/pslib so that those DLLs are NOT held open by this process and can be ++ # replaced on Windows. Uses only libcurl + an embedded public-domain SHA-256. ++ add_executable (gmt_update gmt_update.c sha256.c) ++ target_include_directories (gmt_update PRIVATE ${CURL_INCLUDE_DIRS}) ++ target_link_libraries (gmt_update ${CURL_LIBRARIES}) ++ if (WIN32) ++ target_link_libraries (gmt_update rstrtmgr) ++ endif (WIN32) ++ install (TARGETS gmt_update RUNTIME DESTINATION ${GMT_BINDIR} COMPONENT Runtime) ++endif() + + + ## ===================================== debian/patches/series ===================================== @@ -1,3 +1,4 @@ disable-triangle.patch incorrect-path-for-interpreter.patch no-docs.patch +gmt_update.patch ===================================== debian/rules ===================================== @@ -28,6 +28,7 @@ CMAKE_OPTS = -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DGMT_EXCLUDE_PCRE=on \ -DGMT_INSTALL_MODULE_LINKS=off \ -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \ + -DWITH_GMT_UPDATE=off \ -DLICENSE_RESTRICTED=LGPL %: @@ -55,8 +56,7 @@ execute_after_dh_auto_install: chrpath --delete \ debian/tmp/usr/lib/*/gmt/plugins/supplements.so \ debian/tmp/usr/lib/*/lib*.so.*.* \ - debian/tmp/usr/bin/gmt \ - debian/tmp/usr/bin/gmt_update + debian/tmp/usr/bin/gmt override_dh_compress: # Don't compress the pdf files needed for the gmt-doc-pdf package, nor the examples View it on GitLab: https://salsa.debian.org/debian-gis-team/gmt/-/compare/167bc02d37d255527a83aebb1fcb4eb1c9801f73...8cb0713738c6dda89418c79690dea21b7b073596 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/gmt/-/compare/167bc02d37d255527a83aebb1fcb4eb1c9801f73...8cb0713738c6dda89418c79690dea21b7b073596 You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
