gentoo auto-resync : 16:12:2023 - 14:53:46

4 files changed, 60 insertions, 2 deletions

diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index d6e7ca11daf8..d8f73891efcf 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,4 +1,5 @@
+AUX heaptrack-1.5.0-c99.patch 3041 BLAKE2B 9ac6cdc3796d85e477761fff5d4de2d657a5ad93ff36869141053de6b6e0c6e6dc270de385d6d2a071413e2a2ab65c1bc12c978b18e0b8d8b42209e46692df7f SHA512 b9d08c60527d3ebe456b8f6b2e3b7e21b6f5c2b57f38d639c402080f10e4754e1fb448c9e2528fedad950d767308d907ade2eaf2663cff4398f7fc1fc68591bf
 DIST heaptrack-1.5.0.tar.xz 5447668 BLAKE2B f4a69311267daf9439e264bf8bb9802db41abb3fa766e5dfc8fcfe39c58feab2d0fe32710c6b5a2d63715e8b013e4a81e2984de425be871e253b1b2567a1dca2 SHA512 b52cc63a29d67dade85f40a7f9abb43e104762b9c853385f501d37fcbcef90fdcdfc93e2900c71b5a47c773bf98fe75f66f8b6a9e31a12610b6deec20d9736aa
-EBUILD heaptrack-1.5.0.ebuild 1448 BLAKE2B 8f9605961e18e2e1b0f8f5c12c53bce07453861c20af5b77aa7a4fab8e421b9af4700c137ac3c508233358e37f518197b12b3dfea5dda041e324c3e5669fc05a SHA512 cda85f833f087294844ed5b99d8beb6e62cd8c84765464cec31c80e4644f4d12b8277e760bcfd5c45a4a3056af09f6c7acd88f06814bd66e8ab9bc917328d41c
-EBUILD heaptrack-9999.ebuild 1388 BLAKE2B 8f612fe75cd381683d4d95af171a96d9ba667c7ca847a7667700f1ea1e60d95349df85627009dcc55754d719b30ce11124566be9a8cb783a1a7a62ec47c5da18 SHA512 34012d595cab418d5332e2466f1ba4868208f69b8b20ab94f406cb27ee01674c92c525fa29fbd9bac883d506f84516f6feb36112d9bafbb71c28a920540e119b
+EBUILD heaptrack-1.5.0.ebuild 1598 BLAKE2B aa8e07cd2fd60769c60ae0350b57ee1030df05daa0a26a91295bd5970da8651237e1b326575d247f09e91749fc968c1d7ace8508851efc9e2605e84f39077663 SHA512 35d87621c74c39145a7260e1003ff12d135cff373cbb30046227ff9f1f97e59d79c1f7f6384315d8fa45fcb933147cabb6c0639ae6f8b4c531953ef8809533c6
+EBUILD heaptrack-9999.ebuild 1488 BLAKE2B 9c1727ebd1ccfc3aa9cc5b22f6ab05e0bb794d9460752df5d98f2a30fea3991ced50a6adf2498bb0ef05af9c15c04fb5dbb1df734d3086c572e0df4dbde86538 SHA512 92fa4380d79078ea5822e6640992512905704fd44ab8d0af1508bf8e4ab31d33e4d663a63afe94d052cd0cf3738a1a7ac9df4d025735b3a4464c81494181f45f
 MISC metadata.xml 395 BLAKE2B bfbf8422aff66acc6dc7097c261cfc2d967b62bf7a88516e9c433b5702fe4dcbc81928986abd87eab7cc8ce3201f728bd5482eddc6635cef0c83456c52a8137e SHA512 3713423aa87a37024dbd9b0582a8fc43b8b731b0ecb8013534562151ea982e156361f7a95d1efc3e1ec31b6ee1fd659686d6214fbc64e07c09c3ed76fa7f19ab
diff --git a/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch b/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
new file mode 100644
index 000000000000..4d88af050d5c
--- /dev/null
+++ b/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch
@@ -0,0 +1,43 @@
+https://invent.kde.org/sdk/heaptrack/-/merge_requests/24
+
+From ce0e0d218e76b1b724f4e10b9da2d8f33e4156b6 Mon Sep 17 00:00:00 2001
+From: Florian Weimer <fweimer@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.
+--- 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/dev-util/heaptrack/heaptrack-1.5.0.ebuild b/dev-util/heaptrack/heaptrack-1.5.0.ebuild
index fd796741d336..eb794b0466ad 100644
--- a/dev-util/heaptrack/heaptrack-1.5.0.ebuild
+++ b/dev-util/heaptrack/heaptrack-1.5.0.ebuild
@@ -42,6 +42,15 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# This doesn't exist in libunwind (bug #898768).
+	unw_backtrace_skip
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-c99.patch
+)
+
 src_prepare() {
 	cmake_src_prepare
 	rm -rf 3rdparty/boost-zstd || die # ensure no bundling
diff --git a/dev-util/heaptrack/heaptrack-9999.ebuild b/dev-util/heaptrack/heaptrack-9999.ebuild
index e449505549c7..78ccbe37b70d 100644
--- a/dev-util/heaptrack/heaptrack-9999.ebuild
+++ b/dev-util/heaptrack/heaptrack-9999.ebuild
@@ -41,6 +41,11 @@ RDEPEND="${DEPEND}
 "
 BDEPEND="gui? ( kde-frameworks/extra-cmake-modules:0 )"
 
+QA_CONFIG_IMPL_DECL_SKIP=(
+	# This doesn't exist in libunwind (bug #898768).
+	unw_backtrace_skip
+)
+
 src_prepare() {
 	cmake_src_prepare
 	rm -rf 3rdparty/boost-zstd || die # ensure no bundling