diff options
29 files changed, 136 insertions, 83 deletions
diff --git a/system/file/APKBUILD b/system/file/APKBUILD index 5a158e5a6..1f40c1219 100644 --- a/system/file/APKBUILD +++ b/system/file/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=file pkgver=5.45 -pkgrel=1 +pkgrel=0 pkgdesc="File type identification utility" url="http://www.darwinsys.com/file/" arch="all" @@ -17,7 +17,7 @@ builddir="$srcdir/$pkgname-FILE${pkgver%.*}_${pkgver#*.}" prepare() { export LIBTOOL="slibtool" export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" autoreconf -vif } diff --git a/system/fts/APKBUILD b/system/fts/APKBUILD index 5ab7b2d29..5ca5cdb2a 100644 --- a/system/fts/APKBUILD +++ b/system/fts/APKBUILD @@ -10,16 +10,15 @@ license="BSD-3-Clause" depends="" makedepends="automake autoconf slibtool" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip - slibtoolize.patch" +source="$pkgname-$pkgver.zip::https://github.com/pullmoll/musl-fts/archive/v$pkgver.zip" builddir="$srcdir/musl-$pkgname-$pkgver" prepare() { default_prepare export LIBTOOL="slibtool" export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" - ./bootstrap.sh + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -vif } build() { @@ -44,5 +43,4 @@ package() { cp "$builddir"/musl-fts.pc "$pkgdir"/usr/lib/pkgconfig/libfts.pc } -sha512sums="69aceaa7a8dc7ab5845d3288e315357f92ac32fac55c3d670186f2c5756f665a11471fc81f67126755a707058a8d293ba926d906f542c1360a49ca3c9b357976 fts-1.2.7.zip -dea6eeb4c4bc5fbfdec143af49055ae85be8c4dabe8e9dc3d5ebf477e3874655014d5697157f12d67e2f1fa17f200220accd80210fc9e211f8ca9915d44a328d slibtoolize.patch" +sha512sums="69aceaa7a8dc7ab5845d3288e315357f92ac32fac55c3d670186f2c5756f665a11471fc81f67126755a707058a8d293ba926d906f542c1360a49ca3c9b357976 fts-1.2.7.zip" diff --git a/system/fts/slibtoolize.patch b/system/fts/slibtoolize.patch deleted file mode 100644 index aa454abdc..000000000 --- a/system/fts/slibtoolize.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff '--color=auto' -Nurd musl-fts-1.2.7/bootstrap.sh musl-fts-1.2.7.new/bootstrap.sh ---- musl-fts-1.2.7/bootstrap.sh 2017-01-13 06:57:04.000000000 -0800 -+++ musl-fts-1.2.7.new/bootstrap.sh 2025-06-13 16:58:38.303342991 -0700 -@@ -1,5 +1,5 @@ - #!/bin/sh --libtoolize -+slibtoolize - aclocal - autoconf - autoheader diff --git a/system/gmp/APKBUILD b/system/gmp/APKBUILD index 97a168fb8..66a5f65c0 100644 --- a/system/gmp/APKBUILD +++ b/system/gmp/APKBUILD @@ -7,7 +7,7 @@ url="https://gmplib.org/" arch="all" license="LGPL-3.0+ OR GPL-2.0+" depends="" -makedepends="texinfo" +makedepends="m4 texinfo" subpackages="$pkgname-doc $pkgname-dev libgmpxx" source="https://gmplib.org/download/gmp/gmp-$pkgver.tar.xz" diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index e6ce5fdf2..4380b9161 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.2.0_git20190823 -pkgrel=4 +pkgrel=3 pkgdesc="Console keyboard and font management utilities" url="https://kbd-project.org/" arch="all" @@ -10,7 +10,7 @@ options="!check" # padding error on at least ppc64 license="GPL-2.0+" depends="gzip" checkdepends="check-dev" -makedepends="linux-headers linux-pam-dev autoconf automake" +makedepends="linux-headers linux-pam-dev autoconf automake libtool" provides="$pkgname-keymaps" replaces="$pkgname-keymaps" subpackages="$pkgname-doc $pkgname-fonts::noarch @@ -22,6 +22,11 @@ source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz keymaps.initd " +prepare() { + default_prepare + autoreconf -vif +} + build() { ./configure \ --build=$CBUILD \ diff --git a/system/libbsd/APKBUILD b/system/libbsd/APKBUILD index b35c14e96..5899369e1 100644 --- a/system/libbsd/APKBUILD +++ b/system/libbsd/APKBUILD @@ -19,9 +19,9 @@ source="https://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz prepare() { default_prepare export LIBTOOL="slibtool" - export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" - autoreconf -fi + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -vif } build() { diff --git a/system/libuv/APKBUILD b/system/libuv/APKBUILD index 7a5ac1b4d..224f03bc5 100644 --- a/system/libuv/APKBUILD +++ b/system/libuv/APKBUILD @@ -3,12 +3,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libuv pkgver=1.44.2 -pkgrel=0 +pkgrel=1 pkgdesc="Cross-platform asychronous I/O" url="https://libuv.org" arch="all" license="MIT AND BSD-2-Clause AND BSD-3-Clause AND ISC" -makedepends="automake autoconf libtool linux-headers" +makedepends="automake autoconf slibtool linux-headers" subpackages="$pkgname-dev" source="https://dist.libuv.org/dist/v$pkgver/$pkgname-v$pkgver.tar.gz fix-test-tty-size-assumption.patch @@ -17,6 +17,9 @@ builddir="$srcdir/$pkgname-v$pkgver" prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" sh autogen.sh } diff --git a/system/linux-pam/APKBUILD b/system/linux-pam/APKBUILD index c02990aa3..ad4f874f1 100644 --- a/system/linux-pam/APKBUILD +++ b/system/linux-pam/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=linux-pam pkgver=1.5.2 -pkgrel=1 +pkgrel=2 pkgdesc="Pluggable Authentication Modules" url="https://www.kernel.org/pub/linux/libs/pam" arch="all" @@ -10,9 +10,9 @@ options="suid" license="BSD-3-Clause" depends_dev="gettext-tiny-dev" makedepends_host="$depends_dev utmps-dev" -makedepends_build="$depends_dev byacc flex-dev autoconf automake libtool" +makedepends_build="$depends_dev byacc flex-dev autoconf automake slibtool" makedepends="$makedepends_host $makedepends_build" -subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" +subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-systemd" source="https://github.com/$pkgname/$pkgname/releases/download/v$pkgver/Linux-PAM-$pkgver.tar.xz fix-compat.patch libpam-fix-build-with-eglibc-2.16.patch @@ -33,10 +33,13 @@ prepare() { default_prepare # disable insecure modules sed -e 's/pam_rhosts//g' -i modules/Makefile.am + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -vif } build() { - autoreconf -vif [ "$CLIBC" = "musl" ] && export ac_cv_search_crypt=no LIBS="-lutmps -lskarnet" ./configure \ --build=$CBUILD \ diff --git a/system/musl-obstack/APKBUILD b/system/musl-obstack/APKBUILD index c5bdd4f59..5bacfb4ac 100644 --- a/system/musl-obstack/APKBUILD +++ b/system/musl-obstack/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=musl-obstack pkgver=1.2.3 -pkgrel=0 +pkgrel=1 pkgdesc="Standalone library to implement obstack functionality" url=" " arch="all" @@ -9,15 +9,14 @@ license="GPL-2.0+" depends="" makedepends="autoconf automake slibtool" subpackages="$pkgname-dev" -source="musl-obstack-$pkgver.tar.gz::https://github.com/void-linux/musl-obstack/archive/v$pkgver.tar.gz - slibtoolize.patch" +source="musl-obstack-$pkgver.tar.gz::https://github.com/void-linux/musl-obstack/archive/v$pkgver.tar.gz" prepare() { default_prepare export LIBTOOL="slibtool" - export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" - ./bootstrap.sh + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -vif } build() { @@ -40,5 +39,4 @@ package() { make DESTDIR="$pkgdir" install } -sha512sums="b2bbed19c4ab2714ca794bdcb1a84fad1af964e884d4f3bbe91c9937ca089d92b8472cb05ebe998a9f5c85cb922b9b458db91eff29077bd099942e1ce18e16cc musl-obstack-1.2.3.tar.gz -ef05eb20b4cf9482d7f8f908c47f3eb28cc650d9faa47dbc4a142d3ddfecacd26087923f9f7593b726fac52d6859465c571cbd55130805c82c5a9492dcb86b7e slibtoolize.patch" +sha512sums="b2bbed19c4ab2714ca794bdcb1a84fad1af964e884d4f3bbe91c9937ca089d92b8472cb05ebe998a9f5c85cb922b9b458db91eff29077bd099942e1ce18e16cc musl-obstack-1.2.3.tar.gz" diff --git a/system/musl-obstack/slibtoolize.patch b/system/musl-obstack/slibtoolize.patch deleted file mode 100644 index 1bfbfd1a6..000000000 --- a/system/musl-obstack/slibtoolize.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff '--color=auto' -Nurd musl-obstack-1.2.3/bootstrap.sh musl-obstack-1.2.3.new/bootstrap.sh ---- musl-obstack-1.2.3/bootstrap.sh 2022-03-28 09:31:06.000000000 -0700 -+++ musl-obstack-1.2.3.new/bootstrap.sh 2025-06-13 17:39:11.213363609 -0700 -@@ -1,5 +1,5 @@ - #!/bin/sh --libtoolize -+slibtoolize - aclocal - autoheader - autoconf diff --git a/system/slibtool/APKBUILD b/system/slibtool/APKBUILD index 42b7f2d9c..dc5e984dd 100644 --- a/system/slibtool/APKBUILD +++ b/system/slibtool/APKBUILD @@ -7,7 +7,7 @@ url="https://dev.midipix.org/cross/slibtool" arch="all" options="!check" # https://dev.midipix.org/cross/slibtool/issue/15 license="MIT" -depends="" +depends="sltdl-dev" makedepends="m4" subpackages="" source="https://dl.foss21.org/slibtool/$pkgname-$pkgver.tar.xz" diff --git a/system/sltdl/APKBUILD b/system/sltdl/APKBUILD index 78834edb8..fca3ae005 100644 --- a/system/sltdl/APKBUILD +++ b/system/sltdl/APKBUILD @@ -25,6 +25,7 @@ build() { package() { make DESTDIR="$pkgdir" install + printf "#include <sltdl/sltdl.h>\n" > "$pkgdir"/usr/include/ltdl.h } sha512sums="ca7118187359e4000d09b641a3dfabcdee955da4a7c9c681b39752aec516721b961575a4420b013f2993f9a96f4721f8af8213904ad30c4051d10e5928feec07 sltdl-0.5.0.tar.gz" diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD index b532a613b..4379cc9b4 100644 --- a/system/util-linux/APKBUILD +++ b/system/util-linux/APKBUILD @@ -9,14 +9,14 @@ case $pkgver in *.*) _v=$pkgver;; esac -pkgrel=2 +pkgrel=3 pkgdesc="Official Linux system management utilities" url="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" arch="all" options="!check suid" # multibyte input fails because of musl locale stuff license="GPL-2.0-only AND GPL-2.0+ AND LGPL-2.1+ AND Public-Domain" depends="" -makedepends_build="autoconf automake libtool" +makedepends_build="autoconf automake slibtool" makedepends_host="zlib-dev ncurses-dev linux-headers linux-pam-dev libcap-ng-dev utmps-dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch @@ -38,7 +38,10 @@ prepare() { default_prepare cp "$srcdir"/ttydefaults.h include/ - libtoolize --force && aclocal -I m4 && autoconf \ + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + slibtoolize --force && aclocal -I m4 && autoconf \ && automake --add-missing } diff --git a/user/a52dec/APKBUILD b/user/a52dec/APKBUILD index 9565a2a01..306cf334c 100644 --- a/user/a52dec/APKBUILD +++ b/user/a52dec/APKBUILD @@ -15,8 +15,8 @@ source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.g build() { export LIBTOOL="slibtool" - export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/cracklib/APKBUILD b/user/cracklib/APKBUILD index 4bd73e6e2..cff66d18f 100644 --- a/user/cracklib/APKBUILD +++ b/user/cracklib/APKBUILD @@ -23,10 +23,10 @@ source="https://github.com/cracklib/cracklib/releases/download/v$pkgver/cracklib prepare() { default_prepare export LIBTOOL="slibtool" - export LIBTOOLIZE="slibtoolize" - export ACLOCAL="aclocal --system-acdir=/usr/share/slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" # autogen.sh is not included in the dist tarball, but only calls: - autoreconf -f -i + autoreconf -if } build() { diff --git a/user/cve-check-tool/APKBUILD b/user/cve-check-tool/APKBUILD index 055d49fe2..bafc6fc03 100644 --- a/user/cve-check-tool/APKBUILD +++ b/user/cve-check-tool/APKBUILD @@ -3,7 +3,7 @@ pkgname=cve-check-tool pkgver=5.6.4_p2 _pkgver=${pkgver%_p*}+adelie${pkgver#*_p} -pkgrel=0 +pkgrel=1 pkgdesc="Vulnerability checker for Linux packaging" url="https://code.foxkit.us/sroracle/cve-check-tool" arch="all" @@ -11,13 +11,16 @@ license="GPL-2.0+" depends="" checkdepends="check-dev" makedepends="autoconf automake bash curl-dev glib-dev gobject-introspection-dev - jansson-dev libtool libxml2-dev openssl-dev sqlite-dev" + jansson-dev slibtool libxml2-dev openssl-dev sqlite-dev" subpackages="$pkgname-doc" source="https://dev.sick.bike/dist/cve-check-tool-$_pkgver.tar.gz" builddir="$srcdir/$pkgname-$_pkgver" prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" autoreconf -vif } diff --git a/user/cyrus-sasl/APKBUILD b/user/cyrus-sasl/APKBUILD index be3f5e669..8aed28603 100644 --- a/user/cyrus-sasl/APKBUILD +++ b/user/cyrus-sasl/APKBUILD @@ -26,6 +26,8 @@ source="https://github.com/cyrusimap/$pkgname/releases/download/$pkgname-$pkgver build() { export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/dbus/APKBUILD b/user/dbus/APKBUILD index 4853ae893..a9f243678 100644 --- a/user/dbus/APKBUILD +++ b/user/dbus/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=dbus pkgver=1.12.20 -pkgrel=1 +pkgrel=0 pkgdesc="IPC/message bus system, allowing user applications to communicate" url="https://www.freedesktop.org/wiki/Software/dbus/" pkggroups="messagebus" @@ -10,7 +10,7 @@ arch="all" options="!check" # Requires running X11 server. license="AFL-2.1 OR GPL-2.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc - $pkgname-x11" + $pkgname-systemd $pkgname-x11" triggers="$pkgname.trigger=/etc/dbus-1/system.d" depends="adelie-core" # #1167 depends_dev="util-linux-dev" @@ -29,6 +29,8 @@ source="http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz build() { export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD index b85f3a97e..008f80ba4 100644 --- a/user/dovecot/APKBUILD +++ b/user/dovecot/APKBUILD @@ -10,7 +10,7 @@ case "$pkgver" in *.*.*.*) _pkgvermajor=${pkgver%.*.*};; *.*.*) _pkgvermajor=${pkgver%.*};; esac -pkgrel=1 +pkgrel=2 _pigeonholevel=0.5.21.1 pkgdesc="IMAP and POP3 server" url="https://www.dovecot.org/" @@ -18,7 +18,7 @@ arch="all" options="libtool" license="LGPL-2.0+" depends="openssl" -makedepends="autoconf automake libtool bzip2-dev expat-dev krb5-dev libcap-dev +makedepends="autoconf automake slibtool bzip2-dev expat-dev krb5-dev libcap-dev libsodium-dev linux-headers linux-pam-dev mariadb-dev openldap-dev openssl-dev postgresql-dev sqlite-dev zlib-dev" pkgusers="dovecot dovenull" @@ -68,6 +68,9 @@ _builddir_pigeonhole="$srcdir/$pkgname-$_pkgvermajor-pigeonhole-$_pigeonholevel" # - CVE-2020-10967 _configure() { + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/frei0r-plugins/APKBUILD b/user/frei0r-plugins/APKBUILD index 989dcc871..9ab539f45 100644 --- a/user/frei0r-plugins/APKBUILD +++ b/user/frei0r-plugins/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=frei0r-plugins pkgver=1.7.0 -pkgrel=0 +pkgrel=1 pkgdesc="A minimalistic plugin API for video sources and filters" url=" " arch="all" @@ -10,14 +10,17 @@ options="!check" # No test suite. license="GPL-2.0+" depends="" makedepends="opencv-dev gavl-dev file cairo-dev doxygen - automake autoconf libtool" + automake autoconf slibtool" subpackages="$pkgname-dev $pkgname-doc" source="https://files.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz" prepare() { default_prepare touch README.md AUTHORS ChangeLog TODO - autoreconf -i + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -if } build() { diff --git a/user/ftmenu/APKBUILD b/user/ftmenu/APKBUILD index fb004f0aa..043e8a357 100644 --- a/user/ftmenu/APKBUILD +++ b/user/ftmenu/APKBUILD @@ -2,20 +2,24 @@ # Maintainer: Dan Theisen <djt@hxx.in> pkgname=ftmenu pkgver=0.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="Toolbar icon to reach your Fluxbox menus" url="http://ftmenu.sourceforge.net/" arch="all" options="!check" # there is currently no testsuite to run license="GPL-3.0-only" depends="" -makedepends="autoconf automake gtk+2.0-dev libtool" +makedepends="autoconf automake gtk+2.0-dev slibtool" source="https://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgname-${pkgver%.*}/$pkgname-$pkgver.tar.gz include-stdlib.patch + ask-for-c.patch " prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" autoreconf -if } @@ -39,4 +43,5 @@ package() { } sha512sums="7b83d2b7bb186d2a78f3425f364fc34263332ce881ebbed4805767834610d3fba474b296343de9f2d01aefb10e6638ed356c617ad460746f1a60f0f85d3e6e10 ftmenu-0.4.0.tar.gz -d17a2aff7df7ed285ff9027a7495bf80053b1c9308ecc0f463c56485c9874ffe673755d44b55f758c0677119c18ebb343056e6cc3995b91c902e36358f1d6906 include-stdlib.patch" +d17a2aff7df7ed285ff9027a7495bf80053b1c9308ecc0f463c56485c9874ffe673755d44b55f758c0677119c18ebb343056e6cc3995b91c902e36358f1d6906 include-stdlib.patch +e48842138e6bd3a4897d14f50dffd2714f660f644397f113feb26a8473be8f13ed3a696fc84f59c9935ef5fc37b9cc6c1deb920c2cbf600aed67c0da1ebe4de1 ask-for-c.patch" diff --git a/user/ftmenu/ask-for-c.patch b/user/ftmenu/ask-for-c.patch new file mode 100644 index 000000000..a09a294fc --- /dev/null +++ b/user/ftmenu/ask-for-c.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd ftmenu-0.4.0/configure.ac ftmenu-0.4.0.new/configure.ac +--- ftmenu-0.4.0/configure.ac 2010-04-06 18:02:16.000000000 -0700 ++++ ftmenu-0.4.0.new/configure.ac 2025-06-14 20:11:31.095483191 -0700 +@@ -10,6 +10,7 @@ + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + ++AC_PROG_CC + AC_PROG_CXX + AC_PROG_LIBTOOL + diff --git a/user/gmime/APKBUILD b/user/gmime/APKBUILD index a6380966c..188200abc 100644 --- a/user/gmime/APKBUILD +++ b/user/gmime/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gmime pkgver=3.2.7 -pkgrel=0 +pkgrel=1 pkgdesc="MIME utility library" url="https://developer.gnome.org/gmime/" arch="all" @@ -10,7 +10,7 @@ license="LGPL-2.1+" depends="" depends_dev="gpgme-dev libidn2-dev zlib-dev" checkdepends="gnupg" -makedepends="$depends_dev autoconf automake libtool gtk-doc" +makedepends="$depends_dev autoconf automake slibtool gtk-doc" subpackages="$pkgname-dev $pkgname-doc" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 3.2.3-broken-tests.patch @@ -18,6 +18,9 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve prepare() { default_prepare + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" autoreconf -vif } diff --git a/user/goffice/APKBUILD b/user/goffice/APKBUILD index 0dc77b4f4..2b2d9bec5 100644 --- a/user/goffice/APKBUILD +++ b/user/goffice/APKBUILD @@ -2,19 +2,22 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=goffice pkgver=0.10.50 -pkgrel=0 +pkgrel=1 pkgdesc="Library of document-centric objects and utilities built on top of GLib and Gtk+" url="https://www.gnome.org" arch="all" license="(GPL-2.0-only OR GPL-3.0-only) AND GPL-2.0+ AND MIT" depends="" -makedepends="librsvg-dev intltool gtk+2.0-dev libtool gtk-doc +makedepends="librsvg-dev intltool gtk+2.0-dev slibtool gtk-doc libxslt-dev gobject-introspection-dev glib-dev libgsf-dev cairo-dev libxml2-dev gtk+3.0-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz" build() { + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/graphviz/APKBUILD b/user/graphviz/APKBUILD index 759243a27..a1bbc5623 100644 --- a/user/graphviz/APKBUILD +++ b/user/graphviz/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=graphviz pkgver=2.50.0 -pkgrel=0 +pkgrel=1 pkgdesc="Graph visualization software" url="http://www.graphviz.org/" arch="all" @@ -13,7 +13,7 @@ depends="" depends_dev="zlib-dev libpng-dev libjpeg-turbo-dev expat-dev fontconfig-dev libsm-dev libxext-dev cairo-dev pango-dev librsvg-dev gmp-dev freetype-dev" -makedepends="$depends_dev flex swig m4 libtool guile-dev +makedepends="$depends_dev flex swig m4 slibtool guile-dev bison gtk+2.0-dev libltdl perl-dev python3-dev tcl tcl-dev" install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/graphviz" @@ -25,6 +25,9 @@ source="https://gitlab.com/api/v4/projects/4207231/packages/generic/$pkgname-rel " build() { + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" LIBPOSTFIX=/ \ ./configure \ --build=$CBUILD \ diff --git a/user/gtk-doc/APKBUILD b/user/gtk-doc/APKBUILD index a85a6c2fc..cebb752e2 100644 --- a/user/gtk-doc/APKBUILD +++ b/user/gtk-doc/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=gtk-doc pkgver=1.32 -pkgrel=1 +pkgrel=2 pkgdesc="Documentation tool for public library API" url="https://www.gtk.org/gtk-doc/" arch="noarch" @@ -11,11 +11,14 @@ options="!check" license="GFDL" depends="docbook-xsl perl python3 py3-pygments py3-six pkgconf glib-dev highlight" checkdepends="bc" -makedepends="rarian-dev py3-libxml2 itstool autoconf automake libtool" +makedepends="rarian-dev py3-libxml2 itstool autoconf automake slibtool" source="https://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz" build() { export PYTHON="/usr/bin/python3" + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" ./configure \ --build=$CBUILD \ --host=$CHOST \ diff --git a/user/gtkspell/APKBUILD b/user/gtkspell/APKBUILD index df4d65932..5816bf21a 100644 --- a/user/gtkspell/APKBUILD +++ b/user/gtkspell/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: pkgname=gtkspell pkgver=2.0.16 -pkgrel=11 +pkgrel=12 pkgdesc="Highlighting and replacement of misspelled words in Gtk software" url="http://gtkspell.sourceforge.net/" arch="all" license="GPL-2.0-only" depends="" -makedepends="autoconf automake enchant-dev gtk+2.0-dev gtk-doc intltool libtool" +makedepends="autoconf automake enchant-dev gtk+2.0-dev gtk-doc intltool slibtool" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz enchant-2.patch @@ -16,6 +16,9 @@ source="http://$pkgname.sourceforge.net/download/$pkgname-$pkgver.tar.gz prepare() { default_prepare update_config_sub + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" autoreconf -vif } diff --git a/user/guile/APKBUILD b/user/guile/APKBUILD index 871131af0..608cac566 100644 --- a/user/guile/APKBUILD +++ b/user/guile/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=guile pkgver=2.2.7 -pkgrel=1 +pkgrel=2 pkgdesc="Portable, embeddable Scheme implementation written in C" url="https://www.gnu.org/software/guile/" arch="all" @@ -10,10 +10,11 @@ license="LGPL-3.0+ AND GPL-3.0+" subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" depends="" depends_dev="guile gc-dev" -makedepends="gc-dev gmp-dev libffi-dev libtool libunistring-dev ncurses-dev - texinfo" +makedepends="autoconf automake gc-dev gmp-dev libffi-dev slibtool + libunistring-dev ncurses-dev sltdl-dev texinfo" source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch + sltdl-ize.patch " prepare() { @@ -22,6 +23,10 @@ prepare() { case "$CARCH" in ppc) rm -fvr prebuilt/32-bit-big-endian; ;; #533 esac + export LIBTOOL="slibtool" + export LIBTOOLIZE="slibtoolize" + export ACLOCAL_PATH="/usr/share/slibtool:$ACLOCAL_PATH" + autoreconf -if } build() { @@ -40,4 +45,5 @@ package() { } sha512sums="ad11885ffeb7655ef6c8543e67233992dc37bdcf91ed82188e6a144169c6b7d4e31cf7a6d01509c573d00904cb002719b851f71cdf1359a86de401daf613d773 guile-2.2.7.tar.gz -b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch" +b1c309cc07830ff1741ef88857f8099187b449580e8d57862886abc367ef1accc5a35636d81eee09247f13d3a751cdc8909fdea05368d3d509bd2039ce06d078 0002-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch +ecea6afc934407dd4e9af999279a284516bb18fc93c20c93179b5e16766d6cd78b9a40ae3aff5c6419e54e694956ea975f98875bc551275e22b2695e1986bff4 sltdl-ize.patch" diff --git a/user/guile/sltdl-ize.patch b/user/guile/sltdl-ize.patch new file mode 100644 index 000000000..349e4d016 --- /dev/null +++ b/user/guile/sltdl-ize.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -Nurd guile-2.2.7/configure.ac guile-2.2.7.new/configure.ac +--- guile-2.2.7/configure.ac 2019-07-07 06:07:33.000000000 -0700 ++++ guile-2.2.7.new/configure.ac 2025-06-14 20:47:17.684958649 -0700 +@@ -108,7 +108,7 @@ + AM_CONDITIONAL([HAVE_SHARED_LIBRARIES], [test "x$enable_shared" = "xyes"]) + + dnl Check for libltdl. +-AC_LIB_HAVE_LINKFLAGS([ltdl], [], [#include <ltdl.h>], ++AC_LIB_HAVE_LINKFLAGS([sltdl], [], [#include <ltdl.h>], + [lt_dlopenext ("foo");]) + if test "x$HAVE_LIBLTDL" != "xyes"; then + AC_MSG_ERROR([GNU libltdl (Libtool) not found, see README.]) |