diff options
Diffstat (limited to 'dev-util/heaptrack')
| -rw-r--r-- | dev-util/heaptrack/Manifest | 5 | ||||
| -rw-r--r-- | dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch | 43 | ||||
| -rw-r--r-- | dev-util/heaptrack/heaptrack-1.5.80_pre20250110.ebuild (renamed from dev-util/heaptrack/heaptrack-1.5.0.ebuild) | 32 |
3 files changed, 16 insertions, 64 deletions
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest index 7285d7fe540e..8d7dee5824a6 100644 --- a/dev-util/heaptrack/Manifest +++ b/dev-util/heaptrack/Manifest @@ -1,5 +1,4 @@ -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 1598 BLAKE2B aa8e07cd2fd60769c60ae0350b57ee1030df05daa0a26a91295bd5970da8651237e1b326575d247f09e91749fc968c1d7ace8508851efc9e2605e84f39077663 SHA512 35d87621c74c39145a7260e1003ff12d135cff373cbb30046227ff9f1f97e59d79c1f7f6384315d8fa45fcb933147cabb6c0639ae6f8b4c531953ef8809533c6 +DIST heaptrack-1.5.80_pre20250110-5d8bfe44.tar.gz 9485092 BLAKE2B 86c04c9892a845c382b8c28248c6230517fff3ed536f773e8cd24b73c1655e08d571bb351b606aca4f0147141256f2496f119d5406a04f8da89f58de29c969db SHA512 019882341d4e046b5a1f7f8873227f455995ce1c837efa1f934c17578b41e13fa8dd4c6a20edaaea4e2e9659b43e9631c1cb3d4ccd87108f5c4342889374dff1 +EBUILD heaptrack-1.5.80_pre20250110.ebuild 1577 BLAKE2B 10b7245b4d529ef9bcf83e64c703f2326ca3490093d69b8d790ccc668431ac188be6a97c98221ec549ab4b4349a3c15647ae835d803cbcc89c9792764a06feda SHA512 e49630793c668de71b6d27529853568c9f65c14b8de08781fbbe1ffc96d44923998b8e7ef42c58dc41b6409a15ab4d76847accb3659318211c18577ea582a4e4 EBUILD heaptrack-9999.ebuild 1515 BLAKE2B 025a06461e46f99f680a310dacd5933c8511c0d52ea90524f5dc0594ce357658671690e38d2644a8c20950a7edb50441346694ee323c097500a8fc26e404d0ba SHA512 a8450ce3e05cb3c3fa16764468c16a5d25032c8f5131f63242d418d76fe00ae767399bd73455f8dbc21880ad9fcbb31300a0d4411518c2c55daa8265fd6449f3 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 deleted file mode 100644 index 4d88af050d5c..000000000000 --- a/dev-util/heaptrack/files/heaptrack-1.5.0-c99.patch +++ /dev/null @@ -1,43 +0,0 @@ -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.80_pre20250110.ebuild index eb794b0466ad..f4c9330b0834 100644 --- a/dev-util/heaptrack/heaptrack-1.5.0.ebuild +++ b/dev-util/heaptrack/heaptrack-1.5.80_pre20250110.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 +KDE_ORG_COMMIT=5d8bfe4441be81ff3ced10114bb012d24ec0ab86 inherit cmake kde.org xdg-utils DESCRIPTION="Fast heap memory profiler" HOMEPAGE="https://apps.kde.org/heaptrack/ https://milianw.de/blog/heaptrack-a-heap-memory-profiler-for-linux" -SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="LGPL-2.1+" SLOT="0" @@ -17,23 +17,22 @@ IUSE="+gui test zstd" RESTRICT="!test? ( test )" +# TODO: unbundle robin-map DEPEND=" dev-libs/boost:=[zstd?,zlib] sys-libs/libunwind:= sys-libs/zlib gui? ( - dev-libs/kdiagram:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/kitemmodels:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/threadweaver:5 + dev-libs/kdiagram:6 + dev-qt/qtbase:6[gui,widgets] + kde-frameworks/kconfig:6 + kde-frameworks/kconfigwidgets:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/ki18n:6 + kde-frameworks/kio:6 + kde-frameworks/kitemmodels:6 + kde-frameworks/kwidgetsaddons:6 + kde-frameworks/threadweaver:6 ) zstd? ( app-arch/zstd:= ) " @@ -47,10 +46,6 @@ QA_CONFIG_IMPL_DECL_SKIP=( 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 @@ -58,6 +53,7 @@ src_prepare() { src_configure() { local mycmakeargs=( + -DHEAPTRACK_USE_QT6=ON -DHEAPTRACK_BUILD_GUI=$(usex gui) -DBUILD_TESTING=$(usex test) $(cmake_use_find_package zstd ZSTD) |