* [PR PATCH] libdwarf: update to 0.11.1.
@ 2025-01-12 13:41 meator
2025-01-12 13:46 ` [PR PATCH] [Updated] " meator
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: meator @ 2025-01-12 13:41 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2368 bytes --]
There is a new pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 3636 bytes --]
From 1b095870a6841862a6f3983038ab34a556d5d81f Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:07:19 +0100
Subject: [PATCH 1/2] libdwarf: update to 0.11.1.
---
common/shlibs | 2 +-
srcpkgs/libdwarf/template | 22 +++++++++++-----------
2 files changed, 12 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..f0c8d25cd08038 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,6 +1,11 @@
# 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"
@@ -9,33 +14,28 @@ short_desc="DWARF Debugging Information Format Library"
maintainer="Orphaned <orphan@voidlinux.org>"
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 3ec56f5639344c38c8f1db4584660e640ca01f1c Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:08:17 +0100
Subject: [PATCH 2/2] 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"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
@ 2025-01-12 13:46 ` meator
2025-01-12 14:26 ` meator
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-01-12 13:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 3674 bytes --]
From d98f1249e4178a1202676b02dd1df55021adc0ac Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:07:19 +0100
Subject: [PATCH 1/2] libdwarf: update to 0.11.1.
---
common/shlibs | 2 +-
srcpkgs/libdwarf/template | 23 ++++++++++++-----------
2 files changed, 13 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..99bc9e57d1375b 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,41 +1,42 @@
# 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 <orphan@voidlinux.org>"
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 1496ddcaf814ed0fde661fbd1d9a42007267a534 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:08:17 +0100
Subject: [PATCH 2/2] 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"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
2025-01-12 13:46 ` [PR PATCH] [Updated] " meator
@ 2025-01-12 14:26 ` meator
2025-01-12 14:40 ` meator
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-01-12 14:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 5380 bytes --]
From d98f1249e4178a1202676b02dd1df55021adc0ac Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 | 23 ++++++++++++-----------
2 files changed, 13 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..99bc9e57d1375b 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,41 +1,42 @@
# 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 <orphan@voidlinux.org>"
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 1496ddcaf814ed0fde661fbd1d9a42007267a534 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 faa9826711eb6092c8017ea070691580c94de39f Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
+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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
2025-01-12 13:46 ` [PR PATCH] [Updated] " meator
2025-01-12 14:26 ` meator
@ 2025-01-12 14:40 ` meator
2025-01-12 15:47 ` meator
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-01-12 14:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 5380 bytes --]
From d98f1249e4178a1202676b02dd1df55021adc0ac Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 | 23 ++++++++++++-----------
2 files changed, 13 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..99bc9e57d1375b 100644
--- a/srcpkgs/libdwarf/template
+++ b/srcpkgs/libdwarf/template
@@ -1,41 +1,42 @@
# 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 <orphan@voidlinux.org>"
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 1496ddcaf814ed0fde661fbd1d9a42007267a534 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 f9abbf31f7cd4c688851a0efa2b623a40de1b56a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
+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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (2 preceding siblings ...)
2025-01-12 14:40 ` meator
@ 2025-01-12 15:47 ` meator
2025-04-13 2:17 ` github-actions
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-01-12 15:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 5371 bytes --]
From af9ba69b3bacba3afe9ba04ba7a24ab1e34ceec4 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 <orphan@voidlinux.org>"
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 <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
+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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (3 preceding siblings ...)
2025-01-12 15:47 ` meator
@ 2025-04-13 2:17 ` github-actions
2025-04-13 7:18 ` meator
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: github-actions @ 2025-04-13 2:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
New comment by github-actions[bot] on void-packages repository
https://github.com/void-linux/void-packages/pull/53941#issuecomment-2799551764
Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that. If this pull request is still relevant bump it or assign it.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (4 preceding siblings ...)
2025-04-13 2:17 ` github-actions
@ 2025-04-13 7:18 ` meator
2025-04-16 14:56 ` [PR PATCH] [Updated] " meator
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-04-13 7:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 145 bytes --]
New comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/53941#issuecomment-2799837194
Comment:
bump
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.11.1.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (5 preceding siblings ...)
2025-04-13 7:18 ` meator
@ 2025-04-16 14:56 ` meator
2025-04-16 14:59 ` [PR PATCH] [Updated] libdwarf: update to 0.12.0 meator
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-04-16 14:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.11.1.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 5371 bytes --]
From b900075cdfcaeb69af38601b53f7851cbd93f73d Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:07:19 +0100
Subject: [PATCH 1/3] libdwarf: update to 0.12.0.
---
common/shlibs | 2 +-
srcpkgs/libdwarf/template | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..17669da088781a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2517,7 +2517,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..7af1134826aa97 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.12.0
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 <orphan@voidlinux.org>"
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=444dc1c5176f04d3ebc50341552a8b2ea6c334f8f1868a023a740ace0e6eae9f
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 2eda47bcf1639cb6baf950adb186a385da76d59a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 1f181c9abb6383417baa2981aebbda7788b9a8c4 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
+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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.12.0.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (6 preceding siblings ...)
2025-04-16 14:56 ` [PR PATCH] [Updated] " meator
@ 2025-04-16 14:59 ` meator
2025-04-16 16:20 ` meator
2025-04-16 16:23 ` meator
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-04-16 14:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.12.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 5371 bytes --]
From 05b74b5616e012bef452a3789fbc0114204cb065 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:07:19 +0100
Subject: [PATCH 1/3] libdwarf: update to 0.12.0.
---
common/shlibs | 2 +-
srcpkgs/libdwarf/template | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..ffba09ef837711 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2517,7 +2517,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.12.0_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..7af1134826aa97 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.12.0
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 <orphan@voidlinux.org>"
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=444dc1c5176f04d3ebc50341552a8b2ea6c334f8f1868a023a740ace0e6eae9f
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 ce3f56944bbd41907491104954a853de0d3b2f5a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 d04d70477882db3df599cfc42a10fed372d25197 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
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 <meator.dev@gmail.com>
+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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] libdwarf: update to 0.12.0.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (7 preceding siblings ...)
2025-04-16 14:59 ` [PR PATCH] [Updated] libdwarf: update to 0.12.0 meator
@ 2025-04-16 16:20 ` meator
2025-04-16 16:23 ` meator
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-04-16 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 2373 bytes --]
There is an updated pull request by meator against master on the void-packages repository
https://github.com/meator/void-packages libdwarf
https://github.com/void-linux/void-packages/pull/53941
libdwarf: update to 0.12.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
As discussed on `#xbps`, this update is a bit wonky thanks to upstream's decision to fuck up their versioning.
A new file `/usr/share/dwarfdump/dwarfdump.conf` is now installed alongside `libdwarf`. I am unsure whether it should be marked as `conf_files`, I chose not to here (`dwarfdump` should also read from user's `$HOME`).
It looks like this package breaks `xbps-src` in some way. This is the output of `./xbps-src pkg mold` (of which `libdwarf` is a `checkdepends`):
```
=> xbps-src: cleaning up / masterdir...
=> mold-2.34.1_1: removing autodeps, please wait...
=> mold-2.34.1_1: building with [cmake] for x86_64...
[host] cmake-bootstrap-3.30.1_1: found (https://repo-default.voidlinux.org/current/bootstrap)
[host] ninja-1.12.1_2: not found
error: xbps_dictionary_set [check] tar-1.35_1: found (https://repo-default.voidlinux.org/current)
[check] zstd-1.5.6_1: found (https://repo-default.voidlinux.org/current)
[target] mimalloc-devel-2.1.7_1: found (https://repo-default.voidlinux.org/current)
[target] zlib-devel-1.3.1_1: found (https://repo-default.voidlinux.org/current)
```
#### Testing the changes
- I tested the changes in this PR: **briefly**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/53941.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libdwarf-53941.patch --]
[-- Type: text/x-diff, Size: 9683 bytes --]
From 05b74b5616e012bef452a3789fbc0114204cb065 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:07:19 +0100
Subject: [PATCH 1/5] libdwarf: update to 0.12.0.
---
common/shlibs | 2 +-
srcpkgs/libdwarf/template | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index bec2f470613330..ffba09ef837711 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2517,7 +2517,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.12.0_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..7af1134826aa97 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.12.0
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 <orphan@voidlinux.org>"
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=444dc1c5176f04d3ebc50341552a8b2ea6c334f8f1868a023a740ace0e6eae9f
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 ce3f56944bbd41907491104954a853de0d3b2f5a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 14:08:17 +0100
Subject: [PATCH 2/5] 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 356489fb28181a789687aff04f1ff576ce4c541b Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Sun, 12 Jan 2025 15:25:58 +0100
Subject: [PATCH 3/5] heaptrack: fix build on musl
---
srcpkgs/heaptrack/patches/fix-musl.patch | 25 ++++++++++++++++++++++++
1 file changed, 25 insertions(+)
create mode 100644 srcpkgs/heaptrack/patches/fix-musl.patch
diff --git a/srcpkgs/heaptrack/patches/fix-musl.patch b/srcpkgs/heaptrack/patches/fix-musl.patch
new file mode 100644
index 00000000000000..74620a41f95bb7
--- /dev/null
+++ b/srcpkgs/heaptrack/patches/fix-musl.patch
@@ -0,0 +1,25 @@
+From 79a85b281890fd851c9e4b79e69541bccd7196f1 Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Sun, 26 Jan 2025 14:24:45 +0100
+Subject: [PATCH] Fix build on musl
+
+Original patch by "meator" on github, see:
+https://github.com/KDE/heaptrack/pull/55
+
+Thanks!
+---
+ 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 <string>
+ #include <vector>
++#include <cstdint>
+
+ #include <sys/types.h>
+
From bf208a5f9e562096d7539265f5a20522ab0ea2a1 Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Wed, 16 Apr 2025 18:14:06 +0200
Subject: [PATCH 4/5] heaptrack: fix gcc14 build
---
srcpkgs/heaptrack/patches/fix-gcc14.patch | 45 +++++++++++++++++++++++
1 file changed, 45 insertions(+)
create mode 100644 srcpkgs/heaptrack/patches/fix-gcc14.patch
diff --git a/srcpkgs/heaptrack/patches/fix-gcc14.patch b/srcpkgs/heaptrack/patches/fix-gcc14.patch
new file mode 100644
index 00000000000000..4420e31aa6ea3f
--- /dev/null
+++ b/srcpkgs/heaptrack/patches/fix-gcc14.patch
@@ -0,0 +1,45 @@
+From c6c45f3455a652c38aefa402aece5dafa492e8ab 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.
+---
+ cmake/FindLibunwind.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/cmake/FindLibunwind.cmake b/cmake/FindLibunwind.cmake
+index 2dddfad9..d597de9c 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})
From 9f066c15a7d337dea3d619b53611e77daedb8a8a Mon Sep 17 00:00:00 2001
From: meator <meator.dev@gmail.com>
Date: Wed, 16 Apr 2025 18:20:17 +0200
Subject: [PATCH 5/5] heaptrack: remove patch merged upstream
---
srcpkgs/heaptrack/patches/fix-include.patch | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 srcpkgs/heaptrack/patches/fix-include.patch
diff --git a/srcpkgs/heaptrack/patches/fix-include.patch b/srcpkgs/heaptrack/patches/fix-include.patch
deleted file mode 100644
index 31f67813db9d84..00000000000000
--- a/srcpkgs/heaptrack/patches/fix-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: heaptrack-1.4.0/src/analyze/gui/histogrammodel.h
-===================================================================
---- heaptrack-1.4.0.orig/src/analyze/gui/histogrammodel.h
-+++ heaptrack-1.4.0/src/analyze/gui/histogrammodel.h
-@@ -7,6 +7,7 @@
- #ifndef HISTOGRAMMODEL_H
- #define HISTOGRAMMODEL_H
-
-+#include <array>
- #include <QAbstractTableModel>
-
- #include "treemodel.h"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: libdwarf: update to 0.12.0.
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
` (8 preceding siblings ...)
2025-04-16 16:20 ` meator
@ 2025-04-16 16:23 ` meator
9 siblings, 0 replies; 11+ messages in thread
From: meator @ 2025-04-16 16:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 430 bytes --]
New comment by meator on void-packages repository
https://github.com/void-linux/void-packages/pull/53941#issuecomment-2810095614
Comment:
I have added some heaptrack related changes to this PR. The "heaptrack: remove unnecessary dependency" commit is related to libdwarf, so I have included it into this PR. CI builds heaptrack in this PR because of this, so I had to add some commits to fix heaptrack to make the checks green.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2025-04-16 16:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-12 13:41 [PR PATCH] libdwarf: update to 0.11.1 meator
2025-01-12 13:46 ` [PR PATCH] [Updated] " meator
2025-01-12 14:26 ` meator
2025-01-12 14:40 ` meator
2025-01-12 15:47 ` meator
2025-04-13 2:17 ` github-actions
2025-04-13 7:18 ` meator
2025-04-16 14:56 ` [PR PATCH] [Updated] " meator
2025-04-16 14:59 ` [PR PATCH] [Updated] libdwarf: update to 0.12.0 meator
2025-04-16 16:20 ` meator
2025-04-16 16:23 ` meator
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).