README.md

@@ -12,7 +12,7 @@ If you want to contribute, please read the
 and feel free to either submit a merge request on
 [GitLab](https://gitlab.alpinelinux.org/alpine/aports),
 or to submit a git patch on the Alpine aports mailing list
-(~alpine/aports@lists.alpinelinux.org). (note: this mailing list is presently not functional)
+([~alpine/aports@lists.alpinelinux.org](mailto:~alpine/aports@lists.alpinelinux.org)). (note: this mailing list is presently not functional)
 
 ## Repositories
 

testing/actionlint/APKBUILD → community/actionlint/APKBUILD

 # Contributor: Galen Abell <galen@galenabell.com>
 # Maintainer: Galen Abell <galen@galenabell.com>
 pkgname=actionlint
-pkgver=1.6.27
-pkgrel=2
+pkgver=1.7.0
+pkgrel=0
 pkgdesc="Static checker for GitHub Actions workflow files"
 url="https://github.com/rhysd/actionlint"
 arch="all"
@@ -34,5 +34,5 @@ package() {
 }
 
 sha512sums="
-53427f8f676c489cda56ba2a3fc03d3955cb96d038a2127a46bb3372de47910bf54585e643fbc90f7b3bd3cfbba1c9801b993cad023846d1815814a1108de763  actionlint-1.6.27.tar.gz
+5d465c8f87c205f2a727f90a972ecd8ef345f56313990598714d07ef208a9b9cf868a6f3ba211ccc9ff102e93cb99e39109f0473bd1a33ea4961681a2dd549f5  actionlint-1.7.0.tar.gz
 "

community/alembic/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Leon Marz <main@lmarz.org>
 pkgname=alembic
 pkgver=1.8.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Open framework for storing and sharing scene data"
 url="https://www.alembic.io/"
 arch="all !s390x" # alembic does not support big-endian, which s390x uses

community/apache-mod-md/APKBUILD

@@ -18,6 +18,11 @@ source="https://github.com/icing/mod_md/releases/download/v$pkgver/mod_md-$pkgve
 builddir="$srcdir/mod_md-$pkgver"
 options="!check" # TODO
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \

community/blender/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=blender
 pkgver=4.1.1
 _pkgver=${pkgver%.[0-9]}
-pkgrel=1
+pkgrel=2
 _llvmver=17
 pkgdesc="3D Creation/Animation/Publishing System"
 url="https://www.blender.org/"

community/boca/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=boca
 pkgver=1.0.7
-pkgrel=0
+pkgrel=1
 arch="all"
 url="https://github.com/enzo1982/boca"
 pkgdesc="A component library used by the fre:ac audio converter"

community/catch2-3/APKBUILD

 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer:
 pkgname=catch2-3
-pkgver=3.5.4
+pkgver=3.6.0
 pkgrel=0
 arch="all"
 url="https://github.com/catchorg/Catch2"
@@ -35,5 +35,5 @@ package() {
 }
 
 sha512sums="
-c22ad6a2fbf8665b8775d72dcdc6bfde324eb224fcd897ebce5e62c7ac7640823550198fff45e1ea548a5923db4392ce7009ff784ef78bd59356a2aae5337976  catch2-v3.5.4.tar.gz
+09c728a04d69b0692d6e2f7ceb5889dc69309406c27f7f2b5d383245a5357657c5540dd64a7a4a6e19388bda68105002425286468578b69b20e3a75366871ce2  catch2-v3.6.0.tar.gz
 "

community/celery/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=celery
 pkgver=5.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An asynchronous task queue/job queue based on distributed message passing"
 url="http://www.celeryproject.org/"
 arch="noarch"
@@ -73,5 +73,5 @@ package() {
 sha512sums="
 e59b62878f7da0af79be13df816e899c948f71f1063643baaabc1244dd44fd3114a5b3d724c010307ca8091c6b4343a4322213bc6154b843b79893b8f772476c  celery-5.4.0.tar.gz
 c283956f8fe386ef39cb3e165a20d1cc7ff6398fbf5a922bec6b61fe4a71188519baed9feafc4e0e5b6864851545edaba54b89ba3613b2cf2ddd6426a6bf8fc2  celery.confd
-3e5e2c6a55672bc0a02fca93ad334c694066c636ed62f2b55cb8f27b9301c429d68ce53667ec744b9b152ec786de7aea90cc05a143d6942cf5d2f34e51ca4089  celery.initd
+a27cc3521cdf79ec60b15318c15679fe8f593c029c3ead53b162453ab9e86c05c57f7e4af843d69f17817a707db885f2c44d3b7f56337676dfc2ec0210bf38b7  celery.initd
 "

community/celery/celery.initd

@@ -11,6 +11,6 @@ supervise_daemon_args="-u $CELERY_USER -g $CELERY_GROUP"
 command=/usr/bin/celery
 command_args="${CELERY_OPTS}"
 
-depends() {
+depend() {
 	use net
 }

community/chatty/APKBUILD

@@ -4,14 +4,13 @@
 # Contributor: Mike Banon <mikebdp2@gmail.com>
 # Maintainer: Clayton Craft <clayton@craftyguy.net>
 pkgname=chatty
-pkgver=0.8.2
+pkgver=0.8.3
 pkgrel=0
-_libcmatrix=702b894675f12ecd43439b3b3eee66cc74899b82
-_libgd=c7c7ff4e05d3fe82854219091cf116cce6b19de0
+_libcmatrix=6c260ee37bd2eff096ee44c29690f30718566c1c
 pkgdesc="XMPP and SMS messaging via libpurple and Modemmanager"
 # s390x: doubt anyone would use a mainframe for texting
 arch="all !s390x"
-url="https://source.puri.sm/Librem5/chatty"
+url="https://gitlab.gnome.org/World/Chatty"
 license="GPL-3.0-or-later"
 depends="
 	cyrus-sasl
@@ -29,6 +28,7 @@ makedepends="
 	gspell-dev
 	gstreamer-dev
 	gtk4.0-dev
+	gtksourceview5-dev
 	libadwaita-dev
 	libgee-dev
 	libphonenumber-dev
@@ -40,7 +40,6 @@ makedepends="
 checkdepends="appstream-glib desktop-file-utils"
 source="https://gitlab.gnome.org/World/Chatty/-/archive/v$pkgver/Chatty-v$pkgver.tar.gz
 	https://source.puri.sm/Librem5/libcmatrix/-/archive/$_libcmatrix/libcmatrix-$_libcmatrix.tar.gz
-	https://gitlab.gnome.org/GNOME/libgd/-/archive/$_libgd/libgd-$_libgd.tar.gz
 	"
 
 subpackages="$pkgname-lang $pkgname-bash-completion $pkgname-dbg"
@@ -48,9 +47,7 @@ options="!check" # Requires running Wayland compositor
 builddir="$srcdir/Chatty-v$pkgver"
 
 prepare() {
-	rm -rf "$builddir"/subprojects/libgd
 	rm -rf "$builddir"/subprojects/libcmatrix
-	mv "$srcdir"/libgd-$_libgd "$builddir"/subprojects/libgd
 	mv "$srcdir"/libcmatrix-$_libcmatrix "$builddir"/subprojects/libcmatrix
 
 	default_prepare
@@ -68,7 +65,6 @@ package() {
 }
 
 sha512sums="
-5422fb413d7ccaa0012daa61d227f26a6f1addc48934750b82b7a269439f1219a1794c52df95a2e9f564327b62cb64fc09afa994140913920dd32e6dccf27e1d  Chatty-v0.8.2.tar.gz
-9fc66c3f5115c54af76cf90f191c4b7dd78d22ba160feadefefa32590deea01a51aa670fa34b1f849de35dbf95ab4a4c0dc2160db827636e89bd7a2e22b0a188  libcmatrix-702b894675f12ecd43439b3b3eee66cc74899b82.tar.gz
-681cc23b5a33df88a92e3aac33d0dba1c6ebb69a2bd6f15b6ae31f0b444c108f7bfd1391e604433be58d82c0032028b112652d3d0c473abe4db02d66c55cdef3  libgd-c7c7ff4e05d3fe82854219091cf116cce6b19de0.tar.gz
+efb0a0efdc275878953bda4cfba96878f0d3590362b29631b4dc05b8346f7ef91ba420be9b67b6c53ee04e75636db59637ca701e7fb0488ba6827c9e1a138c26  Chatty-v0.8.3.tar.gz
+19dda48dcad027a737dae4031c5556bd42c204c45c7a870192b0ce3e61e211484cb52b3a8cce576ee757cda37c1a7cbef6746304b9d80efe103d2df7a2b199c2  libcmatrix-6c260ee37bd2eff096ee44c29690f30718566c1c.tar.gz
 "

community/chromium/APKBUILD

@@ -3,7 +3,7 @@
 # Contributor: Elly Fong-Jones <elly@elly.town>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=chromium
-pkgver=124.0.6367.78
+pkgver=124.0.6367.155
 pkgrel=0
 _copium_tag=124.6
 # https://source.chromium.org/chromium/chromium/src/+/main:third_party/test_fonts/test_fonts.tar.gz.sha1
@@ -151,7 +151,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/chrom
 	yes-musl.patch
 	"
 _copium_patches="
-	cr124-fix-ozone-platform-hint.patch
 	cr124-iwyu-sys-select-dawn-terminal.patch
 	cr124-libwebp-shim-sharpyuv.patch
 	"
@@ -876,8 +875,8 @@ swiftshader() {
 }
 
 sha512sums="
-ff8d3161568875661ae343c40826dab62fc05e83c97a2d194da1b388d1ed3eaa233939c60df97a4dfc0857d3145c4db7779d3a34c65473880d8f9e15b6052629  chromium-124.0.6367.78.tar.xz
-2285730acfd1d515c197d284739e56afadd00db13b2da5ec22341e2cdbaea58f3c949572774709389f405ef82c8966131819d7e89d4f34f9fa8b80aa66717748  chromium-124.0.6367.78-testdata.tar.xz
+632158c82c44c67b4d7e67c646f671f2ae4344d40759cca4269c024c1ad2be2740e67dbf0e4200a4da996d7234f0ef5c51a20c90433612775ddf7d5f94e1ae09  chromium-124.0.6367.155.tar.xz
+4c04830cd1280011174adfc9aaa9de466ab4bb67a54fac1a19ead78c5229ea978f0c6e3078449688f475f4c7bd733a4fd1819c6be930c4a4d3abb4814c4a3de9  chromium-124.0.6367.155-testdata.tar.xz
 bbc928e99ebcd4d953b982688b01526cb754bad018f67be9e777a4f8ac51cdd3e01374e5a63faf55b12e7cee0d52816c88062e012b5bcc4f9bb41f28d8e0b7f7  test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz
 c6293916e1780ba69686a5c629063c14b22cb1773aa207487e46ee74f4d1da61b47fffb8b9a2bc6f389d062882d5a8f9212693ed9b28f2c314364bb5e3c08e20  copium-124.6.tar.gz
 1b16564f85a03f3eb934ec51289dc6159e2454202d40f48354f947d6ceffac8889e9eb4c0f4dfaafb3a15101566d54039f832bc9a8433c3c463e2d1dac2d2acc  chromium-launcher.sh

community/codeblocks/APKBUILD

 # Maintainer: Antoni Aloy <aaloytorrens@gmail.com>
 pkgname=codeblocks
 pkgver=20.03
-pkgrel=6
+pkgrel=7
 pkgdesc="Cross-platform C/C++ and Fortran IDE"
 url="https://codeblocks.org"
 # riscv64: ftbfs
-arch="all !riscv64"
+#arch="all !riscv64"
+arch=""
 license="GPL-3.0-or-later"
 makedepends="
 	autoconf

community/cogl/APKBUILD

@@ -27,6 +27,11 @@ makedepends="
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.gnome.org/sources/cogl/${pkgver%.*}/cogl-$pkgver.tar.xz"
 
+prepare() {
+	default_prepare
+	update_config_sub
+}
+
 build() {
 	./configure \
 		--build=$CBUILD \

community/confy/APKBUILD

 # Contributor: Paper <paper@tilde.institute>
 # Maintainer: Paper <paper@tilde.institute>
 pkgname=confy
-pkgver=0.6.5
-pkgrel=2
+pkgver=0.7.0
+pkgrel=0
 pkgdesc="Conferences schedule viewer for GNOME"
 url="https://confy.kirgroup.net/"
 license="GPL-3.0-or-later"
-arch="noarch"
+# s390x: blueprint-compiler program has crashed
+arch="noarch !s390x"
 depends="
-	gtk+3.0
+	gtk4.0
 	py3-gobject3
 	py3-icalendar
-	libhandy1
+	libadwaita
 	libnotify
 	"
+checkdepends="desktop-file-utils"
 makedepends="
+	blueprint-compiler
 	gettext-dev
 	glib-dev
 	meson
 	"
 source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~fabrixxm/confy/archive/$pkgver.tar.gz"
-options="!check"  # no tests
 subpackages="$pkgname-lang $pkgname-pyc"
 
 build() {
@@ -28,10 +30,14 @@ build() {
 	meson compile -C output
 }
 
+check() {
+	meson test --no-rebuild --print-errorlogs -C output
+}
+
 package() {
 	DESTDIR="$pkgdir" meson install -C output
 }
 
 sha512sums="
-1baac4fe3467bd8aaf0f42fe9ca79fb65b2682fc8ff52e92782a6e6a28afd559218732bc5e5ae8b4b4dec294ce463f0216858ae11d0b60ee216b203e11b9b50f  confy-0.6.5.tar.gz
+af74b906cc6023bc0bad82a9bf653430c3a78f35b0900a876b8ceedf89c487d268c0c37926a22b7f5ea0eb06b3c81acf176817d4a26822bf8f6bc9dc5e305526  confy-0.7.0.tar.gz
 "

community/corrosion/APKBUILD

 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=corrosion
-pkgver=0.4.7
+pkgver=0.4.9
 pkgrel=0
 pkgdesc="Marrying Rust and CMake - Easy Rust and C/C++ Integration!"
 url="https://github.com/corrosion-rs/corrosion"
@@ -42,5 +42,5 @@ package() {
 }
 
 sha512sums="
-274baca57f7d599b304b75a73067fae9eb488eec10925fade7e195d494a192760b116a3bdf289e0cb7c291b29684909d5fd1c9404c6d37203c883cd511849bbb  corrosion-0.4.7.tar.gz
+6410a397364526888dd37782a464c7fe1eaece8820da0f617de9e2bd1a5a4c16a71ce45ad9a91f3fd71a6c33da130c83399b68cf5c1430a774bbb320a088ca62  corrosion-0.4.9.tar.gz
 "

community/ctop/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=18
 pkgdesc="Top-like interface for container metrics"
 url="https://ctop.sh/"
 license="MIT"
-arch="all"
+arch="all !loongarch64"
 makedepends="go"
 options="chmod-clean !check" # no test suite
 source="$pkgname-$pkgver.tar.gz::https://github.com/bcicen/ctop/archive/refs/tags/v$pkgver.tar.gz

community/dillo/APKBUILD

 # Contributor: ScrumpyJack <scrumpyjack@st.ilet.to>
 # Maintainer: Celeste <cielesti@protonmail.com>
 pkgname=dillo
-pkgver=3.1.0
-pkgrel=1
-pkgdesc="Very small and fast GUI web browser"
-url="https://github.com/w00fpack/dilloNG"
+pkgver=3.1.0_git20240506
+_gitrev=fc6a26c98fc7aa03db11cab1e3be2a52051650e4
+pkgrel=0
+pkgdesc="Fast and small graphical web browser"
+url="https://github.com/dillo-browser/dillo"
 arch="all"
 license="GPL-3.0-or-later"
 depends="ca-certificates wget"
@@ -15,17 +16,13 @@ makedepends="
 	libjpeg-turbo-dev
 	libpng-dev
 	libx11-dev
-	mbedtls-dev
+	openssl-dev
 	zlib-dev
 	"
 checkdepends="expect xvfb-run"
 subpackages="$pkgname-doc"
-source="https://github.com/w00fpack/dilloNG/archive/refs/tags/Dillo${pkgver%.*}X/dillo-$pkgver.tar.gz
-	dillo.desktop
-	gcc-10.patch
-	mbedtls.patch
-	"
-builddir="$srcdir/dilloNG-Dillo${pkgver%.*}X"
+source="https://github.com/dillo-browser/dillo/archive/$_gitrev/dillo-browser-$_gitrev.tar.gz"
+builddir="$srcdir/$pkgname-$_gitrev"
 options="net" # tests check HTTPS connectivity
 
 prepare() {
@@ -46,7 +43,7 @@ build() {
 		--enable-gif \
 		--enable-jpeg \
 		--enable-ipv6 \
-		--enable-ssl \
+		--enable-tls \
 		--with-ca-certs-dir=/etc/ssl/certs
 
 	make
@@ -56,19 +53,26 @@ check() {
 	export DILLO_TESTBIN="${DILLO_TESTBIN:-"./src/dillo"}"
 	export DILLO_TESTSITE="${DILLO_TESTSITE:-"alpinelinux.org"}"
 
-	$DILLO_TESTBIN --version
+	msg "Running tests for $($DILLO_TESTBIN --version)"
 
+	msg "Running Dillo HTTPS check"
 	HOME="$srcdir" xvfb-run -a expect -f - <<-'END'
 		set testsite $env(DILLO_TESTSITE)
 		spawn $env(DILLO_TESTBIN) https://${testsite}
 		set domain [lindex [split $testsite /] 0]
 		expect {
 			timeout { exit 1 }
-			-re [concat $domain {TLSv1.\d, cipher}] {
+			-re [concat $domain: {TLSv1.\d, cipher}] {
 				exit 0
 			}
 		}
 	END
+
+	msg "Running the Dillo test suite"
+	make check || {
+		cat test/html/test-suite.log
+		return 1
+	}
 }
 
 package() {
@@ -76,9 +80,6 @@ package() {
 
 	install -Dm644 AUTHORS ChangeLog README NEWS \
 		-t "$pkgdir"/usr/share/doc/$pkgname/
-
-	install -Dm644 "$srcdir"/dillo.desktop \
-		-t "$pkgdir"/usr/share/applications/
 }
 
 doc() {
@@ -86,13 +87,9 @@ doc() {
 
 	install -dv "$pkgdir"/usr/share/doc/$pkgname
 	mv -vt "$pkgdir"/usr/share/doc/$pkgname/ \
-		"$subpkgdir"/usr/share/doc/$pkgname/db?.png \
-		"$subpkgdir"/usr/share/doc/$pkgname/speeddial*
+		"$subpkgdir"/usr/share/doc/$pkgname/user_help.html
 }
 
 sha512sums="
-68a69f4fe4152bd8673ff6accfda741fa6391b188580df08513d1cf1d915a74f635de1ecdebefd0c3e6ab908150c1189114ca57dfad1f7826d1405f46bea21e4  dillo-3.1.0.tar.gz
-393a749d33f78e4c8a99c0c94a9708b26d235356f0c8dfa942af4e8da7eb9aa2453911894461714986449dfd15a4b492ef9071fac6b230f52a8f2e562f1bf016  dillo.desktop
-7cb0e73fd26028ad85edbf2c9ca86dd47728b6447ef10ede293fc0de11497f900d0a1f9ee90d4bf1a2e9137a4cebe96a491f3024bdb281ec7f7b68ea7a200ad6  gcc-10.patch
-22a5397737a6163566dec0cd280afe77359f2c7b718ad21c9d28a37a42b88de266edfed6665053ed0ea5272920b95b76d3bfa22e0a067dc458a88a33280571af  mbedtls.patch
+31c468390383775b396c7dbb49db9fe430912e272de3bb1816065497b38a01913e3635ef02ed45450441241e270b01d4b061e7f7add73a8202c07f6bb85404cd  dillo-browser-fc6a26c98fc7aa03db11cab1e3be2a52051650e4.tar.gz
 "

community/dillo/dillo.desktop

-[Desktop Entry]
-Name=Dillo
-GenericName=Web Browser
-Comment=Very small and fast GUI web browser
-Exec=dillo
-Icon=dillo
-Terminal=false
-Type=Application
-Categories=Network;GTK;WebBrowser;

community/dillo/gcc-10.patch

-Taken from Gentoo
-
---- a/dpid/dpid.c
-+++ b/dpid/dpid.c
-@@ -41,6 +41,26 @@
- volatile sig_atomic_t caught_sigchld = 0;
- char *SharedKey = NULL;
- 
-+char *srs_name;
-+
-+/*! dpid's service request socket file descriptor */
-+int srs_fd;
-+
-+/*! Number of available plugins */
-+int numdpis;
-+
-+/*! Number of sockets being watched */
-+int numsocks;
-+
-+/*! State information for each plugin. */
-+struct dp *dpi_attr_list;
-+
-+/*! service served for each plugin  */
-+Dlist *services_list;
-+
-+/*! Set of sockets watched for connections */
-+fd_set sock_set;
-+
- /*! Remove dpid_comm_keys file.
-  * This avoids that dillo instances connect to a stale port after dpid
-  * has exited (e.g. after a reboot).
---- a/dpid/dpid.h
-+++ b/dpid/dpid.h
-@@ -25,10 +25,10 @@
- 
- /*! \TODO: Should read this from dillorc */
- #define SRS_NAME "dpid.srs"
--char *srs_name;
-+extern char *srs_name;
- 
- /*! dpid's service request socket file descriptor */
--int srs_fd;
-+extern int srs_fd;
- 
- /*! plugin state information
-  */
-@@ -49,19 +49,19 @@
- };
- 
- /*! Number of available plugins */
--int numdpis;
-+extern int numdpis;
- 
- /*! Number of sockets being watched */
--int numsocks;
-+extern int numsocks;
- 
- /*! State information for each plugin. */
--struct dp *dpi_attr_list;
-+extern struct dp *dpi_attr_list;
- 
- /*! service served for each plugin  */
--Dlist *services_list;
-+extern Dlist *services_list;
- 
- /*! Set of sockets watched for connections */
--fd_set sock_set;
-+extern fd_set sock_set;
- 
- /*! Set to 1 by the SIGCHLD handler dpi_sigchld */
- extern volatile sig_atomic_t caught_sigchld;
---- a/dpid/dpid_common.c
-+++ b/dpid/dpid_common.c
-@@ -14,6 +14,9 @@
- #include <unistd.h>
- #include "dpid_common.h"
- 
-+/*! Error codes for dpid */
-+dpi_errno_t dpi_errno;
-+
- /*
-  * Send a verbose error message.
-  */
---- a/dpid/dpid_common.h
-+++ b/dpid/dpid_common.h
-@@ -35,12 +35,13 @@
- #define CKD_WRITE(fd, msg) ckd_write(fd, msg, __FILE__, __LINE__)
- #define CKD_CLOSE(fd)      ckd_close(fd, __FILE__, __LINE__)
- 
--
- /*! Error codes for dpid */
--enum {
-+typedef enum {
-    no_errors,
-    dpid_srs_addrinuse /* dpid service request socket address already in use */
--} dpi_errno;
-+} dpi_errno_t;
-+
-+extern dpi_errno_t dpi_errno;
- 
- /*! Intended for identifying dillo plugins
-  * and related files