diff --git a/debian/patches/0005-Fix-check_symbol_exists-with-pedantic-errors.patch b/debian/patches/0002-Fix-check_symbol_exists-with-pedantic-errors.patch similarity index 98% rename from debian/patches/0005-Fix-check_symbol_exists-with-pedantic-errors.patch rename to debian/patches/0002-Fix-check_symbol_exists-with-pedantic-errors.patch index 971dd7a0c..f2cca65d7 100644 --- a/debian/patches/0005-Fix-check_symbol_exists-with-pedantic-errors.patch +++ b/debian/patches/0002-Fix-check_symbol_exists-with-pedantic-errors.patch @@ -9,7 +9,7 @@ Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6656 2 files changed, 26 insertions(+) diff --git a/Modules/CheckSymbolExists.cmake b/Modules/CheckSymbolExists.cmake -index f8ca584..a87fdbd 100644 +index 48ee3c4..a7139af 100644 --- a/Modules/CheckSymbolExists.cmake +++ b/Modules/CheckSymbolExists.cmake @@ -67,14 +67,29 @@ cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced diff --git a/debian/patches/0002-Fix-cross-compilation-with-MPI.patch b/debian/patches/0002-Fix-cross-compilation-with-MPI.patch deleted file mode 100644 index bca38daf9..000000000 --- a/debian/patches/0002-Fix-cross-compilation-with-MPI.patch +++ /dev/null @@ -1,63 +0,0 @@ -From: =?utf-8?q?Timo_R=C3=B6hling?= -Date: Tue, 14 Sep 2021 17:04:48 +0200 -Subject: Fix cross compilation with MPI - -Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6537 ---- - Modules/FindMPI.cmake | 36 +++++++++++++++++++++++++++++++++++- - 1 file changed, 35 insertions(+), 1 deletion(-) - -diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake -index d8f0334..1aaba43 100644 ---- a/Modules/FindMPI.cmake -+++ b/Modules/FindMPI.cmake -@@ -267,6 +267,7 @@ cmake_policy(PUSH) - cmake_policy(SET CMP0057 NEW) # if IN_LIST - - include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -+find_package(PkgConfig QUIET) - - # Generic compiler names - set(_MPI_C_GENERIC_COMPILER_NAMES mpicc mpcc mpicc_r mpcc_r) -@@ -1523,7 +1524,40 @@ foreach(LANG IN ITEMS C CXX Fortran) - if(NOT MPI_PINNED_COMPILER AND NOT MPI_${LANG}_WRAPPER_FOUND) - # If MPI_PINNED_COMPILER wasn't given, and the MPI compiler we potentially found didn't work, we withdraw it. - set(MPI_${LANG}_COMPILER "MPI_${LANG}_COMPILER-NOTFOUND" CACHE FILEPATH "MPI compiler for ${LANG}" FORCE) -- if(NOT MPI_SKIP_GUESSING) -+ -+ if(LANG STREQUAL "C") -+ set(_MPI_PKG "mpi-c") -+ elseif(LANG STREQUAL "CXX") -+ set(_MPI_PKG "mpi-cxx") -+ elseif(LANG STREQUAL "Fortran") -+ set(_MPI_PKG "mpi-fort") -+ else() -+ set(_MPI_PKG "") -+ endif() -+ if(_MPI_PKG AND PKG_CONFIG_FOUND) -+ pkg_check_modules("MPI_${LANG}_PKG" "${_MPI_PKG}") -+ if("${MPI_${LANG}_PKG_FOUND}") -+ set(MPI_${LANG}_COMPILE_OPTIONS ${MPI_${LANG}_PKG_CFLAGS} CACHE STRING "MPI ${LANG} compilation options" FORCE) -+ set(MPI_${LANG}_INCLUDE_PATH ${MPI_${LANG}_PKG_INCLUDE_DIRS} CACHE STRING "MPI ${LANG} include directories" FORCE) -+ set(MPI_${LANG}_LINK_FLAGS ${MPI_${LANG}_PKG_LDFLAGS} CACHE STRING "MPI ${LANG} linker flags" FORCE) -+ set(MPI_${LANG}_LIB_NAMES ${MPI_${LANG}_PKG_LIBRARIES} CACHE STRING "MPI ${LANG} libraries to link against" FORCE) -+ foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIB_NAMES) -+ if(_MPI_LIB) -+ get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE) -+ get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME) -+ get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY) -+ find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY -+ NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}" -+ HINTS ${_MPI_LIB_DIR} -+ DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI" -+ ) -+ mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY) -+ endif() -+ endforeach() -+ endif() -+ endif() -+ -+ if(NOT MPI_SKIP_GUESSING AND NOT "${MPI_${LANG}_PKG_FOUND}") - # For C++, we may use the settings for C. Should a given compiler wrapper for C++ not exist, but one for C does, we copy over the - # settings for C. An MPI distribution that is in this situation would be IBM Platform MPI. - if("${LANG}" STREQUAL "CXX" AND MPI_C_WRAPPER_FOUND) diff --git a/debian/patches/0003-Fix-RunCMake.CPack_DEB.EXTRA-on-Debian-non-Linux-OSe.patch b/debian/patches/0003-Fix-RunCMake.CPack_DEB.EXTRA-on-Debian-non-Linux-OSe.patch deleted file mode 100644 index f508d834b..000000000 --- a/debian/patches/0003-Fix-RunCMake.CPack_DEB.EXTRA-on-Debian-non-Linux-OSe.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: =?utf-8?q?Timo_R=C3=B6hling?= -Date: Tue, 28 Sep 2021 16:54:07 +0200 -Subject: Fix RunCMake.CPack_DEB.EXTRA on Debian non-Linux OSes - -Forwarded: https://gitlab.kitware.com/cmake/cmake/-/merge_requests/6540 - -The generated path with the packages uses $CPACK_TOPLEVEL_TAG, which -by default is $CPACK_SYSTEM_NAME, thus the OS name. - -To make the expected stderr match also non-Linux OSes, accept any -non-slash characters in place of "Linux", so it works also on other -Debian OSes (e.g. Debian/Hurd). - -(Cherry-picked commit b07812c6de51840a0dc6d3486d4a814fa7ef37f4 from -upstream) ---- - Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt -index 37360e8..8b6ca94 100644 ---- a/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt -+++ b/Tests/RunCMake/CPack/tests/EXTRA/DEB-stderr.txt -@@ -1,6 +1,6 @@ - CPack Warning: Adding file to tar: --#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/bas -+#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/[^/]+/DEB/extra-0.1.1-[^/]+/bas - #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles - CPack Warning: Adding file to tar: --#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/Linux/DEB/extra-0.1.1-Linux/foo -+#top level directory: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/_CPack_Packages/[^/]+/DEB/extra-0.1.1-[^/]+/foo - #missing file: .*/Tests/RunCMake/DEB.EXTRA/CPack/EXTRA-build/conffiles diff --git a/debian/patches/0004-Make-FindFLTK-safe-to-include-multiple-times.patch b/debian/patches/0004-Make-FindFLTK-safe-to-include-multiple-times.patch deleted file mode 100644 index 2f0b4287a..000000000 --- a/debian/patches/0004-Make-FindFLTK-safe-to-include-multiple-times.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: =?utf-8?q?Timo_R=C3=B6hling?= -Date: Mon, 18 Oct 2021 16:45:01 +0200 -Subject: Make FindFLTK safe to include multiple times - -Forwarded: not-needed - -This is a backport of commit 51fd21736b10e2fa04382c5aa71f2044d31e362f -from the 3.22.x milestone. ---- - Modules/FindFLTK.cmake | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake -index bab7256..d54d2f6 100644 ---- a/Modules/FindFLTK.cmake -+++ b/Modules/FindFLTK.cmake -@@ -152,13 +152,17 @@ if(NOT FLTK_DIR) - endif() - - # Check if FLTK was built using CMake --if(EXISTS ${FLTK_DIR}/FLTKConfig.cmake) -- set(FLTK_BUILT_WITH_CMAKE 1) --endif() -+foreach(fltk_include IN LISTS FLTK_DIR) -+ if(EXISTS "${fltk_include}/FLTKConfig.cmake") -+ set(FLTK_BUILT_WITH_CMAKE 1) -+ set(FLTK_CMAKE_PATH "${fltk_include}/FLTKConfig.cmake") -+ break() -+ endif() -+endforeach() - - if(FLTK_BUILT_WITH_CMAKE) - set(FLTK_FOUND 1) -- include(${FLTK_DIR}/FLTKConfig.cmake) -+ include("${FLTK_CMAKE_PATH}") - - # Fluid - if(FLUID_COMMAND) diff --git a/debian/patches/series b/debian/patches/series index 319869ae8..3089b58d9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ 0001-Prefer-Debian-default-version-of-Python.patch -0002-Fix-cross-compilation-with-MPI.patch -0003-Fix-RunCMake.CPack_DEB.EXTRA-on-Debian-non-Linux-OSe.patch -0004-Make-FindFLTK-safe-to-include-multiple-times.patch -0005-Fix-check_symbol_exists-with-pedantic-errors.patch +0002-Fix-check_symbol_exists-with-pedantic-errors.patch