From 8828e69857c54e318fd85ab2296b9bae883e608b Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Wed, 6 May 2026 19:51:14 +0200 Subject: Raise the minimum required version of CMake to 3.10. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../debian/changelog | 6 ++ .../debian/patches/03-required-cmake-3.10.diff | 14 +++++ .../debian/patches/series | 1 + .../debian/changelog | 6 ++ .../debian/patches/12-required-cmake-3.10.diff | 14 +++++ .../debian/patches/series | 1 + .../pcsc-lite-nodbus-1.4.102/debian/changelog | 7 +++ .../debian/patches/cmake.diff | 4 +- debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog | 7 +++ .../debian/patches/009-required-cmake-3.10.diff | 71 ++++++++++++++++++++++ debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/series | 1 + 11 files changed, 130 insertions(+), 2 deletions(-) create mode 100644 debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/03-required-cmake-3.10.diff create mode 100644 debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/12-required-cmake-3.10.diff create mode 100644 debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/009-required-cmake-3.10.diff diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog index ab01ddad..f805d52b 100644 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-plugins-extra-trinity (0.8.4-3debian14.0.0+9~a) forky; urgency=low + + * Raise the minimum required version of CMake to 3.10. + + -- Slávek Banko Wed, 06 May 2026 19:46:35 +0200 + compiz-fusion-plugins-extra-trinity (0.8.4-3debian14.0.0+8~a) forky; urgency=low * Fix FTBFS caused by changes in cdbs system. diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/03-required-cmake-3.10.diff b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/03-required-cmake-3.10.diff new file mode 100644 index 00000000..bdd6015b --- /dev/null +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/03-required-cmake-3.10.diff @@ -0,0 +1,14 @@ +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,7 @@ +-project (compiz-plugins-extra) + +-cmake_minimum_required (VERSION 2.4) ++cmake_minimum_required( VERSION 3.10 ) ++ ++project (compiz-plugins-extra) + + set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include (cmake/addons.cmake) diff --git a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series index 6121184b..a5158803 100644 --- a/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-fusion-plugins-extra-trinity/compiz-fusion-plugins-extra-trinity-0.8.4/debian/patches/series @@ -2,3 +2,4 @@ crash_fix_4082dc3c.patch 01-disable-gconf.patch 02-malloc-free-implicit-declaration.diff +03-required-cmake-3.10.diff diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog index 00ed6892..bd5683ae 100644 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/changelog @@ -1,3 +1,9 @@ +compiz-fusion-plugins-main-trinity (0.8.4-3debian14.0.0+9~a) forky; urgency=low + + * Raise the minimum required version of CMake to 3.10. + + -- Slávek Banko Wed, 06 May 2026 19:46:35 +0200 + compiz-fusion-plugins-main-trinity (0.8.4-3debian14.0.0+8~a) forky; urgency=low * Fix FTBFS caused by changes in cdbs system. diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/12-required-cmake-3.10.diff b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/12-required-cmake-3.10.diff new file mode 100644 index 00000000..9e9a61c3 --- /dev/null +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/12-required-cmake-3.10.diff @@ -0,0 +1,14 @@ +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,7 @@ +-project (compiz-plugins-main) + +-cmake_minimum_required (VERSION 2.4) ++cmake_minimum_required( VERSION 3.10 ) ++ ++project (compiz-plugins-main) + + set (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + include (cmake/addons.cmake) diff --git a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series index 5a691915..5a3083bd 100644 --- a/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series +++ b/debian/compiz-fusion-plugins-main-trinity/compiz-fusion-plugins-main-trinity-0.8.4/debian/patches/series @@ -6,3 +6,4 @@ 09-multiple-definitions.diff 10-disable-gconf.patch 11-malloc-free-implicit-declaration.diff +12-required-cmake-3.10.diff diff --git a/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/changelog b/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/changelog index cd9f363e..229348df 100644 --- a/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/changelog +++ b/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/changelog @@ -1,3 +1,10 @@ +pcsc-lite-nodbus (1.4.102-4debian14.0.0+8~a) forky; urgency=low + + * Raise the minimum required version of CMake to 3.10. + * Use tde_setup_compiler_flags instead of tde_setup_architecture_flags. + + -- Slávek Banko Wed, 06 May 2026 19:46:35 +0200 + pcsc-lite-nodbus (1.4.102-4debian14.0.0+7~a) forky; urgency=low * Use tde-cdbs and tde-cmake for building diff --git a/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/patches/cmake.diff b/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/patches/cmake.diff index b4b0dd52..bf553142 100644 --- a/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/patches/cmake.diff +++ b/debian/pcsc-lite-nodbus/pcsc-lite-nodbus-1.4.102/debian/patches/cmake.diff @@ -14,7 +14,7 @@ Index: b/CMakeLists.txt +# +################################################# + -+cmake_minimum_required( VERSION 2.8 ) ++cmake_minimum_required( VERSION 3.10 ) + + +##### general package setup ##################### @@ -53,7 +53,7 @@ Index: b/CMakeLists.txt +set( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ) + +include( TDEMacros ) -+tde_setup_architecture_flags( ) ++tde_setup_compiler_flags( ) + + +##### setup install paths ####################### diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog b/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog index 64eef111..7b22c0ee 100644 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/changelog @@ -1,3 +1,10 @@ +wv2 (0.4.2.dfsg.2-2debian14.0.0+7~a) forky; urgency=low + + * Raise the minimum required version of CMake to 3.10. + * Use tde_get_library_filename instead of GET_TARGET_PROPERTY( ... LOCATION). + + -- Slávek Banko Wed, 06 May 2026 19:46:35 +0200 + wv2 (0.4.2.dfsg.2-2debian14.0.0+6~a) forky; urgency=low * Use tde-cdbs and tde-cmake for building diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/009-required-cmake-3.10.diff b/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/009-required-cmake-3.10.diff new file mode 100644 index 00000000..e50b16c2 --- /dev/null +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/009-required-cmake-3.10.diff @@ -0,0 +1,71 @@ +Index: b/CMakeLists.txt +=================================================================== +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,6 +1,7 @@ +-PROJECT( wvWare ) + +-cmake_minimum_required(VERSION 2.6) ++cmake_minimum_required (VERSION 3.10 ) ++ ++PROJECT( wvWare ) + + # wv2 versioning + SET( WV2_MAJOR_VERSION 0 ) +Index: b/cmake/MacroCreateLibtoolFile.cmake +=================================================================== +--- a/cmake/MacroCreateLibtoolFile.cmake ++++ b/cmake/MacroCreateLibtoolFile.cmake +@@ -1,6 +1,43 @@ + # MacroCreateLibtoolFile.cmake + # http://www.cmake.org/Wiki/CMakeMacroLibtoolFile + ++function( tde_get_library_filename _filename _target ) ++ get_target_property( _type ${_target} TYPE ) ++ if( "${_type}" MATCHES "_LIBRARY" ) ++ get_target_property( _output_prefix ${_target} PREFIX ) ++ if( "${_output_prefix}" STREQUAL "_output_prefix-NOTFOUND" ) ++ if( "${_type}" MATCHES "STATIC_" ) ++ set( _output_prefix "${CMAKE_STATIC_LIBRARY_PREFIX}" ) ++ elseif( "${_type}" MATCHES "SHARED_" ) ++ set( _output_prefix "${CMAKE_SHARED_LIBRARY_PREFIX}" ) ++ elseif( "${_type}" MATCHES "MODULE_" ) ++ set( _output_prefix "${CMAKE_SHARED_MODULE_PREFIX}" ) ++ else( ) ++ set( _output_prefix "" ) ++ endif( ) ++ endif( ) ++ get_target_property( _output_suffix ${_target} SUFFIX ) ++ if( "${_output_suffix}" STREQUAL "_output_suffix-NOTFOUND" ) ++ if( "${_type}" MATCHES "STATIC_" ) ++ set( _output_suffix "${CMAKE_STATIC_LIBRARY_SUFFIX}" ) ++ elseif( "${_type}" MATCHES "SHARED_" ) ++ set( _output_suffix "${CMAKE_SHARED_LIBRARY_SUFFIX}" ) ++ elseif( "${_type}" MATCHES "MODULE_" ) ++ set( _output_suffix "${CMAKE_SHARED_MODULE_SUFFIX}" ) ++ else( ) ++ set( _output_suffix "" ) ++ endif( ) ++ endif( ) ++ get_target_property( _output ${_target} OUTPUT_NAME ) ++ if( "${_output}" STREQUAL "_output-NOTFOUND" ) ++ set( _output "${_target}" ) ++ endif( ) ++ set( ${_filename} "${_output_prefix}${_output}${_output_suffix}" PARENT_SCOPE ) ++ else( ) ++ set( ${_filename} "" PARENT_SCOPE ) ++ endif( ) ++endfunction( ) ++ + MACRO(GET_TARGET_PROPERTY_WITH_DEFAULT _variable _target _property _default_value) + GET_TARGET_PROPERTY (${_variable} ${_target} ${_property}) + IF (${_variable} MATCHES NOTFOUND) +@@ -9,7 +46,7 @@ + ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT) + + MACRO(CREATE_LIBTOOL_FILE _target _install_DIR) +- GET_TARGET_PROPERTY(_target_location ${_target} LOCATION) ++ tde_get_library_filename( _target_location ${_target} ) + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "") + GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0) diff --git a/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/series b/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/series index 1b6787c3..bb5c1ba1 100644 --- a/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/series +++ b/debian/wv2/wv2-0.4.2.dfsg.2/debian/patches/series @@ -6,3 +6,4 @@ fix-nan-and-inf-for-mips.patch glib-2.32-compat.patch buffer-overflow.patch support-endnotes.patch +009-required-cmake-3.10.diff -- cgit v1.2.3