Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package heaptrack for openSUSE:Factory checked in at 2026-10-15 12:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/heaptrack (Old) and /work/SRC/openSUSE:Factory/.heaptrack.new.3698736 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "heaptrack" Thu Oct 15 12:19:35 2026 rev:19 rq:1384855 version:1.6.0~pre20260904 Changes: -------- --- /work/SRC/openSUSE:Factory/heaptrack/heaptrack.changes 2025-10-15 12:47:47.382943054 +0200 +++ /work/SRC/openSUSE:Factory/.heaptrack.new.3698736/heaptrack.changes 2026-10-15 12:20:25.129767937 +0200 @@ -1,0 +2,14 @@ +Mon Oct 12 14:44:19 UTC 2026 - Fabian Vogt <[email protected]> + +- Switch to a pre-release build of the 1.6 branch: + * Support for Qt 6 +- Drop patches, now upstream: + * 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch +- Replace 0001-Use-system-robin-map.patch with upstream + 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch +- Replace 0001-CMake-Make-the-boost-system-component-optional.patch + with upstream patches: + 0002-Fix-build-with-boost-1.89.patch + 0003-Raise-Boost-minimum-version-to-1.70.patch + +------------------------------------------------------------------- Old: ---- 0001-CMake-Make-the-boost-system-component-optional.patch 0001-Use-system-robin-map.patch 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch heaptrack-1.5.0.tar.xz heaptrack-1.5.0.tar.xz.sig New: ---- 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch 0002-Fix-build-with-boost-1.89.patch 0003-Raise-Boost-minimum-version-to-1.70.patch _service heaptrack-1.6.0~pre20260904.obscpio heaptrack.obsinfo ----------(Old B)---------- Old: 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch - Replace 0001-CMake-Make-the-boost-system-component-optional.patch with upstream patches: Old: * 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch - Replace 0001-Use-system-robin-map.patch with upstream 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch Old:- Drop patches, now upstream: * 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch - Replace 0001-Use-system-robin-map.patch with upstream ----------(Old E)---------- ----------(New B)---------- New:- Replace 0001-Use-system-robin-map.patch with upstream 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch - Replace 0001-CMake-Make-the-boost-system-component-optional.patch New: with upstream patches: 0002-Fix-build-with-boost-1.89.patch 0003-Raise-Boost-minimum-version-to-1.70.patch New: 0002-Fix-build-with-boost-1.89.patch 0003-Raise-Boost-minimum-version-to-1.70.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ heaptrack.spec ++++++ --- /var/tmp/diff_new_pack.aNxxiI/_old 2026-10-15 12:20:25.937801735 +0200 +++ /var/tmp/diff_new_pack.aNxxiI/_new 2026-10-15 12:20:25.938801777 +0200 @@ -1,7 +1,7 @@ # # spec file for package heaptrack # -# Copyright (c) 2025 SUSE LLC and contributors +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,45 +18,43 @@ # Needed for Leap, see boo#468748 %global __requires_exclude GLIBC_PRIVATE -%bcond_without released +%bcond_with released Name: heaptrack -Version: 1.5.0 +Version: 1.6.0~pre20260904 Release: 0 Summary: Heap Memory Allocation Profiler License: LGPL-2.1-or-later URL: https://apps.kde.org/heaptrack/ -Source0: https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{version}.tar.xz +Source0: %{name}-%{version}.tar.xz %if %{with released} Source1: https://download.kde.org/stable/heaptrack/%{version}/%{name}-%{version}.tar.xz.sig -Source2: heaptrack.keyring %endif -# PATCH-FIX-UPSTREAM -- gcc14 compat -Patch0: 0001-cmake-Fix-C-compatibility-of-libunwind-probes.patch -# PATCH-FIX-UPSTREAM -- CMake 4 compat -Patch1: 0001-Use-system-robin-map.patch -# PATCH-FIX-UPSTREAM -- boost 1.89 compat -Patch2: 0001-CMake-Make-the-boost-system-component-optional.patch -BuildRequires: extra-cmake-modules +Source2: heaptrack.keyring +# PATCH-FIX-UPSTREAM +Patch1: 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch +Patch2: 0002-Fix-build-with-boost-1.89.patch +Patch3: 0003-Raise-Boost-minimum-version-to-1.70.patch +BuildRequires: kf6-extra-cmake-modules BuildRequires: libboost_container-devel BuildRequires: libboost_filesystem-devel +BuildRequires: libboost_headers-devel >= 1.70 BuildRequires: libboost_iostreams-devel BuildRequires: libboost_program_options-devel BuildRequires: libdwarf-devel BuildRequires: libunwind-devel BuildRequires: pkgconfig BuildRequires: zlib-devel -BuildRequires: cmake(KChart) >= 2.6.0 -BuildRequires: cmake(KF5ConfigWidgets) -BuildRequires: cmake(KF5CoreAddons) -BuildRequires: cmake(KF5I18n) -BuildRequires: cmake(KF5IconThemes) -BuildRequires: cmake(KF5ItemModels) -BuildRequires: cmake(KF5KIO) -BuildRequires: cmake(KF5ThreadWeaver) -BuildRequires: cmake(Qt5Core) -BuildRequires: cmake(Qt5Widgets) +BuildRequires: cmake(KChart6) >= 2.6.0 +BuildRequires: cmake(KF6ConfigWidgets) +BuildRequires: cmake(KF6CoreAddons) +BuildRequires: cmake(KF6I18n) +BuildRequires: cmake(KF6IconThemes) +BuildRequires: cmake(KF6KIO) +BuildRequires: cmake(KF6ThreadWeaver) +BuildRequires: cmake(Qt6Core) >= 6.5.0 +BuildRequires: cmake(Qt6Widgets) BuildRequires: cmake(tsl-robin-map) -BuildRequires: pkgconfig(libdw) >= 0.158 +BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(libzstd) Suggests: heaptrack-gui @@ -76,7 +74,7 @@ Requires: heaptrack = %{version} %description gui -A Qt5/KF5 based GUI for Heaptrack. +A Qt/KF based GUI for Heaptrack. %lang_package @@ -86,40 +84,37 @@ # Disable building tests, they're not used and post-build-checks trips over it sed -i"" '/add_subdirectory(tests)/d' CMakeLists.txt -# Needed after robin-map update to 1.4.0 -sed -i 's#CMAKE_CXX_STANDARD 14#CMAKE_CXX_STANDARD 17#' CMakeLists.txt - %build %if "%{_lib}" == "lib64" extra_opts="-DLIB_SUFFIX=64" %endif -%cmake_kf5 -d build -- $extra_opts +%cmake_kf6 -DHEAPTRACK_USE_SYSTEM_ROBINMAP=ON $extra_opts -%cmake_build +%kf6_build %install -%kf5_makeinstall -C build +%kf6_install %find_lang %{name} --all-name %files %license LICENSES/* %doc README.md -%{_kf5_bindir}/heaptrack -%{_kf5_bindir}/heaptrack_print +%{_kf6_bindir}/heaptrack +%{_kf6_bindir}/heaptrack_print %{_libdir}/heaptrack/ %files devel %{_includedir}/heaptrack_api.h %files gui -%{_kf5_bindir}/heaptrack_gui -%{_kf5_applicationsdir}/org.kde.heaptrack.desktop -%{_kf5_appstreamdir}/org.kde.heaptrack.appdata.xml -%dir %{_kf5_iconsdir}/hicolor/* -%dir %{_kf5_iconsdir}/hicolor/*/* -%{_kf5_iconsdir}/*/*/*/*.* +%{_kf6_bindir}/heaptrack_gui +%{_kf6_applicationsdir}/org.kde.heaptrack.desktop +%{_kf6_appstreamdir}/org.kde.heaptrack.appdata.xml +%dir %{_kf6_iconsdir}/hicolor/* +%dir %{_kf6_iconsdir}/hicolor/*/* +%{_kf6_iconsdir}/*/*/*/*.* %files lang -f %{name}.lang ++++++ 0001-Allow-to-use-system-robin-map-instead-of-bundled.patch ++++++ >From 805181c589f2f5bb71a9245b3f9dd00300e8026c Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Fri, 17 Oct 2025 22:16:38 +0200 Subject: [PATCH 1/3] Allow to use system robin-map instead of bundled Adds new HEAPTRACK_USE_SYSTEM_ROBINMAP CMake option Signed-off-by: Andreas Sturmlechner <[email protected]> (cherry picked from commit a7bedb1b28fef4e7976269e9f47c0f62d90b4836) --- 3rdparty/CMakeLists.txt | 7 ++++--- CMakeLists.txt | 10 ++++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index a2c8e69..297e227 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -18,6 +18,7 @@ if (ZSTD_FOUND AND NOT BOOST_IOSTREAMS_HAS_ZSTD) mark_as_system_target(boost-zstd) endif() -add_subdirectory(robin-map) - -mark_as_system_target(robin_map) +if(NOT HEAPTRACK_USE_SYSTEM_ROBINMAP) + add_subdirectory(robin-map) + mark_as_system_target(robin_map) +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index 6893e81..a3dedd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,12 @@ option( ON ) +option( + HEAPTRACK_USE_SYSTEM_ROBINMAP + "Use system robin-map instead of bundled" + OFF +) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) if (NOT MSVC) @@ -170,6 +176,10 @@ if (HEAPTRACK_BUILD_TRACK) endif() endif() +if (HEAPTRACK_USE_SYSTEM_ROBINMAP) + find_package(tsl-robin-map CONFIG REQUIRED) +endif() + add_subdirectory(3rdparty) add_subdirectory(src) add_subdirectory(tests) -- 2.55.0 ++++++ 0002-Fix-build-with-boost-1.89.patch ++++++ >From ec6cd9e1063130ed0f28e13cef4fae87a89d788c Mon Sep 17 00:00:00 2001 From: David Faure <[email protected]> Date: Sun, 5 Oct 2025 12:27:29 +0200 Subject: [PATCH 2/3] Fix build with boost 1.89 boost_system has become a headers-only library, there is nothing to link to and nothing to find_package against (e.g. on OpenSUSE Tumbleweed its headers are provided by libboost_headers-devel). https://github.com/boostorg/system/commit/7a495bb46d7ccd808e4be2a6589260839b0fd3a3 https://www.reddit.com/r/openSUSE/comments/1nwy4cw/libboost_system_missing_from_repos/ src/analyze wasn't linking against Boost_SYSTEM_LIBRARY so there was no point in locating boost_system there. (cherry picked from commit 99348321819fe8efb3771b2dcd9aaffbc598b271) --- CMakeLists.txt | 8 +++++++- src/analyze/CMakeLists.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3dedd0..b60772f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,13 @@ if (APPIMAGE_BUILD) endif() include(FeatureSummary) -find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS system filesystem iostreams container) +find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) +# boost_system no longer exists in 1.89 +if (Boost_VERSION VERSION_LESS 1.89.0) + find_package(Boost ${REQUIRED_IN_APPIMAGE} COMPONENTS system) +else() + set(Boost_SYSTEM_FOUND TRUE) +endif() set_package_properties(Boost PROPERTIES TYPE RECOMMENDED PURPOSE "Boost container libraries can greatly improve performance (via pmr allocators)") find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt index ac79961..2640f4c 100644 --- a/src/analyze/CMakeLists.txt +++ b/src/analyze/CMakeLists.txt @@ -2,7 +2,7 @@ if (ECM_FOUND) include(ECMEnableSanitizers) endif() -find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options system filesystem) +find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem) configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h) -- 2.55.0 ++++++ 0003-Raise-Boost-minimum-version-to-1.70.patch ++++++ >From ac440ee0b7369ea2957c06ea470f0d3e2b361878 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner <[email protected]> Date: Sun, 19 Oct 2025 21:05:39 +0200 Subject: [PATCH 3/3] Raise Boost minimum version to 1.70 Boost 1.70 was released on April 12th, 2019 This solves multiple issues: - Mainly, with <boost-1.89, the second FindBoost call for System reset Boost_IOSTREAMS_FOUND since 99348321819fe8efb3771b2dcd9aaffbc598b271, ending up never checking BOOST_IOSTREAMS_HAS_ZSTD - Boost-1.70 introduced their BoostConfig.cmake upstream cmake module which CMake Policy CMP0167 drives to port away to (fixes warning introduced with CMake >=3.30 - Boost-1.69 introduced zstd compression/decompression filter, so the bundled lib is unnecessary - Boost-1.69 made Boost.System header-only, providing a stub library, so we can simply drop all references - see also: https://www.boost.org/doc/libs/1_69_0/libs/system/doc/html/system.html#changes_in_boost_1_69 Further fix: - Do not expand variables beforehand - see also: https://invent.kde.org/plasma/libplasma/-/merge_requests/267 Signed-off-by: Andreas Sturmlechner <[email protected]> (cherry picked from commit 5adfa5acc4d2a4877e163ddef8f7279955d0594d) --- CMakeLists.txt | 10 ++-------- src/analyze/CMakeLists.txt | 2 +- src/interpret/CMakeLists.txt | 2 +- tests/auto/CMakeLists.txt | 7 ++----- tests/auto/no_asan/CMakeLists.txt | 3 +-- 5 files changed, 7 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b60772f..d8929c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,18 +32,12 @@ if (APPIMAGE_BUILD) endif() include(FeatureSummary) -find_package(Boost 1.60.0 ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) -# boost_system no longer exists in 1.89 -if (Boost_VERSION VERSION_LESS 1.89.0) - find_package(Boost ${REQUIRED_IN_APPIMAGE} COMPONENTS system) -else() - set(Boost_SYSTEM_FOUND TRUE) -endif() +find_package(Boost 1.70.0 CONFIG ${REQUIRED_IN_APPIMAGE} COMPONENTS filesystem iostreams container) set_package_properties(Boost PROPERTIES TYPE RECOMMENDED PURPOSE "Boost container libraries can greatly improve performance (via pmr allocators)") find_package(Threads REQUIRED) find_package(ZLIB REQUIRED) -if (${Boost_IOSTREAMS_FOUND}) +if (Boost_IOSTREAMS_FOUND) find_package(ZSTD ${REQUIRED_IN_APPIMAGE}) include(CheckCXXSourceCompiles) diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt index 2640f4c..9b26fd6 100644 --- a/src/analyze/CMakeLists.txt +++ b/src/analyze/CMakeLists.txt @@ -2,7 +2,7 @@ if (ECM_FOUND) include(ECMEnableSanitizers) endif() -find_package(Boost 1.41.0 REQUIRED COMPONENTS iostreams program_options filesystem) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS iostreams program_options filesystem) configure_file(analyze_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/analyze_config.h) diff --git a/src/interpret/CMakeLists.txt b/src/interpret/CMakeLists.txt index ef0d5be..6cd0857 100644 --- a/src/interpret/CMakeLists.txt +++ b/src/interpret/CMakeLists.txt @@ -3,7 +3,7 @@ if (ECM_FOUND) endif() find_package(Elfutils 0.158 REQUIRED) -find_package(Boost 1.41.0 REQUIRED COMPONENTS program_options) +find_package(Boost 1.70.0 CONFIG REQUIRED COMPONENTS program_options) include_directories( ${PROJECT_SOURCE_DIR}/3rdparty/ diff --git a/tests/auto/CMakeLists.txt b/tests/auto/CMakeLists.txt index 4f6a91a..3132c2c 100644 --- a/tests/auto/CMakeLists.txt +++ b/tests/auto/CMakeLists.txt @@ -11,7 +11,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../../src/track ) -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") set(LIBUTIL_LIBRARY "util") endif() @@ -44,7 +44,7 @@ add_test(NAME tst_trace COMMAND tst_trace) configure_file(tst_heaptrack_interpret.cmake.sh ${CMAKE_CURRENT_BINARY_DIR}/tst_heaptrack_interpret.sh @ONLY) add_test(NAME tst_heaptrack_interpret COMMAND ${CMAKE_CURRENT_BINARY_DIR}/tst_heaptrack_interpret.sh) -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) add_executable(tst_libheaptrack tst_libheaptrack.cpp ../../src/track/libheaptrack.cpp) @@ -56,7 +56,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") ${LIBUTIL_LIBRARY} heaptrack_unwind rt - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_libheaptrack COMMAND tst_libheaptrack) @@ -64,7 +63,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") add_executable(tst_io tst_io.cpp) set_target_properties(tst_io PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_io - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_io COMMAND tst_io) @@ -75,7 +73,6 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") add_executable(tst_parser tst_parser.cpp) set_target_properties(tst_parser PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_parser - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} heaptrack_gui_private Qt${QT_VERSION_MAJOR}::Test diff --git a/tests/auto/no_asan/CMakeLists.txt b/tests/auto/no_asan/CMakeLists.txt index 1aed05d..927e6ff 100644 --- a/tests/auto/no_asan/CMakeLists.txt +++ b/tests/auto/no_asan/CMakeLists.txt @@ -1,9 +1,8 @@ -if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}") +if (Boost_FILESYSTEM_FOUND) add_executable(tst_inject tst_inject.cpp) set_target_properties(tst_inject PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/${BIN_INSTALL_DIR}") target_link_libraries(tst_inject ${CMAKE_DL_LIBS} - ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY} ) add_test(NAME tst_inject COMMAND tst_inject) -- 2.55.0 ++++++ _service ++++++ <services> <service mode="manual" name="obs_scm"> <param name="url">https://invent.kde.org/sdk/heaptrack.git</param> <param name="scm">git</param> <param name="revision">refs/heads/1.6</param> <param name="versionformat">1.6.0~pre%cd</param> </service> <service mode="manual" name="set_version" /> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> </services> ++++++ heaptrack.obsinfo ++++++ name: heaptrack version: 1.6.0~pre20260904 mtime: 1788492757 commit: e5021fd1f8731fdc2d3e771dcc9dc58e629f0bd9
