diff options
97 files changed, 1314 insertions, 1313 deletions
diff --git a/system/execline/APKBUILD b/system/execline/APKBUILD index 502097bcd..028c1a0f6 100644 --- a/system/execline/APKBUILD +++ b/system/execline/APKBUILD @@ -1,22 +1,23 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=execline -pkgver=2.9.6.1 -pkgrel=1 +pkgver=2.9.7.0 +pkgrel=0 pkgdesc="A small scripting language for non-interactive scripts" url="https://skarnet.org/software/execline/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="$pkgname-libs $pkgname-dev $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz execline.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --enable-pedantic-posix make @@ -25,11 +26,8 @@ build() { package() { make DESTDIR="$pkgdir" install mkdir -p -m 0755 "$pkgdir/usr/share/doc" "$pkgdir/usr/bin" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" ln -s ../../bin/execlineb "$pkgdir/usr/bin/execlineb" } -sha512sums="86e20a63926cc03cb81e07c9cbea9da5d0384436a82b93e331da6b3ced33829baf5adae4286d2c053b21474d41602d53804ff0bc280da60f7bccc64cbe5f601e execline-2.9.6.1.tar.gz -54026153ee1b96357bdf4614c520a287b34db1ded012cb563240c1292daea33af6da6b39a051ad18dd5b53a1d42c25cc109185ce83c8cbc67fcb098a9418d78e execline.pc.in" +sha512sums="c46aa4954a560610074a5a4f8cecc1512bab05b40739c4dddc74881edb30468f248fc08ca1a461ec66279fa43fa25d130b339790995fb1eeb1612a13dc479ac1 execline-2.9.7.0.tar.gz" diff --git a/system/execline/execline.pc.in b/system/execline/execline.pc.in deleted file mode 100644 index c0b28d9df..000000000 --- a/system/execline/execline.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: execline -Description: the execline library for argv and envp manipulation -URL: https://skarnet.org/software/execline/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lexecline diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD index 144ddcefc..4380b9161 100644 --- a/system/kbd/APKBUILD +++ b/system/kbd/APKBUILD @@ -2,13 +2,13 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=kbd pkgver=2.2.0_git20190823 -pkgrel=2 +pkgrel=3 pkgdesc="Console keyboard and font management utilities" url="https://kbd-project.org/" arch="all" options="!check" # padding error on at least ppc64 license="GPL-2.0+" -depends="" +depends="gzip" checkdepends="check-dev" makedepends="linux-headers linux-pam-dev autoconf automake libtool" provides="$pkgname-keymaps" diff --git a/system/mdevd/APKBUILD b/system/mdevd/APKBUILD index f97c26160..b4ef7fa4e 100644 --- a/system/mdevd/APKBUILD +++ b/system/mdevd/APKBUILD @@ -1,20 +1,24 @@ # Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=mdevd -pkgver=0.1.6.5 +pkgver=0.1.7.0 pkgrel=0 pkgdesc="A small uevent manager daemon" url="https://skarnet.org/software/mdevd/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc $pkgname-openrc" source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz mdev.conf mdevd.run mdevd.initd" build() { - ./configure --enable-allstatic --enable-static-libc + ./configure \ + --enable-allstatic \ + --with-pkgconfig \ + --enable-pkgconfig \ + --enable-static-libc make } @@ -40,7 +44,7 @@ openrc() { ln -s ../../init.d/mdevd "$rldir/mdevd" } -sha512sums="a6d4fd9802e46746b7c677bf1c5d496f7af46eb3d827248781989c0cfcd81e14b5eb7ab6af6aef9be6f3b3f1bc4fa6de1a61735f2fc2aa6b7dc994b0f73999f7 mdevd-0.1.6.5.tar.gz +sha512sums="b50750afbba81c5168348acc2b38ba28abe0ac19bf4ea49c04f68eec1269a079642bccbed0acb1ef5da4848aea20c5f71c2711945eb2218ab79d570ffecdce57 mdevd-0.1.7.0.tar.gz f966d66366eac3b9b9eeb9b8523ea0924ada2b858c85ca0c0151d0fb374dfbf56c49ec2210d2d5ca19aa4d9f24371c85d777050eb8bf9f57821ec65704f18717 mdev.conf 427a5903fa2126060955dcce8144d59255a679c4973f2dbc3145a4d646e879fc241ebcaa53289498719d343c746fc376c41defa87932dcbe91192b2d6f4ed1c4 mdevd.run -e7599f51a4280243a5be459c6fad7eb8ba3b5f65fae8cad923ccca2addab55787819909fea311c998e1126e6802a81ab000ee6de7474f3245ce72521244c22ba mdevd.initd" +afda8cb4fbf3125367b67df713b51a1de4fea9e444580bcf7e0056a236f7a1b72b64f1b3feabe9aff308d46ff04b2f2711e64fada305eea4290080017c8a72fe mdevd.initd" diff --git a/system/mdevd/mdevd.initd b/system/mdevd/mdevd.initd index e9dff025f..1b55a3a84 100644 --- a/system/mdevd/mdevd.initd +++ b/system/mdevd/mdevd.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 2019-2023 Adélie Linux +# Copyright 2019-2025 Adélie Linux description="mdevd manages device permissions and symbolic links in /dev" extra_started_commands="reload" diff --git a/system/pcre2/APKBUILD b/system/pcre2/APKBUILD index 4e4aa309d..ddf7de0e4 100644 --- a/system/pcre2/APKBUILD +++ b/system/pcre2/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Jakub Jirutka <jakub@jirutka.cz> # Maintainer: Zach van Rijn <me@zv.io> pkgname=pcre2 -pkgver=10.42 +pkgver=10.45 pkgrel=0 pkgdesc="Perl-compatible regular expression library" -url="https://pcre.org" +url="https://www.pcre.org/" arch="all" license="BSD-3-Clause" depends="" @@ -12,7 +12,7 @@ depends_dev="libedit-dev zlib-dev" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools libpcre2-16:_libpcre libpcre2-32:_libpcre" -source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz +source="https://github.com/PhilipHazel/pcre2/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2 " # secfixes: @@ -40,7 +40,7 @@ build() { --enable-pcre2-32 \ --enable-pcre2grep-libz \ --enable-pcre2test-libedit \ - --with-match-limit-recursion=8192 \ + --with-match-limit-depth=262144 \ $_enable_jit make } @@ -69,4 +69,4 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="a3db6c5c620775838819be616652e73ce00f5ef5c1f49f559ff3efb51a119d02f01254c5901c1f7d0c47c0ddfcf4313e38d6ca32c35381b8f87f36896d10e6f7 pcre2-10.42.tar.gz" +sha512sums="4c1f0cf793624516d7eeb15745d6c07c9f678dd2c2b349062c6b614e88bf42262972d133576e85140dee2a882984aaf2d688953fc9c69ec7105b2daaeae89845 pcre2-10.45.tar.bz2" diff --git a/system/ruby/APKBUILD b/system/ruby/APKBUILD index 4c8ec8e3b..c01d0fec0 100644 --- a/system/ruby/APKBUILD +++ b/system/ruby/APKBUILD @@ -77,7 +77,7 @@ replaces="ruby-etc ruby-gems" _gemdir="/usr/lib/ruby/gems/$_abiver" _rubydir="/usr/lib/ruby/$_abiver" -_chost="$(printf '%s' "$CHOST" | sed 's/-foxkit-/-/')" +_chost="$(printf '%s' "$CHOST" | sed 's/-.*-linux-musl/-linux-musl/')" case "$CARCH" in x86 | pmmx) _arch="i386";; diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD index 8131fbb38..a5ad313c1 100644 --- a/system/s6-linux-init/APKBUILD +++ b/system/s6-linux-init/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-init -pkgver=1.1.2.1 +pkgver=1.1.3.0 pkgrel=0 pkgdesc="A s6-based init system" url="https://skarnet.org/software/s6-linux-init/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_utmps_version=0.1.2 -_execline_version=2.9.6 -_s6_version=2.13.1 +_skalibs_version=2.14.4 +_utmps_version=0.1.3 +_execline_version=2.9.7 +_s6_version=2.13.2 depends="execline s6>=$_s6_version s6-linux-init-common" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version utmps-dev>=$_utmps_version" @@ -28,7 +27,6 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz rc.shutdown reboot.sh earlygetty.run - s6-linux-init.pc.in dracut_module.sh" install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall" provides="/sbin/init=0" @@ -36,6 +34,8 @@ provides="/sbin/init=0" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" \ --enable-utmps @@ -68,8 +68,6 @@ package() { for i in init halt poweroff reboot shutdown telinit ; do ln -sf "../etc/s6-linux-init/current/bin/$i" "$pkgdir/sbin/$i" done - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -106,11 +104,10 @@ dracut() { install -D -m755 "$srcdir"/dracut_module.sh "$subpkgdir"/usr/lib/dracut/modules.d/99s6li/module-setup.sh } -sha512sums="343b6a9bdcf3b1abb544409bb2d7a6c8a1dbcb07d1b941ae74e8800e48ad605c6427f724d7692569b3ade4829948d0e57024c764c18a60c3bb2eb2efefedb622 s6-linux-init-1.1.2.1.tar.gz +sha512sums="671f0532f708f570b307510d76eefabfecf0fb989491b2bb02dfccc1043ed80761367c2f7a56821aa44d159b57b4c1eca739b50362ec56f2be3b498df6f9a34a s6-linux-init-1.1.3.0.tar.gz 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8 rc.init e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da runlevel 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4 rc.shutdown 6fb2a1112988fd2322b4bc4862bfb948a1c2e43921c5d01ae873c0d31b39fe74fc2934a5018c08b1704a2b2199b31d3a3d7365be369bba734f153b74e000aa74 reboot.sh dfff483b61370ce2c8fe653cb4e9b6ec7ef678f26b128eab8e677548a48b668b532b12a2e4618c85bf95777a666ac30189780708803d6ea12e43ab0072399212 earlygetty.run -1e617f0a1ae724c80d0f577c1484297b4aea3107cad6b2589ffeabcad3a12a8ba5de876fd2a6d7ddc03c4e6e9d34938dd0356b273fe62c475ff31da9aef2596d s6-linux-init.pc.in a62cf543e64aaf24f16c0e3d23497890de7a4a621c9d8f93c447001ea56a21324046ee589188d11b3d4dbfea4a707b5a1889d2b703c00ea6a81207a0442f9799 dracut_module.sh" diff --git a/system/s6-linux-init/s6-linux-init.pc.in b/system/s6-linux-init/s6-linux-init.pc.in deleted file mode 100644 index 338fef40a..000000000 --- a/system/s6-linux-init/s6-linux-init.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-linux-init -Description: Library to register a logout hook -URL: https://skarnet.org/software/s6-linux-init/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6_linux_init diff --git a/system/s6-rc/APKBUILD b/system/s6-rc/APKBUILD index a45dcc5aa..f4b23483a 100644 --- a/system/s6-rc/APKBUILD +++ b/system/s6-rc/APKBUILD @@ -1,25 +1,26 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-rc -pkgver=0.5.5.0 +pkgver=0.5.6.0 pkgrel=0 pkgdesc="skarnet.org's service manager, working on top of s6" url="https://skarnet.org/software/s6-rc/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version s6-dev>=$_s6_version" makedepends="$depends_dev execline-dev>=$_execline_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-rc.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" make @@ -27,11 +28,8 @@ build() { package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@S6_VERSION@@/${_s6_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="8769c71eaf1416fb1d2040865585e0c3c7abb0c9732313d3534f82be8f50417500796cda41a434e8a521bff77960ba23009e51080892700a158ae61537303081 s6-rc-0.5.5.0.tar.gz -1ca049b2ad49a8ad22f9136d4a82ab692616e82e14b27657b82433b937c5f7ff193ad230a9c968498fb0a1597a4f58174757576444a27bd865347cf28c149ae2 s6-rc.pc.in" +sha512sums="1e65ff999b7c5b4f34c90ae1edf5e4315e3323d03ac82ca1467848a41936f57623cb2d20b77b43f944b6845992ceb482a5573acbfa1c1d241eb825ea4b7ca90b s6-rc-0.5.6.0.tar.gz" diff --git a/system/s6-rc/s6-rc.pc.in b/system/s6-rc/s6-rc.pc.in deleted file mode 100644 index 1b8f1b180..000000000 --- a/system/s6-rc/s6-rc.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -Name: s6-rc -Description: The C interface to the s6-rc service manager -URL: https://skarnet.org/software/s6-rc/ -Version: @@VERSION@@ -Requires.private: s6 >= @@S6_VERSION@@, skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6rc - diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD index b5a96d864..022dc594c 100644 --- a/system/s6/APKBUILD +++ b/system/s6/APKBUILD @@ -1,26 +1,27 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6 -pkgver=2.13.1.0 +pkgver=2.13.2.0 pkgrel=0 pkgdesc="skarnet.org's small & secure supervision software suite" url="https://skarnet.org/software/s6/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 +_skalibs_version=2.14.4 +_execline_version=2.9.7 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version" install="$pkgname.post-upgrade" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" triggers="$pkgname.trigger=/run/service" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-static-libc \ --libexecdir="/lib/$pkgname" make @@ -28,11 +29,8 @@ build() { package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g; s/@@EXECLINE_VERSION@@/${_execline_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/var/lib/s6/services" "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="89912f627d239e9d0b830c97e3b35b0358ac3ea1b3b958de091318e19ee9ca0bac0a008f114682bc0ed8388e15592ffd683c4bbf1128fe7109cad16f18a1065b s6-2.13.1.0.tar.gz -0af788e78b5840a0ed612de6d2c15bc868d4f2444063f283af1ac42aec7029af24c660abf65c7d9fa369aa1ca96bb8503ffffe37db531fdd75b80db570888a38 s6.pc.in" +sha512sums="0ee3b319fb0731681e8823bd6c0b415c556b87819b1ca72be2ff622b4f35f87ffe7a71ccaa2c783933d76eedcde7ded1fe767ee44a63e1717b2299a2b5aa81e1 s6-2.13.2.0.tar.gz" diff --git a/system/s6/s6.pc.in b/system/s6/s6.pc.in deleted file mode 100644 index f01fd55ac..000000000 --- a/system/s6/s6.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6 -Description: The C interface to the s6 supervision suite -URL: https://skarnet.org/software/s6/ -Version: @@VERSION@@ -Requires.private: execline >= @@EXECLINE_VERSION@@, skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6 diff --git a/system/skalibs/APKBUILD b/system/skalibs/APKBUILD index d1f6e1f8d..05fc9ebde 100644 --- a/system/skalibs/APKBUILD +++ b/system/skalibs/APKBUILD @@ -1,7 +1,6 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=skalibs -pkgver=2.14.3.0 +pkgver=2.14.4.0 pkgrel=0 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software" url="https://skarnet.org/software/skalibs/" @@ -9,19 +8,19 @@ arch="all" options="!check" # No test suite. license="ISC" subpackages="$pkgname-dev $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz skalibs.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ + --enable-pkgconfig \ --with-sysdeps-devurandom=yes \ - --with-sysdeps-posixspawnearlyreturn=no + --with-sysdeps-posixspawnearlyreturn=no \ + --with-sysdeps-procselfexe=/proc/self/exe make } package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -32,5 +31,4 @@ dev() { mv "$pkgdir/usr/lib/skalibs/sysdeps" "$subpkgdir/usr/lib/skalibs/" } -sha512sums="f40222740494425477252e78c772edda3f6cb201723558c513acb6c87d55a0f3432c918acf112c9457ed3ff0ee71bf5192f61b1c9070e668f219fd6d3f6f3bfa skalibs-2.14.3.0.tar.gz -5771f0e72e7e7e9a45cafdf2e4508938a29ff9474845c897e383004b031ad142dee1b65d83a9a0168696782163cb4a32f82db4d7360413b433e68282cd4cc487 skalibs.pc.in" +sha512sums="a97c9ecd62e4d751a6613c01831bff5856c5d23f8fd295d539c3280c6ffa2379e67789c728552cb4d85aa03b30af7e2499b80cb8025b52ca6d1c1746b48102b1 skalibs-2.14.4.0.tar.gz" diff --git a/system/skalibs/skalibs.pc.in b/system/skalibs/skalibs.pc.in deleted file mode 100644 index 33849426f..000000000 --- a/system/skalibs/skalibs.pc.in +++ /dev/null @@ -1,5 +0,0 @@ -Name: skalibs -Description: The skarnet.org general-purpose C library. -URL: https://skarnet.org/software/skalibs/ -Version: @@VERSION@@ -Libs: -lskarnet diff --git a/system/utmps/APKBUILD b/system/utmps/APKBUILD index b8dda2050..75c22fb25 100644 --- a/system/utmps/APKBUILD +++ b/system/utmps/APKBUILD @@ -1,7 +1,6 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=utmps -pkgver=0.1.2.3 +pkgver=0.1.3.0 pkgrel=0 pkgdesc="A secure utmp/wtmp implementation" url="https://skarnet.org/software/utmps/" @@ -9,7 +8,7 @@ arch="all" options="!check" # No test suite license="ISC" depends="execline s6" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends_dev="skalibs-dev>=$_skalibs_version" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-openrc" @@ -18,14 +17,15 @@ source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz utmpd.run wtmpd.run btmpd.run - utmps.initd - utmps.pc.in" + utmps.initd" build() { ./configure \ --enable-shared \ --enable-static-libc \ --libexecdir="/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-libc-includes make } @@ -36,8 +36,6 @@ package() { mkdir -p -m 0755 "$runimage/utmps" "$pkgdir/usr/share/doc" chown utmp:utmp "$runimage/utmps" install -D -m 0755 "$srcdir/utmps.initd" "$pkgdir/etc/init.d/utmps" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -62,9 +60,8 @@ openrc() { ln -s ../../init.d/utmps "$rldir/utmps" } -sha512sums="41822b5ef582c86cd2439f13c88871bef2d496e6c7ae5493d9e2be70c7cf2f25656dedf045b4dbe925b1c6b3bfbadc7430a898ccc56951f096e768990a9735df utmps-0.1.2.3.tar.gz +sha512sums="307010371d8c7d9e56e1823c599d84f44719e6050ccf30799f08d7a6c071ca2fbc46ef236d5e2422dc1b96f8a7582ae735635302c28becd6aac3263302c385d9 utmps-0.1.3.0.tar.gz 0ec30284c64c6ea9f25142c5f4a643bd48b137fe85781b650104f5137ffa4dfc35ca7be3e41e3acd3403ebe1d8c5378073afa4e2f3607d3d794fcd9f98ed51c4 utmpd.run 9e875a5cd37be531320a8e582afed2c980dd0a1bdfc2f6f3d826d5e5389fc6ab93f973ed1506edb23f4c73cf24a2357aefe856148eaacff86c2aafe376c575e2 wtmpd.run 503bdbb3d244243934b9b4e3deea0bf92a95f88417c822ad9cf6202584d4724d5e182a0d88d7f09069e435a8a97230b85d2b264736c85c893da193fd5ec34c71 btmpd.run -89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd -d5ac39af2e688b5a118302ff31f15a0ea708eff4a94e2f6631c37f77ae528d64034ada1685f302af5b09816b617aae13b3513721883c8d9fee33fe729377f435 utmps.pc.in" +89fb24ab5759b3a1162044895efbe01c7a17d505a29df0cd7141654783b7ada8e934a1ce5981218af41812cfb517263bbd608948102af40b7a41a843b7aaf6ca utmps.initd" diff --git a/system/utmps/utmps.pc.in b/system/utmps/utmps.pc.in deleted file mode 100644 index ef581ec6f..000000000 --- a/system/utmps/utmps.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: utmps -Description: A secure implementation of the utmp mechanism. -URL: https://skarnet.org/software/utmps/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lutmps diff --git a/user/apaste/APKBUILD b/user/apaste/APKBUILD index 13db635b0..99851d559 100644 --- a/user/apaste/APKBUILD +++ b/user/apaste/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=apaste -pkgver=0.0.2.1 +pkgver=0.0.3.0 pkgrel=0 pkgdesc="A command-line pastebin" url="https://skarnet.org/software/apaste/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="s6-networking" makedepends="skalibs-dev>=$_skalibs_version s6-networking-dev>=$_s6net_version" subpackages="apaste-doc apasted:server apasted-openrc:apasted_openrc" @@ -30,7 +29,9 @@ build() { ./configure \ --enable-shared \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -75,7 +76,7 @@ apasted_openrc() { install -D -m 0755 "$srcdir/apasted.initd" "$subpkgdir/etc/init.d/apasted" } -sha512sums="262c149941d414130e7bfcbf7ecbc858427f5acd20880a68216935f79ad2632b9d82ff87cc09874d3d7215db9ebc4c55de7355ac9e29740751f44e9b2b4f8229 apaste-0.0.2.1.tar.gz +sha512sums="ac3031b5d43447cf33bb4300ce866716b650ed730d74e6d41fff83a7a3eff2233172d9962e13c6d624002537a7c13ac5d581715a9a49145f392139c21b921ea6 apaste-0.0.3.0.tar.gz 970a79b6da5a7c58539cd9d47cba36855eb4f37e1e0bbd841ade15022b5fb291a077f7ad118ff662a45f3b2b59162264a180c338f23f964ea3e48364c68ac606 apasted.run 817b276ae51e9bd769e39a8313a84449d181c65749640119ba1e4af3c21d2572152c7bdd5eec70cbcfaa3255fd6cba966dfc1dc7a818a60d329283c39ae058a8 apastesd.run 9341c1c69c1d45b35052b0042665fffb9cff6583fad558ed37a19af574b53a5e298727c43a6c718fd40936e8f16d1a10e9c229392595ba1e06ddb21d1d8b055b apasted-log.run diff --git a/user/bcnm/APKBUILD b/user/bcnm/APKBUILD index 1a3c6380b..69fc94ef5 100644 --- a/user/bcnm/APKBUILD +++ b/user/bcnm/APKBUILD @@ -1,39 +1,32 @@ -# Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=bcnm -pkgver=0.0.1.8 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="Client network manager" url="https://skarnet.org/software/bcnm/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz - $pkgname.pc.in - wpactrl.pc.in" +source="https://skarnet.org/software/bcnm/bcnm-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/wpactrl.pc.in" > "$srcdir/wpactrl.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" - install -D -m 0644 "$srcdir/wpactrl.pc" "$pkgdir/usr/lib/pkgconfig/wpactrl.pc" mkdir -p "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="78868ba9f5c58acba1e8283492929164096a9e66ea8fd6fc6b5adb4c81bce78cba96173afb4510daa0e16b79313d0ee9ef790523b062f4ceb181ecdea5973f9a bcnm-0.0.1.8.tar.gz -168127832b78284e4388fa983ea44612e760ca3b5789a863a4a82adb8a75044e006640711a8426d321bb2995425a8cb8e1fb8f788e6d09e5f7b93e55a457fdb6 bcnm.pc.in -ccc46c7a918328236cc5730710a114d06fb91fa6f023f853df70725581469b5b980dc3a5d20046df26393d21b51b4c87f1588cb5fa6cd065b32801a4dfeebb72 wpactrl.pc.in" +sha512sums="826f8f5dce5bc07396c5c8af116c438ad9da0b320e9002e33e3da8f16619f36f2c295f25ef2acbdbf90e241b5887f6d0b51abab5f3f547d5e067378d220913f5 bcnm-0.0.2.0.tar.gz" diff --git a/user/bcnm/bcnm.pc.in b/user/bcnm/bcnm.pc.in deleted file mode 100644 index 710ae09ec..000000000 --- a/user/bcnm/bcnm.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: bcnm -Description: C library to get network interface information -URL: https://skarnet.org/software/bcnm/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lbcnm diff --git a/user/bcnm/wpactrl.pc.in b/user/bcnm/wpactrl.pc.in deleted file mode 100644 index 09b893dc6..000000000 --- a/user/bcnm/wpactrl.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: wpactrl -Description: C Library to control wpa_supplicant -URL: https://skarnet.org/software/bcnm/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -lwpactrl diff --git a/user/brillo/APKBUILD b/user/brillo/APKBUILD new file mode 100644 index 000000000..f377b047f --- /dev/null +++ b/user/brillo/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=brillo +pkgver=1.4.12 +pkgrel=0 +pkgdesc="Utility for controlling display brightness" +url="https://gitlab.com/cameronnemo/brillo" +arch="all" +options="!check" # no testsuite +license="GPL-3.0-only AND 0BSD" +depends="udev polkit" +makedepends="" +subpackages="" +source="https://gitlab.com/cameronnemo/brillo/-/archive/v$pkgver/brillo-v$pkgver.tar.bz2" +builddir="$srcdir/brillo-v$pkgver" + +build() { + make +} + +package() { + make DESTDIR="$pkgdir" install.bin install.udev install.polkit +} + +sha512sums="f7bb6df12a8ddd7df6ac3c973cf24a0b4974387479d20477c7cec75503ca0bfbff8d16645464f79f73074711e62614ffcc5c9388384100274ba8be0bfaae26b8 brillo-v1.4.12.tar.bz2" diff --git a/user/cairo/APKBUILD b/user/cairo/APKBUILD index d9be3529f..3f1823ece 100644 --- a/user/cairo/APKBUILD +++ b/user/cairo/APKBUILD @@ -1,25 +1,22 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=cairo -pkgver=1.16.0 -pkgrel=3 +pkgver=1.18.4 +pkgrel=0 pkgdesc="A vector graphics library" url="https://cairographics.org/" arch="all" -options="!check" # Recursive dependency on gtk+2.0 for check. +options="!check" # Times out (after 3600 seconds). license="LGPL-2.0+ AND MPL-1.1" depends="" -depends_dev="fontconfig-dev freetype-dev libxrender-dev pixman-dev - xcb-util-dev libxext-dev $pkgname-tools" -makedepends="$depends_dev zlib-dev expat-dev glib-dev libpng-dev cmd:which" +depends_dev="$pkgname-tools" +makedepends="expat-dev fontconfig-dev freetype-dev glib-dev gtk-doc libpng-dev + libx11-dev libxext-dev libxrender-dev meson pixman-dev xcb-util-dev + zlib-dev" subpackages="$pkgname-dev $pkgname-doc $pkgname-gobject $pkgname-tools" -# fontconfig-ultimate https://github.com/bohoomil/fontconfig-ultimate -_ultver="2016-04-23" source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz - fontconfig-ultimate-$_ultver.tar.gz::https://github.com/bohoomil/fontconfig-ultimate/archive/$_ultver.tar.gz musl-stacksize.patch - CVE-2018-19876.patch - CVE-2019-6462.patch - CVE-2020-35492.patch + cairo-respect-fontconfig_pb.patch + cairo-webkit-html5-fix.patch " # secfixes: @@ -29,42 +26,30 @@ source="https://cairographics.org/releases/$pkgname-$pkgver.tar.xz # 1.16.0-r1: # - CVE-2018-19876 -prepare() { - default_prepare +build() { + meson setup \ + -Dprefix=/usr \ + -Dfontconfig=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dpng=enabled \ + -Dspectre=disabled \ + -Dtee=enabled \ + -Dxcb=enabled \ + -Dxlib=enabled \ + -Dzlib=enabled \ + -Dgtk_doc=true \ + build - # infinality - for j in "$srcdir"/fontconfig-ultimate-$_ultver/$pkgname/*.patch; do - msg "Applying ${j}" - patch -p1 -i $j - done + meson compile -C build } -build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --enable-ft \ - --enable-gobject \ - --enable-pdf \ - --enable-png \ - --enable-ps \ - --enable-svg \ - --enable-tee \ - --enable-x \ - --enable-xcb \ - --enable-xcb-shm \ - --enable-xlib \ - --enable-xlib-xrender \ - --disable-xlib-xcb \ - --disable-static - make +check() { + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } gobject() { @@ -81,9 +66,7 @@ tools() { "$subpkgdir"/usr/lib/cairo/ } -sha512sums="9eb27c4cf01c0b8b56f2e15e651f6d4e52c99d0005875546405b64f1132aed12fbf84727273f493d84056a13105e065009d89e94a8bfaf2be2649e232b82377f cairo-1.16.0.tar.xz -d8185f4ec74f44c4746acf7e79bba7ff7ffd9d35bdabeb25e10b4e12825942d910931aa857f1645e5c8185bcb40a1f1ffe1e7e647428e9ea66618b2aec52fac3 fontconfig-ultimate-2016-04-23.tar.gz +sha512sums="863679f817ed67dc2c916c035d740916e27e7e69c04fca63936e37d274e7f4c79848d16c8f7c481798864602e8847c489f698df89b785cbc576c925dbd513316 cairo-1.18.4.tar.xz 86f26fe41deb5e14f553c999090d1ec1d92a534fa7984112c9a7f1d6c6a8f1b7bb735947e8ec3f26e817f56410efe8cc46c5e682f6a278d49b40a683513740e0 musl-stacksize.patch -9020c596caa54a2ac435d5dae0f121d36d3c3f34d487b9c1032665b1bd15813506adf31984e34b5dd328ee0e068de0627e1d061230758328cae4fa993c3a9209 CVE-2018-19876.patch -ebe5d71b18aa9eefe1e0a6c150761bb7abef41f144f37eb0bfa8a01947aacb1292ac131cf815dcaaaa6478c0aac07ca5428fba28ad346a00c5aaa5fa64f6ff5b CVE-2019-6462.patch -8dcb95b6a8e023ad5675f81f9a87a087868dc74113cd0ab96568d525582266c366064cc7cc168738dc75968385ab0444911f54754d31962dfe1235526afbd72c CVE-2020-35492.patch" +bdc01ec3619e40e6e260890e038628607076d56d8e64ceaf8a3fd3c92e348d451a12852148a168f2e0e69d40285800fa66e39fdee771d1e0d632311c61923ca2 cairo-respect-fontconfig_pb.patch +9bf936f9c84f00409d75665034b21fa345c2e1c414715a899ad37ae10eaf54348537a3386ce078a56f1e931c749c3e50a99dd3b4e8aab484077ee18b5b89abe9 cairo-webkit-html5-fix.patch" diff --git a/user/cairo/CVE-2018-19876.patch b/user/cairo/CVE-2018-19876.patch deleted file mode 100644 index 33731e4fc..000000000 --- a/user/cairo/CVE-2018-19876.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 -From: Carlos Garcia Campos <cgarcia@igalia.com> -Date: Mon, 19 Nov 2018 12:33:07 +0100 -Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in - cairo_ft_apply_variations - -Fixes a crash when using freetype >= 2.9 ---- - src/cairo-ft-font.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c -index 325dd61b4..981973f78 100644 ---- a/src/cairo-ft-font.c -+++ b/src/cairo-ft-font.c -@@ -2393,7 +2393,11 @@ skip: - done: - free (coords); - free (current_coords); -+#if HAVE_FT_DONE_MM_VAR -+ FT_Done_MM_Var (face->glyph->library, ft_mm_var); -+#else - free (ft_mm_var); -+#endif - } - } - --- -2.21.0 - diff --git a/user/cairo/CVE-2019-6462.patch b/user/cairo/CVE-2019-6462.patch deleted file mode 100644 index 2a26876c3..000000000 --- a/user/cairo/CVE-2019-6462.patch +++ /dev/null @@ -1,36 +0,0 @@ -From bbeaf08190d3006a80b80a77724801cd477a37b8 Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <hlewin@worldiety.de> -Date: Sat, 17 Apr 2021 19:15:03 +0200 -Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop - ---- - src/cairo-arc.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/cairo-arc.c b/src/cairo-arc.c -index 390397bae..1c891d1a0 100644 ---- a/src/cairo-arc.c -+++ b/src/cairo-arc.c -@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) - { M_PI / 11.0, 9.81410988043554039085e-09 }, - }; - int table_size = ARRAY_LENGTH (table); -+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */ - - for (i = 0; i < table_size; i++) - if (table[i].error < tolerance) - return table[i].angle; - - ++i; -+ - do { - angle = M_PI / i++; - error = _arc_error_normalized (angle); -- } while (error > tolerance); -+ } while (error > tolerance && i < max_segments); - - return angle; - } --- -GitLab - diff --git a/user/cairo/CVE-2020-35492.patch b/user/cairo/CVE-2020-35492.patch deleted file mode 100644 index d7369b3d6..000000000 --- a/user/cairo/CVE-2020-35492.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001 -From: Heiko Lewin <heiko.lewin@worldiety.de> -Date: Tue, 15 Dec 2020 16:48:19 +0100 -Subject: [PATCH] Fix mask usage in image-compositor - ---- - src/cairo-image-compositor.c | 8 ++-- - test/Makefile.sources | 1 + - test/bug-image-compositor.c | 39 ++++++++++++++++++++ - test/reference/bug-image-compositor.ref.png | Bin 0 -> 185 bytes - 4 files changed, 44 insertions(+), 4 deletions(-) - create mode 100644 test/bug-image-compositor.c - create mode 100644 test/reference/bug-image-compositor.ref.png - -diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c -index 79ad69f68..4f8aaed99 100644 ---- a/src/cairo-image-compositor.c -+++ b/src/cairo-image-compositor.c -@@ -2610,14 +2610,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - unsigned num_spans) - { - cairo_image_span_renderer_t *r = abstract_renderer; -- uint8_t *m; -+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask); - int x0; - - if (num_spans == 0) - return CAIRO_STATUS_SUCCESS; - - x0 = spans[0].x; -- m = r->_buf; -+ m = base; - do { - int len = spans[1].x - spans[0].x; - if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) { -@@ -2655,7 +2655,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - spans[0].x, y, - spans[1].x - spans[0].x, h); - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else if (spans[0].coverage == 0x0) { - if (spans[0].x != x0) { -@@ -2684,7 +2684,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h, - #endif - } - -- m = r->_buf; -+ m = base; - x0 = spans[1].x; - } else { - *m++ = spans[0].coverage; - diff --git a/user/cairo/cairo-respect-fontconfig_pb.patch b/user/cairo/cairo-respect-fontconfig_pb.patch new file mode 100644 index 000000000..0bb0f4a7a --- /dev/null +++ b/user/cairo/cairo-respect-fontconfig_pb.patch @@ -0,0 +1,13 @@ +--- a/src/cairo-ft-font.c 2015-03-10 23:21:07.000000000 +0100 ++++ b/src/cairo-ft-font.c 2015-03-11 21:59:05.747697134 +0100 +@@ -1932,7 +1932,9 @@ _cairo_ft_options_merge (cairo_ft_option + options->base.subpixel_order = other->base.subpixel_order; + } + +- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT) ++ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT; ++ ++ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT) + options->base.hint_style = other->base.hint_style; + + if (other->base.hint_style == CAIRO_HINT_STYLE_NONE) diff --git a/user/cairo/cairo-webkit-html5-fix.patch b/user/cairo/cairo-webkit-html5-fix.patch new file mode 100644 index 000000000..07c5c6db8 --- /dev/null +++ b/user/cairo/cairo-webkit-html5-fix.patch @@ -0,0 +1,30 @@ +From 0742b90a214b35951414558f6f5579f79b8a8194 Mon Sep 17 00:00:00 2001 +From: Massimo Valentini <mvalentini@src.gnome.org> +Date: Thu, 21 Aug 2014 17:15:51 +0200 +Subject: [PATCH] Fix segfault rendering videos in webkit based browsers + +do not tessellate empty boxes. + +Reported-by: Henrique Lengler <henriqueleng@openmailbox.org> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81699 +--- + src/cairo-bentley-ottmann-rectangular.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/cairo-bentley-ottmann-rectangular.c b/src/cairo-bentley-ottmann-rectangular.c +index 5541bdc..4bcd8d1 100644 +--- a/src/cairo-bentley-ottmann-rectangular.c ++++ b/src/cairo-bentley-ottmann-rectangular.c +@@ -834,6 +834,9 @@ _cairo_bentley_ottmann_tessellate_boxes (const cairo_boxes_t *in, + for (i = 0; i < chunk->count; i++) { + int h; + ++ if (box[i].p1.y == box[i].p2.y) ++ continue; ++ + if (box[i].p1.x < box[i].p2.x) { + rectangles[j].left.x = box[i].p1.x; + rectangles[j].left.dir = 1; +-- +1.9.3 + diff --git a/user/clang/APKBUILD b/user/clang/APKBUILD index 7d8f46369..5084a4020 100644 --- a/user/clang/APKBUILD +++ b/user/clang/APKBUILD @@ -3,7 +3,7 @@ pkgname=clang # Note: Update together with llvm. pkgver=18.1.8 -pkgrel=0 +pkgrel=1 _llvmver=${pkgver%%.*} pkgdesc="A C language family front-end for LLVM" arch="all" @@ -21,7 +21,6 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l big-endian-32.patch cfe-005-ppc64-dynamic-linker-path.patch ppc-dirwatcher.patch - ppc-interp.patch use-llvm-lit.patch " builddir="$srcdir/llvm-project-$pkgver.src/$pkgname" @@ -66,16 +65,6 @@ prepare() { rm -f test/Driver/ppc-float-abi-warning.cpp # known broken on 32-bit platforms rm -f test/CodeGenCUDA/static-device-var-rdc.cu - - case $CARCH in - ppc) - for _interp_test in code-undo.cpp const.cpp execute-stmts.cpp \ - execute-weak.cpp execute.cpp fail.cpp global-dtor.cpp \ - inline-virtual.cpp lambda.cpp multiline.cpp \ - simple-exception.cpp; do - rm test/Interpreter/$_interp_test - done;; - esac } build() { @@ -166,5 +155,4 @@ d37d2339a76c21666aa4405b2a620100e6967eb933535b5cea05f5de25a4d7551047944350071552 241a087888b7b5373b54653c4675c77c70d82b61a1b79359cba7d5fe0187851e790cb4e7e278a0a59c660b9a980cf087b393dc43a19a975fc9b97717bca12bc4 big-endian-32.patch 8272ec0eeb93287c9cc961099139f7cb0f94561befc31a4521387fa5f7216dc4b3d99750c4560a0b71ec4acde5bd776abef733cfafe81058ef054b62f72fc209 cfe-005-ppc64-dynamic-linker-path.patch 0032fdd3864870d345caff9c4ff44f58bebc802bddf06c4b3bf30276c89e237167e6dea03456d322d3f6e2ee5e3a2ecf9f649ed033f0ab078b80bda44371b3ce ppc-dirwatcher.patch -a2d90bcfc7cee261d6c8ac3b5dd011f55eab94deff456b63c5ef3598397e358b271e7ae86dec9e56c09c874736645ffbecccde4d31826d9b20908a4a16c61387 ppc-interp.patch 6c6b4fc49539ecf02e4eec9c2bbd89cc37fe01383e7884aa52c90ab0a4aa23cd9a86716bc645af6949f787d2fe3b9a3ad177baef1edbec928437872d14db536d use-llvm-lit.patch" diff --git a/user/clang/ppc-interp.patch b/user/clang/ppc-interp.patch deleted file mode 100644 index fae58aa3d..000000000 --- a/user/clang/ppc-interp.patch +++ /dev/null @@ -1,35 +0,0 @@ -PPC32 doesn't support some of the clang-repl due to R_PPC_REL24 not being -implemented in RuntimeDyld. - ---- clang-14.0.6.src/test/Interpreter/execute.cpp.old 2022-06-22 16:46:24.000000000 +0000 -+++ clang-14.0.6.src/test/Interpreter/execute.cpp 2022-12-05 01:04:26.517960246 +0000 -@@ -1,4 +1,4 @@ --// UNSUPPORTED: system-aix -+// UNSUPPORTED: system-aix, powerpc- - - // clang-format off - // RUN: clang-repl "int i = 10;" 'extern "C" int printf(const char*,...);' \ ---- clang/unittests/Interpreter/InterpreterTest.cpp.old 2024-10-10 18:11:05.390017076 +0000 -+++ clang/unittests/Interpreter/InterpreterTest.cpp 2024-10-10 22:34:07.176019197 +0000 -@@ -30,7 +30,7 @@ - - using namespace clang; - --#if defined(_AIX) -+#if defined(_AIX) || (!defined(__powerpc64__) && defined(__powerpc__)) - #define CLANG_INTERPRETER_NO_SUPPORT_EXEC - #endif - ---- clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp.old 2024-06-15 17:21:32.000000000 +0000 -+++ clang/unittests/Interpreter/ExceptionTests/InterpreterExceptionTest.cpp 2024-10-10 22:36:53.358466534 +0000 -@@ -113,8 +113,8 @@ - if (Triple.isOSAIX()) - GTEST_SKIP(); - -- // FIXME: ARM fails due to `Not implemented relocation type!` -- if (Triple.isARM()) -+ // FIXME: ARM and PPC32 fail due to `Not implemented relocation type!` -+ if (Triple.isARM() || Triple.isPPC32()) - GTEST_SKIP(); - - // FIXME: libunwind on darwin is broken, see PR49692. diff --git a/user/darkman/APKBUILD b/user/darkman/APKBUILD new file mode 100644 index 000000000..1600fae79 --- /dev/null +++ b/user/darkman/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=darkman +pkgver=2.0.1 +pkgrel=0 +pkgdesc="Framework for managing dark- and light-mode transitions" +url="https://darkman.whynothugo.nl/" +arch="all" +options="!check" # no testsuite +license="0BSD" +depends="" +makedepends="gcc-go scdoc" +subpackages="$pkgname-doc $pkgname-systemd" +source="https://gitlab.com/WhyNotHugo/darkman/-/archive/v$pkgver/darkman-v$pkgver.tar.bz2" +builddir="$srcdir/darkman-v$pkgver" + +build() { + make VERSION="$pkgver" +} + +package() { + make VERSION="$pkgver" DESTDIR="$pkgdir" install +} + +sha512sums="8036e3470d22e1f689d8305cb3faf81a1fc2f0692afd8fb9657c2c22af417f25fd928189fcda42df7c053cb9129c90cdf11df64e6f597498af95f330de76f282 darkman-v2.0.1.tar.bz2" diff --git a/user/dwl/APKBUILD b/user/dwl/APKBUILD new file mode 100644 index 000000000..000ac4151 --- /dev/null +++ b/user/dwl/APKBUILD @@ -0,0 +1,25 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=dwl +pkgver=0.7 +pkgrel=0 +pkgdesc="Minimal, DWM-like compositor for Wayland" +url="https://codeberg.org/dwl/dwl" +arch="all" +options="!check" # no testsuite +license="GPL-3.0+ AND MIT AND CC0-1.0" +depends="wlroots-0.18" +makedepends="libinput-dev libxkbcommon-dev wayland-dev wayland-protocols wlroots-0.18-dev" +subpackages="$pkgname-doc" +source="https://codeberg.org/dwl/dwl/releases/download/v$pkgver/dwl-v$pkgver.tar.gz" +builddir="$srcdir/dwl-v$pkgver" + +build() { + make PREFIX="/usr" +} + +package() { + make PREFIX="/usr" DESTDIR="$pkgdir" install +} + +sha512sums="d2ec9467bb7758ea52e0face555cb505624062eb66c8959b59e715b7d1c7bb74c649029f365c9bfd07d7b5806fdef018f555d7e64bd62e7e413ead45b5d73986 dwl-v0.7.tar.gz" diff --git a/user/firefox-esr/APKBUILD b/user/firefox-esr/APKBUILD index 5a306b1f8..66803e8b4 100644 --- a/user/firefox-esr/APKBUILD +++ b/user/firefox-esr/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Molly Miller <adelie@m-squa.red> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=firefox-esr -pkgver=128.4.0 +pkgver=128.10.1 _llvmver=18 pkgrel=0 pkgdesc="Firefox web browser (extended support release)" @@ -21,7 +21,7 @@ makedepends=" ncurses-dev openssl-dev alsa-lib-dev bzip2-dev icu-dev libevent-dev libffi-dev libpng-dev - libjpeg-turbo-dev nspr-dev nss-dev pulseaudio-dev zlib-dev + libjpeg-turbo-dev nspr-dev nss-dev pcre-dev pulseaudio-dev zlib-dev dbus-glib-dev fts-dev gconf-dev gtk+3.0-dev hunspell-dev libnotify-dev libsm-dev libxcomposite-dev libxdamage-dev @@ -158,7 +158,7 @@ package() { EOF } -sha512sums="e720b1f993926d73f5a5727648f753176ac2fd093fb0b71393946bbc5919ce5fc7b88b82960bd1aa427b5663c7f659828dc6702485fc0c1e7a6961571c67faa3 firefox-128.4.0esr.source.tar.xz +sha512sums="6e7363d8cbecda1cedaf534ac10dc046b5f515399ec754492357e8a558c61ee3389f7bb90aa929dbcb4d6eba041ae1e778a0a8f90aa1e1f939eea517333b6c45 firefox-128.10.1esr.source.tar.xz aaeec88eda3ca5ef00503f2e1656f8a143017d5ff60bd289ce7a49b7f8352ce5b61556c732e5eb3b6859e1c30551219eb5bbb954e9b88eca8d3f44683bdd747d mozconfig 1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch 5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch @@ -174,7 +174,7 @@ c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8 11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch 9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch -e1d9e30a1c8d1c6bdd3530183400d7d245e437ce18bb5b262bec1d01932b02b8eaededd892efcdd277eaccb357aede4537972382be9f00eedf1785acebbd1ca6 webrender.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch f3b7c3e804ce04731012a46cb9e9a6b0769e3772aef9c0a4a8c7520b030fdf6cd703d5e9ff49275f14b7d738fe82a0a4fde3bc3219dff7225d5db0e274987454 firefox.desktop 5dcb6288d0444a8a471d669bbaf61cdb1433663eff38b72ee5e980843f5fc07d0d60c91627a2c1159215d0ad77ae3f115dcc5fdfe87e64ca704b641aceaa44ed firefox-safe.desktop" diff --git a/user/firefox-esr/webrender.patch b/user/firefox-esr/webrender.patch index e6b145956..cfc920cfd 100644 --- a/user/firefox-esr/webrender.patch +++ b/user/firefox-esr/webrender.patch @@ -8,7 +8,7 @@ Bug 1716707 [s390x] Software WebRender does not support big endian --- firefox-128.0/image/imgFrame.cpp +++ firefox-128.0/image/imgFrame.cpp -@@ -372,6 +372,17 @@ mAborted = true; +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/flameshot/APKBUILD b/user/flameshot/APKBUILD new file mode 100644 index 000000000..3ac292020 --- /dev/null +++ b/user/flameshot/APKBUILD @@ -0,0 +1,40 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=flameshot +pkgver=12.1.0 +pkgrel=0 +pkgdesc="Simple, powerful screenshot utility" +url="https://flameshot.org/" +arch="all" +license="GPL-3.0+ AND LGPL-3.0+ AND MIT AND (GPL-3.0+ AND GPL-2.0-only) AND Apache-2.0 AND CC0-1.0 AND FAL-1.3" +depends="" +makedepends="cmake qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev" +subpackages="$pkgname-doc $pkgname-lang" +source="flameshot-$pkgver.tar.gz::https://github.com/flameshot-org/flameshot/archive/refs/tags/v$pkgver.tar.gz" +langdir="/usr/share/flameshot/translations" + +build() { + if [ "$CBUILD" != "$CHOST" ]; then + CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" + fi + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DBUILD_SHARED_LIBS=True \ + -DCMAKE_BUILD_TYPE=RelWithDebugInfo \ + -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ + -DCMAKE_C_FLAGS="$CFLAGS" \ + ${CMAKE_CROSSOPTS} \ + . + make +} + +check() { + CTEST_OUTPUT_ON_FAILURE=TRUE ctest +} + +package() { + make DESTDIR="$pkgdir" install +} + +sha512sums="159bf3a8ff406b3881dcc77fc48d9e7cc0d595bd47ee2363396d7efc95f69160cf25ccf99cd1b2c2b527baeadf91c209784a7bca23ed5f17caacc385e161c83c flameshot-12.1.0.tar.gz" diff --git a/user/fontconfig/APKBUILD b/user/fontconfig/APKBUILD index aeae4256d..415f0c925 100644 --- a/user/fontconfig/APKBUILD +++ b/user/fontconfig/APKBUILD @@ -1,40 +1,41 @@ # Contributor: Mika Havela <mika.havela@gmail.com> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=fontconfig -pkgver=2.13.1 +pkgver=2.15.0 pkgrel=0 pkgdesc="Library for configuring and customizing font access" url="https://www.freedesktop.org/wiki/Software/fontconfig/" arch="all" -options="!check" # Fails test with fixed fonts license="MIT" depends="" -makedepends="freetype-dev expat-dev python3-dev gperf util-linux-dev" +makedepends="expat-dev freetype-dev gperf meson python3-dev util-linux-dev" triggers="$pkgname.trigger=/usr/share/fonts/*" subpackages="$pkgname-dev $pkgname-lang" -source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.gz" +source="https://www.freedesktop.org/software/fontconfig/release/${pkgname}-${pkgver}.tar.xz + disable-crbug.patch + " build() { - # regenerate hash functions - rm -f src/fcobjshash.h - - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ - --enable-static \ - --disable-docs - make + --wrap-mode=nofallback \ + -Dnls=enabled \ + -Dtests=enabled \ + -Dtools=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make -j1 DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="830df32e944ee21ad02a9df04787b9902af36ffc13913524acef6e38799a38c5df7a6e407cc0ff9c24455520549d53b3d85d22642a229ac654dc9269926f130b fontconfig-2.13.1.tar.gz" +sha512sums="754cd5fffa198fc07a39cf7df683e9adfa7f54ab41fdff8c0eacc078fd35d3e01069ba343f2b045e0b40df88d9f1fc1ee0f7565799f9cb194a59cf95b64c4417 fontconfig-2.15.0.tar.xz +4295ce39520f0b24348ee0ad742de627a7f46084744022d8920da6a67a15e529fd89d31e7cfa33c2b7e613186bf9c20ad03a090f18dab63a66fbf9f50bbe6bfb disable-crbug.patch" diff --git a/user/fontconfig/disable-crbug.patch b/user/fontconfig/disable-crbug.patch new file mode 100644 index 000000000..2c2720ac6 --- /dev/null +++ b/user/fontconfig/disable-crbug.patch @@ -0,0 +1,13 @@ +i.e. the comment. + +--- fontconfig-2.15.0/test/meson.build.old 2020-12-16 23:27:27.000000000 -0600 ++++ fontconfig-2.15.0/test/meson.build 2025-05-09 20:36:03.552602973 -0500 +@@ -14,8 +14,6 @@ + # FIXME: ['test-migration.c'], + ['test-bz106632.c', {'c_args': ['-DFONTFILE="@0@"'.format(join_paths(meson.current_source_dir(), '4x6.pcf'))]}], + ['test-issue107.c'], # FIXME: fails on mingw +- # FIXME: this needs NotoSans-hinted.zip font downloaded and unpacked into test build directory! see run-test.sh +- ['test-crbug1004254.c', {'dependencies': dependency('threads')}], # for pthread + ] + + if get_option('default_library') == 'static' diff --git a/user/gdk-pixbuf/APKBUILD b/user/gdk-pixbuf/APKBUILD index e6268e4c9..cd1ac322d 100644 --- a/user/gdk-pixbuf/APKBUILD +++ b/user/gdk-pixbuf/APKBUILD @@ -13,7 +13,9 @@ makedepends="glib-dev gobject-introspection-dev libjpeg-turbo-dev libpng-dev install="$pkgname.pre-deinstall" triggers="$pkgname.trigger=/usr/lib/gdk-pixbuf-2.0/*/loaders" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz + fix-pkgconfig.patch + " # secfixes: # 2.36.6-r1: @@ -37,4 +39,5 @@ package() { DESTDIR="$pkgdir" meson install -C build } -sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 gdk-pixbuf-2.42.12.tar.xz" +sha512sums="ae9fcc9b4e8fd10a4c9bf34c3a755205dae7bbfe13fbc93ec4e63323dad10cc862df6a9e2e2e63c84ffa01c5e120a3be06ac9fad2a7c5e58d3dc6ba14d1766e8 gdk-pixbuf-2.42.12.tar.xz +24d461273c262e52299b9a70bc89e6fd4bd4425c1aef9575f5fcd6f3fb6d0ee0d05c4151f6bb9a28708f189ad26764b3c9b76a9d1e5094405a679abdf3905663 fix-pkgconfig.patch" diff --git a/user/gdk-pixbuf/fix-pkgconfig.patch b/user/gdk-pixbuf/fix-pkgconfig.patch new file mode 100644 index 000000000..a15c2c29c --- /dev/null +++ b/user/gdk-pixbuf/fix-pkgconfig.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build +--- gdk-pixbuf-2.42.12/gdk-pixbuf/meson.build 2025-07-01 18:58:08.263906972 -0700 ++++ gdk-pixbuf-2.42.12.new/gdk-pixbuf/meson.build 2025-07-01 18:54:50.384849537 -0700 +@@ -383,6 +383,7 @@ + 'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders', + ], + requires: 'gobject-2.0', ++ requires_private: 'libpng', + subdirs: gdk_pixbuf_api_name, + filebase: gdk_pixbuf_api_name, + ) diff --git a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch index 50a9a8c28..ba4c03906 100644 --- a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch +++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch @@ -20,7 +20,7 @@ diff --git a/glib/gquark.c b/glib/gquark.c index 9e51a92..17ecd7f 100644 --- a/glib/gquark.c +++ b/glib/gquark.c -@@ -57,6 +57,11 @@ static gint quark_block_offset = 0; +@@ -60,6 +60,11 @@ static gint quark_block_offset = 0; void g_quark_init (void) { diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD index 45d91ed79..1de391541 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,17 +1,16 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.72.4 +pkgver=2.84.0 pkgrel=0 pkgdesc="Common C routines used by Gtk+ and other libs" url="https://developer.gnome.org/glib/" arch="all" -options="!check" # Now requires D-Bus running. license="LGPL-2.1+" depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" -checkdepends="tzdata shared-mime-info" -makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev" +checkdepends="dbus-x11 tzdata shared-mime-info" +makedepends="$depends_dev dbus-dev meson pcre2-dev py3-docutils xmlto zlib-dev" triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules" subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" @@ -21,7 +20,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve i386-fpu-test.patch musl-no-locale.patch ridiculous-strerror-nonconformance.patch - meson-sucks-and-i-hate-you-so-much-right-now.patch + sigstksz.patch " # secfixes: @@ -29,20 +28,23 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # - CVE-2019-12450 build() { - meson --default-library=both \ + meson setup \ + --default-library=both \ -Dprefix=/usr \ -Dselinux=disabled \ - -Dman=true build - ninja -C build + -Dman-pages=enabled \ + --wrap-mode=nofallback \ + build + meson compile -C build } check() { # workaround if a user builds it on a computer running X11 - DISPLAY= ninja -C build test + DISPLAY= dbus-run-session meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build rm -rf "$pkgdir"/usr/lib/charset.alias } @@ -75,10 +77,10 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8 glib-2.72.4.tar.xz -32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch -48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099 broken-gio-tests.patch -aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch -db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d musl-no-locale.patch -56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch" +sha512sums="72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7 glib-2.84.0.tar.xz +ee128ea2f1b4d1b3179bbc4af56ebb671e1e6a1d0c4d9b279ecf77bc33dc6ab34d5dcbe35af7f5fd703c4eda3cc06cfabe1ee39ead059401ff7902500f2eefe6 0001-gquark-fix-initialization-with-c-constructors.patch +348fa10b38c8d7ea4181dbfd321c33d62475fc83461235e33ff5fb5170f2af44e587bd2f4805c49004ef6e33ed89252a493cf88687a246c4e34c1c09e14cb047 broken-gio-tests.patch +69e23d20b2682eb6adc013f78160902ad9a9703e06904b98725541b6d20f6bf5ce8958a5b43831485c87f6d8116768f591a5d5ee6c2c6ce6843581d6d05b8599 i386-fpu-test.patch +0b5515a9fd4bfe566d2d236374a8cdbec49191030aa74c56e0fe1b297daf65b172ce5e02477d3bc1e67a2c07bc979fd9de4ce2fb7a00a9754f88b5e76d2dddf2 musl-no-locale.patch +06af1c22004c34ae896bb5eaeb94599b42e46769408ac4c2575d809307922005d65d0053b9aeccb2049b85303cc1ba5d26cac733608aa2d407ad9ae39210beb0 ridiculous-strerror-nonconformance.patch +893a61dac6b4da6330bab9d5b9a9f7b3ae6643f4681895e24cc4a55518bdf16996af6175149299fbf782e633f7a37e308e7c3b52f9eb58d24f7fcf0c015e947b sigstksz.patch" diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch index 75354ad8b..bb5b32418 100644 --- a/user/glib/broken-gio-tests.patch +++ b/user/glib/broken-gio-tests.patch @@ -1,7 +1,7 @@ Requires update-desktop-database --- glib-2.52.1/gio/tests/appinfo.c.old 2016-10-22 00:17:49.000000000 -0500 +++ glib-2.52.1/gio/tests/appinfo.c 2017-08-20 23:23:32.581229536 -0500 -@@ -486,7 +486,7 @@ +@@ -637,7 +637,7 @@ g_test_add_func ("/appinfo/launch-context", test_launch_context); g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals); g_test_add_func ("/appinfo/tryexec", test_tryexec); @@ -15,7 +15,7 @@ Requires update-desktop-database Requires working iconv --- glib-2.52.1/gio/tests/converter-stream.c.old 2016-10-22 00:18:11.000000000 -0500 +++ glib-2.52.1/gio/tests/converter-stream.c 2017-08-20 23:21:31.711358101 -0500 -@@ -1203,7 +1203,7 @@ +@@ -1208,7 +1208,7 @@ }; CharsetTest charset_tests[] = { { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 }, @@ -30,7 +30,7 @@ Requires working iconv Requires update-desktop-database --- glib-2.52.1/gio/tests/resources.c.old 2016-10-22 00:18:12.000000000 -0500 +++ glib-2.52.1/gio/tests/resources.c 2017-08-20 23:39:47.127025718 -0500 -@@ -426,6 +426,7 @@ +@@ -819,6 +819,7 @@ g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_bytes_unref (data); @@ -40,7 +40,7 @@ Requires update-desktop-database found = g_resources_get_info ("/resourceplugin/test1.txt", --- a/gio/tests/resources.c +++ b/gio/tests/resources.c -@@ -763,6 +763,7 @@ +@@ -828,6 +828,7 @@ g_assert_false (found); g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND); g_clear_error (&error); diff --git a/user/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch index 986c33164..f400a10d6 100644 --- a/user/glib/i386-fpu-test.patch +++ b/user/glib/i386-fpu-test.patch @@ -1,6 +1,6 @@ --- glib-2.54.2/glib/tests/timer.c.old 2016-10-22 00:21:30.000000000 -0500 +++ glib-2.54.2/glib/tests/timer.c 2018-03-03 18:39:40.424741042 -0600 -@@ -203,7 +203,10 @@ +@@ -386,7 +386,10 @@ { g_test_init (&argc, &argv, NULL); diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch deleted file mode 100644 index 1e63ac0f4..000000000 --- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- glib-2.58.0/glib/libcharset/meson.build.old 2018-08-30 17:12:09.000000000 +0000 -+++ glib-2.58.0/glib/libcharset/meson.build 2018-09-10 03:42:01.930000000 +0000 -@@ -1,4 +1,5 @@ - charset_lib = static_library('charset', 'localcharset.c', - include_directories : configinc, - pic : true, -+ install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args) diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch index 1624b0078..461454fc0 100644 --- a/user/glib/musl-no-locale.patch +++ b/user/glib/musl-no-locale.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/option-context.c.old 2016-10-22 05:21:34.000000000 +0000 +++ glib-2.52.1/glib/tests/option-context.c 2017-08-20 23:14:46.364133517 +0000 -@@ -638,7 +638,7 @@ +@@ -641,7 +641,7 @@ old_locale = g_strdup (setlocale (LC_NUMERIC, locale)); current_locale = setlocale (LC_NUMERIC, NULL); @@ -11,7 +11,7 @@ goto cleanup; --- glib-2.52.1/glib/tests/convert.c.old 2016-10-22 00:21:34.000000000 -0500 +++ glib-2.52.1/glib/tests/convert.c 2017-08-20 22:51:48.363430954 -0500 -@@ -707,7 +707,7 @@ +@@ -995,7 +995,7 @@ g_test_add_func ("/conversion/no-conv", test_no_conv); g_test_add_func ("/conversion/iconv-state", test_iconv_state); @@ -23,7 +23,7 @@ g_test_add_func ("/conversion/filename-utf8", test_filename_utf8); --- glib-2.56.1/glib/tests/gdatetime.c.old 2018-07-02 21:11:49.890000000 -0500 +++ glib-2.56.1/glib/tests/gdatetime.c 2018-07-02 21:19:30.340000000 -0500 -@@ -2329,7 +2329,6 @@ +@@ -3547,7 +3547,6 @@ g_test_add_func ("/GDateTime/printf", test_GDateTime_printf); g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf); g_test_add_func ("/GDateTime/strftime", test_strftime); diff --git a/user/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch index 3ffc0aafa..b900672a8 100644 --- a/user/glib/ridiculous-strerror-nonconformance.patch +++ b/user/glib/ridiculous-strerror-nonconformance.patch @@ -1,6 +1,6 @@ --- glib-2.52.1/glib/tests/strfuncs.c.old 2016-10-22 00:21:44.000000000 -0500 +++ glib-2.52.1/glib/tests/strfuncs.c 2017-08-20 22:48:18.233702952 -0500 -@@ -1335,7 +1335,7 @@ +@@ -2067,7 +2067,7 @@ setlocale (LC_ALL, "C"); strs = g_hash_table_new (g_str_hash, g_str_equal); diff --git a/user/glib/sigstksz.patch b/user/glib/sigstksz.patch new file mode 100644 index 000000000..b0de031f1 --- /dev/null +++ b/user/glib/sigstksz.patch @@ -0,0 +1,20 @@ +See-also: https://inbox.vuxu.org/musl/D3S38EL8UO9V.U731IQFLR32X@ayaya.dev/ + +--- glib-2.84.0/glib/tests/unix.c.old 2025-03-06 07:09:13.000000000 -0600 ++++ glib-2.84.0/glib/tests/unix.c 2025-05-04 21:55:45.796547202 -0500 +@@ -588,13 +588,13 @@ + #ifndef SA_ONSTACK + g_test_skip ("alternate stack is not supported"); + #else +- size_t minsigstksz = MINSIGSTKSZ; ++ size_t minsigstksz = 32768; + guint8 *stack_memory = NULL; + guint8 *zero_mem = NULL; + stack_t stack = { 0 }; + stack_t old_stack = { 0 }; + +-#ifdef _SC_MINSIGSTKSZ ++#if 0 + /* Use the kernel-provided minimum stack size, if available. Otherwise default + * to MINSIGSTKSZ. Unfortunately that might not be big enough for huge + * register files for big CPU instruction set extensions. */ diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD index b148cc811..4a6cef267 100644 --- a/user/gst-plugins-bad/APKBUILD +++ b/user/gst-plugins-bad/APKBUILD @@ -1,11 +1,12 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-bad -pkgver=1.20.2 -pkgrel=3 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Lower-quality plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" +options="!check" # nvidious license="LGPL-2.1+" # rtpmanagerbad depends on rtpmanager # symptom: tests 'rtpsrc' and 'rtpsink' will fail @@ -19,12 +20,7 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev meson subpackages="$pkgname-dev $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz - camerabin.patch curlhttpsrc.patch - mpegts.patch - fix-arm-test-alignment.patch - fix-arm-parser-alignment.patch - disable-failing-test.patch " build() { @@ -45,10 +41,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz -7f6023e766895ac8213f9dabd4d8acbeb03f18c2d98fa27865e7656c439e0ea97d02f9e9f0ea98205238ddb8f6473062af524b799d1da0cbe41a3055a11df250 camerabin.patch -d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch -d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch -566fbdc37c9f9fb5b671ecffa2f596a95f6431668ff8dd8b91bc827a280b5fb18a8fac3122a38f060263cb3f2d2138805af1e1c324eb619188f982c8cc575221 fix-arm-test-alignment.patch -f394b1643a5d0943e8acd7e9ee11702ce3bbfb27242f3eac140b884ce7bb5dea725ab4bb0a28cbf9d435622dcc68ea0ee0bee1c51a520787c382167dd1e43583 fix-arm-parser-alignment.patch -3c900a5cbe3ac129172f36acd4d9ede2610ceab500515c32a380dabd2d3d3f78d26be0c9521db855d13283b5be154c9407cd6bf5ec59524305170fc2db2572cb disable-failing-test.patch" +sha512sums="69c78970f0396c08fbddbd44e080142688fcd1ecdc0fa88709b934f6c546754904338469ceecd0f16c6a6b8585bf5faec3230426272b7eb2b63a21b9034d94db gst-plugins-bad-1.26.1.tar.xz +d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch" diff --git a/user/gst-plugins-bad/disable-failing-test.patch b/user/gst-plugins-bad/disable-failing-test.patch deleted file mode 100644 index b650bf519..000000000 --- a/user/gst-plugins-bad/disable-failing-test.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch was modified from upstream in the following way(s): - -* Adjust paths so that it applies to this subproject. - -From 81e7bde67c7aa4de2f846db1ed619771613259da Mon Sep 17 00:00:00 2001 -From: Edward Hervey <edward@centricular.com> -Date: Thu, 5 Sep 2024 10:08:17 +0200 -Subject: [PATCH] check: Disable failing test - -Test hasn't been properly fixed for several years with modern libsoup, and it -only for the legacy adaptive demuxer. - -Fixes #3783 - -Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7454> ---- - .../gst-plugins-bad/tests/check/elements/dash_mpd.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c b/subprojects/gst-plugins-bad/tests/check/elements/dash_mpd.c -index 1d347b0a54ea..91d6cc505d91 100644 ---- a/tests/check/elements/dash_mpd.c -+++ b/tests/check/elements/dash_mpd.c -@@ -5999,6 +5999,12 @@ GST_START_TEST (dash_mpdparser_maximum_segment_duration) - - GST_END_TEST; - -+#if 0 -+/* -+ * Test disabled due to failures with recent libsoup -+*/ -+ -+ - /* - * Test parsing of Perioud using @xlink:href attribute - */ -@@ -6103,6 +6109,7 @@ GST_START_TEST (dash_mpdparser_xlink_period) - - GST_END_TEST; - -+#endif - - /* - * Test parsing xsd:datetime with timezoneoffset. -@@ -6658,8 +6665,11 @@ dash_suite (void) - tcase_add_test (tc_simpleMPD, dash_mpdparser_various_duration_formats); - tcase_add_test (tc_simpleMPD, dash_mpdparser_default_presentation_delay); - -+#if 0 -+ /* Test disabled due to failure with libsoup */ - /* tests checking xlink attributes */ - tcase_add_test (tc_simpleMPD, dash_mpdparser_xlink_period); -+#endif - - /* tests checking the MPD management - * (eg. setting active streams, obtaining attributes values) --- -GitLab - diff --git a/user/gst-plugins-bad/fix-arm-parser-alignment.patch b/user/gst-plugins-bad/fix-arm-parser-alignment.patch deleted file mode 100644 index 63715380e..000000000 --- a/user/gst-plugins-bad/fix-arm-parser-alignment.patch +++ /dev/null @@ -1,32 +0,0 @@ -This patch differs from upstream in the following way(s): - - * Paths changed to accommodate 'builddir' - -From 10930661ee8ab2f43078ece482c33ca74c2440fb Mon Sep 17 00:00:00 2001 -From: Zach van Rijn <me@zv.io> -Date: Thu, 13 Jun 2024 09:11:30 -0500 -Subject: [PATCH] pcapparse: Avoid unaligned memory access - -Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3602 ---- - subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c b/subprojects/gst-plugins-bad/gst/pcapparse/gstpcapparse.c -index 53e7ef6fc25..0a9c9a6063b 100644 ---- a/gst/pcapparse/gstpcapparse.c -+++ b/gst/pcapparse/gstpcapparse.c -@@ -456,8 +456,8 @@ gst_pcap_parse_scan_frame (GstPcapParse * self, - return FALSE; - - /* ip info */ -- ip_src_addr = *((guint32 *) (buf_ip + 12)); -- ip_dst_addr = *((guint32 *) (buf_ip + 16)); -+ memcpy(&ip_src_addr, buf_ip + 12, sizeof(ip_src_addr)); -+ memcpy(&ip_dst_addr, buf_ip + 16, sizeof(ip_dst_addr)); - buf_proto = buf_ip + ip_header_size; - ip_packet_len = GUINT16_FROM_BE (*(guint16 *) (buf_ip + 2)); - --- -GitLab - diff --git a/user/gst-plugins-bad/fix-arm-test-alignment.patch b/user/gst-plugins-bad/fix-arm-test-alignment.patch deleted file mode 100644 index 1a03eafa7..000000000 --- a/user/gst-plugins-bad/fix-arm-test-alignment.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 57a1296d5913b222be87ccee1ae981b84931a7da Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Tue, 13 Jun 2023 01:29:14 +0100 -Subject: [PATCH 2/2] asfmux: fix potentially unaligned write on 32-bit ARM - -Fixes #2665 ---- - .../gst-plugins-bad/gst/asfmux/gstasfobjects.c | 12 ++++-------- - 1 file changed, 4 insertions(+), 8 deletions(-) - -diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c -index d9739826384..fa0f2849d17 100644 ---- a/gst/asfmux/gstasfobjects.c -+++ b/gst/asfmux/gstasfobjects.c -@@ -311,14 +311,10 @@ gst_asf_put_time (guint8 * buf, guint64 time) - void - gst_asf_put_guid (guint8 * buf, Guid guid) - { -- guint32 *aux32 = (guint32 *) buf; -- guint16 *aux16 = (guint16 *) & (buf[4]); -- guint64 *aux64 = (guint64 *) & (buf[8]); -- *aux32 = GUINT32_TO_LE (guid.v1); -- *aux16 = GUINT16_TO_LE (guid.v2); -- aux16 = (guint16 *) & (buf[6]); -- *aux16 = GUINT16_TO_LE (guid.v3); -- *aux64 = GUINT64_TO_BE (guid.v4); -+ GST_WRITE_UINT32_LE (buf + 0, guid.v1); -+ GST_WRITE_UINT16_LE (buf + 4, guid.v2); -+ GST_WRITE_UINT16_LE (buf + 6, guid.v3); -+ GST_WRITE_UINT64_BE (buf + 8, guid.v4); - } - - /** --- -GitLab diff --git a/user/gst-plugins-bad/mpegts.patch b/user/gst-plugins-bad/mpegts.patch deleted file mode 100644 index 1579c4e32..000000000 --- a/user/gst-plugins-bad/mpegts.patch +++ /dev/null @@ -1,120 +0,0 @@ -https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1314 - ---- gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c 2022-07-02 23:19:51.027302943 -0500 -@@ -296,7 +296,7 @@ - dvb_text_from_utf8 (const gchar * text, gsize * out_size) - { - GError *error = NULL; -- gchar *out_text; -+ gchar *out_text = NULL; - guint8 *out_buffer; - guint encoding; - GIConv giconv = (GIConv) - 1; -@@ -304,7 +304,8 @@ - /* We test character maps one-by-one. Start with the default */ - encoding = _ICONV_ISO6937; - giconv = _get_iconv (_ICONV_UTF8, encoding); -- out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); -+ if (giconv != (GIConv) - 1) -+ out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error); - - if (out_text) { - GST_DEBUG ("Using default ISO6937 encoding"); ---- gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c.old 2022-05-02 17:29:29.000000000 -0500 -+++ gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c 2022-07-02 23:41:27.379013955 -0500 -@@ -71,6 +71,14 @@ - 0xc0, 0x00, 0xc4, 0x86, 0x56, 0xa5 - }; - -+static gboolean -+_has_iso6937_iconv (void) -+{ -+ GIConv test = (GIConv) - 1; -+ test = g_iconv_open("iso6937", "utf-8"); -+ return (test != (GIConv) - 1); -+} -+ - GST_START_TEST (test_scte_sit) - { - GstMpegtsSCTESIT *sit; -@@ -397,11 +405,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != nit_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -- nit_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != nit_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of NIT section", data[i], -+ nit_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - nit_section->data[nit_section->section_length - 1]++; -@@ -486,11 +495,12 @@ - - fail_if (data == NULL); - -- for (i = 0; i < data_size; i++) { -- if (data[i] != sdt_data_check[i]) -- fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -- sdt_data_check[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < data_size; i++) { -+ if (data[i] != sdt_data_check[i]) -+ fail ("0x%X != 0x%X in byte %d of SDT section", data[i], -+ sdt_data_check[i], i); -+ } - - /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */ - sdt_section->data[sdt_section->section_length - 1]++; -@@ -594,14 +604,15 @@ - /* Check creation of descriptor */ - desc = gst_mpegts_descriptor_from_dvb_network_name ("Name"); - fail_if (desc == NULL); -- fail_unless (desc->length == 4); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 4); - fail_unless (desc->tag == 0x40); - -- for (i = 0; i < 6; i++) { -- if (desc->data[i] != network_name_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of network name descriptor", -- desc->data[i], network_name_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 6; i++) { -+ if (desc->data[i] != network_name_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of network name descriptor", -+ desc->data[i], network_name_descriptor[i], i); -+ } - - /* Check parsing of descriptor */ - ret = gst_mpegts_descriptor_parse_dvb_network_name (desc, &string); -@@ -623,14 +634,15 @@ - desc = gst_mpegts_descriptor_from_dvb_service - (GST_DVB_SERVICE_DIGITAL_TELEVISION, "Name", "Provider"); - fail_if (desc == NULL); -- fail_unless (desc->length == 15); -+ if (_has_iso6937_iconv()) fail_unless (desc->length == 15); - fail_unless (desc->tag == 0x48); - -- for (i = 0; i < 17; i++) { -- if (desc->data[i] != service_descriptor[i]) -- fail ("0x%X != 0x%X in byte %d of service descriptor", -- desc->data[i], service_descriptor[i], i); -- } -+ if (_has_iso6937_iconv()) -+ for (i = 0; i < 17; i++) { -+ if (desc->data[i] != service_descriptor[i]) -+ fail ("0x%X != 0x%X in byte %d of service descriptor", -+ desc->data[i], service_descriptor[i], i); -+ } - - /* Check parsing of descriptor with data */ - ret = gst_mpegts_descriptor_parse_dvb_service diff --git a/user/gst-plugins-base/APKBUILD b/user/gst-plugins-base/APKBUILD index 6a89cb469..9aa2afd80 100644 --- a/user/gst-plugins-base/APKBUILD +++ b/user/gst-plugins-base/APKBUILD @@ -1,11 +1,10 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-base -pkgver=1.20.1 -pkgrel=1 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Base plugins" url="https://gstreamer.freedesktop.org/" arch="all" -options="!check" # fails overlaycomposition on ppc64 license="GPL LGPL" depends="" makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev iso-codes-dev @@ -15,27 +14,30 @@ makedepends="alsa-lib-dev cdparanoia-dev expat-dev glib-dev iso-codes-dev orc-compiler orc-dev pango-dev wayland-dev wayland-protocols !gst-plugins-base" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz" +source="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-$pkgver.tar.xz + endian.patch + " ldpath="/usr/lib/gstreamer-1.0" build() { - meson \ + meson setup \ --wrap-mode=nofallback \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dnls=enabled \ -Dpackage-name="GStreamer Base Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="679a0eee1973fa9612e2e24978e2c2d9d8fdc5732e1699b4a87712881f1549d0811719a13ff4fe77b91322ca4425c39623b371703f6b3a36fb7238b977d3e541 gst-plugins-base-1.20.1.tar.xz" +sha512sums="b0c491755856af37fd8416af57b782ba04cfdf4298947a521ece90b4723fcf331199f428c74fafb37b3094a8172a0d409d20079544f7424fd6c089574313e296 gst-plugins-base-1.26.1.tar.xz +b44763d6b380bb51d246b64019078ee621a2d64a00f29f12039fd52aafd1c24e204350ea5c967c2fecb298075f6e45f62d16c3116d20aca8da557ace84ba0744 endian.patch" diff --git a/user/gst-plugins-base/endian.patch b/user/gst-plugins-base/endian.patch new file mode 100644 index 000000000..ed06e7c7f --- /dev/null +++ b/user/gst-plugins-base/endian.patch @@ -0,0 +1,40 @@ +--- gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/gst/videoconvertscale/gstvideoconvertscale.c 2025-05-11 14:05:05.042191384 -0500 +@@ -1407,8 +1407,13 @@ + g_return_val_if_fail (gst_value_is_fixed (from_par), othercaps); + + gst_video_convert_scale_get_fraction (from_par, &from_par_n, &from_par_d); +- gst_structure_get (ins, +- "width", G_TYPE_INT, &from_w, "height", G_TYPE_INT, &from_h, NULL); ++ { ++ gint wi = 0, hi = 0; ++ gst_structure_get (ins, ++ "width", G_TYPE_INT, &wi, "height", G_TYPE_INT, &hi, NULL); ++ from_w = wi; ++ from_h = hi; ++ } + + { + gint wi = 0, hi = 0; +--- gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-base-1.26.1/tests/check/elements/audiomixer.c 2025-05-11 14:06:12.944933423 -0500 +@@ -2125,12 +2125,18 @@ + gst_message_unref (msg); + } + ++#if G_BYTE_ORDER == G_LITTLE_ENDIAN ++#define AUDIO_FMT "S16LE" ++#else ++#define AUDIO_FMT "S16BE" ++#endif ++ + GST_START_TEST (test_qos_message_live) + { + GstBus *bus = gst_bus_new (); + GstHarness *h, *h2; + GstBuffer *b; +- static const char *caps_str = "audio/x-raw, format=(string)S16LE, " ++ static const char *caps_str = "audio/x-raw, format=(string)" AUDIO_FMT ", " + "rate=(int)1000, channels=(int)1, layout=(string)interleaved"; + GstMessage *msg; + GstPad *pad; diff --git a/user/gst-plugins-good/APKBUILD b/user/gst-plugins-good/APKBUILD index bc8624aa0..2570bf9df 100644 --- a/user/gst-plugins-good/APKBUILD +++ b/user/gst-plugins-good/APKBUILD @@ -1,8 +1,8 @@ # Contributor: A. Wilcox <awilfox@adelielinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-good -pkgver=1.20.2 -pkgrel=2 +pkgver=1.26.1 +pkgrel=0 pkgdesc="GStreamer multimedia framework - Free, well-written plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" @@ -18,27 +18,26 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev subpackages="$pkgname-gtk $pkgname-lang" ldpath="/usr/lib/gstreamer-1.0" source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz - drop-messages-interval-type.patch - fix-arm-test-alignment.patch + flvmux-disable-flaky-test.patch " build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dnls=enabled \ -Dorc=disabled \ -Dpackage-name="GStreamer Good Plugins (${DISTRO_NAME:-Adélie Linux})" \ -Dpackage-origin="${DISTRO_URL:-https://www.adelielinux.org/}" \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } gtk() { @@ -51,6 +50,5 @@ gtk() { "$subpkgdir"/usr/lib/gstreamer-1.0/ } -sha512sums="a10ea48fdfbe741e9bc63036b011748558f89968aaa525380ac99884c27463d190c0b49e2d98b4f554eee6ead8a5c5da3ba62e5b0b1fe54877598beccc68a933 gst-plugins-good-1.20.2.tar.xz -0f08a08d6f0e8303a9c899c5260f6ca2c0e0a41e1ca2a9c795c1cb1267a9003354cd0e5538022049a09784ba9000a4a60b7a0b07b38a18483ec30d9a86356e46 drop-messages-interval-type.patch -b08c5013100dff428125dca9075641a8c528ccdcdf005b66b286cfe3b8b6f80c4b04f41d768883e98112107b857e17af68e2864a331f379bd7ea5027adc641d8 fix-arm-test-alignment.patch" +sha512sums="ce096c912e6dfdec5c6e815b712e949296a18ea358cdb124997f256b1fbf8a68db9fc75c4e05a69a2cecd20de1a6bdb3fcfe4422f6d81b6f887ee484b5d1a556 gst-plugins-good-1.26.1.tar.xz +d31d0f70703efb13fbe919f008e1029a08649d3220f5689c7aa105cbbfe3c8cda4a2ae0b01bad32cb295ea202a965cb719776bd86f463a7b78d5b091b00e0348 flvmux-disable-flaky-test.patch" diff --git a/user/gst-plugins-good/drop-messages-interval-type.patch b/user/gst-plugins-good/drop-messages-interval-type.patch deleted file mode 100644 index ebf0c1e5a..000000000 --- a/user/gst-plugins-good/drop-messages-interval-type.patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3580 - -From e91ab24c5777986926bea5e9f0c832f606c9fb52 Mon Sep 17 00:00:00 2001 -From: "A. Wilcox" <AWilcox@Wilcox-Tech.com> -Date: Fri, 16 Dec 2022 01:00:46 -0600 -Subject: [PATCH] tests: Cast drop-messages-interval type properly - -The rtpjitterbuffer test drop_messages_interval uses a GstClockTime for -the message drop interval. This property is defined as a guint. On -systems with 64-bit time_t but 32-bit uint, this can cause the -g_object_set function to fail to read the arguments properly. - -Fixes: #1656 ---- - .../gst-plugins-good/tests/check/elements/rtpjitterbuffer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - - ---- gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c.old 2022-05-02 22:29:29.000000000 +0000 -+++ gst-plugins-good-1.20.2/tests/check/elements/rtpjitterbuffer.c 2022-12-16 07:04:53.663472650 +0000 -@@ -3097,7 +3097,7 @@ - guint num_sent_msg = 0; - - g_object_set (h->element, "post-drop-messages", TRUE, NULL); -- g_object_set (h->element, "drop-messages-interval", interval, NULL); -+ g_object_set (h->element, "drop-messages-interval", (guint)interval, NULL); - next_seqnum = construct_deterministic_initial_state (h, latency_ms); - - /* Create a bus to get the drop message on */ diff --git a/user/gst-plugins-good/fix-arm-test-alignment.patch b/user/gst-plugins-good/fix-arm-test-alignment.patch deleted file mode 100644 index 2b2a6a0c0..000000000 --- a/user/gst-plugins-good/fix-arm-test-alignment.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 57ced2fded938aa08d8727683a1823ae36170fc3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com> -Date: Mon, 12 Jun 2023 19:24:15 +0100 -Subject: [PATCH] tests: rtpbin_buffer_list: fix possible unaligned read on - 32-bit ARM - -Fixes https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/issues/689 ---- - .../tests/check/elements/rtpbin_buffer_list.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c b/subprojects/gst-plugins-good/tests/check/elements/rtpbin_buffer_list.c -index b804744352a..1c3d5cdd3a7 100644 ---- a/tests/check/elements/rtpbin_buffer_list.c -+++ b/tests/check/elements/rtpbin_buffer_list.c -@@ -25,6 +25,12 @@ - #include <gst/rtp/gstrtpbuffer.h> - #include <gst/rtp/gstrtcpbuffer.h> - -+#if G_BYTE_ORDER == G_BIG_ENDIAN -+#define READ_UINT64(mem) GST_READ_UINT64_BE(mem) -+#else -+#define READ_UINT64(mem) GST_READ_UINT64_LE(mem) -+#endif -+ - /* UDP/IP is assumed for bandwidth calculation */ - #define UDP_IP_HEADER_OVERHEAD 28 - -@@ -236,8 +242,8 @@ check_header (GstBuffer * buffer, guint index) - * most likely be changed in gstrtpbin. - */ - fail_unless (info.data != NULL); -- fail_unless_equals_uint64 (*(guint64 *) info.data, -- *(guint64 *) rtp_header[index]); -+ fail_unless_equals_uint64 (READ_UINT64 (info.data), -+ READ_UINT64 (rtp_header[index])); - fail_unless (*(guint16 *) (info.data + 12) == - *(guint16 *) (rtp_header[index] + 12)); - --- -GitLab - diff --git a/user/gst-plugins-good/flvmux-disable-flaky-test.patch b/user/gst-plugins-good/flvmux-disable-flaky-test.patch new file mode 100644 index 000000000..ef2d3feb3 --- /dev/null +++ b/user/gst-plugins-good/flvmux-disable-flaky-test.patch @@ -0,0 +1,15 @@ +This test is known flaky and causes a timeout every time on ppc64. + +Upstream-URL: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2803 + +--- gst-plugins-good-1.26.1/tests/check/elements/flvmux.c.old 2025-04-24 14:20:14.000000000 -0500 ++++ gst-plugins-good-1.26.1/tests/check/elements/flvmux.c 2025-05-17 17:53:27.568081593 -0500 +@@ -1162,7 +1162,7 @@ + + tcase_add_test (tc_chain, test_speex_streamable); + tcase_add_test (tc_chain, test_increasing_timestamp_when_pts_none); +- tcase_add_test (tc_chain, test_video_caps_late); ++ //tcase_add_test (tc_chain, test_video_caps_late); + tcase_add_test (tc_chain, test_audio_caps_change_streamable); + tcase_add_test (tc_chain, test_video_caps_change_streamable); + tcase_add_test (tc_chain, test_audio_caps_change_streamable_single); diff --git a/user/gstreamer/APKBUILD b/user/gstreamer/APKBUILD index 94c5af1c9..7ee893c50 100644 --- a/user/gstreamer/APKBUILD +++ b/user/gstreamer/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gstreamer -pkgver=1.20.1 +pkgver=1.26.1 pkgrel=0 pkgdesc="GStreamer multimedia framework" url="https://gstreamer.freedesktop.org/" @@ -9,16 +9,12 @@ license="LGPL-2.0+" depends="" depends_dev="libxml2-dev" makedepends="$depends_dev bison flex gobject-introspection-dev glib-dev - meson ninja" + meson" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-lang" -source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz - disable-tests.patch - test-deadlock.patch - time64.patch - " +source="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-$pkgver.tar.xz" build() { - meson \ + meson setup \ -Dprefix=/usr \ -Dintrospection=enabled \ -Dpackage-name="GStreamer (${DISTRO_NAME:-Adélie Linux})" \ @@ -26,16 +22,16 @@ build() { -Dglib-asserts=disabled \ -Dnls=enabled \ -Dptp-helper-permissions=none \ - _build - ninja -C _build + build + meson compile -C build } check() { - ninja -C _build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C _build install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -55,7 +51,4 @@ tools() { mv "$pkgdir"/usr/lib/libgstcheck-1.0.so.* "$subpkgdir"/usr/lib/ } -sha512sums="d6f67cce81ba15fba3fcf70850e3c84b25e8da3e53fd56e6f2c87c7ee1701071ea44deb754a0ea371b3cb17877f26aab94d9eccb6729cbb370d6d6d5c324aa1a gstreamer-1.20.1.tar.xz -39e6bfb52ebe85beefa2550eb404f83c5bbb3546cc1733b99e757401d2d182f95d829b90df99d5f43506d7c85d4f44ac797f35653cd42a935f1dc56d0b844c02 disable-tests.patch -d7e574e8715607d3103d46eb05388b781702a9e937d78f8cfab6d8d48d04baa7fbfe547bdeb816bbfddb5a333dd1862e460b057b12ea24704351ef5653f78491 test-deadlock.patch -977a9e689cce68b151a742ef67dbb60a10a55fcfae67f086909e1f0fc4a5998026acd03aeed32068fdb0485dd884c4313f39a63e3bab5baaafa878c439531bc3 time64.patch" +sha512sums="7a5da377fbfb25cacc2d9613a57210c00ca70ee00f3ef4d108a3c98bd6a2cb703b773ca6fd6d9ac7b59b60d0bf0573cff69bdea18e07159ac56ee992613d0a78 gstreamer-1.26.1.tar.xz" diff --git a/user/gstreamer/disable-tests.patch b/user/gstreamer/disable-tests.patch deleted file mode 100644 index 7fc78e9e4..000000000 --- a/user/gstreamer/disable-tests.patch +++ /dev/null @@ -1,24 +0,0 @@ -elements_leaks: - Fails due to heavy parallelisation on ppc64. - It always succeeds when run serially. - -elements_filesink: - Seems to be disabled on other musl distros as well. - Filed at: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1194 - ---- gstreamer-1.20.1/tests/check/meson.build.old 2022-03-14 06:33:40.000000000 -0500 -+++ gstreamer-1.20.1/tests/check/meson.build 2022-05-02 01:55:00.352168066 -0500 -@@ -84,11 +84,11 @@ - [ 'elements/fakesrc.c', not gst_registry ], - # FIXME: blocked forever on Windows due to missing fcntl (.. O_NONBLOCK) - [ 'elements/fdsrc.c', not gst_registry or host_system == 'windows' ], -- [ 'elements/filesink.c', not gst_registry ], -+ [ 'elements/filesink.c', true ], - [ 'elements/filesrc.c', not gst_registry ], - [ 'elements/funnel.c', not gst_registry ], - [ 'elements/identity.c', not gst_registry or not gst_parse ], -- [ 'elements/leaks.c', not tracer_hooks or not gst_debug ], -+ [ 'elements/leaks.c', true ], - [ 'elements/multiqueue.c', not gst_registry ], - [ 'elements/selector.c', not gst_registry ], - [ 'elements/streamiddemux.c', not gst_registry ], diff --git a/user/gstreamer/test-deadlock.patch b/user/gstreamer/test-deadlock.patch deleted file mode 100644 index b506ca19f..000000000 --- a/user/gstreamer/test-deadlock.patch +++ /dev/null @@ -1,140 +0,0 @@ -From f24595e9d7952e1e957c0973de62e6c3df031c08 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:26:10 +0000 -Subject: [PATCH 1/3] gstreamer: tests: make the gstbin pop message more clear - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index e366d5fe20f..06be4c75fbb 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -38,7 +38,7 @@ pop_async_done (GstBus * bus) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped async-done message"); - } - - static void -@@ -46,14 +46,14 @@ pop_latency (GstBus * bus) - { - GstMessage *message; - -- GST_DEBUG ("popping async-done message"); -+ GST_DEBUG ("popping latency message"); - message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); - - gst_message_unref (message); -- GST_DEBUG ("popped message"); -+ GST_DEBUG ("popped latency message"); - } - - static void -@@ -63,7 +63,7 @@ pop_state_changed (GstBus * bus, int count) - - int i; - -- GST_DEBUG ("popping %d messages", count); -+ GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { - message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); - -@@ -72,7 +72,7 @@ pop_state_changed (GstBus * bus, int count) - - gst_message_unref (message); - } -- GST_DEBUG ("popped %d messages", count); -+ GST_DEBUG ("popped %d state-changed messages", count); - } - - static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", --- -GitLab - - -From 2c47f61c69702572bf666ad9ecaf59710f4a342c Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sun, 20 Feb 2022 23:28:00 +0000 -Subject: [PATCH 2/3] gstreamer: tests: add a timeout in gstbin pop functions - instaed of wait forever - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index 06be4c75fbb..c837d0e7e8a 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -32,7 +32,7 @@ pop_async_done (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping async-done message"); -- message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_ASYNC_DONE, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_ASYNC_DONE, "did not get GST_MESSAGE_ASYNC_DONE"); -@@ -47,7 +47,7 @@ pop_latency (GstBus * bus) - GstMessage *message; - - GST_DEBUG ("popping latency message"); -- message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_LATENCY, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_LATENCY, "did not get GST_MESSAGE_LATENCY"); -@@ -65,7 +65,7 @@ pop_state_changed (GstBus * bus, int count) - - GST_DEBUG ("popping %d state-changed message", count); - for (i = 0; i < count; ++i) { -- message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, -1); -+ message = gst_bus_poll (bus, GST_MESSAGE_STATE_CHANGED, GST_SECOND); - - fail_unless (message && GST_MESSAGE_TYPE (message) - == GST_MESSAGE_STATE_CHANGED, "did not get GST_MESSAGE_STATE_CHANGED"); --- -GitLab - - -From 686add28e21ae0031f9e3b07f9fb5cd4d5d19bc5 Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Mon, 21 Feb 2022 23:06:07 +0000 -Subject: [PATCH 3/3] gstreamer: tests: fix gstbin deadlock - -this is a bit ugly but if the latency message is lost -the pop_latency will hang forever. - -Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/778 - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> ---- - tests/check/gst/gstbin.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tests/check/gst/gstbin.c b/tests/check/gst/gstbin.c -index c837d0e7e8a..5d9a09171aa 100644 ---- a/tests/check/gst/gstbin.c -+++ b/tests/check/gst/gstbin.c -@@ -741,7 +741,8 @@ GST_START_TEST (test_watch_for_state_change) - pop_state_changed (bus, 3); - if (ret == GST_STATE_CHANGE_ASYNC) { - pop_async_done (bus); -- pop_latency (bus); -+ if (gst_bus_have_pending (bus)) -+ pop_latency (bus); - } - - fail_unless (gst_bus_have_pending (bus) == FALSE, --- -GitLab - diff --git a/user/gstreamer/time64.patch b/user/gstreamer/time64.patch deleted file mode 100644 index 89c88c380..000000000 --- a/user/gstreamer/time64.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 664fc63a246cba97e202f712aa48105f46a9ff69 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian@centricular.com> -Date: Mon, 12 Dec 2022 11:34:51 +0200 -Subject: [PATCH] systemclock: Use `futex_time64` syscall on x32 and other - platforms that always use a 32-bit `struct timespec` for the normal `futex` - syscall - -See also https://gitlab.gnome.org/GNOME/glib/-/issues/2634 ---- - gst/gstsystemclock.c | 26 +++++++++++++++++++++- - 1 file changed, 25 insertions(+), 1 deletion(-) - -diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c -index 6d0b6ec47b6..8c396d2c7b4 100644 ---- a/gst/gstsystemclock.c -+++ b/gst/gstsystemclock.c -@@ -130,7 +130,31 @@ gst_futex_cond_broadcast (guint * cond_val) - static gboolean - gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - { -+ /* On x32 (ILP32 ABI on x86_64) and potentially sparc64, the raw futex() -+ * syscall takes a 32-bit timespan argument *regardless* of whether userspace -+ * is using 32-bit or 64-bit `struct timespec`. This means that we can’t -+ * unconditionally pass a `struct timespec` pointer into the syscall. -+ * -+ * Assume that any such platform is new enough to define the -+ * `__NR_futex_time64` workaround syscall (which accepts 64-bit timespecs, -+ * introduced in kernel 5.1), and use that to pass a 64-bit timespec instead. -+ * -+ * `clock_gettime()` on such systems will either return a 32-bit `struct -+ * timespec`, in which case the values we will get passed in here are -+ * already not y2038-safe, or `struct timespec` is using 64-bit `time_t` and -+ * everything is fine. -+ */ -+#ifdef __NR_futex_time64 -+ struct -+ { -+ gint64 tv_sec; -+ gint64 tv_nsec; -+ } end; -+ const long int futex_syscall_id = __NR_futex_time64; -+#else - struct timespec end; -+ const long int futex_syscall_id = __NR_futex; -+#endif - guint sampled; - int res; - gboolean success; -@@ -146,7 +170,7 @@ gst_futex_cond_wait_until (guint * cond_val, GMutex * mutex, gint64 end_time) - /* we use FUTEX_WAIT_BITSET_PRIVATE rather than FUTEX_WAIT_PRIVATE to be - * able to use absolute time */ - res = -- syscall (__NR_futex, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, -+ syscall (futex_syscall_id, cond_val, (gsize) FUTEX_WAIT_BITSET_PRIVATE, - (gsize) sampled, &end, NULL, FUTEX_BITSET_MATCH_ANY); - success = (res < 0 && errno == ETIMEDOUT) ? FALSE : TRUE; - g_mutex_lock (mutex); --- -GitLab - diff --git a/user/gtk4/APKBUILD b/user/gtk4/APKBUILD index e1eb0ee41..1795d2107 100644 --- a/user/gtk4/APKBUILD +++ b/user/gtk4/APKBUILD @@ -1,27 +1,29 @@ # Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=gtk4 -pkgver=4.8.3 -pkgrel=1 +pkgver=4.18.5 +pkgrel=0 pkgdesc="Version 4 of the GNOME graphics toolkit" url="https://www.gtk.org" arch="all" -options="!check" # Requires X11 +options="!check" # Requires Wayland environment running license="LGPL-2.0+ AND LGPL-2.1+ AND LGPL-2.0-only AND Expat" depends="" makedepends="cairo-dev cmake cups-dev ffmpeg-dev ffmpeg-libs gdk-pixbuf-dev gi-docgen glib-dev gobject-introspection-dev graphene-dev gstreamer-dev gst-plugins-bad-dev iso-codes-dev libepoxy-dev libexecinfo-dev - libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev libxkbcommon-dev libxrandr-dev - meson ninja pango-dev>=1.50.0 py3-docutils py3-jinja2 py3-markdown - py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev + librsvg-dev libxcursor-dev libxdamage-dev libxi-dev libxinerama-dev + libxkbcommon-dev libxrandr-dev meson pango-dev py3-docutils py3-jinja2 + py3-markdown py3-pygments py3-pygobject py3-toml py3-typogrify tiff-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev $pkgname-doc" -source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz" +source="https://download.gnome.org/sources/gtk/${pkgver%.*}/gtk-$pkgver.tar.xz + vulkan-nullref.patch + " builddir="$srcdir/gtk-$pkgver" build() { - meson \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ @@ -29,21 +31,21 @@ build() { --buildtype=release \ --wrap-mode=nofallback \ -Dc_link_args='-lexecinfo' \ - -Dgtk_doc=true \ -Dman-pages=true \ - -Ddemos=false \ -Dbuild-examples=false \ + -Dvulkan=disabled \ build - ninja -C build + meson compile -C build } check() { - ninja -C build test + meson test -C build } package() { - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="56be0f5ce85a9cbbda4a5de53baeeb6b8cc527a5d34723ae5548759ec7c28f03d204b6b6758dffed02a9e226f3bfcd1f15971105c2f2f7be7cef22538be27754 gtk-4.8.3.tar.xz" +sha512sums="4a09188fdbeb532d8c2064199126eaf60d806118bb637d5182121f3d80d374acdf343568c3423effb9574c364279ded7d7cbd4e0331dc1fb647970f60c98bff0 gtk-4.18.5.tar.xz +1dca0747e2f572354c0d47e443270d64f5855d9fba592621d570be5eed49213ce8303e7d028bbe4d493cceebea9b3c90d6dc4f0671b1cae153a15384aa35d63e vulkan-nullref.patch" diff --git a/user/gtk4/vulkan-nullref.patch b/user/gtk4/vulkan-nullref.patch new file mode 100644 index 000000000..464415901 --- /dev/null +++ b/user/gtk4/vulkan-nullref.patch @@ -0,0 +1,69 @@ +From d4350c0fe535a759abd7898c7f251738242d1408 Mon Sep 17 00:00:00 2001 +From: Benjamin Otte <otte@redhat.com> +Date: Thu, 24 Apr 2025 03:36:15 +0200 +Subject: [PATCH] vulkan: Handle not being compiled against Vulkan + +The Vulkan renderer should work and just fail to realize. +Currently it SEGVs with a NULL function call. + +Part-of: <https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/8506> +--- + gsk/gpu/gskvulkanrenderer.c | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/gsk/gpu/gskvulkanrenderer.c b/gsk/gpu/gskvulkanrenderer.c +index a5f827df839..6282c0b51c1 100644 +--- a/gsk/gpu/gskvulkanrenderer.c ++++ b/gsk/gpu/gskvulkanrenderer.c +@@ -4,6 +4,8 @@ + + #include "gskgpurendererprivate.h" + ++#include <glib/gi18n-lib.h> ++ + #ifdef GDK_RENDERING_VULKAN + + #include "gskvulkandeviceprivate.h" +@@ -143,14 +145,28 @@ gsk_vulkan_renderer_unrealize (GskRenderer *renderer) + + GSK_RENDERER_CLASS (gsk_vulkan_renderer_parent_class)->unrealize (renderer); + } +-#endif ++ ++#else /* !GDK_RENDERING_VULKAN */ ++ ++static gboolean ++gsk_vulkan_renderer_realize (GskRenderer *renderer, ++ GdkDisplay *display, ++ GdkSurface *surface, ++ GError **error) ++{ ++ g_set_error_literal (error, GDK_VULKAN_ERROR, GDK_VULKAN_ERROR_NOT_AVAILABLE, ++ _("Vulkan support disabled during GTK build")); ++ ++ return FALSE; ++} ++#endif /* GDK_RENDERING_VULKAN */ + + static void + gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + { ++ GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + #ifdef GDK_RENDERING_VULKAN + GskGpuRendererClass *gpu_renderer_class = GSK_GPU_RENDERER_CLASS (klass); +- GskRendererClass *renderer_class = GSK_RENDERER_CLASS (klass); + + gpu_renderer_class->frame_type = GSK_TYPE_VULKAN_FRAME; + +@@ -162,6 +178,8 @@ gsk_vulkan_renderer_class_init (GskVulkanRendererClass *klass) + gpu_renderer_class->get_backbuffer = gsk_vulkan_renderer_get_backbuffer; + + renderer_class->unrealize = gsk_vulkan_renderer_unrealize; ++#else ++ renderer_class->realize = gsk_vulkan_renderer_realize; + #endif + } + +-- +GitLab + diff --git a/user/harfbuzz/APKBUILD b/user/harfbuzz/APKBUILD index f858e0b00..be03db054 100644 --- a/user/harfbuzz/APKBUILD +++ b/user/harfbuzz/APKBUILD @@ -1,44 +1,44 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> -# Maintainer: +# Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=harfbuzz -pkgver=2.6.8 -pkgrel=1 +pkgver=11.2.0 +pkgrel=0 pkgdesc="Text shaping library" url="https://www.freedesktop.org/wiki/Software/HarfBuzz" arch="all" -options="!check" # tests depend on certain freetype behaviours license="MIT" depends="" makedepends="cairo-dev freetype-dev glib-dev gobject-introspection-dev icu-dev - graphite2-dev" + graphite2-dev gtk-doc meson" checkdepends="python3" -subpackages="$pkgname-dev $pkgname-icu" +subpackages="$pkgname-dev $pkgname-doc $pkgname-icu" source="https://github.com/$pkgname/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.xz" build() { - ./configure \ - --build=$CBUILD \ - --host=$CHOST \ + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --infodir=/usr/share/info \ --localstatedir=/var \ - --disable-static \ - --with-glib \ - --with-gobject \ - --with-graphite2 \ - --with-icu \ - --with-truetype - make + -Dcairo=enabled \ + -Ddocs=enabled \ + -Dfreetype=enabled \ + -Dglib=enabled \ + -Dgobject=enabled \ + -Dgraphite2=enabled \ + -Dicu=enabled \ + build + + meson compile -C build } check() { - make check + meson test -C build } package() { - make DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" meson install -C build } dev() { @@ -49,8 +49,9 @@ dev() { icu() { pkgdesc="Harfbuzz ICU support library" replaces="harfbuzz" + install_if="harfbuzz=$pkgver-r$pkgrel icu-libs" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/lib*icu.so.* "$subpkgdir"/usr/lib/ } -sha512sums="651b23d7d4fab6fef472ee57db39bbaebc31c2f40ea3a482c1499ad1a7b549b86a2bccbe9da191c8e9ecdf464191dd3c9a7485546b51695ad8ab3c0329732d9d harfbuzz-2.6.8.tar.xz" +sha512sums="108a164e5277f76f535bbd1c3744b1f78897e714376c2f61c1171b95d5004a0ab99179efdd92063f7677b30d5c1ab4e0a40612bf60d672af9f03bdd24b1edefa harfbuzz-11.2.0.tar.xz" diff --git a/user/hyperfine/APKBUILD b/user/hyperfine/APKBUILD new file mode 100644 index 000000000..ee21cbd2a --- /dev/null +++ b/user/hyperfine/APKBUILD @@ -0,0 +1,376 @@ +# Contributor: Zach van Rijn <me@zv.io> +# Maintainer: Zach van Rijn <me@zv.io> +pkgname=hyperfine +pkgver=1.19.0 +pkgrel=0 +pkgdesc="A command-line benchmarking tool" +url="https://github.com/sharkdp/hyperfine" +arch="all" +license="Apache-2.0 OR MIT" +depends="" +makedepends="cargo" +subpackages="" +source="hyperfine-$pkgver.tar.gz::https://github.com/sharkdp/hyperfine/archive/refs/tags/v$pkgver.tar.gz" + +# dependencies taken from Cargo.lock +cargo_deps=" +ahash 0.7.8 +aho-corasick 1.1.3 +anstream 0.6.18 +anstyle 1.0.10 +anstyle-parse 0.2.6 +anstyle-query 1.1.2 +anstyle-wincon 3.0.6 +anyhow 1.0.93 +approx 0.5.1 +arrayvec 0.7.6 +assert_cmd 2.0.16 +autocfg 0.1.8 +autocfg 1.4.0 +bitflags 1.3.2 +bitflags 2.6.0 +bitvec 1.0.1 +borsh 1.5.2 +borsh-derive 1.5.2 +bstr 1.10.0 +bytecheck 0.6.12 +bytecheck_derive 0.6.12 +byteorder 1.5.0 +bytes 1.8.0 +cfg-if 1.0.0 +cfg_aliases 0.2.1 +clap 4.5.20 +clap_builder 4.5.20 +clap_complete 4.5.37 +clap_lex 0.7.2 +cloudabi 0.0.3 +colorchoice 1.0.3 +colored 2.1.0 +console 0.15.8 +csv 1.3.1 +csv-core 0.1.11 +difflib 0.4.0 +doc-comment 0.3.3 +encode_unicode 0.3.6 +equivalent 1.0.1 +errno 0.3.9 +fastrand 2.2.0 +float-cmp 0.9.0 +fuchsia-cprng 0.1.1 +funty 2.0.0 +getrandom 0.2.15 +hashbrown 0.12.3 +hashbrown 0.15.1 +indexmap 2.6.0 +indicatif 0.17.4 +instant 0.1.13 +is_terminal_polyfill 1.70.1 +itoa 1.0.11 +lazy_static 1.5.0 +libc 0.2.162 +linux-raw-sys 0.4.14 +memchr 2.7.4 +nix 0.29.0 +normalize-line-endings 0.3.0 +num 0.2.1 +num-bigint 0.2.6 +num-complex 0.2.4 +num-integer 0.1.46 +num-iter 0.1.45 +num-rational 0.2.4 +num-traits 0.2.19 +number_prefix 0.4.0 +once_cell 1.20.2 +portable-atomic 1.9.0 +ppv-lite86 0.2.20 +predicates 3.1.2 +predicates-core 1.0.8 +predicates-tree 1.0.11 +proc-macro-crate 3.2.0 +proc-macro2 1.0.89 +ptr_meta 0.1.4 +ptr_meta_derive 0.1.4 +quote 1.0.37 +radium 0.7.0 +rand 0.6.5 +rand 0.8.5 +rand_chacha 0.1.1 +rand_chacha 0.3.1 +rand_core 0.3.1 +rand_core 0.4.2 +rand_core 0.6.4 +rand_hc 0.1.0 +rand_isaac 0.1.1 +rand_jitter 0.1.4 +rand_os 0.1.3 +rand_pcg 0.1.2 +rand_xorshift 0.1.1 +rdrand 0.4.0 +regex 1.11.1 +regex-automata 0.4.8 +regex-syntax 0.8.5 +rend 0.4.2 +rkyv 0.7.45 +rkyv_derive 0.7.45 +rust_decimal 1.36.0 +rustix 0.38.40 +ryu 1.0.18 +seahash 4.1.0 +serde 1.0.214 +serde_derive 1.0.214 +serde_json 1.0.132 +shell-words 1.1.0 +simdutf8 0.1.5 +statistical 1.0.0 +strsim 0.11.1 +syn 1.0.109 +syn 2.0.87 +tap 1.0.1 +tempfile 3.14.0 +terminal_size 0.4.0 +termtree 0.4.1 +thiserror 2.0.3 +thiserror-impl 2.0.3 +tinyvec 1.8.0 +tinyvec_macros 0.1.1 +toml_datetime 0.6.8 +toml_edit 0.22.22 +unicode-ident 1.0.13 +unicode-width 0.1.14 +utf8parse 0.2.2 +uuid 1.11.0 +version_check 0.9.5 +wait-timeout 0.2.0 +wasi 0.11.0+wasi-snapshot-preview1 +winapi 0.3.9 +winapi-i686-pc-windows-gnu 0.4.0 +winapi-x86_64-pc-windows-gnu 0.4.0 +windows-sys 0.48.0 +windows-sys 0.52.0 +windows-sys 0.59.0 +windows-targets 0.48.5 +windows-targets 0.52.6 +windows_aarch64_gnullvm 0.48.5 +windows_aarch64_gnullvm 0.52.6 +windows_aarch64_msvc 0.48.5 +windows_aarch64_msvc 0.52.6 +windows_i686_gnu 0.48.5 +windows_i686_gnu 0.52.6 +windows_i686_gnullvm 0.52.6 +windows_i686_msvc 0.48.5 +windows_i686_msvc 0.52.6 +windows_x86_64_gnu 0.48.5 +windows_x86_64_gnu 0.52.6 +windows_x86_64_gnullvm 0.48.5 +windows_x86_64_gnullvm 0.52.6 +windows_x86_64_msvc 0.48.5 +windows_x86_64_msvc 0.52.6 +winnow 0.6.20 +wyz 0.5.1 +zerocopy 0.7.35 +zerocopy-derive 0.7.35 +" + +source="$source $(echo "$cargo_deps" | sed -E 's#^([^ ]+) ([^ ]+)$#\1-\2.tar.gz::https://crates.io/api/v1/crates/\1/\2/download#g')" + +prepare() { + export CARGO_HOME="$srcdir/cargo-home" + export CARGO_VENDOR="$CARGO_HOME/adelie" + + (builddir=$srcdir; default_prepare) + + mkdir -p "$CARGO_VENDOR" + cat <<- EOF > "$CARGO_HOME/config" + [source.adelie] + directory = "${CARGO_VENDOR}" + + [source.crates-io] + replace-with = "adelie" + local-registry = "/nonexistant" + EOF + + echo "$cargo_deps" | while read -r _dep _ver; do + [ -n "$_dep" ] || continue + _dep="$_dep-$_ver" + ln -s "$srcdir/$_dep" "$CARGO_VENDOR/$_dep" + _sum=$(sha256sum "$srcdir/$_dep.tar.gz" | cut -d' ' -f1) + cat <<- EOF > "$CARGO_VENDOR/$_dep/.cargo-checksum.json" + { + "package":"$_sum", + "files":{} + } + EOF + done +} + +build() { + export CARGO_HOME="$srcdir/cargo-home" + cargo build --release -j $JOBS +} + +check() { + export CARGO_HOME="$srcdir/cargo-home" + export PATH="$PATH:$srcdir/$pkgname-$pkgver/hyperfine/target/release" + cargo test -j $JOBS --release +} + +package() { + install -Dm755 target/release/hyperfine -t "$pkgdir"/usr/bin/ +} + +sha512sums="91e3b497844944bc11afaba07488dac9803b145d69259064c9a510cf76039baa2e025751743bf3230d114b31d7eb46e017c99d38506f0b6fcf2b9a3623352e8e hyperfine-1.19.0.tar.gz +63677b2001d633ecabb36c08bd92e00b5fa71f24aed1c4601d12d846ea06aeaf093c37cfe1f6642147800caa6c749e9a202aa21f9ab4799efa379ad0d952a2ee ahash-0.7.8.tar.gz +ba422a54688c4678fcf16e34fdf3ed06c333e6e3fc8b75af9272a215add494d43ebaef319021134b61327fd5d3572aec0dc655b714ffb3bc71ba3c265c9ebb69 aho-corasick-1.1.3.tar.gz +5149977d6f7b5e9cf6350f1ef130caa3ff46c7e78976358452a185ce196cdd77fee48a3a9838f434ae6ea9c15b19f6bfbab156edf819f81179d6774318f08963 anstream-0.6.18.tar.gz +621e7a89fad13db985f07375d316cf8efba57fd44ae18628a8049a65aefbaef27949f99317872e91e0922bb089a00234055199ea3167f80ae03d00ada4f75dea anstyle-1.0.10.tar.gz +e28c9818afcda0e9b84c205d9c6697ce64cb06c21df2c3666869c07d66893105d9c5e96a27fcf2410a09f6af00735252e22b5c7d8c6cb3f68c4a8f376c49d396 anstyle-parse-0.2.6.tar.gz +26069d936c4b1fb09bc65cda0253fe9be8fa4e96c0821f980c772602b4e9230035ec8c9d092ef95e0a0354ac559f8d25f57a14c34086d4d241b5fba688951837 anstyle-query-1.1.2.tar.gz +59ec6f5a53bd68b6344d82e923eb8c45ddac481dd0d270a7b452dc5b0540ee1656705697c1508942ecc131e7c075248c85d8f4159f27d97ea94f22469ce2eeb5 anstyle-wincon-3.0.6.tar.gz +237b36bdefeaf8dd2f7d4c5c92d8f7627a5206ded5fa3dafd5710f2fbd3dd7d7187d4a8ae917ae03d0cf06bc8d101a7663bb7bb022507ac1ec88577a37475efc anyhow-1.0.93.tar.gz +c6d768496c974b6ff4cf7ad8e65f3fc9faf29a1957da497968ee112c6a0b9d7a0ff9a2579206e864976c0f65ed2190bc9d2b63b31a09ced7b57879e207c46407 approx-0.5.1.tar.gz +b1f320746018a7f32340a833420089446ec5cefb7f299b4506eab7423d5db49f00b72d8aa8c6600f9159b9480d5eb3ce69407d93f5c9934147860c83e4d6eca8 arrayvec-0.7.6.tar.gz +0b9167282d75169b0b1fad0b1401b42884185976ae0dd690851671aedbc1a9af26dd33f3047400eb4a1b5070216acc293aade149aded7e4f86dd5c0ef0e9a6a9 assert_cmd-2.0.16.tar.gz +d6156e0a8701f38c20b693380ed1ac5b15f84bc87c5ae0541483b9b387e6118d8673d8e5da5f4eee4d736c777e923d3fba7f61589a49c353170a708a709d8db5 autocfg-0.1.8.tar.gz +3b5e7c30bc73e105e4bfcab584c24fc4016db41fac9c356c6649fd841051704bbe8848e09546eb50d7c1f18ea8ce1cb72fbc268a620d5c609b3472114b5be73c autocfg-1.4.0.tar.gz +3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62 bitflags-1.3.2.tar.gz +f9bb3c48931ed7e7e05ec6d13305af5da6b6c18861ff307d7dc17c658f63972c87b70b0527287b3625c8592befc207cfe15550654995faf3862bb12a6d95bacf bitflags-2.6.0.tar.gz +83d643c5aca020ebbe9094b5aaba6a796e7c3c509228a4348444e57a06bc3a5dd042eed57a2254d91661e73bdab2bc0d1bd02be376906acc6b6d75b5354a8d8e bitvec-1.0.1.tar.gz +3500f00806cd26cd7431f9a3d097cb0f30fb4b0fe1bf0346978cfbdd07915e31cb8bc6721426bb365351a9e89ec8b7c6397c87c966852c8f4d00862fc7b4a7ce borsh-1.5.2.tar.gz +f3a9b1d588eb7e6147a63560d71557622f6b947728b926a25aa85bd56c26a4648dc96bf60875531fffee23c13235b6b412f3386f0ab9e454f4915af7ce66773a borsh-derive-1.5.2.tar.gz +823abdbda9b13802facc7d6b1ed9ad809ed3b0b827d26e418348ffb8481b5f5735f129c5a9a8c7b2ab010d7f32ca57cba69a1ee10a64225c54c6ceacd22c05d2 bstr-1.10.0.tar.gz +49a85f9bbfe8bccceffcd94e3eac1f4407d93159358428ea07652714e06e97fbcb41f22f72d9d10318bc9a019be8afc99727764162f18e8de01ea4069f44dda6 bytecheck-0.6.12.tar.gz +57f8480ddb76d8620095962acd203231fb7938c0caf9c216d89466f22464a6970f13adca5f4d5b10c9e1ec99d6e0b260ba7586c2bb895fad0380f8f9ac9a4fc8 bytecheck_derive-0.6.12.tar.gz +96caf981177f6ded9f27f025922cb94eb0cd9de5303bd91680099912d922092e77b7361efa70011e84f1595e443193e4f1b354443b9980c123f6ae573b236f7f byteorder-1.5.0.tar.gz +a721724e5cbfc73b79102a9c4a00fc9da520417819ca5c82b798c8cfb45af3d77b33f7035ad33d6187399c613cc2e83644236ac772aec934f521f87d4680059a bytes-1.8.0.tar.gz +0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff cfg-if-1.0.0.tar.gz +74969d12d5d24002a29e08d52e30fbce014dd481a7c35ee0162e69333c5f2d7755f3b02439b31522e12444cf1ac8e65880ce33fe6778dac03757e362cbf8a72c cfg_aliases-0.2.1.tar.gz +e432a118a2ec15b273a404c3cb75bbe579b11034ba55def1823d4670c6553e3d8611074a24f50a0f4adc8bda184213b06106c44c68a19d267342c53e345351d4 clap-4.5.20.tar.gz +e914c8b6592f9d230b4f4290cf4b4d73d0160c12a1fa3976c74bad21ff16da532d6af792f0a33fa472166f1cd551291b5d1d71fe8b359040040418694ec52000 clap_builder-4.5.20.tar.gz +5c864ea85f0823ec91a1c9693720853dd5bc5804daee9a0607bf14e9f5fe40b536bdb3b935d1e96e535d896a272d7fa1f99eba6983ec94bb630ab0c36cefbabb clap_complete-4.5.37.tar.gz +a8726397e5372fca3389748efdfdbd016b6baedad5b4bd95f33e4e820d4f40e0b94c88b1918ded3678aecf23911028e2261837e73d58ba7fd6f091eb47267380 clap_lex-0.7.2.tar.gz +691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c cloudabi-0.0.3.tar.gz +fc26696189d3935d5510a1237504339c1f354d03ffd3b4e830b7080335aa778bc72787ac5fa9a67a731b9bde2788da778d497f2ef97ec68bdec5145fedf4cd14 colorchoice-1.0.3.tar.gz +fa70f18fb29f6870a727d8243808c96e9497f8302f5f2b1748f9d9e396031e9c53a025b8edc9c8c9a0f8cfca12e5da73250a71e382b3074e9415b85bc004769e colored-2.1.0.tar.gz +b05e49ed145785e29631d481885788f0cc5574d4d7c4d90280dfedaee7f8c1515072c9c4cfe6bd2e017230cd228157222af7e7d41a9fce697cd1888095df4de9 console-0.15.8.tar.gz +6b0be5e017b2b2cb926d11d7a36cdae1bf0ddb56165127f25f6fd55956f95a572ed7e054f863610e91c9c2329f5af0eee9678f9020644800587d6daa5a94755b csv-1.3.1.tar.gz +0445c8a4d4d0f90f03e5d6507c26454aaeac0b355fb39d19e1676a7cb27b4372db3541367ce838d38151862b7bfbf19750cb550e24e74ab5e07ae9bb4edeedee csv-core-0.1.11.tar.gz +fcb57859424fea6958a4407061c421599fbca111357b1fe72faa65d8fb0b74425c993a24484e8414f475fa146cd8368c4f82e1ceb4e8dd9f95741149345b37a9 difflib-0.4.0.tar.gz +e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba doc-comment-0.3.3.tar.gz +64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77 encode_unicode-0.3.6.tar.gz +b2bc60e804c1b02c461dcefcfd60fc37145af710d183ebe65f9a4d63f2b2072d23193f98dc550a9213c7fdc6a2a837af23b04a89294ebbb681a4aaf5d5031140 equivalent-1.0.1.tar.gz +777fbac5730d420d58275ef63b7579997d8e6c72106d483ee1e3b1f1ce3977f1f66c56870a05acaa4cfacacb820eaf963e9c763748759cff3668fa2e6f89f04a errno-0.3.9.tar.gz +de2835aee8d5380a6e1c0f627a876594626e1379f2f7dbd3ad0f785d7c3f3f82162c9c20a68417324506f78264cb9dbcfb2d4d5dc9ca666996150979738822e4 fastrand-2.2.0.tar.gz +f8dad12ecf8a278769054fd78794999dae8dedbcfde5e77bdf6cea12fdeaadeeb2f1f3ca62df9aadc1bc3f61457236c4854d6d6923ad6d03ae7f23af600572e8 float-cmp-0.9.0.tar.gz +ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2 fuchsia-cprng-0.1.1.tar.gz +691e1c275b648110ef42c4adece8178cf037bad40d469780280eb2ebe07aa4b0406737c5ba02c9f9f63ee57a99fec27e5e51712e2113655f7522c8678f689155 funty-2.0.0.tar.gz +04789a53d3f4a84862e1e8b2113641af67e471b468de1222470d5e6cef0015232463a2cf3c3518dc2a533b3983b175a7c8922da00665bcf71c1e4e279b67e6fb getrandom-0.2.15.tar.gz +b3700fcd659a21a6b9b3777c18b37a83bf25542b4e8f2b963779a122f5d22e1742c064cfc03e649583e7dd5c6e90ca8407f8c51a0e8755f6a108682853022f76 hashbrown-0.12.3.tar.gz +8bdd4966b336f5d5b184cf14d4a7e625d184d8f3f0782845c746f374f92425055def71e64087fb3a3770fd9b2d9ed40310fa45f60e56d298accaf9c500add841 hashbrown-0.15.1.tar.gz +c870348691f5acf97e7bff25c805e60f2e9db9e3ee7b3b939b7be45b6bcfaadee9880e6ad27adbbe2545865193655b5fa9de18487b7a1d030017b2fca48616ca indexmap-2.6.0.tar.gz +54c92f028dc5aded5e1a947afc09c33930f0439d7ee55e9dca66ccc2af6860e7b67cd8153bbdb33dff962ffd03dc0004eace2e69135c11a867331f0ef3e9bf6d indicatif-0.17.4.tar.gz +b7839431e8920c4c0841d0974eede75fc50f2bb7a9475664bd2c4ff6c558a10084e1c025e5be977c3364ae9112c365c0a6f480cb9b35ee4130ca2beebcf650a9 instant-0.1.13.tar.gz +4730fa09401cb4e69c92b38b2b43afd74699c61f5bd7b37605efbc0c08ca7a1318d43e4a844e46e0f84f83f42432f01e33771be2b18eb5977702ab9f894837e1 is_terminal_polyfill-1.70.1.tar.gz +7e22dffac34c9c9f432daef395e0ec710ed658164bc9cd9fc6445c9f984c912a10bac556214a026bcddbe27a3197b35b0c87d6709fd605062637d086b2d20311 itoa-1.0.11.tar.gz +6d2f9887cd7f34f019644e42f02f2bf0111accd73aeaa60973ba0b039b6774670debece1ea9a6978e923208ef5d3ab7326473ee3560c078817f0f7ab8ed0f65f lazy_static-1.5.0.tar.gz +f43e294d587e7cd9c2da9b67be83fc70801ea66c318342cf1e11556566ecc1c8a612925770d85c75af1e887b425f326fac59229b78877d2377092243ea8e6a99 libc-0.2.162.tar.gz +28149660bd975ede05624af3582d5c78f498239f5d89713c2c32f5372fc16f4ca024dec35f81ea973a2cf986098890395dbda06ac6cf4ee29df3f9a0e11eaea7 linux-raw-sys-0.4.14.tar.gz +8d0e8b9c30208897d4b1b920f1bdcccd0c2b75d92a06abe4a1b2407938768abb6487d63de56c6a80419798fe69517210643dfaf11f5f5540185f0eccf220adb2 memchr-2.7.4.tar.gz +86c05084aa0e6238f8d48df0f5ce6e6d7661b589f4f3fbdad43387c59c0d6afafea4badf25d31db1611615de19a0b9ef18ce614846b79a47cad4e2c9367dbe7f nix-0.29.0.tar.gz +f8e2a6e333b0e8972febe8b9cf058c8d899c384fd177e0b6ef1c5f94e0fa18192963970cb1a2ba80e3135a8cca66cdae6796e4d84ac6b325bb369575bdfc6eea normalize-line-endings-0.3.0.tar.gz +9d094e0a29b2bb42d382d5167150418bc2ed81e8deb3c6636c99c86ca14abf5f69b82a49f1678dd110119eeaec2f476fe7a5d57e60558473a6b7c710dec7f778 num-0.2.1.tar.gz +19c1ff0ae6fdfc690ccfe4fe6008c102e50ab9bf6b1f4e4f04a348d217d4d9d538585945466b72b70713053bcfd73685d1a907e41d135265d330bde996709eb8 num-bigint-0.2.6.tar.gz +53be64d6f67b1ff7d0a4e1723ae21035abfd300ab27bed0976e0c3903fe8e29f47ffe75040832ee2f81da5c2f4f671d3d845d308365b9a5a989ace99a7d463ea num-complex-0.2.4.tar.gz +e27986d91f6c6dc3d5a0900defe28ab5f47905cde3f84d0914b7acee076dca8fec6fdb7b631ac94d3a31eb01ecbc5854e51afc3187cd1abfa21e1bfafdc700ae num-integer-0.1.46.tar.gz +6195c7bd5f904e9f0aeee3ce17b42c0383d053f9d37954a9ce3b4ff0a048afa121c9a37aa9c74b9ace7353d7fd9f57a7d04c7a18e1456fc2c4c298d8ecfd0172 num-iter-0.1.45.tar.gz +06e55f17a1ea58fd465a232ebd687686c922669f0b561f648717164f3fcc8fe2bb43213d1e6377158d2542f633ef2e1482a7c3cef8090328c34feacf7f9bdd93 num-rational-0.2.4.tar.gz +180018a5eceb45085e4e8d103ff21bb4d5079cea874c42a0ad4c76c99d275d434bbc1cc289f0cdec172866daa89dbfe0871410b2cc3407233fe1129786905956 num-traits-0.2.19.tar.gz +a43b668d7314218b86ca7451daa9dfef71f6c9f6616bc34c12d94ae6030f182bcca9da83905cb46f3d49d0aa81385a787e92e4f3ae239658067adc249f8174df number_prefix-0.4.0.tar.gz +bc6005bdab7a154c01e2203fb553a68695727475a9a882cf906d49c054ce886ad92cb491d380b6b9fe71a81b2fd690ce91c9a6cf8dfa8508470ac9acfc8a31c8 once_cell-1.20.2.tar.gz +1431a4c092f6a0cb50bcc78488d603c8ba8f4ee697f77fdcfcce7002fcb371f52a321089422c76564fbf3277c48e30f889565747951c60360d95a6917bb6adeb portable-atomic-1.9.0.tar.gz +6d171f63b42296f7765732fce3af7ea05d0d81f1541ffb3ad86e81210715ef4afe5bc9e58926e97e757aea6ff96a8012c8411eac78be0fd080898318ed21d7d1 ppv-lite86-0.2.20.tar.gz +50896189f39842ef424aebc12c2633112fda83eba1bdeaa3e6f398db1e28dca0cc7838948f25e67f6fceede1a91a1b0ede5d4dc4edac6da752e48c7a07bbe3ae predicates-3.1.2.tar.gz +8cfd010b70aa694620d6c573bd8ddc50ea16ba08f6c737902ba6697307af4510b9298ffcc3068b45bdc6430103db6fb4499783c64044d87d023bea46d45d0f7c predicates-core-1.0.8.tar.gz +e1b08010f9cab65c75d82cc44cfdf64d92127acf6a72ee0ce1533e5d7d8027ccab912e1c499b7b78508b5e3cb20dc03df94de3dd520ae13736906a5f374b10cd predicates-tree-1.0.11.tar.gz +41479ec5e414a8b05dffaa0ece21122387d5165a54e60d8ee3502f8a3c0a2ac0247f56996f933d5d77f1efe41a56bffe16874e8c6a34b66100cf047e4b760863 proc-macro-crate-3.2.0.tar.gz +488ab38a04df1d0330309382a7e4f667238cbc9b4d513da6a8f5718f8a762f76cc122af67fefe8f4b021a286b3d23e3ec83d781fe6ac823042a6daf14d147e2f proc-macro2-1.0.89.tar.gz +9936264dd52ae40e6afc8cef8914dbdc5767f397b91ea965d65275fe547a2d9cde7ccdcf908f787e25f84fbc23a2e30df895793fca308e09f48f2adf2e30d2bf ptr_meta-0.1.4.tar.gz +15a72b2c36e9d1761c4dd42cee1623c2d85c52eadc3c3102c8334c14c9c5db9a43d74dbbab1d14a2600d789917fcb5bc2652877b172aaa02c37a6868462ff20e ptr_meta_derive-0.1.4.tar.gz +c4ed21428c1f89cf22b85d80720a7869831a9c129d694617b0ce8c258278114ab98846f3f653abf736d1c86bc9224bbd695e9a7b06aa3adf292d02e1ef14cc05 quote-1.0.37.tar.gz +51e23cf52997b46c0018a94b0259b29d7bf33ddba19f6db406ca57ee5b1417d7e5f27dda3bb487d0099886011a97f238e8b3dd4d6c86e8464c0b471c1a7622a0 radium-0.7.0.tar.gz +2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904 rand-0.6.5.tar.gz +8b33a8988906ba5e2057a9a84bdd11f867a5536c22f5056eec59ed4ec4e3a6da2fd773da4c0510d343762e5a4ea0f007db4c4a7cef87a47f90e36c1a84d86fb2 rand-0.8.5.tar.gz +200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b rand_chacha-0.1.1.tar.gz +8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 rand_chacha-0.3.1.tar.gz +5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114 rand_core-0.3.1.tar.gz +f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028 rand_core-0.4.2.tar.gz +36c67eb845aa2ccca49d6d680f28d418229bbc5a050729e487fe6b9f9f384fdd7b8d67fc6508b90b79ffb3c26688e72feceb3ecae57d3d7f59338aeb62296f79 rand_core-0.6.4.tar.gz +808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f rand_hc-0.1.0.tar.gz +9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e rand_isaac-0.1.1.tar.gz +fe3791612cf82bd0ad1a115c442b4a007141647eecd48f49dff9a5d326c374663d9bd2e511c8d292e1dba44665359b522cd5d57ccd3a18598e88e42ee1670e4a rand_jitter-0.1.4.tar.gz +01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575 rand_os-0.1.3.tar.gz +6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c rand_pcg-0.1.2.tar.gz +3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5 rand_xorshift-0.1.1.tar.gz +6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894 rdrand-0.4.0.tar.gz +d065f6dc405771518260425f39a5eaaf8cab62e78c91ceed3b3994a9a121674d2484cadaaf816bdad89c87a40550d57b66a3d9de6618a7119a658301ce7e67d8 regex-1.11.1.tar.gz +278e3e2ab230ed5fa7d4837e8ea879fae68ebf35c2da5cc3a67f46b7d593abbcf71e6326a0cf34e38edc0f3f2166ff42a4fcc17a400d9604429aa5b4be075a3f regex-automata-0.4.8.tar.gz +549d8d130fea9ec0d5806126f57f31d433f50e9328c5532ad417c44bb5488ec0d20acb0983dbe54dabaa0b453cbea4533cf7baac7144df119e8f78dfe55c5ab8 regex-syntax-0.8.5.tar.gz +2df17191ce710e09927f6d17fa5e3432a154d605cf3b58bdd6a3037d69cc0b017007e23c16526a8879a89cc49e3a47d38ae5f6aca8b42cd05624fd15c9dc3529 rend-0.4.2.tar.gz +bac10c6e7e7f797e505cc8103c55ae2fd4b04a76631e085fcf1c8f2b05e52c064cb14145479dadc292995b7ca5bbab5235d54d8e651bf47623a0228f936f73c9 rkyv-0.7.45.tar.gz +ec48c62251a8c2b97de67da56cf6abff15cff1a329d7f8dd3e45e1175616f0dd1b32c2a9c0998086fc57d0084e7908cfd6000fff3eaa30a1776f8abd9cb00564 rkyv_derive-0.7.45.tar.gz +9dc8dbca6249991e4b8b2179f41bb51f2513bcf6f29490351989f04aeb7f1d15b88a8f13f7cdb666761c585d5e86397150c660883a334b9d4fdd96a08fdb5526 rust_decimal-1.36.0.tar.gz +a7482682e2f0321318c08cf17f69815779515c197815a2a9f228c728af4cff3684101b4a13656a1ff98933ee492e4a847a03b7f46d697f9c71552931734b2449 rustix-0.38.40.tar.gz +a9b2beac778ec47e6be303148d7512ee681bd2361f6e4ac6db32c8b4baf86a8c5eb5b0d02eacd6131ae88c7b5105c57018c3050676e0b3dd1ed9c4d2fd650e84 ryu-1.0.18.tar.gz +4d9111dd2e491c7f6d49e0b79a3c23628c02d6603ac46e88ed137ca737830003b549ccb38087679de2cf0b02a53065b89f8d79e0ac9ddb66844d970cc6383f8b seahash-4.1.0.tar.gz +100eac65a39b9b9c32c1671d36fa9cf8aca84a2673e24c2521fdbdb3ed9f932c71548f3f1a26b1e73dd7c92a34ffa8ed1c76eb173fa20d6e85736cdf8dc9a8ee serde-1.0.214.tar.gz +70bc0a31d344cfec8d30f2034beab25097ef76ab8d89947b21753f737759e5d4e60e5596e0c7994a7cc35993bae01148120f6cdf5239be25fb243056effa27f0 serde_derive-1.0.214.tar.gz +9d157ce7d705fee8245569e7c577310782b69675a6e459f21904544b824a1ca5c9b445d17419fee438dfeb6fcc35343ba14e022043fffade0210b6d2c1b5795e serde_json-1.0.132.tar.gz +05c280a8e1f65b205746560a82e397689a3b5ec934219b558ece3a25efbfdefe903f9172319240e96039b38fb2c4be6e070805aedbdfd10344d9144b9c93de00 shell-words-1.1.0.tar.gz +139668c7232f533d3439986474da5036efa32d4e0d21fa72e1283e27dbd0670984283d91c238e445be61317426f67cdb8d3f13738b2fb657563f866c8b6d89d6 simdutf8-0.1.5.tar.gz +00f58a7e1b8c818336fdf55def5a46b1347c5961b4fc27d156fc03f5c197af6f53f23485eea80b2b3ca6ce2acfb304fa4846904d85c6290d1750ad4b5a635c22 statistical-1.0.0.tar.gz +0cebe0155a92640e56db9a599ae62078cbb32e1d2da8bfa67ed0e8f410a7558dfcf7b3c2720ff5913282e291ecf076aed9fe9bf84c8d44e814a642b1bed3335c strsim-0.11.1.tar.gz +12816b9e8cf984024b2fbce9f0ae14cf94d4d2c06f08cc54fb793ce78770bb4cc1288eb7df0ba5e8e937756e1e8e295c53fe07a0c5dde1ea8ddba03b6203b37d syn-1.0.109.tar.gz +bcfff545d6dfefd81e09f8f30a86bdd85759b3a7d4093ef3365ed02718e10dbd604c52b94c9d7fa955d339fdc5b6c079940c6f345b5a48c52b5c8607794ca6f2 syn-2.0.87.tar.gz +d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995 tap-1.0.1.tar.gz +98c1ab70eb3efd2d8b16ed58c8c83f8599663af7ef269304e908a04c38334f659a4d0b1647a13dc0d1eb90a293f1b37ec8ff0b9b45ef5b7ff1b4452bbfcdcb15 tempfile-3.14.0.tar.gz +b1a66cdf4e94997b5291f3becfac1e2a838f6c3f6c068faa1ff1aa775b2a97d41be2aff5460d88928786cfd7dc8dac5e2d46a62b475d40343e1fd517c6299897 terminal_size-0.4.0.tar.gz +ddbe0d3ddd79b182732359f47958ca32aa351d10b1e7d5f6456700b851aa2b5314ce005e1fd120a248b676f219fbd68039cefc071d92c5b5477d053bb6e29062 termtree-0.4.1.tar.gz +f6a8e8e1bb6d6e10edc07c35f3141b4b3ecb46b943b4879dd8f8bef0306feaa5446d8e47b24cffeb4cd6c57b4715b86b2bc0716b4ef7dfdaeb080ecd29646c9a thiserror-2.0.3.tar.gz +50bb722db6bff4f18975312be61fbf201b8edb29a2c6420d8a2a1f2817403aa09c6de1269e7f952c4d4583f0dd2ab1eec45b26e5391b6bd69c6450c8e42019c1 thiserror-impl-2.0.3.tar.gz +b7b32e38229645965900f80f298685f13e6d13e58cfd6945409a6643ca9c9adc2621456956d5998ab9dd91c2db4ae79638b156ca0d9c7c5505023fd9b28414df tinyvec-1.8.0.tar.gz +10008c7b3a3d50c94b9c370015b76ee082f5dfb6dcacf014dc2f2dbe92f903618d10d0202b21f48fcf98a94ae76fb712db55a5e8ad353645d378cf0e6ec74f7e tinyvec_macros-0.1.1.tar.gz +d38b98db3b2d4eebd3001d88e2135b6fdbae63b200f7e900c6bb9c121dd3f170e557332bd26f237312c1cbef61666716b0cf550c2d730f86fa7cd9eb5f64a16f toml_datetime-0.6.8.tar.gz +0f98b371f7e27ae7f435a207c0915f942af145cc5dfabfe6d57f2b797efa3e706025401e501fccc6df70c001ce27051381556b8e7824447edd23ea25d047da4d toml_edit-0.22.22.tar.gz +5ba884f39debe9c8eb0b1d251ca713f7e2bc191d211707ed10cd81465487dbdca53914c19e131edfa1da15af132dc2c346260c3969c61e3747b63399ccb1cc51 unicode-ident-1.0.13.tar.gz +3c58a18776aa82cc13c761789a47901616cd98a30356f93d7eb05ae457314209d0a66213e2bbfa5eb8b59be6beacf62438234ce8daafa31b128dbf7d5d6fcadb unicode-width-0.1.14.tar.gz +f3dbf78fe924f1dc3cf9498b6e43fb10174699463f31091a7a8136d8f31ec84fc00e80e3d8551b7e86257e8b3573cfddb56fc0de797fdb2cde0e962a8f239266 utf8parse-0.2.2.tar.gz +0cd1b95fc2247bf4e627de6abb41e332ebaf39e5720640e52b9f235f7a0e2d451e7a486efdabb616ce00e47832d21919611683d0e6a71c86a86f290940cfda32 uuid-1.11.0.tar.gz +d11d5a2240ab0c67ea69db56561ce202201edeef9a8e5eda3d9ae7ab7bb5752d8f343fe7f6536d8383de8d55f9024efa84f66a0c21e69563b7a38c4a628014db version_check-0.9.5.tar.gz +db3b7aa2acfd44e64451042b8ba98eecab77a82aa5c58ed08dadb119ab36dee4e26d62baad7978ed56d5ad03019c96be5021455362290f56043981137bac8066 wait-timeout-0.2.0.tar.gz +043500ab28cd9cb779475255da5d109ebab7fccca72b64873dc28d77bc5a157ba8d96b9e8f05223b5b36c7089bb7b4ba87657fc69bac16b78972f897294a865f wasi-0.11.0+wasi-snapshot-preview1.tar.gz +ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 winapi-0.3.9.tar.gz +a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 winapi-i686-pc-windows-gnu-0.4.0.tar.gz +4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513 winapi-x86_64-pc-windows-gnu-0.4.0.tar.gz +bdf534bcf3face31e9ebe11427a911a53f89f4ff5eaea8cccd094e139bfe14b2aec602b1cab1df774794d999477439d9adc6b627a8e33c20334fc348ba2c47ed windows-sys-0.48.0.tar.gz +24ee0df246c2b456a4987a9124786a28acd358768cc7d1305bccd81bc5bb8822b81a03fb18d35174a520b911c6d9b685f81a34ab319fee13da3b985273584f03 windows-sys-0.52.0.tar.gz +d35e009e979633a1f3c8468cd038bd5c8c0381405165ce03497decd7d9edaaac485d704487e4a61d9aaf4e4d011b4248408912df6a0044d50e8457259867e061 windows-sys-0.59.0.tar.gz +e079eeef255a046be7f8e6a31c14f7b230254ebcf05eed2944827bb3d2a0dc30940d87593cf544d5e7ef35f6312b99430efcfb01421d91b02bb9c4bef7d98709 windows-targets-0.48.5.tar.gz +d6d2dbd96096c6c396dba141a9817e377c35877f3b2fe58b2553280c7cfcb1ed6ee75bd4d62c9b882662de67ddaf0c1049b91530d29c94dd709c230e08eb895f windows-targets-0.52.6.tar.gz +20158d31454488f6053d3ad7b97d7fc6eae6cf37e4ba0e50c28bd29b368505eed64199ae31104d5f97b66846be54e5ed25c0ad31ea850819205c573a31ac0996 windows_aarch64_gnullvm-0.48.5.tar.gz +f62b2d942bdb3a9353465b07d47b93de179bb706511aa497e4addd74cff95e689a9b633e7801ce786e73b5ae5f30b506b6faa199c5ab86eefdc1d94652df79c5 windows_aarch64_gnullvm-0.52.6.tar.gz +223f016c6f1a44dbc5c8a8428b39438f75380ea06951b7c26ed0877b19d79410c6fde5e4c7f2c839b6e76159131f39a1230e0e3a208dfc425ba9117e3665c4ff windows_aarch64_msvc-0.48.5.tar.gz +a3e21305ad0e6de38f5b5ed5d37ee5825b7521064163bcdf31d63341cd87983f54377865d2daf3bb480d2d0aa66d6f598fa09540ec1d71baea74569c86bd213b windows_aarch64_msvc-0.52.6.tar.gz +931ba5c1e4eb8ae73248e00d9611298d1c4b4b0dae719fdeb9243930cd420a103a7bc2738e0a4887c42c8f25728d6c5d64ad141dc092bc3f1d0f35dbe37d303a windows_i686_gnu-0.48.5.tar.gz +a1f6b5dd23d17ec3567bc9d11a4be6f35e196eee21ca342e9b88dbaa6a5f7c46e439c834b77e724f32ac22c0d81573746b3b513a6c944a221b92b2c76fe98822 windows_i686_gnu-0.52.6.tar.gz +95f13af855d530acc0b856214478d4b11b8dbab3f8f79dd223d0b009790c0e46d096fc1773e0277997deb2d5b96c704f17f23c7df11411524629f75415dec99f windows_i686_gnullvm-0.52.6.tar.gz +70e2fb4fdb006a4cbd43ab2c7e940b277a15fb1790dfa2d1fc1f1fd18bead4886f6dc046e44326603e4894d988578917b8932aba5d9a6a4cc8424911cad9dc7e windows_i686_msvc-0.48.5.tar.gz +ca97913ce202d73266cf55947b868bea7e964a4516b6a096a81aeab6a60ee73867171032ced35e3afccff741ddfb2def7468343b6eceb95253e4d4f349efbf96 windows_i686_msvc-0.52.6.tar.gz +1d6056fae430b3d042bdff3c6217c76be4b8b9f5dada9bad06beaac2db7d7ab9b0a82e44f498ec88e61afa73e99f56d84d445dc3847732b9ce5d947e08485f74 windows_x86_64_gnu-0.48.5.tar.gz +c4086bb0280042f2bef9b556283b67f8a5cacddd209e1c5fabec63decec6d4fd2d6a7071407973981b98ae0c0cf7034fc612f9e70dc6d3eed9acdec771ae31cb windows_x86_64_gnu-0.52.6.tar.gz +c016d5b5e73832b61ff67929d92fa8c16e154656294357266ad29ce1f44db4ca2d2935dba31a6b571187dc838b1d22f1e3b41fefffd1d719a338439adf1646aa windows_x86_64_gnullvm-0.48.5.tar.gz +67681f5859e249c56b0183181811f6212cc7008d6471dad78aecc7ebe3d027686b19210b8aa9014c554410f69f913d21ce2aca928eea905eab779bea26464cbd windows_x86_64_gnullvm-0.52.6.tar.gz +fa1c5cd14ca2ff0082e2504cf59d317dc4dc6f7138d35c12f95d4476a9c13d8b7f5537d0ee251eee7c99411ad31b22263171b7fbd391daa5d3ea3488ceaa61a0 windows_x86_64_msvc-0.48.5.tar.gz +21944cd8e3a481b514509e73ae3f62722fe7ed380d37ea0c25f8fbdeba79174dd52ff65d898838da5df4197894b74e00f45d47489418e978753b4e55c7e623e7 windows_x86_64_msvc-0.52.6.tar.gz +3347fdfb5b15ec73a40614ecd0cce60f41d3f2d083f49aaafceeaf5db52d5c677dc3eb39fcc2595999fc9f864d1fde81e180e09dc86a6f6124878e16e86e8bc8 winnow-0.6.20.tar.gz +15d86c167145c90e3fbabcefd11754fb1cb835896e32d1bb7f4b027e5b2092f5fdbdca4062c129bc38e655cb87c6a3f4e181747ee25d89db5e01fb1fcac18fe9 wyz-0.5.1.tar.gz +17fcb31c029ae89c01e5bae5fb2bb46bd434120199a3dc2c7fe0012dbbcfe2a0bb38934c4a7d3a4920e3fe47c097403beee554fefa54b66cb390f8b1de638d3c zerocopy-0.7.35.tar.gz +dbe23573b62a6267d7bc8c744320b75b2fbda03b908c1d175211f7394374fe182bce58021e25485c10671d726b2007f250565dfe53134d51c89293bb607e9feb zerocopy-derive-0.7.35.tar.gz" diff --git a/user/libglvnd/APKBUILD b/user/libglvnd/APKBUILD index 55441570d..82323eed5 100644 --- a/user/libglvnd/APKBUILD +++ b/user/libglvnd/APKBUILD @@ -6,7 +6,7 @@ pkgdesc="The GL Vendor-Neutral Dispatch library" url=" " arch="all" license="MIT AND BSD-1-Clause" -options="checkx11" +options="!check checkx11" depends="" makedepends="libx11-dev libxext-dev meson xorgproto-dev" replaces="mesa-gl mesa-egl mesa-gles" diff --git a/user/libinput/APKBUILD b/user/libinput/APKBUILD index 091c94866..d1ea54a43 100644 --- a/user/libinput/APKBUILD +++ b/user/libinput/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libinput -pkgver=1.26.2 +pkgver=1.28.0 pkgrel=0 pkgdesc="Library for handling input devices" url="https://www.freedesktop.org/wiki/Software/libinput/" @@ -32,4 +32,4 @@ package() { DESTDIR="$pkgdir" ninja -C builddir/ install } -sha512sums="51fab62e1bfb6007287e1219bf458a351806ce685e6e7ba5360062c863f0811da75acc6ec92aef7f9e0556dac0413fbe43a4744885f7449e38036130112907a6 libinput-1.26.2.tar.bz2" +sha512sums="2665fbfbf47f8ef329e387841ff9542b6191925d2fb46a19be64ef0b2e274db3b9ce8b42652ccdeb18c66e3a3c748ff576b313ecb8f7f6b4a01102bfb3e999e3 libinput-1.28.0.tar.bz2" diff --git a/user/libxcvt/APKBUILD b/user/libxcvt/APKBUILD index 9efeb5b24..1888d3ccc 100644 --- a/user/libxcvt/APKBUILD +++ b/user/libxcvt/APKBUILD @@ -1,5 +1,5 @@ # Contributor: Milan P. Stanić <mps@arvanta.net> -# Maintainer: Ermine <mustela@arvanta.net> +# Maintainer: Ermine <mustela@erminea.space> pkgname=libxcvt pkgver=0.1.2 pkgrel=0 diff --git a/user/libxkbcommon/APKBUILD b/user/libxkbcommon/APKBUILD index b76281beb..a667c3ab7 100644 --- a/user/libxkbcommon/APKBUILD +++ b/user/libxkbcommon/APKBUILD @@ -1,10 +1,10 @@ # Contributor: Ariadne Conill <ariadne@dereferenced.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=libxkbcommon -pkgver=1.7.0 +pkgver=1.8.1 pkgrel=0 pkgdesc="Keyboard handling library" -url="https://www.xkbcommon.org/" +url="https://xkbcommon.org/" arch="all" license="MIT AND X11" options="checkx11" @@ -14,7 +14,8 @@ makedepends="bison doxygen libxcb-dev meson libxml2-dev wayland-dev graphviz wayland-protocols" subpackages="$pkgname-dev $pkgname-doc $pkgname-tools $pkgname-tools-doc:xkbcli_doc $pkgname-tools-bash-completion:bashcomp" -source="https://www.xkbcommon.org/download/libxkbcommon-$pkgver.tar.xz" +source="https://github.com/xkbcommon/libxkbcommon/archive/refs/tags/xkbcommon-$pkgver.tar.gz" +builddir="$srcdir/libxkbcommon-xkbcommon-$pkgver" build() { meson setup \ @@ -68,4 +69,4 @@ bashcomp() { "$subpkgdir"/usr/share/bash-completion/completions/ } -sha512sums="4b74a9f3f63e2ebc1cbdcaa963c70362e55fa527e1d89b6a1fd30d7a84a8b60c1b3dc99bcfbde85aa31890e0b2f62f0bad3c8ff8340fe6a930ee662b33448ba5 libxkbcommon-1.7.0.tar.xz" +sha512sums="a11b8563b11bd085b909753fa99e5b2129343363a05d4fac44a46b334b644dbdd57c356021926e9fdcc2bf6855b90283af93e74c471c3d5677c2ed1bf19427c2 xkbcommon-1.8.1.tar.gz" diff --git a/user/lighttpd/APKBUILD b/user/lighttpd/APKBUILD index 3da2b301a..73e9cdb1b 100644 --- a/user/lighttpd/APKBUILD +++ b/user/lighttpd/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=lighttpd -pkgver=1.4.78 +pkgver=1.4.79 pkgrel=0 pkgdesc="A secure, fast, compliant and very flexible web-server" url="https://www.lighttpd.net" @@ -36,7 +36,6 @@ source="https://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-$pkgver.t $pkgname.confd $pkgname.logrotate lighttpd.conf - mime-types.conf mod_cgi.conf mod_fastcgi.conf mod_fastcgi_fpm.conf @@ -81,7 +80,7 @@ package() { "$pkgdir"/etc/logrotate.d/lighttpd # config files - local i; for i in lighttpd.conf mime-types.conf mod_cgi.conf \ + local i; for i in lighttpd.conf mod_cgi.conf \ mod_fastcgi.conf mod_fastcgi_fpm.conf do install -m644 "$srcdir"/$i "$pkgdir"/etc/lighttpd/$i @@ -108,12 +107,11 @@ mod_webdav() { } sha512sums=" -40559e676da38b7b4742d7140ab1afe6b69a10ececc5ab1e18c1ea0e4b1c3f13f8058e8e005cbad3df8c008b6b80511afbd0bde9c8094848f3db4d5a29961181 lighttpd-1.4.78.tar.xz +e0f1bb2cfca5e81001ea30d13f088425dfc7acbec924ecddf438eb6326ab3158a61c6c4aaee0b68a90666d1cb987ce94b1f6a48afd92485cc995db5b58265f83 lighttpd-1.4.79.tar.xz a74fb8394fb77fca2a08bdcfc79d4e13de6aca7bc4ed842b7e05f7f3a9cc85dccaa4971ba8fd0edfaa19da8d3870a743b713d9e51f1cbfe5b8e2843bb7fe5346 lighttpd.initd 9d2ab5deb7353ebf290e90936b511941df440859c78589d0bcf130ef69a5e9c79e4d318548b6b118df002083c46f7476230a28954b7a10a9dbd05040e02b1291 lighttpd.confd 0536b4f21d2e8659f7831b45998c13d9f6051ae7ecde13be01f372f837d255bfc4e211de48a7686cc743d53aa9c08ab3f10ec19788896dcf8356b90053ca7a16 lighttpd.logrotate -f99f109178bc8e60859b01ae7ebaaa63090849fe27f203780bf1e860c2bce997a1b8e6cf4e2a40b5c2f998aac13888aa693dfbfcc8e1bd9be4442a31bcf124d0 lighttpd.conf -a3f2f5763885d7e4f510491b24164e34aaf62bb02daa12991575dc64335c12668355af5bb8d6ce191eb4e9cce95324b1f7c9ba61b323b4e7b50a1e03e021afcf mime-types.conf +ba622693023f38b7ecb6234e29494cbec9cc94786a4d9d544a293e08208aaebb038bf443e205f7c5b8780c6c723a800b7f4d6ec7aaad75ebc65ac9b4f1cf064f lighttpd.conf 27cc638d8068dcf47bd9db44943d1db6c6f4e8e6abd6b42af7cea004b1c093440068541d98c68f8bea70b956713adaf8ed59a4b642dea826ee8620a05f8cfde5 mod_cgi.conf 1d15b84c03fb648a0e67ab5c5411b85478b4454c44bc2959cc96d1700eeadd7ff429520a5f1550db6527267646622dccd3d47d3fd1258869fccaf5c22d4ad4b2 mod_fastcgi.conf f9efc4b70d825600f5356c30e57d0b6cac11c01739337f7192c09c2cfd96cb76c8328b11d818ea4c2addc1a6d253975b84700106ae75854d55d0df73e220bd2b mod_fastcgi_fpm.conf diff --git a/user/lighttpd/lighttpd.conf b/user/lighttpd/lighttpd.conf index 9c9b89c7b..e8807efaf 100644 --- a/user/lighttpd/lighttpd.conf +++ b/user/lighttpd/lighttpd.conf @@ -35,7 +35,6 @@ server.modules = ( ######## Inclusions ######## -include "mime-types.conf" # uncomment for cgi support # include "mod_cgi.conf" # uncomment for php/fastcgi support diff --git a/user/lighttpd/mime-types.conf b/user/lighttpd/mime-types.conf deleted file mode 100644 index f24d4d858..000000000 --- a/user/lighttpd/mime-types.conf +++ /dev/null @@ -1,79 +0,0 @@ -############################################################################### -# Default mime-types.conf for Gentoo. -# include'd from lighttpd.conf. -# $Header: /var/cvsroot/gentoo-x86/www-servers/lighttpd/files/conf/mime-types.conf,v 1.4 2010/03/14 21:45:18 bangert Exp $ -############################################################################### - -# {{{ mime types -mimetype.assign = ( - ".svg" => "image/svg+xml", - ".svgz" => "image/svg+xml", - ".pdf" => "application/pdf", - ".sig" => "application/pgp-signature", - ".spl" => "application/futuresplash", - ".class" => "application/octet-stream", - ".ps" => "application/postscript", - ".torrent" => "application/x-bittorrent", - ".dvi" => "application/x-dvi", - ".gz" => "application/x-gzip", - ".pac" => "application/x-ns-proxy-autoconfig", - ".swf" => "application/x-shockwave-flash", - ".tar.gz" => "application/x-tgz", - ".tgz" => "application/x-tgz", - ".tar" => "application/x-tar", - ".zip" => "application/zip", - ".dmg" => "application/x-apple-diskimage", - ".mp3" => "audio/mpeg", - ".m3u" => "audio/x-mpegurl", - ".wma" => "audio/x-ms-wma", - ".wax" => "audio/x-ms-wax", - ".ogg" => "application/ogg", - ".wav" => "audio/x-wav", - ".gif" => "image/gif", - ".jpg" => "image/jpeg", - ".jpeg" => "image/jpeg", - ".png" => "image/png", - ".xbm" => "image/x-xbitmap", - ".xpm" => "image/x-xpixmap", - ".xwd" => "image/x-xwindowdump", - ".css" => "text/css", - ".html" => "text/html", - ".htm" => "text/html", - ".js" => "text/javascript", - ".asc" => "text/plain", - ".c" => "text/plain", - ".h" => "text/plain", - ".cc" => "text/plain", - ".cpp" => "text/plain", - ".hh" => "text/plain", - ".hpp" => "text/plain", - ".conf" => "text/plain", - ".log" => "text/plain", - ".text" => "text/plain", - ".txt" => "text/plain", - ".diff" => "text/plain", - ".patch" => "text/plain", - ".ebuild" => "text/plain", - ".eclass" => "text/plain", - ".rtf" => "application/rtf", - ".bmp" => "image/bmp", - ".tif" => "image/tiff", - ".tiff" => "image/tiff", - ".ico" => "image/x-icon", - ".dtd" => "text/xml", - ".xml" => "text/xml", - ".mpeg" => "video/mpeg", - ".mpg" => "video/mpeg", - ".mov" => "video/quicktime", - ".qt" => "video/quicktime", - ".avi" => "video/x-msvideo", - ".asf" => "video/x-ms-asf", - ".asx" => "video/x-ms-asf", - ".wmv" => "video/x-ms-wmv", - ".bz2" => "application/x-bzip", - ".tbz" => "application/x-bzip-compressed-tar", - ".tar.bz2" => "application/x-bzip-compressed-tar" - ) -# }}} - -# vim: set ft=conf foldmethod=marker et : diff --git a/user/llvm18/APKBUILD b/user/llvm18/APKBUILD index 694f8245e..bc5bb0c83 100644 --- a/user/llvm18/APKBUILD +++ b/user/llvm18/APKBUILD @@ -6,7 +6,7 @@ _pkgname=llvm pkgver=18.1.8 _majorver=${pkgver%%.*} pkgname=$_pkgname$_majorver -pkgrel=0 +pkgrel=1 pkgdesc="Low Level Virtual Machine compiler system, version $_majorver" url="https://llvm.org/" arch="all" @@ -23,6 +23,7 @@ source="https://github.com/llvm/llvm-project/releases/download/llvmorg-$pkgver/l llvm-fix-build-with-musl-libc.patch disable-FileSystemTest.CreateDir-perms-assert.patch dyld-elf-ppc32.patch + dyld-elf-ppc32-2.patch hexagon.patch i586-json-test.patch m68k-endianness.patch @@ -98,28 +99,6 @@ prepare() { # RISC-V issues are uninvestigated as of yet. #1233 rm -v test/CodeGen/RISCV/rvv/combine-store-extract-crash.ll rm -v test/CodeGen/RISCV/xtheadmempair.ll - - # ExecutionEngine for PPC32 requires R_PPC_REL24 to be - # implemented in RuntimeDyld. - for _bad_orc in global-ctor-with-cast.ll \ - global-variable-alignment.ll \ - trivial-call-to-function.ll \ - trivial-call-to-internal-function.ll \ - trivial-reference-to-global-variable.ll \ - trivial-reference-to-internal-variable-nonzeroinit.ll \ - trivial-reference-to-internal-variable-zeroinit.ll \ - trivial-return-zero.ll \ - weak-comdat.ll; do - rm -v test/ExecutionEngine/Orc/$_bad_orc; - done - for _bad_ee in frem.ll mov64zext32.ll \ - test-interp-vec-arithm_float.ll \ - test-interp-vec-arithm_int.ll \ - test-interp-vec-logical.ll \ - test-interp-vec-setcond-fp.ll \ - test-interp-vec-setcond-int.ll; do - rm -v test/ExecutionEngine/$_bad_ee; - done esac #1053 @@ -337,7 +316,8 @@ _common_subpkg() { sha512sums="25eeee9984c8b4d0fbc240df90f33cbb000d3b0414baff5c8982beafcc5e59e7ef18f6f85d95b3a5f60cb3d4cd4f877c80487b5768bc21bc833f107698ad93db llvm-project-18.1.8.src.tar.xz f84cd65d7042e89826ba6e8d48c4c302bf4980da369d7f19a55f217e51c00ca8ed178d453df3a3cee76598a7cecb94aed0775a6d24fe73266f82749913fc3e71 llvm-fix-build-with-musl-libc.patch d56945bb0476561028616222846257f990d66e68b4458894f8791252411038b269831f9400ed9df3b99f571a82443caaac347a8b38a5516c77c3583469118309 disable-FileSystemTest.CreateDir-perms-assert.patch -9e919d7988b18c7184d9fccd14911d70bbe2acf82d38111bfd41f1ba2976fea07e74527a43c552dad158c982a2cbaaf03f6a1e98c7a1fc02b4e75382cfe6d0b2 dyld-elf-ppc32.patch +94099a2001d38d935ece69943971e7943691e8a5471b31ae2169e1f2f2e60de8a9fe8ba718dfa942c84d22fced7492bc9b87bce84a3e801a46e549c4657f9eb5 dyld-elf-ppc32.patch +23cd4c38899bf001f6e27db9a21dfb9fa1264a81993ef423535ff3132d2a258b4706d201ff15a96624db82540ee09c14810af0392f0786262699dfdbcb47b9ba dyld-elf-ppc32-2.patch 807587a0c897d47a01a846c5c4f7cbf1f2d16437a163b66ee2381a7147e9d04b0141b2c76d022db61903d0d2841ddb267ba98c66c9e41501ca41837659743df8 hexagon.patch 22dedbbdc99ab4df6c64921186803552fc61cfc00a5cd052295a5450809e7205ac21dd07df158b7e99b960084b2ec3d8832480a8cd073fe1c2d613cd21c90b60 i586-json-test.patch b186ce027dca389cfd23dc91b03e023e688c7610745cf62d0b277b6178972bcf55abf0df08453f2a6b85dc61dba929cb565cb30633a2fe0f193a443f54025bf7 m68k-endianness.patch diff --git a/user/llvm18/dyld-elf-ppc32-2.patch b/user/llvm18/dyld-elf-ppc32-2.patch new file mode 100644 index 000000000..d424554e2 --- /dev/null +++ b/user/llvm18/dyld-elf-ppc32-2.patch @@ -0,0 +1,176 @@ +Author: Ash Logan <ash@heyquark.com> + +adds a whole bunch of ppc32 relocation types - probably only REL32 and REL24 are actually needed, or +indeed tested. +mostly copypasted from the ppc64 code with ELFv2 ABI removed. No attempt is made to support GOT/PLT +relocations, since the JIT doesn't seem to generate these. + +makes clang-repl and the ExecutionEngine testsuites pass, and allows llvmpipe to run + +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp 2025-02-26 00:10:04.114888980 +1100 +@@ -1029,6 +1029,14 @@ uint8_t *RuntimeDyldImpl::createStubFunc + writeBytesUnaligned(JrT9Instr, Addr + 24, 4); + writeBytesUnaligned(NopInstr, Addr + 28, 4); + return Addr; ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ // The ABI docs talk endlessly of PLTs and GOTs which have special relocation types. ++ // For the generic types, just do a generic jump. ++ writeInt32BE(Addr, 0x3D800000); // lis r12, h(addr) ++ writeInt32BE(Addr+4, 0x618C0000); // ori r12, l(addr) ++ writeInt32BE(Addr+8, 0x7D8903A6); // mtctr r12 ++ writeInt32BE(Addr+12, 0x4E800420); // bctr ++ return Addr; + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + // Depending on which version of the ELF ABI is in use, we need to + // generate one of two variants of the stub. They both start with +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2025-02-26 00:32:57.021079997 +1100 +@@ -819,7 +819,7 @@ void RuntimeDyldELF::resolvePPC32Relocat + uint8_t *LocalAddress = Section.getAddressWithOffset(Offset); + switch (Type) { + default: +- report_fatal_error("Relocation type not implemented yet!"); ++ report_fatal_error("Relocation type " + Twine(Type) + " not implemented yet!"); + break; + case ELF::R_PPC_ADDR16_LO: + writeInt16BE(LocalAddress, applyPPClo(Value + Addend)); +@@ -835,6 +835,37 @@ void RuntimeDyldELF::resolvePPC32Relocat + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); + writeInt32BE(LocalAddress, delta); + } break; ++ case ELF::R_PPC_REL24: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_REL24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR32: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ writeInt32BE(LocalAddress, delta); ++ } break; ++ case ELF::R_PPC_ADDR30: { ++ uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); ++ int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0x00000003) | (delta & 0xFFFFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR24: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<26>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR24 overflow"); ++ uint32_t Inst = readBytesUnaligned(LocalAddress, 4); ++ writeInt32BE(LocalAddress, (Inst & 0xFC000003) | (delta & 0x03FFFFFC)); ++ } break; ++ case ELF::R_PPC_ADDR16: { ++ int64_t delta = static_cast<int64_t>(Value + Addend); ++ if (SignExtend64<16>(delta) != delta) ++ llvm_unreachable("Relocation R_PPC_ADDR16 overflow"); ++ writeInt16BE(LocalAddress, delta); ++ } break; + } + } + +@@ -1551,6 +1587,76 @@ RuntimeDyldELF::processRelocationRef( + processSimpleRelocation(SectionID, Offset, RelType, Value); + } + ++ } else if (Arch == Triple::ppc || Arch == Triple::ppcle) { ++ if (RelType == ELF::R_PPC_REL24) { ++ // A PPC branch relocation will need a stub function if the target is ++ // an external symbol (either Value.SymbolName is set, or SymType is ++ // Symbol::ST_Unknown) or if the target address is not within the ++ // signed 24-bits branch address. ++ SectionEntry &Section = Sections[SectionID]; ++ uint8_t *Target = Section.getAddressWithOffset(Offset); ++ bool RangeOverflow = false; ++ bool IsExtern = Value.SymbolName || SymType == SymbolRef::ST_Unknown; ++ if (!IsExtern) { ++ uint8_t *RelocTarget = ++ Sections[Value.SectionID].getAddressWithOffset(Value.Addend); ++ int64_t delta = static_cast<int64_t>(Target - RelocTarget); ++ // If it is within 26-bits branch range, just set the branch target ++ if (SignExtend64<26>(delta) != delta) { ++ RangeOverflow = true; ++ } else { ++ RelocationEntry RE(SectionID, Offset, RelType, Value.Addend); ++ addRelocationForSection(RE, Value.SectionID); ++ } ++ } ++ if (IsExtern || RangeOverflow) { ++ // It is an external symbol (either Value.SymbolName is set, or ++ // SymType is SymbolRef::ST_Unknown) or out of range. ++ StubMap::const_iterator i = Stubs.find(Value); ++ if (i != Stubs.end()) { ++ // Symbol function stub already created, just relocate to it ++ resolveRelocation(Section, Offset, ++ reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset(i->second)), ++ RelType, 0); ++ LLVM_DEBUG(dbgs() << " Stub function found\n"); ++ } else { ++ // Create a new stub function. ++ LLVM_DEBUG(dbgs() << " Create a new stub function\n"); ++ Stubs[Value] = Section.getStubOffset(); ++ uint8_t *StubTargetAddr = createStubFunction( ++ Section.getAddressWithOffset(Section.getStubOffset())); ++ ++ // The PPC32 ELF ABI doesn't really provide any guidance on the no-PLT case so let's do ++ // our best ++ uint64_t StubRelocOffset = StubTargetAddr - Section.getAddress(); ++ if (!IsTargetLittleEndian) ++ StubRelocOffset += 2; ++ ++ RelocationEntry REh(SectionID, StubRelocOffset + 0, ++ ELF::R_PPC_ADDR16_HI, Value.Addend); ++ RelocationEntry REl(SectionID, StubRelocOffset + 4, ++ ELF::R_PPC_ADDR16_LO, Value.Addend); ++ ++ if (Value.SymbolName) { ++ addRelocationForSymbol(REh, Value.SymbolName); ++ addRelocationForSymbol(REl, Value.SymbolName); ++ } else { ++ addRelocationForSection(REh, Value.SectionID); ++ addRelocationForSection(REl, Value.SectionID); ++ } ++ ++ resolveRelocation(Section, Offset, reinterpret_cast<uint64_t>( ++ Section.getAddressWithOffset( ++ Section.getStubOffset())), ++ RelType, 0); ++ Section.advanceStubOffset(getMaxStubSize()); ++ } ++ } ++ } else { ++ // Normal relocations are fine as-is probs ++ processSimpleRelocation(SectionID, Offset, RelType, Value); ++ } + } else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) { + if (RelType == ELF::R_PPC64_REL24) { + // Determine ABI variant in use for this object. +@@ -2228,6 +2334,8 @@ size_t RuntimeDyldELF::getGOTEntrySize() + case Triple::x86: + case Triple::arm: + case Triple::thumb: ++ case Triple::ppc: ++ case Triple::ppcle: + Result = sizeof(uint32_t); + break; + case Triple::mips: +diff -rup llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h +--- llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2024-06-16 03:21:32.000000000 +1000 ++++ llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.h 2025-02-25 23:51:24.830956991 +1100 +@@ -69,6 +69,8 @@ class RuntimeDyldELF : public RuntimeDyl + return 16; + else if (IsMipsN64ABI) + return 32; ++ else if (Arch == Triple::ppc || Arch == Triple::ppcle) ++ return 16; + else if (Arch == Triple::ppc64 || Arch == Triple::ppc64le) + return 44; + else if (Arch == Triple::x86_64) + diff --git a/user/llvm18/dyld-elf-ppc32.patch b/user/llvm18/dyld-elf-ppc32.patch index 7fb744169..77ff8c644 100644 --- a/user/llvm18/dyld-elf-ppc32.patch +++ b/user/llvm18/dyld-elf-ppc32.patch @@ -8,17 +8,15 @@ Needs more tests before submitting upstream, but seems to DTRT. --- llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp.old 2022-06-22 16:46:24.000000000 +0000 +++ llvm-14.0.6.src/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldELF.cpp 2022-11-28 06:33:12.239921624 +0000 -@@ -830,6 +830,13 @@ +@@ -830,6 +830,11 @@ case ELF::R_PPC_ADDR16_HA: writeInt16BE(LocalAddress, applyPPCha(Value + Addend)); break; -+ case ELF::R_PPC_REL32: ++ case ELF::R_PPC_REL32: { + uint32_t FinalAddress = Section.getLoadAddressWithOffset(Offset); + int64_t delta = static_cast<int64_t>(Value - FinalAddress + Addend); -+ if (SignExtend64<32>(delta) != delta) -+ llvm_unreachable("Relocation R_PPC_REL32 overflow"); + writeInt32BE(LocalAddress, delta); -+ break; ++ } break; } } diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD index 06968019c..4ccdec0ef 100644 --- a/user/marco/APKBUILD +++ b/user/marco/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=marco pkgver=1.26.2 -pkgrel=0 +pkgrel=1 pkgdesc="Window manager for the MATE desktop environment" url="https://mate-desktop.org" arch="all" license="GPL-2.0+ AND MIT-advertising AND MIT-CMU" -depends="" +depends="mate-desktop mate-settings-daemon" makedepends="gtk+3.0-dev intltool itstool libcanberra-dev libice-dev libsm-dev libxml2-utils libxres-dev startup-notification-dev wayland-protocols zenity" subpackages="$pkgname-dev $pkgname-doc $pkgname-lang" diff --git a/user/pango/APKBUILD b/user/pango/APKBUILD index 43b8630fb..95e39984f 100644 --- a/user/pango/APKBUILD +++ b/user/pango/APKBUILD @@ -1,13 +1,13 @@ # Maintainer: Zach van Rijn <me@zv.io> pkgname=pango -pkgver=1.50.7 +pkgver=1.56.3 pkgrel=0 pkgdesc="Library for laying out and rendering text" url="https://www.pango.org/" arch="all" -options="!check" # no tests available license="LGPL-2.1+" depends="" +checkdepends="cantarell-fonts" makedepends="$depends_dev cairo-dev expat-dev fontconfig-dev freetype-dev fribidi-dev glib-dev gobject-introspection-dev harfbuzz-dev libxft-dev meson ninja" @@ -20,20 +20,33 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve # 1.42.4-r1: # - CVE-2019-1010238 -build () { - meson \ +prepare() { + default_prepare + # Test fails on ppc64 with x-position moved; upstream suggested it was + # related to rounding differences in HarfBuzz. + rm tests/layouts/valid-20.layout +} + +build() { + meson setup \ --prefix=/usr \ --sysconfdir=/etc \ --mandir=/usr/share/man \ --localstatedir=/var \ --buildtype=release \ - . output - ninja -C output + --wrap-mode=nofallback \ + -Dintrospection=enabled \ + . build + meson compile -C build +} + +check() { + meson test -C build } package() { mkdir -p "$pkgdir"/etc/pango - DESTDIR="$pkgdir" ninja -C output install + DESTDIR="$pkgdir" meson install -C build } -sha512sums="4d754ed753fc34074c2a8751459406af7eb1eccb227c6158287f7e2921614d918cae47d078d4a2b4c098b641e40274e81bf1ec6b6a1b147efd550626665767d3 pango-1.50.7.tar.xz" +sha512sums="adb5aa66ea0c45f7bb112867a77f25d31d39bbb18fd8d41df0c1fd329714def874aa3cb8a49847561a75b0824c2abf8ce09a610d088e88d7de015c36a1536ac0 pango-1.56.3.tar.xz" diff --git a/user/rspamd/APKBUILD b/user/rspamd/APKBUILD index e61e4ad91..e4d36f982 100644 --- a/user/rspamd/APKBUILD +++ b/user/rspamd/APKBUILD @@ -5,11 +5,12 @@ # Contributor: Duncan Bellamy <dunk@denkimushi.com> # Maintainer: Lee Starnes <lee@canned-death.us> pkgname=rspamd -pkgver=3.8.4 -pkgrel=1 +pkgver=3.11.1 +pkgrel=0 pkgdesc="Fast, free and open-source spam filtering system" url="https://rspamd.com/" arch="all" +options="!check" # Tests require LuaJIT's ffi module license="Apache-2.0 AND BSD-1-Clause AND BSD-2-Clause AND BSD-3-Clause AND CC0-1.0 AND LGPL-2.1+ AND LGPL-3.0-only AND MIT AND Zlib" pkgusers="rspamd" pkggroups="rspamd" @@ -21,6 +22,7 @@ makedepends=" file-dev glib-dev icu-dev + libarchive-dev libevent-dev libexecinfo-dev libgd-dev @@ -40,24 +42,29 @@ subpackages=" $pkgname-client $pkgname-libs $pkgname-utils::noarch - $pkgname-controller::noarch - $pkgname-fuzzy::noarch - $pkgname-proxy::noarch $pkgname-openrc $pkgname-dbg " +ldpath="/usr/lib/rspamd" source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgver.tar.gz $pkgname.logrotated $pkgname.initd $pkgname.confd - 10-conf-split-workers.patch " +provides=" + rspamd-controller=$pkgver-r$pkgrel + rspamd-fuzzy=$pkgver-r$pkgrel + rspamd-proxy=$pkgver-r$pkgrel + " + +replaces="rspamd-controller rspamd-fuzzy rspamd-proxy" + build() { if [ "$CBUILD" != "$CHOST" ]; then CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux" fi - LDFLAGS="-lexecinfo" cmake -B build \ + LDFLAGS="$LDFLAGS -lexecinfo" cmake -B build \ -DCMAKE_BUILD_TYPE=None \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCONFDIR=/etc/$pkgname \ @@ -67,43 +74,34 @@ build() { -DENABLE_LUAJIT=OFF \ -DLUA_INCLUDE_DIR=/usr/include/lua5.3 \ -DLUA_LIBRARY=/usr/lib/lua5.3/liblua.so \ - -DENABLE_REDIRECTOR=ON \ -DENABLE_URL_INCLUDE=ON \ -DENABLE_BACKWARD=OFF \ -DENABLE_PCRE2=ON \ + -DENABLE_URL_INCLUDE=ON \ -DSYSTEM_ZSTD=ON \ -DCMAKE_CXX_FLAGS="$CXXFLAGS" \ -DCMAKE_C_FLAGS="$CFLAGS" \ "$CMAKE_CROSSOPTS" . - make -C build + cmake --build build --target all } check() { - make -C build rspamd-test + cmake --build build --target run-test } package() { - make -C build DESTDIR="$pkgdir" install + DESTDIR="$pkgdir" cmake --install build cd "$pkgdir" - local path=usr/bin - for b in rspamd rspamc rspamadm; - do - rm "$path"/$b - mv "$path"/$b-$pkgver "$path"/$b - done - mv "$path"/rspamd_stats "$path"/rspamd-stats - mkdir -p ./usr/sbin - mv usr/bin/rspamd usr/sbin/ - - mkdir -p usr/share/doc/$pkgname - mv usr/share/$pkgname/www/README.md \ - usr/share/doc/$pkgname/ + install -D usr/share/"$pkgname"/www/README.md \ + usr/share/doc/"$pkgname"/README.md + rm usr/share/"$pkgname"/www/README.md install -Dm 644 "$srcdir"/$pkgname.logrotated etc/logrotate.d/$pkgname install -Dm 755 "$srcdir"/$pkgname.initd etc/init.d/$pkgname install -Dm 644 "$srcdir"/$pkgname.confd etc/conf.d/$pkgname + install -d etc/"$pkgname"/local.d etc/"$pkgname"/override.d mkdir -p etc/$pkgname/local.d \ etc/$pkgname/override.d @@ -120,14 +118,14 @@ client() { pkgdesc="$pkgdesc (console client)" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/rspamc" "$subpkgdir/usr/bin/rspamc" + mv "$pkgdir"/usr/bin/rspamc* "$subpkgdir/usr/bin/" } libs() { pkgdesc="$pkgdesc (libraries)" - mkdir -p "$subpkgdir/usr/lib/$subpkgname" - mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$subpkgname/" + mkdir -p "$subpkgdir/usr/lib/$pkgname" + mv "$pkgdir/usr/lib/$pkgname/"*.so "$subpkgdir/usr/lib/$pkgname/" } utils() { @@ -135,41 +133,10 @@ utils() { depends="perl" mkdir -p "$subpkgdir/usr/bin" - mv "$pkgdir/usr/bin/${pkgname}-stats" "$subpkgdir/usr/bin/" -} - -fuzzy() { - pkgdesc="$pkgdesc (local fuzzy storage)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname/modules.d" - mv "$pkgdir/etc/$pkgname"/worker-fuzzy.* "$subpkgdir/etc/$pkgname/" - mv "$pkgdir/etc/$pkgname"/modules.d/fuzzy_* "$subpkgdir/etc/$pkgname/modules.d/" -} - -controller() { - pkgdesc="$pkgdesc (controller web interface)" - license="MIT" - depends="$pkgname" - - mkdir -p "$subpkgdir/usr/share/$pkgname" - mv "$pkgdir/usr/share/$pkgname/www" "$subpkgdir/usr/share/$pkgname/www" - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-controller.* "$subpkgdir/etc/$pkgname/" -} - -proxy() { - pkgdesc="$pkgdesc (milter support)" - license="Apache-2.0" - depends="$pkgname" - - mkdir -p "$subpkgdir/etc/$pkgname" - mv "$pkgdir/etc/$pkgname"/worker-proxy.* "$subpkgdir/etc/$pkgname/" + mv "$pkgdir/usr/bin/${pkgname}"_stats "$subpkgdir/usr/bin/" } -sha512sums="dda099dd9a17699d143fc8018b89fbecfa9659eccc26b5fb88bc3f40c47e935993dfc81f1f93bb69880d17af40870e6ea20edbeed7e3f4c12c278f5c12b56a51 rspamd-3.8.4.tar.gz +sha512sums="979aad9d2cc720c12922d55f4ad742b65e18d0ca52ebb764a2432bd3d64e559461c8e1fa87f7ac52e614df71d0a776aa0362a876eaa745cd3f8c21afee52b8ab rspamd-3.11.1.tar.gz 2efe28575c40d1fba84b189bb872860e744400db80dce2f6330be6c6287fb3f46e6511284729b957488bf40bcb9b0952e26df9934f5f138334bd2766075c45cb rspamd.logrotated -782e1126d32e450a1db0ac822c127b9a763f903093f200bdf603a6a0610a853671b94c89b0bb2d8ebdfb065e0cf62be51c1c7f451e8da34e25f252a276c2b0f3 rspamd.initd -a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd -0321c76b42131943f7b53efeb6bbd1c5b732fdec4f796838568af45d245066518f8b2ccd667d5a370df539ba73dda47e66d4ce0eeb211ef6fc5942e96c2e311b 10-conf-split-workers.patch" +c136126e3d3953079939b2b0b9b49f5f921af4c3aa0ad59a206632436ff963a69b5980a3b8e4eb14882d8db31d6fd96045a9e1cd6302ad111d76b8e92fab890e rspamd.initd +a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd" diff --git a/user/rspamd/rspamd.initd b/user/rspamd/rspamd.initd index aaa40428b..cf0ea79ab 100644 --- a/user/rspamd/rspamd.initd +++ b/user/rspamd/rspamd.initd @@ -13,7 +13,7 @@ description_reopen="Reopen log files" : ${cfgfile:=${RSPAMD_CONFIG:-/etc/rspamd/rspamd.conf}} : ${startuplog:=${RSPAMD_STARTUPLOG:-/dev/null}} -command="/usr/sbin/rspamd" +command="/usr/bin/rspamd" command_args="--config $cfgfile --no-fork ${command_args:-}" command_background="yes" pidfile="/run/rspamd/$RC_SVCNAME.pid" diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD index 58de23ace..cbccc10cf 100644 --- a/user/s6-dns/APKBUILD +++ b/user/s6-dns/APKBUILD @@ -1,36 +1,34 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-dns -pkgver=2.4.0.0 +pkgver=2.4.1.0 pkgrel=0 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities" url="https://skarnet.org/software/s6-dns/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-dns.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ --enable-shared \ --disable-allstatic \ --prefix=/usr \ - --libexecdir="/usr/lib/$pkgname" + --libexecdir="/usr/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig make } package() { make DESTDIR="$pkgdir" install mkdir -p -m 0755 "$pkgdir/usr/share/doc" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="6c9eb8ad4501ac20733747ae0065ed1d19abd2c61e29e98fc6d0421367ec9ece951daea287e4ec8c4301a74b6f96b8a0e376b4b3ba046cca515b8b57d69600e2 s6-dns-2.4.0.0.tar.gz -fd93571da2d2a6c2dea00219414f9ee5fe3bc09a4a6a7fd002b9251c22ff682eddfeff4bf9c6c90d8b02681fc8117328a1fd9689839ab457d354870c522bf5e7 s6-dns.pc.in" +sha512sums="48e8c6b0bf0704b674f56267ea3e4b7261bbc6344b121ec87053a9a7e2f4740e5e90ec60eaaa96a1e0fe08f82f4f8ffd8b29d4d097a1a108d9bcbaae0de3905b s6-dns-2.4.1.0.tar.gz" diff --git a/user/s6-dns/s6-dns.pc.in b/user/s6-dns/s6-dns.pc.in deleted file mode 100644 index 1edd81bca..000000000 --- a/user/s6-dns/s6-dns.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-dns -Description: A DNS client library for sync+async single-threaded resolution -URL: https://skarnet.org/software/s6-dns/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6dns diff --git a/user/s6-linux-utils/APKBUILD b/user/s6-linux-utils/APKBUILD index c9ca33c70..6dcd1feb8 100644 --- a/user/s6-linux-utils/APKBUILD +++ b/user/s6-linux-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-linux-utils -pkgver=2.6.2.1 +pkgver=2.6.3.0 pkgrel=0 pkgdesc="skarnet.org's Linux-specific miscellaneous utilities" url="https://skarnet.org/software/s6-linux-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="d3f796c1edc0de6e289b7b82e8c97ea58e80d0bcb2e4731a5c2c25cf4abfbd91318e33ab48956bc6e7b2f188c622bb33def72e96f22f9448778ede5ac829c940 s6-linux-utils-2.6.2.1.tar.gz" +sha512sums="ddd8f96d637b25d3f846d546145325a8cb78a3ba3cbf897649f924ee739c7dbe891907f886dd25f11d0354b40022fe7d16b1907044716d05720e8fd6c0171e60 s6-linux-utils-2.6.3.0.tar.gz" diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD index 75dcd1f64..b6757a898 100644 --- a/user/s6-networking/APKBUILD +++ b/user/s6-networking/APKBUILD @@ -1,23 +1,22 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-networking -pkgver=2.7.0.4 +pkgver=2.7.1.0 pkgrel=0 pkgdesc="skarnet.org's UCSPI TCP and TLS tools, access control tools, and network time management utilities." url="https://skarnet.org/software/s6-networking/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6dns_version=2.4.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6dns_version=2.4.1 _bearssl_version=0.6 depends="execline" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev execline-dev>=$_execline_version s6-dev>=$_s6_version s6-dns-dev>=$_s6dns_version bearssl-dev>=$_bearssl_version" subpackages="$pkgname-dev $pkgname-libs $pkgname-doc" -source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz s6-networking.pc.in" +source="https://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz" build() { ./configure \ @@ -25,17 +24,16 @@ build() { --disable-allstatic \ --prefix=/usr \ --libexecdir="/usr/lib/$pkgname" \ + --with-pkgconfig \ + --enable-pkgconfig \ --enable-ssl=bearssl make } package() { make DESTDIR="$pkgdir" install - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" mkdir -p -m 0755 "$pkgdir/usr/share/doc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="2a789cbc2f901e78fffb959fcbddf89c71de75c0d57d3fb1a927418fa8a43f71057c2b50b03e15aa45d5d7ee6521e76b697ae57eef2b7eea760ef9295314dc9b s6-networking-2.7.0.4.tar.gz -d6a17ebe194c4ffb1c402fec7589e34961b2b73cd4b380c2ffe9e7d74667d150f4c200cfc6f2e07e44eb14fbb8c51d0e1d2f39c284553472c5b4ae1137381d9f s6-networking.pc.in" +sha512sums="33741efa5c1908f8e7396929df08c3591e25b7c58335b331a146db17a9b7e5c00b75dd3337aa46114723969b8490fb1b6754a25357003780bdfd0a2fd8e3283c s6-networking-2.7.1.0.tar.gz" diff --git a/user/s6-networking/s6-networking.pc.in b/user/s6-networking/s6-networking.pc.in deleted file mode 100644 index d0a288192..000000000 --- a/user/s6-networking/s6-networking.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: s6-networking -Description: A C interface to some rfc1413 functions -URL: https://skarnet.org/software/s6-networking/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ls6net diff --git a/user/s6-portable-utils/APKBUILD b/user/s6-portable-utils/APKBUILD index 9752d687c..6d0909f02 100644 --- a/user/s6-portable-utils/APKBUILD +++ b/user/s6-portable-utils/APKBUILD @@ -1,14 +1,13 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=s6-portable-utils -pkgver=2.3.0.4 +pkgver=2.3.1.0 pkgrel=0 pkgdesc="skarnet.org's portable miscellaneous utilities" url="https://skarnet.org/software/s6-portable-utils/" arch="all" options="!check" license="ISC" -_skalibs_version=2.14.3 +_skalibs_version=2.14.4 depends="" makedepends="skalibs-dev>=$_skalibs_version" subpackages="$pkgname-doc" @@ -18,7 +17,9 @@ build() { ./configure \ --disable-allstatic \ --prefix=/usr \ - --with-dynlib=/lib + --with-dynlib=/lib \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -28,4 +29,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="0da4fb637f414d870e0476a01c08448b021d2c20c9a4746ab1c6c700e8eeb055d57f6e8326228694463483cd307e308f8fe148a615232039f32dcf351d5060ec s6-portable-utils-2.3.0.4.tar.gz" +sha512sums="80ab6152d5c3f88449d77924ceb43ccef12a41918d2fd8042ded15423b8f65e612d582c6475d73c500380018a91f7adc48c71740c898015565a046a8fbef1cd5 s6-portable-utils-2.3.1.0.tar.gz" diff --git a/user/sdl2/APKBUILD b/user/sdl2/APKBUILD index 22026bb6c..6e380a778 100644 --- a/user/sdl2/APKBUILD +++ b/user/sdl2/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sdl2 pkgver=2.0.22 -pkgrel=0 +pkgrel=1 pkgdesc="Low level audio, keyboard, mouse, joystick and graphics library" url="https://www.libsdl.org/" arch="all" @@ -15,6 +15,7 @@ makedepends="alsa-lib-dev libx11-dev libxcursor-dev libxext-dev libxi-dev libxinerama-dev wayland-dev wayland-protocols" subpackages="$pkgname-dev" source="https://www.libsdl.org/release/SDL2-$pkgver.tar.gz + altivec-detection.patch sdl2-soname.patch " builddir="$srcdir/SDL2-$pkgver" @@ -39,4 +40,5 @@ package() { } sha512sums="ca4b690433cd4d9d73b797da98666317128e7e817ab60e874a49d94791ea41e8a6b4fc43649593120daa0702190c0f8a6ed326c908d87375c8da9f369d994f6a SDL2-2.0.22.tar.gz +f7ca983c0450e95a760041c5c329e715bb513100efbd12c2469fd283e7ca4d3643b8180d6d5e64c66075ea03e1e88364853aa76d3db6dbcc8d22e8eb385881d6 altivec-detection.patch 81b5807cd9f2683231c14562e961467fcd7ba257140d1a266932d6a6a5103633e3af896c09b261620b2934d521809e08ed79d3287c0897f4783c6afc1c01a566 sdl2-soname.patch" diff --git a/user/sdl2/altivec-detection.patch b/user/sdl2/altivec-detection.patch new file mode 100644 index 000000000..ccb60a375 --- /dev/null +++ b/user/sdl2/altivec-detection.patch @@ -0,0 +1,22 @@ +Use getauxval on Linux if available. + +--- SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c.old 2022-01-08 02:29:52.000000000 +0000 ++++ SDL2-2.0.22/src/cpuinfo/SDL_cpuinfo.c 2025-04-27 18:58:12.097867624 +0000 +@@ -113,7 +113,7 @@ + #define CPU_HAS_AVX512F (1 << 12) + #define CPU_HAS_ARM_SIMD (1 << 13) + +-#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ ++#if SDL_ALTIVEC_BLITTERS && HAVE_SETJMP && !__MACOSX__ && !__OpenBSD__ && !__FreeBSD__ && !__linux__ + /* This is the brute force way of detecting instruction sets... + the idea is borrowed from the libmpeg2 library - thanks! + */ +@@ -333,6 +333,8 @@ + elf_aux_info(AT_HWCAP, &cpufeatures, sizeof(cpufeatures)); + altivec = cpufeatures & PPC_FEATURE_HAS_ALTIVEC; + return altivec; ++#elif defined(__linux__) && defined(__powerpc__) && HAVE_GETAUXVAL ++ altivec = getauxval(AT_HWCAP) & PPC_FEATURE_HAS_ALTIVEC; + #elif SDL_ALTIVEC_BLITTERS && HAVE_SETJMP + void (*handler) (int sig); + handler = signal(SIGILL, illegal_instruction); diff --git a/user/smtpd-starttls-proxy/APKBUILD b/user/smtpd-starttls-proxy/APKBUILD index d0e3a8a8a..7896f97e2 100644 --- a/user/smtpd-starttls-proxy/APKBUILD +++ b/user/smtpd-starttls-proxy/APKBUILD @@ -1,16 +1,15 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=smtpd-starttls-proxy -pkgver=0.0.1.5 +pkgver=0.0.2.0 pkgrel=0 pkgdesc="An SMTP proxy implementing STARTTLS" url="https://skarnet.org/software/smtpd-starttls-proxy/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="s6>=$_s6_version s6-networking>=$_s6net_version" makedepends="skalibs-dev>=$_skalibs_version s6-dev" subpackages="$pkgname-dev $pkgname-doc" @@ -19,7 +18,9 @@ source="https://skarnet.org/software/smtpd-starttls-proxy/smtpd-starttls-proxy-$ build() { ./configure \ --disable-allstatic \ - --prefix=/usr + --prefix=/usr \ + --with-pkgconfig \ + --enable-pkgconfig make } @@ -29,4 +30,4 @@ package() { cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } -sha512sums="228b4f15abdf94a814e03c57f3c6eacf604575128710e26921e8010d73c97ed2ff717185bc06b6bfd1e380f34201154a85b9864a7aef4881b3e0329948cc608e smtpd-starttls-proxy-0.0.1.5.tar.gz" +sha512sums="e13bd72c0afdbe6e6673867b1d7354aa7067f755eebd3db32ecbaef2759e3db626954cacf4cb70d8aaea8899bf7c22a997f797f9991978890399ccfcb55de483 smtpd-starttls-proxy-0.0.2.0.tar.gz" diff --git a/user/thunderbird/APKBUILD b/user/thunderbird/APKBUILD index 319eba9f3..21b415dc6 100644 --- a/user/thunderbird/APKBUILD +++ b/user/thunderbird/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=thunderbird -pkgver=128.4.0 +pkgver=128.10.1 pkgrel=0 _llvmver=18 pkgdesc="Email client from Mozilla" @@ -154,7 +154,7 @@ package() { ${pkgdir}/usr/share/applications/thunderbird.desktop } -sha512sums="ad031b3a9b738598358cead23cf8438435016222cd9a474c31892dc1b3db43d2d5d3a10c9639df770dc76eb3c0bc9db8be8beab84828d54ee50fc1e03f0da0a5 thunderbird-128.4.0esr.source.tar.xz +sha512sums="09b54450928c6e0d948cd79a56c28bdb5fe5a81d7c710470a1ec195dd295c433b872682102c74930f19b1184391c30115293dadcd7dc8a08ae8baeb12770ef9c thunderbird-128.10.1esr.source.tar.xz fec4e343db973f90a38cc86e145c8ab0c8bec8f6eed36ff47f9986b154ea44f0e72ea1b5c9862e772505b3371dc0a9265fa1a6bed59007a5845a1dc622fce4e8 mozconfig 1fff71be77aa34791ef8aa972b5dc5f131d79f4b895ebbfb59bc223078764d6f79c82a3a4e4c717a3893ecbe4907d556f27e97d2692e41f02365f06da759a71a bad-google-code.patch 5e6c3fa027052cc43ba161cf5c12016b07723e7c0b002a42431bbd5d716d512d5245ab6befbb56c37c7d244441533f810f4e7b583f83bbe965981931f1435a94 fix-mutex-build.patch @@ -170,6 +170,6 @@ c2248297df00633771da7e6b9f2caba3dd5108d93617f652fa8b2fb4e6975821e5fee866c00713f8 11f7ce86376b54281082fa5b9d3fefee8046eabe38a0ec17266764b4f62cb90f4744245c1ca93d73ed74cf81c066dab7ddcb3fe9704be8f91e0a2a4f664b203a skia-endian.patch a6a14104ee6985867efb1937a262aba1538ed4b069bba56e400d75f51d84d29363d8bbb2183ee27785758ad3a8b8ae4350e23dc854d50c92cb2147eddf83b9bb skia-unified.patch 9df89366bd51670f534591e4c169186703ad3166a493f522e58f129fb79af375d71baaf0f6b238126792118a2d3ed0f011b010e39497ab5901ee5bea63a84fa2 stackwalk-x86-ppc.patch -e1d9e30a1c8d1c6bdd3530183400d7d245e437ce18bb5b262bec1d01932b02b8eaededd892efcdd277eaccb357aede4537972382be9f00eedf1785acebbd1ca6 webrender.patch +7d6c5f3cafd29eae4e7c5433b14f49cc679eebdcb4e602af18819f685500747a6daa8d38fbb0f91878331b14ce299ca8b731f62ab013b69e579fc450b29fe743 webrender.patch ed78e15030d79b10026ebae26e44a68d16c2a8567082072b5099b0dde4f79ae217a21737e0d9c7ec6a3cc99de3ab3c9083cca7d82889d559bb18cc15fa7e6f2a without-jit.patch 95a2b1deb4f6c90750fdd2bfe8ca0a7879a5b267965091705a6beb0a0a4b1ccad75d11df7b9885543ca4232ff704e975c6946f4c11804cb71c471e06f9576001 thunderbird.desktop" diff --git a/user/thunderbird/webrender.patch b/user/thunderbird/webrender.patch index e6b145956..cfc920cfd 100644 --- a/user/thunderbird/webrender.patch +++ b/user/thunderbird/webrender.patch @@ -8,7 +8,7 @@ Bug 1716707 [s390x] Software WebRender does not support big endian --- firefox-128.0/image/imgFrame.cpp +++ firefox-128.0/image/imgFrame.cpp -@@ -372,6 +372,17 @@ mAborted = true; +@@ -382,6 +382,17 @@ mAborted = true; return NS_ERROR_OUT_OF_MEMORY; } diff --git a/user/tipidee/APKBUILD b/user/tipidee/APKBUILD index 035f0e95f..a4b9a855b 100644 --- a/user/tipidee/APKBUILD +++ b/user/tipidee/APKBUILD @@ -1,17 +1,16 @@ -# Contributor: Laurent Bercot <ska-adelie@skarnet.org> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=tipidee -pkgver=0.0.5.1 +pkgver=0.0.6.0 pkgrel=0 pkgdesc="The skarnet.org web server" url="https://skarnet.org/software/tipidee/" arch="all" options="!check" # No test suite. license="ISC" -_skalibs_version=2.14.3 -_execline_version=2.9.6 -_s6_version=2.13.1 -_s6net_version=2.7.0 +_skalibs_version=2.14.4 +_execline_version=2.9.7 +_s6_version=2.13.2 +_s6net_version=2.7.1 depends="execline>=$_execline_version s6>=$_s6_version s6-networking>=$_s6net_version" depends_dev="skalibs-dev>=$_skalibs_version" makedepends="$depends_dev" @@ -24,7 +23,6 @@ source=" tipidee.conf tipidee.confd tipidee.initd - tipidee.pc.in " install=" tipidee.pre-install @@ -40,6 +38,8 @@ build() { --disable-allstatic \ --prefix=/usr \ --sysconfdir=/etc \ + --with-pkgconfig \ + --enable-pkgconfig \ --libexecdir="/usr/lib/$pkgname" make } @@ -69,8 +69,6 @@ package() { install -m 0644 -D "$srcdir/tipidee.conf" "$pkgdir/etc/tipidee.conf" install -m 0644 -D "$srcdir/tipidee.confd" "$pkgdir/etc/conf.d/tipidee" install -m 0755 -D "$srcdir/tipidee.initd" "$pkgdir/etc/init.d/tipidee" - sed -e "s/@@VERSION@@/$pkgver/g; s/@@SKALIBS_VERSION@@/${_skalibs_version}/g;" "$srcdir/$pkgname.pc.in" > "$srcdir/$pkgname.pc" - install -D -m 0644 "$srcdir/$pkgname.pc" "$pkgdir/usr/lib/pkgconfig/$pkgname.pc" cp -a "$builddir/doc" "$pkgdir/usr/share/doc/$pkgname" } @@ -81,11 +79,10 @@ dev() { mv "$subpkgdir/usr/bin/tipidee-config" "$pkgdir/usr/bin/tipidee-config" } -sha512sums="2f0ae2b3f7c7782785e8498e482bb4cfbb58c0bbe1689b2d3a5a4970783704147e8e5b96737970e2a542ee409e2b179a199a990fbf20b3ea4083cd47d16960cf tipidee-0.0.5.1.tar.gz +sha512sums="1a8ae1f7293fc7a1db1f0f4dd0752388f58e134c3f0847a768cf56e2e5a21b7d037f71f3d9e4ff16ab986c699d39827e53b467c8b13b0b9dad41b6fd742c9a5c tipidee-0.0.6.0.tar.gz 560048b2b767053770e37ce3fd69540f2fad23236f012da115c1f985240f42d0bb7809630d8991e39169e255e3d36ebfdc85f895d16675119a95d3a6e64fd2b2 httpd.run 1c9333785c63662039580504dd36af21d05eb9972e6770af17e87e062bd7d9fa67695f4120221e241e10503ca0fb3b5347f032b6c1eef309f2ff8cd636266f2b httpsd.run b5af306fe7040f966b13da84bfb0c4b528683c03205519d08fe429ee826ffad27c9ddb32be8c8bf8b42ce7964ef15572e3c66a96494aed833ee951c769f81bd2 logger.run bb2681a3000133724bb8fd4918bc3209ea676c2e4f96ad8b298d8e7302aeebd6876341ea205f2d808f34e4c9b5c138bba032694c6069c17026b0ddf23702f9ba tipidee.conf 7a999200ad21b2b0737ce82136bc8e055d7ab4a865b7727e6dc8df0eaeea6ace11eb5756b64231ce7938d11b5ec218944173ea1df3db059d033bf3f848c9a608 tipidee.confd -5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd -21e71ed438270598de55631c46006bcb66528889477d1a09c76db4160d46651b1c657b31913393115c01aae4853afa4fe425a6fb3985ea8fa403de1d36e3f2f1 tipidee.pc.in" +5001d079b1ca7920d163cc2d58a5855e2740e72ed85df25414b4719c52133bd0f2f9e69c63c57f31645159189fc046c7d213048fc1cbd0f640336e43874e4482 tipidee.initd" diff --git a/user/tipidee/tipidee.pc.in b/user/tipidee/tipidee.pc.in deleted file mode 100644 index e200f758a..000000000 --- a/user/tipidee/tipidee.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: tipidee -Description: A C interface to some HTTP server functions -URL: https://skarnet.org/software/tipidee/ -Version: @@VERSION@@ -Requires.private: skalibs >= @@SKALIBS_VERSION@@ -Libs: -ltipidee diff --git a/user/wayland-protocols/APKBUILD b/user/wayland-protocols/APKBUILD index 3c5e8da43..b5af36542 100644 --- a/user/wayland-protocols/APKBUILD +++ b/user/wayland-protocols/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net> # Maintainer: Sile Ekaterin Liszka <sheila@vulpine.house> pkgname=wayland-protocols -pkgver=1.38 +pkgver=1.42 pkgrel=0 pkgdesc="Protocols and protocol extensions complementing the Wayland core protocol" url="https://wayland.freedesktop.org" @@ -35,5 +35,5 @@ package() { DESTDIR="$pkgdir" ninja -C build install } -sha512sums="43fc36d35bedb245deed0e2de246f42d2bbfa6ecafa094f2a7fb103d6df8ae28f3cc200bc5aa24745b9131a28381883c24779da0a6d9ac954753bd5ebb1405db wayland-protocols-1.38.tar.xz +sha512sums="ce85fecbe886264eaeb34c7992d4e493295f57f6213d5a2ec04b3471daee04a4225b1a7e77a27ccf39306074780553ec1383c55af30cc2c78942b40cc5777c1b wayland-protocols-1.42.tar.xz adf31ede543514317d57dbd4966034ffbd03e0745701d69c9a852d4b8388542fbb350ce3b32020192dfdbe90fe3a9a1e0ce1d472d9a8be695006652b704ab3f6 tests.patch" diff --git a/user/waypipe/0.9.2-fix-compile.patch b/user/waypipe/0.9.2-fix-compile.patch new file mode 100644 index 000000000..096e4851b --- /dev/null +++ b/user/waypipe/0.9.2-fix-compile.patch @@ -0,0 +1,11 @@ +diff '--color=auto' -Nurd waypipe-v0.9.2/src/secctx.c waypipe-v0.9.2.new/src/secctx.c +--- waypipe-v0.9.2/src/secctx.c 2024-11-18 14:29:20.000000000 -0800 ++++ waypipe-v0.9.2.new/src/secctx.c 2024-11-25 10:20:47.643421280 -0800 +@@ -2,6 +2,7 @@ + #include "util.h" + #include <sys/socket.h> + #include <sys/un.h> ++#include <string.h> + #include <unistd.h> + #include <wayland-client.h> + diff --git a/user/waypipe/APKBUILD b/user/waypipe/APKBUILD new file mode 100644 index 000000000..311c4e8c6 --- /dev/null +++ b/user/waypipe/APKBUILD @@ -0,0 +1,37 @@ +# Contributor: Síle Ekaterin Liszka <sheila@vulpine.house> +# Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> +pkgname=waypipe +pkgver=0.9.2 +pkgrel=0 +pkgdesc="proxy for Wayland clients" +url="https://gitlab.freedesktop.org/mstoeckl/waypipe" +arch="all" +license="MIT" +depends="" +makedepends="ffmpeg-dev libdrm-dev libva-dev lz4-dev mesa-dev meson scdoc wayland-dev wayland-protocols" +subpackages="$pkgname-doc" +source="https://gitlab.freedesktop.org/mstoeckl/waypipe/-/archive/v$pkgver/$pkgname-v$pkgver.tar.bz2 + 0.9.2-fix-compile.patch" +builddir="$srcdir/$pkgname-v$pkgver" + +build() { + meson setup \ + --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --localstatedir=/var \ + --buildtype=release \ + . output + meson compile -C output +} + +check() { + meson test -C output +} + +package() { + DESTDIR="$pkgdir" meson install -C output +} + +sha512sums="0ffdb49cb5dbee717798721505e4661710fcd234a55bbfe2452888024d4a8b99a0e0e99cdce23ba0b92ee456aeb9f14324baba1c7c5724cb8cca7bb6e9c276bb waypipe-v0.9.2.tar.bz2 +30c818075c95b198d351cad94e48e3d7eb3dc18f9b38964c2090483131365bf37f7eeb12ba89f17822c8cab9dbb658e7e2efcc81f0433e79c9a2cdb8bbf92dc6 0.9.2-fix-compile.patch" diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD index ece7397aa..a874bdf9e 100644 --- a/user/wireguard-tools/APKBUILD +++ b/user/wireguard-tools/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Mira Ressel <aranea@aixah.de> # Maintainer: Laurent Bercot <ska-adelie@skarnet.org> pkgname=wireguard-tools -pkgver=1.0.20210424 +pkgver=1.0.20210914 pkgrel=0 pkgdesc="Userland tools for the WireGuard VPN" url="https://www.wireguard.com/" @@ -29,4 +29,4 @@ bashcomp() { mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/" } -sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59 wireguard-tools-1.0.20210424.tar.xz" +sha512sums="6727ea65551dbb064457449b93a943bd6534ca93bc7fa5704c2f6826266c98688ee9ea28731fda57a5245d5f63c05f3899fcca54e40c0b6251b7c4796e957445 wireguard-tools-1.0.20210914.tar.xz" |