From af9ba69b3bacba3afe9ba04ba7a24ab1e34ceec4 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 12 Jan 2025 14:07:19 +0100 Subject: [PATCH 1/3] libdwarf: update to 0.11.1. --- common/shlibs | 2 +- srcpkgs/libdwarf/template | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/common/shlibs b/common/shlibs index e0bba1a4f23171..2371d98964b523 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2528,7 +2528,7 @@ libgeany.so.0 geany-1.25_1 libctpl.so.2 ctpl-0.3.4_1 libmuparser.so.2 muparser-2.2.5_1 libgtkgl-2.0.so.1 gtkglarea-2.1.0_1 -libdwarf.so.1 libdwarf-20160613_1 +libdwarf.so.0 libdwarf-0.11.1_1 libmemcached.so.11 libmemcached-1.0.18_1 libhashkit.so.2 libmemcached-1.0.18_1 libmemcachedutil.so.2 libmemcached-1.0.18_1 diff --git a/srcpkgs/libdwarf/template b/srcpkgs/libdwarf/template index ff57daef3f288e..bad8d489c4f85e 100644 --- a/srcpkgs/libdwarf/template +++ b/srcpkgs/libdwarf/template @@ -1,41 +1,39 @@ # Template file for 'libdwarf' pkgname=libdwarf -version=20201020 +# See https://www.prevanders.net/dwarf.html#nfuture +reverts="20201020_1 20200825_1 20200719_1 20200114_1 20191104_2 20191104_1 20191002_1 20190529_1 20190110_1 20180809_1 20180527_1 20180129_1 20170709_2 20170709_1 20170416_1 20161124_1 20161021_1 20161001_1 20160923_1 20160613_1 20160507_1 20160115_1 20150507_3 20150507_2 20150507_1" +version=0.11.1 revision=1 build_style=gnu-configure configure_args="--enable-shared --enable-dwarfgen" makedepends="elfutils-devel" +checkdepends="python3" short_desc="DWARF Debugging Information Format Library" maintainer="Orphaned " license="LGPL-2.1-only" homepage="https://www.prevanders.net/dwarf.html" -distfiles="https://prevanders.net/${pkgname}-${version}.tar.gz" -checksum=1c5ce59e314c6fe74a1f1b4e2fa12caea9c24429309aa0ebdfa882f74f016eff +distfiles="https://www.prevanders.net/libdwarf-${version}.tar.xz" +checksum=b5be211b1bd0c1ee41b871b543c73cbff5822f76994f6b160fc70d01d1b5a1bf if [ "$CROSS_BUILD" ]; then hostmakedepends="elfutils-devel" fi -post_install() { - rm -rf ${PKGDESTDIR}/usr/share/libdwarf/libdwarf-devel - mkdir ${DESTDIR}/usr/include/libdwarf - mv ${DESTDIR}/usr/include/*.h ${DESTDIR}/usr/include/libdwarf -} - libdwarf-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - vmove "usr/include/libdwarf" + vmove "usr/include/libdwarf-0" vmove "usr/lib/*.so" vmove "usr/lib/*.a" + vmove "usr/lib/pkgconfig" } } libdwarf-doc_package() { short_desc+=" - documentation" pkg_install() { - for i in README NEWS libdwarf/*.pdf ; do + for i in README NEWS doc/*.pdf ; do vdoc $i done } From aba5065cef65318460b7942e43d80b4ab0f0dd55 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 12 Jan 2025 14:08:17 +0100 Subject: [PATCH 2/3] heaptrack: remove unnecessary dependency --- srcpkgs/heaptrack/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index 745ebc24ec1080..0a9c887c1af27d 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DHEAPTRACK_BUILD_GUI=ON" hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons gettext" -makedepends="qt5-devel boost-devel libunwind-devel libdwarf-devel kdiagram-devel +makedepends="qt5-devel boost-devel libunwind-devel kdiagram-devel libzstd-devel ecm-devel ki18n-devel kitemmodels-devel kio-devel kconfigwidgets-devel threadweaver-devel" #depends="gdb" From 42c6b4c6a89b084c1b3a03c96d42da20bbf68e17 Mon Sep 17 00:00:00 2001 From: meator Date: Sun, 12 Jan 2025 15:25:58 +0100 Subject: [PATCH 3/3] heaptrack: fix build on musl See also: https://github.com/KDE/heaptrack/pull/55 --- srcpkgs/heaptrack/patches/fix-include2.patch | 21 ++++++++++++++++++++ srcpkgs/heaptrack/template | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/heaptrack/patches/fix-include2.patch diff --git a/srcpkgs/heaptrack/patches/fix-include2.patch b/srcpkgs/heaptrack/patches/fix-include2.patch new file mode 100644 index 00000000000000..b50217b4e10c44 --- /dev/null +++ b/srcpkgs/heaptrack/patches/fix-include2.patch @@ -0,0 +1,21 @@ +From d6dc3d697a5f37fce52269b65ca43c7194c985a7 Mon Sep 17 00:00:00 2001 +From: meator +Date: Sun, 12 Jan 2025 15:19:37 +0100 +Subject: [PATCH] Fix build on musl + +--- + src/analyze/suppressions.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/analyze/suppressions.h b/src/analyze/suppressions.h +index 2c674470..0a5a4893 100644 +--- a/src/analyze/suppressions.h ++++ b/src/analyze/suppressions.h +@@ -9,6 +9,7 @@ + + #include + #include ++#include + + #include + diff --git a/srcpkgs/heaptrack/template b/srcpkgs/heaptrack/template index 0a9c887c1af27d..8312ababfdd5b4 100644 --- a/srcpkgs/heaptrack/template +++ b/srcpkgs/heaptrack/template @@ -1,7 +1,7 @@ # Template file for 'heaptrack' pkgname=heaptrack version=1.5.0 -revision=1 +revision=2 build_style=cmake configure_args="-DHEAPTRACK_BUILD_GUI=ON" hostmakedepends="qt5-qmake qt5-host-tools extra-cmake-modules kcoreaddons