From f53364c86da512280161ba999746a276b5be0a2a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 Nov 2024 01:06:38 +0000 Subject: [PATCH] build: sync with upstream 2024-11-21 https://github.com/void-linux/void-packages/commit/4e893efc --- common/hooks/post-install/15-qt-private-api.sh | 7 ++++++- common/shlibs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/common/hooks/post-install/15-qt-private-api.sh b/common/hooks/post-install/15-qt-private-api.sh index 18f3576..3f445b4 100644 --- a/common/hooks/post-install/15-qt-private-api.sh +++ b/common/hooks/post-install/15-qt-private-api.sh @@ -41,7 +41,12 @@ hook() { for _shlib in $_list; do msg_normal "${pkgver}: requires PRIVATE_API from $_shlib\n" done - _version=$(printf '%s\n' $_list | sed 's/^libQt\([0-9]*\).*/\1/' | grep -v '^5$' | uniq) + _version=$(printf '%s\n' $_list | + sed -E ' + s/^libQt([0-9]*)3D.*/\1/ + s/^libQt([0-9]*).*/\1/ + ' | grep -v '^5$' | uniq + ) for _v in $_version; do _ok= for _md in ${makedepends}; do diff --git a/common/shlibs b/common/shlibs index 381c6ef..8503c3e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2793,7 +2793,7 @@ libsmpeg2-2.0.so.0 smpeg2-2.0.0_1 libedac.so.1 libedac-0.18_1 libxlsreader.so.8 libxls-1.6.1_1 libR.so R-4.0.2_1 -libmarkdown.so.2 discount-2.2.0_3 +libmarkdown.so.3 discount-3.0.0d_1 libkeystone.so.0 keystone-0.9_1 libmate-slab.so.0 libmate-control-center-1.14.0_2 libuev.so.3 libuev-2.4.0_1