diff --git a/debian/patches/0001-Prefer-default-Python-version.patch b/debian/patches/0001-Prefer-default-Python-version.patch index bcc15edac..87b3e1a88 100644 --- a/debian/patches/0001-Prefer-default-Python-version.patch +++ b/debian/patches/0001-Prefer-default-Python-version.patch @@ -14,7 +14,7 @@ Forwarded: not-needed 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake -index faca5ae..f46a78f 100644 +index e0bdbc5..68c5ac3 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -1533,12 +1533,7 @@ unset (${_PYTHON_PREFIX}_SOSABI) @@ -41,7 +41,7 @@ index faca5ae..f46a78f 100644 diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake -index 443c6eb..aed0873 100644 +index e5bcb5f..3cfccb5 100644 --- a/Modules/FindPythonInterp.cmake +++ b/Modules/FindPythonInterp.cmake @@ -107,6 +107,7 @@ if(DEFINED PYTHONLIBS_VERSION_STRING) diff --git a/debian/patches/0002-Fix-ImageMagick_-_ARCH_INCLUDE_DIR-detection.patch b/debian/patches/0002-Fix-ImageMagick_-_ARCH_INCLUDE_DIR-detection.patch new file mode 100644 index 000000000..216e5d47c --- /dev/null +++ b/debian/patches/0002-Fix-ImageMagick_-_ARCH_INCLUDE_DIR-detection.patch @@ -0,0 +1,25 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Mon, 11 Nov 2024 15:24:01 +0100 +Subject: Fix ImageMagick_*_ARCH_INCLUDE_DIR detection + +Bug-Debian: https://bugs.debian.org/1087233 +Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9990 +--- + Modules/FindImageMagick.cmake | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/Modules/FindImageMagick.cmake b/Modules/FindImageMagick.cmake +index 66e65ad..809fec7 100644 +--- a/Modules/FindImageMagick.cmake ++++ b/Modules/FindImageMagick.cmake +@@ -133,7 +133,9 @@ function(FIND_IMAGEMAGICK_API component header) + NO_DEFAULT_PATH + ) + find_path(ImageMagick_${component}_ARCH_INCLUDE_DIR +- NAMES magick/magick-baseconfig.h ++ NAMES ++ magick/magick-baseconfig.h ++ MagickCore/magick-baseconfig.h + HINTS + ${PC_${component}_INCLUDEDIR} + ${PC_${component}_INCLUDE_DIRS} diff --git a/debian/patches/0003-Recognize-Multi-Arch-libdir-for-musl-linux-any.patch b/debian/patches/0003-Recognize-Multi-Arch-libdir-for-musl-linux-any.patch new file mode 100644 index 000000000..faea106d7 --- /dev/null +++ b/debian/patches/0003-Recognize-Multi-Arch-libdir-for-musl-linux-any.patch @@ -0,0 +1,20 @@ +From: =?utf-8?q?Timo_R=C3=B6hling?= +Date: Mon, 11 Nov 2024 15:26:05 +0100 +Subject: Recognize Multi-Arch libdir for musl-linux-any + +Bug-Debian: https://bugs.debian.org/1085507 +Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/9991 +--- + Modules/Platform/Linux-Initialize.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Modules/Platform/Linux-Initialize.cmake b/Modules/Platform/Linux-Initialize.cmake +index 7166b20..e1e5d7e 100644 +--- a/Modules/Platform/Linux-Initialize.cmake ++++ b/Modules/Platform/Linux-Initialize.cmake +@@ -2,4 +2,4 @@ set(LINUX 1) + set(UNIX 1) + + # Match multiarch library directory names. +-set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*") ++set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-[a-z0-9_]*") diff --git a/debian/patches/series b/debian/patches/series index 812333042..5bfda2b8a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ 0001-Prefer-default-Python-version.patch +0002-Fix-ImageMagick_-_ARCH_INCLUDE_DIR-detection.patch +0003-Recognize-Multi-Arch-libdir-for-musl-linux-any.patch