[neon/forks/heaptrack/Neon/release] /: add patches and do not ignore patches

Jonathan Riddell null at kde.org
Tue Sep 3 14:57:16 BST 2024


Git commit 429da8299f6037a7123ff98a3e38fc7a39024ac2 by Jonathan Riddell.
Committed on 03/09/2024 at 13:57.
Pushed by jriddell into branch 'Neon/release'.

add patches and do not ignore patches

D  +0    -32   .gitignore
A  +12   -0    debian/patches/10_update_cmake_version.patch
A  +28   -0    debian/patches/20_disable_some_unreliable_tests.patch

https://invent.kde.org/neon/forks/heaptrack/-/commit/429da8299f6037a7123ff98a3e38fc7a39024ac2

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9f87cc0..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-# general
-apidocs
-.kdev4
-*~
-*.bak
-doxygen.log
-build
-*.patch
-*.diff
-*.orig
-*.rej
-*.swp
-massif.out.*
-perf.data
-perf.data.*
-callgrind.out.*
-.*kate-swp
-
-# IDEs/clangd
-.clangd
-.cache
-compile_commands.json
-.idea
-
-# from kdiff3
-*.BACKUP.*
-*.BASE.*
-*.LOCAL.*
-*.REMOTE.*
-build*/
-*.zst
-*.AppImage
diff --git a/debian/patches/10_update_cmake_version.patch b/debian/patches/10_update_cmake_version.patch
new file mode 100644
index 0000000..d2c92f5
--- /dev/null
+++ b/debian/patches/10_update_cmake_version.patch
@@ -0,0 +1,12 @@
+Description: Increase cmake version
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2023-12-28
+
+--- heaptrack-1.5.0.orig/3rdparty/robin-map/CMakeLists.txt
++++ heaptrack-1.5.0/3rdparty/robin-map/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.5)
+ 
+ project(tsl-robin-map VERSION 1.2.1 LANGUAGES CXX)
+ 
diff --git a/debian/patches/20_disable_some_unreliable_tests.patch b/debian/patches/20_disable_some_unreliable_tests.patch
new file mode 100644
index 0000000..725a611
--- /dev/null
+++ b/debian/patches/20_disable_some_unreliable_tests.patch
@@ -0,0 +1,28 @@
+Description: Disable unreliable tests
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2023-12-28
+
+Index: heaptrack/tests/auto/CMakeLists.txt
+===================================================================
+--- heaptrack.orig/tests/auto/CMakeLists.txt
++++ heaptrack/tests/auto/CMakeLists.txt
+@@ -39,7 +39,7 @@ target_link_libraries(tst_trace
+ )
+ target_include_directories(tst_trace PRIVATE ${LIBDW_INCLUDE_DIRS} )
+ 
+-add_test(NAME tst_trace COMMAND tst_trace)
++#add_test(NAME tst_trace COMMAND tst_trace)
+ 
+ if ("${Boost_FILESYSTEM_FOUND}" AND "${Boost_SYSTEM_FOUND}")
+     add_executable(tst_libheaptrack
+Index: heaptrack/tests/auto/no_asan/CMakeLists.txt
+===================================================================
+--- heaptrack.orig/tests/auto/no_asan/CMakeLists.txt
++++ heaptrack/tests/auto/no_asan/CMakeLists.txt
+@@ -6,5 +6,5 @@ if ("${Boost_FILESYSTEM_FOUND}" AND "${B
+             ${Boost_SYSTEM_LIBRARY}
+             ${Boost_FILESYSTEM_LIBRARY}
+     )
+-    add_test(NAME tst_inject COMMAND tst_inject)
++#add_test(NAME tst_inject COMMAND tst_inject)
+ endif()


More information about the Neon-commits mailing list