From 25edbe3d8ba56e2c8fd9de9a473236dcfa33d26c Mon Sep 17 00:00:00 2001 From: Iced Quinn Date: Fri, 21 Oct 2022 17:29:13 -0500 Subject: [PATCH] antimicrox: update to 3.2.5 chore: remove antimicro from common/shlibs chore: include old antimicrox libs in removed packages refactor: musl-specific flags --- common/shlibs | 1 - srcpkgs/antimicrox/template | 25 ++++++++----------------- srcpkgs/libantimicrox | 1 - srcpkgs/libantimicrox-devel | 1 - srcpkgs/removed-packages/template | 2 ++ 5 files changed, 10 insertions(+), 20 deletions(-) delete mode 120000 srcpkgs/libantimicrox delete mode 120000 srcpkgs/libantimicrox-devel diff --git a/common/shlibs b/common/shlibs index 9712cbc1262f..83f52c934a2a 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3947,7 +3947,6 @@ libnotcurses-core.so.3 notcurses-3.0.5_1 libnotcurses++.so.3 notcurses-3.0.5_1 libnotcurses-ffi.so.3 notcurses-3.0.5_1 libevemu.so.3 evemu-2.7.0_1 -libantilib.so.1 libantimicrox-3.1.2_1 libinih.so.0 inih-52_1 libpcaudio.so.0 pcaudiolib-1.1_1 libdcerpc-samr.so.0 samba-4.13.2_1 diff --git a/srcpkgs/antimicrox/template b/srcpkgs/antimicrox/template index 6a77e8e3a09b..82153fd3c4b6 100644 --- a/srcpkgs/antimicrox/template +++ b/srcpkgs/antimicrox/template @@ -1,6 +1,6 @@ # Template file for 'antimicrox' pkgname=antimicrox -version=3.1.3 +version=3.3.1 revision=1 build_style=cmake hostmakedepends="pkg-config extra-cmake-modules itstool gettext qt5-qmake @@ -12,23 +12,14 @@ maintainer="fosslinux " license="GPL-3.0-or-later" homepage="https://github.com/AntiMicroX/antimicrox" distfiles="${homepage}/archive/${version}.tar.gz" -checksum=53c6b0e6c8ea8c3a5527b56e1ad052eae983ba36abfc090769c6164bc5f342dd +changelog="https://raw.githubusercontent.com/AntiMicroX/antimicrox/master/CHANGELOG.md" +checksum=df1df587691568190a1cfa024f85e842c3883f9c58e6a7e883d42976584f728d -libantimicrox_package() { - short_desc+=" - libraries" - pkg_install() { - vmove usr/lib/*.so.* - } -} - -libantimicrox-devel_package() { - depends="libantimicrox>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/lib/*.so - vmove usr/include - } -} +case "$XBPS_TARGET_MACHINE" in + *-musl) + makedepends+=" libexecinfo-devel" + configure_args+=" -DCMAKE_EXE_LINKER_FLAGS=-lexecinfo" ;; +esac antimicro_package() { build_style=meta diff --git a/srcpkgs/libantimicrox b/srcpkgs/libantimicrox deleted file mode 120000 index ff1739a80980..000000000000 --- a/srcpkgs/libantimicrox +++ /dev/null @@ -1 +0,0 @@ -antimicrox \ No newline at end of file diff --git a/srcpkgs/libantimicrox-devel b/srcpkgs/libantimicrox-devel deleted file mode 120000 index ff1739a80980..000000000000 --- a/srcpkgs/libantimicrox-devel +++ /dev/null @@ -1 +0,0 @@ -antimicrox \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 1b8e3bb7a7d2..a7ba3fa38bb5 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -245,6 +245,8 @@ replaces=" key-mon<=1.17_5 laditools<=1.1.0_3 libapp<=20140527_2 + libantimicrox<=3.1.3_1 + libantimicrox-devel<=3.1.3_1 libco-devel<=20_1 libco<=20_1 libdbusmenu-qt<=0.9.2_4