Control: tags 1112997 + patch Control: tags 1112997 + pending Dear maintainer,
I've prepared an NMU for hydrogen (versioned as 1.2.2+dfsg-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for hydrogen-1.2.2+dfsg hydrogen-1.2.2+dfsg changelog | 7 patches/0001-CMake-bump-minimum-required-version-to-3.5.patch | 118 ++++++++++ patches/series | 1 3 files changed, 126 insertions(+) diff -Nru hydrogen-1.2.2+dfsg/debian/changelog hydrogen-1.2.2+dfsg/debian/changelog --- hydrogen-1.2.2+dfsg/debian/changelog 2024-08-04 06:13:19.000000000 +0300 +++ hydrogen-1.2.2+dfsg/debian/changelog 2025-11-21 14:25:55.000000000 +0200 @@ -1,3 +1,10 @@ +hydrogen (1.2.2+dfsg-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with CMake 4. (Closes: #1112997) + + -- Adrian Bunk <[email protected]> Fri, 21 Nov 2025 14:25:55 +0200 + hydrogen (1.2.2+dfsg-2) unstable; urgency=medium * Remove redundant and incomplete copy of "old_tutorial" because upstream diff -Nru hydrogen-1.2.2+dfsg/debian/patches/0001-CMake-bump-minimum-required-version-to-3.5.patch hydrogen-1.2.2+dfsg/debian/patches/0001-CMake-bump-minimum-required-version-to-3.5.patch --- hydrogen-1.2.2+dfsg/debian/patches/0001-CMake-bump-minimum-required-version-to-3.5.patch 1970-01-01 02:00:00.000000000 +0200 +++ hydrogen-1.2.2+dfsg/debian/patches/0001-CMake-bump-minimum-required-version-to-3.5.patch 2025-11-20 20:18:23.000000000 +0200 @@ -0,0 +1,118 @@ +From 9af3666075e253fd61f38a4a032b287b81067e0a Mon Sep 17 00:00:00 2001 +From: theGreatWhiteShark <[email protected]> +Date: Tue, 20 May 2025 07:32:40 +0200 +Subject: CMake: bump minimum required version to 3.5 + +It seems CMake want to get rid off older versions an there syntax. While +I do not see any conflicting statements, I was not able to compile our +source with a very recent version (`4.0.2`). + +But since `3.5` was released 9 years ago this should pose a problem. + +``` +PS $ C:\Users\USER\git\hydrogen\windows> .\Build-WinNative.ps1 -build +Building Hydrogen +Using the following setting: +QTDIR: C:\msys64\mingw64 +PATH: C:\msys64\mingw64\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\OpenSSH\;C:\Program Files\dotnet\;C:\Users\USER\AppData\Local\Microsoft\WindowsApps; +MSYS: C:\msys64\mingw64 + +cmake version 4.0.2 + +CMake suite maintained and supported by Kitware (kitware.com/cmake). + +g++.exe (Rev4, Built by MSYS2 project) 15.1.0 +Copyright (C) 2025 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + + Directory: C:\Users\USER\git\hydrogen + +Mode LastWriteTime Length Name +---- ------------- ------ ---- +d----- 5/20/2025 7:26 AM build +CMake Deprecation Warning at CMakeLists.txt:5 (cmake_minimum_required): + Compatibility with CMake < 3.10 will be removed from a future version of + CMake. + + Update the VERSION argument <min> value. Or, use the <min>...<max> syntax + to tell CMake that the project requires at least <min> but has been updated + to work with policies introduced by <max> or earlier. + +-- The C compiler identification is GNU 15.1.0 +-- The CXX compiler identification is GNU 15.1.0 +-- Detecting C compiler ABI info +-- Detecting C compiler ABI info - done +-- Check for working C compiler: C:/msys64/mingw64/bin/cc.exe - skipped +-- Detecting C compile features +-- Detecting C compile features - done +-- Detecting CXX compiler ABI info +-- Detecting CXX compiler ABI info - done +-- Check for working CXX compiler: C:/msys64/mingw64/bin/c++.exe - skipped +-- Detecting CXX compile features +-- Detecting CXX compile features - done +-- MIS +-- 1.2.4- +-- Performing Test CMAKE_HAVE_LIBC_PTHREAD +-- Performing Test CMAKE_HAVE_LIBC_PTHREAD - Success +-- Found Threads: TRUE +-- Performing Test HAVE_STDATOMIC +-- Performing Test HAVE_STDATOMIC - Success +-- Found WrapAtomic: TRUE +-- Found WrapVulkanHeaders: C:/msys64/mingw64/include +-- Found ZLIB: C:/msys64/mingw64/lib/libz.dll.a (found version "1.3.1") +CMake Error at C:/Users/USER/git/hydrogen/cmake/sscanf/CMakeLists.txt:1 (cmake_minimum_required): + Compatibility with CMake < 3.5 has been removed from CMake. + + Update the VERSION argument <min> value. Or, use the <min>...<max> syntax + to tell CMake that the project requires at least <min> but has been updated + to work with policies introduced by <max> or earlier. + + Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway. + +CMake Error at cmake/CompileHelper.cmake:14 (try_compile): + Failed to configure test project build system. +Call Stack (most recent call first): + CMakeLists.txt:275 (compile_helper) + +-- Configuring incomplete, errors occurred! +Starting build +mingw32-make: Makefile: No such file or directory +mingw32-make: *** No rule to make target 'Makefile'. Stop. +build failed +At C:\Users\USER\git\hydrogen\windows\Build-WinNative.ps1:89 char:2 ++ throw 'build failed' ++ ~~~~~~~~~~~~~~~~~~~~ + + CategoryInfo : OperationStopped: (build failed:String) [], RuntimeException + + FullyQualifiedErrorId : build failed +``` +--- + cmake/rtclock/CMakeLists.txt | 3 +-- + cmake/sscanf/CMakeLists.txt | 3 +-- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/cmake/rtclock/CMakeLists.txt b/cmake/rtclock/CMakeLists.txt +index ac4e996da..f81246b41 100644 +--- a/cmake/rtclock/CMakeLists.txt ++++ b/cmake/rtclock/CMakeLists.txt +@@ -1,5 +1,4 @@ +- +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + PROJECT($CMAKE_PROJECT_NAME) + add_definitions() + include_directories() +diff --git a/cmake/sscanf/CMakeLists.txt b/cmake/sscanf/CMakeLists.txt +index 4a4dce65b..e6a2c98d4 100644 +--- a/cmake/sscanf/CMakeLists.txt ++++ b/cmake/sscanf/CMakeLists.txt +@@ -1,5 +1,4 @@ +- +-CMAKE_MINIMUM_REQUIRED(VERSION 2.6) ++CMAKE_MINIMUM_REQUIRED(VERSION 3.5) + PROJECT($CMAKE_PROJECT_NAME) + add_definitions() + include_directories() +-- +2.30.2 + diff -Nru hydrogen-1.2.2+dfsg/debian/patches/series hydrogen-1.2.2+dfsg/debian/patches/series --- hydrogen-1.2.2+dfsg/debian/patches/series 2024-08-04 06:13:19.000000000 +0300 +++ hydrogen-1.2.2+dfsg/debian/patches/series 2025-11-21 14:25:55.000000000 +0200 @@ -2,3 +2,4 @@ 0003-use-h2-icon.png.patch 0004-Define-documentation-subdir.patch 0004-use-local-fonts-only.patch +0001-CMake-bump-minimum-required-version-to-3.5.patch
