[neon/sdk/heaptrack/Neon/unstable] debian/patches: all patches are upstream
Carlos De Maine
null at kde.org
Wed Aug 26 00:57:38 BST 2026
Git commit 3b404517747361f9e10d0e98ab49349d6f48afbe by Carlos De Maine.
Committed on 25/08/2026 at 23:55.
Pushed by carlosdem into branch 'Neon/unstable'.
all patches are upstream
D +0 -64 debian/patches/2de688e02fbc5ff96fcf29ad3af962e8035824eb.patch
D +0 -72 debian/patches/38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2.patch
D +0 -52 debian/patches/99348321819fe8efb3771b2dcd9aaffbc598b271.patch
D +0 -47 debian/patches/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch
M +0 -4 debian/patches/series
https://invent.kde.org/neon/sdk/heaptrack/-/commit/3b404517747361f9e10d0e98ab49349d6f48afbe
diff --git a/debian/patches/2de688e02fbc5ff96fcf29ad3af962e8035824eb.patch b/debian/patches/2de688e02fbc5ff96fcf29ad3af962e8035824eb.patch
deleted file mode 100644
index 83fe53b..0000000
--- a/debian/patches/2de688e02fbc5ff96fcf29ad3af962e8035824eb.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 2de688e02fbc5ff96fcf29ad3af962e8035824eb Mon Sep 17 00:00:00 2001
-From: Alessandro Astone <ales.astone at gmail.com>
-Date: Wed, 27 Dec 2023 19:21:06 +0100
-Subject: [PATCH] Support KChart6 for KF6
-
----
- src/analyze/CMakeLists.txt | 14 ++++++++++++--
- src/analyze/gui/CMakeLists.txt | 2 +-
- 2 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/analyze/CMakeLists.txt b/src/analyze/CMakeLists.txt
-index e57d242..e71aee9 100644
---- a/src/analyze/CMakeLists.txt
-+++ b/src/analyze/CMakeLists.txt
-@@ -34,6 +34,12 @@ endif()
- add_subdirectory(print)
-
- if(HEAPTRACK_BUILD_GUI)
-+ if(QT_VERSION_MAJOR EQUAL 6)
-+ set(KChartName KChart6)
-+ else()
-+ set(KChartName KChart)
-+ endif()
-+
- find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} ${REQUIRED_IN_APPIMAGE} NO_MODULE OPTIONAL_COMPONENTS Widgets)
- set_package_properties(Qt${QT_VERSION_MAJOR} PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable.")
- find_package(ECM 1.0.0 ${REQUIRED_IN_APPIMAGE} NO_MODULE)
-@@ -41,8 +47,8 @@ if(HEAPTRACK_BUILD_GUI)
- if(Qt${QT_VERSION_MAJOR}_FOUND AND ECM_FOUND)
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
- find_package(KF${QT_VERSION_MAJOR} ${REQUIRED_IN_APPIMAGE} COMPONENTS CoreAddons I18n ItemModels ThreadWeaver ConfigWidgets KIO IconThemes)
-- find_package(KChart ${REQUIRED_IN_APPIMAGE} "2.6.0")
-- set_package_properties(KChart PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
-+ find_package(${KChartName} ${REQUIRED_IN_APPIMAGE} "2.6.0")
-+ set_package_properties(${KChartName} PROPERTIES TYPE RECOMMENDED PURPOSE "Required for the heaptrack_gui executable. Get it from the kdiagram module.")
- if(KF${QT_VERSION_MAJOR}I18n_FOUND)
- ki18n_install(../../po)
- endif()
-@@ -51,6 +57,10 @@ if(HEAPTRACK_BUILD_GUI)
- endif()
- endif()
-
-+if(KChart6_FOUND)
-+ set(KChart_FOUND TRUE)
-+endif()
-+
- if (KF${QT_VERSION_MAJOR}_FOUND)
- add_subdirectory(gui)
- endif()
-diff --git a/src/analyze/gui/CMakeLists.txt b/src/analyze/gui/CMakeLists.txt
-index f5803b6..2124683 100644
---- a/src/analyze/gui/CMakeLists.txt
-+++ b/src/analyze/gui/CMakeLists.txt
-@@ -92,7 +92,7 @@ if (KChart_FOUND)
- histogrammodel.cpp
- )
- list(APPEND LIBRARIES
-- KChart
-+ ${KChartName}
- Qt${QT_VERSION_MAJOR}::Svg
- )
- endif()
---
-GitLab
diff --git a/debian/patches/38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2.patch b/debian/patches/38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2.patch
deleted file mode 100644
index c28a455..0000000
--- a/debian/patches/38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2 Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella at gmx.de>
-Date: Tue, 2 Jan 2024 15:47:29 +0100
-Subject: [PATCH] Use QString for KConfigGroup names
-
-Required in KF6
----
- src/analyze/gui/mainwindow.cpp | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/analyze/gui/mainwindow.cpp b/src/analyze/gui/mainwindow.cpp
-index 1ebd4c9..c3be2fa 100644
---- a/src/analyze/gui/mainwindow.cpp
-+++ b/src/analyze/gui/mainwindow.cpp
-@@ -57,8 +57,8 @@ const int MAINWINDOW_VERSION = 1;
-
- namespace Config {
- namespace Groups {
--const char MainWindow[] = "MainWindow";
--const char CodeNavigation[] = "CodeNavigation";
-+const QString MainWindow() { return QStringLiteral("MainWindow"); }
-+const QString CodeNavigation() { return QStringLiteral("CodeNavigation"); }
- }
- namespace Entries {
- const char State[] = "State";
-@@ -317,7 +317,7 @@ MainWindow::MainWindow(QWidget* parent)
- {
- m_ui->setupUi(this);
-
-- auto group = m_config->group(Config::Groups::MainWindow);
-+ auto group = m_config->group(Config::Groups::MainWindow());
- auto state = group.readEntry(Config::Entries::State, QByteArray());
- restoreState(state, MAINWINDOW_VERSION);
-
-@@ -671,7 +671,7 @@ MainWindow::MainWindow(QWidget* parent)
- MainWindow::~MainWindow()
- {
- auto state = saveState(MAINWINDOW_VERSION);
-- auto group = m_config->group(Config::Groups::MainWindow);
-+ auto group = m_config->group(Config::Groups::MainWindow());
- group.writeEntry(Config::Entries::State, state);
- }
-
-@@ -788,7 +788,7 @@ void MainWindow::setupCodeNavigationMenu()
- auto group = new QActionGroup(this);
- group->setExclusive(true);
-
-- const auto settings = m_config->group(Config::Groups::CodeNavigation);
-+ const auto settings = m_config->group(Config::Groups::CodeNavigation());
- const auto currentIdx = settings.readEntry(Config::Entries::IDE, firstAvailableIde());
-
- for (int i = 0; i < LAST_IDE; ++i) {
-@@ -838,7 +838,7 @@ void MainWindow::setupCodeNavigationMenu()
-
- void MainWindow::setCodeNavigationIDE(QAction* action)
- {
-- auto settings = m_config->group(Config::Groups::CodeNavigation);
-+ auto settings = m_config->group(Config::Groups::CodeNavigation());
-
- if (action->data() == -1) {
- const auto customCmd =
-@@ -859,7 +859,7 @@ void MainWindow::setCodeNavigationIDE(QAction* action)
-
- void MainWindow::navigateToCode(const QString& filePath, int lineNumber, int columnNumber)
- {
-- const auto settings = m_config->group(Config::Groups::CodeNavigation);
-+ const auto settings = m_config->group(Config::Groups::CodeNavigation());
- const auto ideIdx = settings.readEntry(Config::Entries::IDE, firstAvailableIde());
-
- QString command;
---
-GitLab
diff --git a/debian/patches/99348321819fe8efb3771b2dcd9aaffbc598b271.patch b/debian/patches/99348321819fe8efb3771b2dcd9aaffbc598b271.patch
deleted file mode 100644
index e32e6ab..0000000
--- a/debian/patches/99348321819fe8efb3771b2dcd9aaffbc598b271.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 99348321819fe8efb3771b2dcd9aaffbc598b271 Mon Sep 17 00:00:00 2001
-From: David Faure <faure at kde.org>
-Date: Sun, 5 Oct 2025 12:27:29 +0200
-Subject: [PATCH] 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.
----
- CMakeLists.txt | 8 +++++++-
- src/analyze/CMakeLists.txt | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b859fbd..adc08a3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -25,7 +25,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 8e16ff2..340eb7f 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)
-
---
-GitLab
diff --git a/debian/patches/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch b/debian/patches/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch
deleted file mode 100644
index 60d48a3..0000000
--- a/debian/patches/c6c45f3455a652c38aefa402aece5dafa492e8ab.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c6c45f3455a652c38aefa402aece5dafa492e8ab Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer at redhat.com>
-Date: Fri, 15 Dec 2023 22:53:19 +0100
-Subject: [PATCH] cmake: Fix C compatibility of libunwind probes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Future compilers such as GCC 14 are likely to enforce C type
-compatibility rules by default and report errors like this one:
-
-…/TryCompile-aAxUZn/src.c: In function ‘main’:
-…/TryCompile-aAxUZn/src.c:3:43: error: passing argument 1 of ‘unw_backtrace’ from incompatible pointer type
- 3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }
- | ^~~~
- | |
- | void * (*)[10]
-In file included from /usr/include/libunwind-x86_64.h:129,
- from /usr/include/libunwind.h:23,
- from …/TryCompile-aAxUZn/src.c:2:
-/usr/include/libunwind-common.h:318:27: note: expected ‘void **’ but argument is of type ‘void * (*)[10]’
- 318 | extern int unw_backtrace (void **, int);
- | ^~~~~~~
-
-Removing the address operator ensures that the array type decays to
-a pointer, and that the types are compatible.
----
- cmake/FindLibunwind.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake
-index 2dddfad..d597de9 100644
---- a/cmake/FindLibunwind.cmake
-+++ b/cmake/FindLibunwind.cmake
-@@ -57,8 +57,8 @@ if (LIBUNWIND_LIBRARY)
- LIBUNWIND_HAS_UNW_GETCONTEXT)
- check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { unw_context_t context; unw_cursor_t cursor; unw_getcontext(&context); unw_init_local(&cursor, &context); return 0; }"
- LIBUNWIND_HAS_UNW_INIT_LOCAL)
-- check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
-- check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(&buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
-+ check_c_source_compiles("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace(buf, 10); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE)
-+ check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { void* buf[10]; unw_backtrace_skip(buf, 10, 2); return 0; }" LIBUNWIND_HAS_UNW_BACKTRACE_SKIP)
- check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_cache_size(unw_local_addr_space, 1024, 0); }" LIBUNWIND_HAS_UNW_SET_CACHE_SIZE)
- check_c_source_compiles ("#define UNW_LOCAL_ONLY 1\n#include <libunwind.h>\nint main() { return unw_set_caching_policy(unw_local_addr_space, UNW_CACHE_PER_THREAD); }" LIBUNWIND_HAS_UNW_CACHE_PER_THREAD)
- set(CMAKE_REQUIRED_QUIET ${CMAKE_REQUIRED_QUIET_SAVE})
---
-GitLab
diff --git a/debian/patches/series b/debian/patches/series
index 2c2f02e..137b1b4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
20_disable_some_unreliable_tests.patch
-38fd1d7b0ff53a35ed7c4ef241c21c8c06e1efb2.patch
-c6c45f3455a652c38aefa402aece5dafa492e8ab.patch
-2de688e02fbc5ff96fcf29ad3af962e8035824eb.patch
-99348321819fe8efb3771b2dcd9aaffbc598b271.patch
\ No newline at end of file
More information about the Neon-commits
mailing list