backports/py3-rapidjson: drop due to orphan dependency

forgejo: add special case for dotnet9-stage0
forgejo: add special case for dotnet9-sdk
2024-12-13 11:20:41 -05:00 · 2024-12-13 10:29:04 -05:00 · 2024-12-13 10:26:58 -05:00 · 2024-12-13 10:20:15 -05:00 · 2024-12-10 16:20:45 -05:00 · 2024-12-01 14:55:11 -05:00
108 changed files with 592 additions and 2066 deletions
--- a/.forgejo/bin/check_ver.sh
+++ b/.forgejo/bin/check_ver.sh
@ -7,9 +7,13 @@ repo=${downstream/*\/}

 curl --silent $downstream/x86_64/APKINDEX.tar.gz | tar -O -zx APKINDEX > APKINDEX

+if [ "$ALL_PACKAGES" == "true" ]; then
+	owned_by_you=$(awk -F ':' '{if($1=="o"){print $2}}' APKINDEX | sort | uniq)
+	echo "Found $(printf '%s\n' $owned_by_you | wc -l ) packages"
+else
 	owned_by_you=$(awk -v RS= -v ORS="\n\n" '/m:Antoine Martin \(ayakael\) <dev@ayakael.net>/' APKINDEX | awk -F ':' '{if($1=="o"){print $2}}' | sort | uniq)
-
 	echo "Found $(printf '%s\n' $owned_by_you | wc -l ) packages owned by you"
+fi

 rm -f out_of_date not_in_anitya

@ -18,6 +22,12 @@ for pkg in $owned_by_you; do
 	downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1)
 	downstream_version=${downstream_version/-*}

+	# special cases
+	case $pkg in
+		freetube) upstream_version=$(curl --fail -X GET -sS -H 'Content-Type: application/json' "https://release-monitoring.org/api/v2/packages/?name=$pkg&distribution=Alpine" | jq -r '.items.[].version' | sed "s|-beta||");;
+		dotnet9-sdk|dotnet9-stage0) upstream_version=${upstream_version/-*};;
+	esac
+
 	if [ -z "$upstream_version" ]; then
 		echo "$pkg not in anitya"
 		echo "$pkg" >> not_in_anitya
--- a/.forgejo/bin/clear-repo.sh
+++ b/.forgejo/bin/clear-repo.sh
@ -0,0 +1,17 @@
+#!/bin/sh
+
+TARGET_REPO=$1
+ARCH=$2
+
+
+curl --silent $TARGET_REPO/$ARCH/APKINDEX.tar.gz | tar -O -zx APKINDEX > APKINDEX
+
+pkgs=$(awk -F ':' '{if($1=="o"){print $2}}' APKINDEX | sort | uniq)
+
+for pkg in $pkgs; do
+	pkgvers=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}')
+	for pkgver in $pkgvers; do
+		echo "Deleting $pkg-$pkgver of arch $ARCH from $TARGET_REPO"
+		curl -s --user $FORGE_REPO_USER:$FORGE_REPO_TOKEN -X DELETE $TARGET_REPO/$ARCH/$pkg-$pkgver.apk
+	done
+done
--- a/.forgejo/workflows/check-backports.yml
+++ b/.forgejo/workflows/check-backports.yml
@ -0,0 +1,28 @@
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  check-backports:
+    name: Check backports repo
+    runs-on: x86_64
+    container:
+      image: alpine:latest
+    env:
+      downstream: https://ayakael.net/api/packages/forge/alpine/v3.21/backports
+      FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
+      LABEL_NUMBER: 1
+      ALL_PACKAGES: true
+    steps:
+      - name: Environment setup
+        run: apk add grep coreutils gawk curl wget bash nodejs git jq sed
+      - name: Get scripts
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+      - name: Check out-of-date packages
+        run: ${{ github.workspace }}/.forgejo/bin/check_ver.sh
+      - name: Create issues
+        run: ${{ github.workspace }}/.forgejo/bin/create_issue.sh
--- a/README.md
+++ b/README.md
@ -18,10 +18,11 @@ Affixed to each repository description is the appropriate link for use in

 #### Backports
 ```
-https://ayakael.net/api/packages/forge/alpine/edge/backports
+https://ayakael.net/api/packages/forge/alpine/v3.21/backports
 ```

-Aports from the official Alpine repositories backported from edge.
+Aports from the official Alpine repositories backported from edge. This is only
+available and kept up-to-date on latest stable release.

 #### User
 ```
--- a/backports/calibre/APKBUILD
+++ b/backports/calibre/APKBUILD
@ -1,6 +1,6 @@
 # Maintainer: Cowington Post <cowingtonpost@gmail.com>
 pkgname=calibre
-pkgver=7.12.0
+pkgver=7.21.0
 pkgrel=0
 pkgdesc="Ebook management application"
 # qt6-webengine
@ -59,6 +59,7 @@ makedepends="
 	qt6-qtbase-dev
 	uchardet-dev
 	xdg-utils
+	ffmpeg-dev
 	"
 subpackages="
 	$pkgname-pyc
@ -100,7 +101,6 @@ package() {

 	python3 setup.py install \
 		--staging-root="$pkgdir"/usr \
-		--no-compile \
 		--system-plugins-location=/usr/share/calibre/system-plugins

 	cp -a man-pages/ "$pkgdir"/usr/share/man
@ -111,6 +111,6 @@ package() {
 }

 sha512sums="
-ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363  calibre-7.12.0.tar.xz
+0c2ee610833df83219c0c33b09e1374a8262f1630ccd48e3c4725c92922a3ac5d102ad83fc213457fb9de3efa4f5a2c98ff6dff039828e1661085a1054d7f631  calibre-7.21.0.tar.xz
 eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76  0001-calibre-no-update.patch
 "
--- a/backports/caprine/APKBUILD
+++ b/backports/caprine/APKBUILD
@ -2,7 +2,7 @@
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=caprine
 pkgver=2.60.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Elegant Facebook Messenger desktop app"
 arch="x86_64 aarch64" # blocked by electron
 url="https://github.com/sindresorhus/caprine"
--- a/backports/coin/APKBUILD
+++ b/backports/coin/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=coin
 pkgver=4.0.0
-pkgrel=6
+pkgrel=7
 pkgdesc="OpenGL OpenInventor compatible graphics library"
 url="https://github.com/coin3d/coin"
 license="BSD-3-Clause"
--- a/backports/cura/APKBUILD
+++ b/backports/cura/APKBUILD
@ -7,12 +7,13 @@ pkgver=5.2.2
 pkgrel=1
 pkgdesc="3D printer / slicing GUI built on top of the Uranium framework"
 url="https://ultimaker.com/software/ultimaker-cura"
-arch="noarch !ppc64le !x86 !armhf !riscv64 !s390x !armv7" # ppc64le: no py3-keyring
+# ppc64le: no py3-keyring
 # x86: no curaengine
 # armhf: no uranium, qt5-qtquickcontrols, qt5-qtquickcontrols2, qt5-qtgraphicaleffects
 # riscv64: no uranium
 # s390x: no py3-trimesh, no py3-numpy-stl
 # armv7: no py3-trimesh
+arch="noarch !ppc64le !x86 !armhf !riscv64 !s390x !armv7"
 license="LGPL-3.0-or-later"
 # add cura-binary-data to depends when packaged
 depends="
--- a/backports/electron-tasje/APKBUILD
+++ b/backports/electron-tasje/APKBUILD
@ -1,7 +1,7 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=electron-tasje
-pkgver=0.7.1
+pkgver=0.7.3
 pkgrel=0
 pkgdesc="Tiny replacement for electron-builder"
 url="https://codeberg.org/selfisekai/electron_tasje/"
@ -31,5 +31,5 @@ package() {
 }

 sha512sums="
-665ccbd6cb357c25d55daed4ad3b3ce008da258054951d9d069a5b12e72dd5812d534f906868e6b18e78949f058069a961c394c6f21ab3b3fab5393c330445e5  electron_tasje-0.7.1.tar.gz
+251b7eabe74acdb5c7394f9d4d735b736acf555352785a9896ddaeed37632b238e823e1bb639e1f5a44a50455957ec41e1a585a3b2a9919b5818bb40843bd877  electron_tasje-0.7.3.tar.gz
 "
--- a/backports/electron/APKBUILD
+++ b/backports/electron/APKBUILD
@ -1,16 +1,18 @@
-# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
+# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=electron
-pkgver=30.0.9
-_semver="${pkgver/_beta/-beta.}"
+pkgver=33.2.1
+_gittag=v"${pkgver/_beta/-beta.}"
 pkgrel=0
-_chromium=124.0.6367.233
-_copium_tag=124.5
+_chromium=130.0.6723.127
+_copium_tag=129.1
 _depot_tools=495b23b39aaba2ca3b55dd27cadc523f1cb17ee6
 pkgdesc="Electron cross-platform desktop toolkit"
 url="https://github.com/electron/electron"
 arch="aarch64 x86_64" # same as chromium
 license="MIT"
 depends="gtk+3.0 so:libudev.so.1 xdg-utils"
+_llvmver=19
 makedepends="
 	ada-dev
 	alsa-lib-dev
@ -22,7 +24,7 @@ makedepends="
 	bzip2-dev
 	c-ares-dev
 	cairo-dev
-	clang-dev
+	clang$_llvmver-dev
 	clang-extra-tools
 	compiler-rt
 	crc32c-dev
@ -44,12 +46,12 @@ makedepends="
 	gzip
 	harfbuzz-dev
 	hdrhistogram-c-dev
-	highway-dev
 	hunspell-dev
 	http-parser-dev
 	hwdata-dev
 	java-jdk
 	jpeg-dev
+	jsoncpp-dev
 	krb5-dev
 	lcms2-dev
 	libarchive-tools
@ -75,7 +77,7 @@ makedepends="
 	libxslt-dev
 	linux-headers
 	lld
-	llvm
+	llvm$_llvmver
 	mesa-dev
 	minizip-dev
 	nghttp2-dev
@ -95,11 +97,16 @@ makedepends="
 	py3-six
 	python3
 	qt5-qtbase-dev
+	re2-dev
 	rsync
 	rust
+	rust-bindgen
 	samurai
+	snappy-dev
 	speex-dev
+	spirv-tools-dev
 	sqlite-dev
+	woff2-dev
 	xcb-proto
 	yarn
 	zlib-dev
@ -107,21 +114,18 @@ makedepends="
 	"
 subpackages="$pkgname-lang $pkgname-dev"
 # the lower patches are specific to electron, the top ones are from the equivalent chromium version
-source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst
+source="
+	https://ayakael.net/api/packages/mirrors/generic/electron/$_gittag/electron-$_gittag-$_chromium.tar.zst
 	copium-$_copium_tag.tar.gz::https://codeberg.org/selfisekai/copium/archive/$_copium_tag.tar.gz
 	chromium-revert-drop-of-system-java.patch
 	compiler.patch
 	disable-dns_config_service.patch
 	disable-failing-tests.patch
 	fc-cache-version.patch
-	fix-missing-cstdint-include-musl.patch
 	fix-opus.patch
 	fstatat-32bit.patch
 	gdbinit.patch
 	generic-sensor-include.patch
-	import-version.patch
-	libstdc++13.patch
-	mman.patch
 	musl-auxv.patch
 	musl-sandbox.patch
 	musl-tid-caching.patch
@ -131,18 +135,15 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst
 	no-res-ninit-nclose.patch
 	no-sandbox-settls.patch
 	partalloc-no-tagging-arm64.patch
-	perfetto-libstdc++.patch
 	pvalloc.patch
-	random-fixes.patch
-	quiche-array.patch
-	system-zstd.patch
 	temp-failure-retry.patch
 	yes-musl.patch

-	icon.patch
-	python-jinja-3.10.patch
-	webpack-hash.patch
-	unbundle-node.patch
+	electron_icon.patch
+	electron_python-jinja-3.10.patch
+	electron_webpack-hash.patch
+	electron_unbundle-node.patch
+	electron_system-zlib-headers.patch

 	default.conf
 	electron.desktop
@ -150,21 +151,23 @@ source="https://ab-sn.lnl.gay/electron-$_semver-$_chromium.tar.zst
 	"
 _copium_patches="
 	cr124-iwyu-sys-select-dawn-terminal.patch
-	cr124-libwebp-shim-sharpyuv.patch
+	cr126-aarch64-musl-unsupported-relocation.patch
+	cr129-ffmpeg-no-noh264parse.patch
+	cr129-musl-metricts-imports.patch
 	"
 # tests are todo for some base checks
 options="!check net suid"
-builddir="$srcdir/electron-$_semver-$_chromium"
+builddir="$srcdir/electron-$_gittag-$_chromium"

 export PATH="$PATH:/usr/lib/qt5/bin"

-export CC=clang
-export CXX=clang++
+export CC=clang-$_llvmver
+export CXX=clang++-$_llvmver

 # required to find the tools
 export AR=llvm-ar
 export NM=llvm-nm
-export LD=clang++
+export LD=clang++-$_llvmver

 # less log spam, reproducible
 export CFLAGS="${CFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-shift-count-overflow -Wno-ignored-attributes"
@ -188,6 +191,7 @@ snapshot() {
 	# vpython3 execs system python3 with this set
 	export VPYTHON_BYPASS="manually managed python not supported by chrome operations"
 	export CHROMIUM_BUILDTOOLS_PATH="$srcdir/src/buildtools"
+	export DEPOT_TOOLS_UPDATE=0
 	mkdir -p "$srcdir"
 	cd "$srcdir"

@ -205,7 +209,7 @@ snapshot() {
 	echo "solutions = [
 	{
 		\"name\": \"src/electron\",
-		\"url\": \"https://github.com/electron/electron.git@v$_semver\",
+		\"url\": \"https://github.com/electron/electron.git@$_gittag\",
 		\"deps_file\": \"DEPS\",
 		\"managed\": False,
 		\"custom_deps\": {
@ -220,8 +224,7 @@ snapshot() {
 		--nohooks

 	python3 src/build/landmines.py
-	python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE
-	python3 src/build/util/lastchange.py -s src/third_party/dawn \
+	python3 src/build/util/lastchange.py -o src/build/util/LASTCHANGE \
 		--revision src/gpu/webgpu/DAWN_VERSION
 	python3 src/build/util/lastchange.py -m GPU_LISTS_VERSION \
 		--revision-id-only --header src/gpu/config/gpu_lists_version.h
@ -234,26 +237,27 @@ snapshot() {
 	python3 src/electron/script/apply_all_patches.py \
 		src/electron/patches/config.json

-	mv src $pkgname-$_semver-$_chromium
+	mv src $pkgname-$_gittag-$_chromium

 	# extra binaries are most likely things we don't want, so nuke them all
-	for elf in $(scanelf -RA -F "%F" $pkgname-$_semver-$_chromium); do
+	for elf in $(scanelf -RA -F "%F" $pkgname-$_gittag-$_chromium); do
 		rm -f "$elf"
 	done

 	msg "generating tarball.. (this takes a while)"
-	tar -cf $pkgname-$_semver-$_chromium.tar \
+	tar -cf $pkgname-$_gittag-$_chromium.tar \
 		--exclude="ChangeLog*" \
 		--exclude="testdata/*" \
 		--exclude="test_data/*" \
 		--exclude="android_rust_toolchain/*" \
+		--exclude="third_party/instrumented_libs/binaries" \
 		--exclude-backups \
 		--exclude-caches-all \
 		--exclude-vcs \
-		$pkgname-$_semver-$_chromium
+		$pkgname-$_gittag-$_chromium

-	zstd --auto-threads=logical --ultra --long -22 -T"${ZSTD_LIMIT:-0}" -vv $pkgname-$_semver-$_chromium.tar -o "$SRCDEST"/$pkgname-$_semver-$_chromium.tar.zst
-	mcli cp "$SRCDEST"/$pkgname-$_semver-$_chromium.tar.zst "$_distbucket"
+	zstd --auto-threads=logical --ultra --long -22 -T"${ZSTD_LIMIT:-0}" -vv $pkgname-$_gittag-$_chromium.tar -o "$SRCDEST"/$pkgname-$_gittag-$_chromium.tar.zst
+	mcli cp "$SRCDEST"/$pkgname-$_gittag-$_chromium.tar.zst "$_distbucket"
 }

 prepare() {
@ -267,7 +271,7 @@ prepare() {
 				;;
 		esac
 	done
-	if [ ! -z "$failed" ]; then
+	if [ -n "$failed" ]; then
 		error "The following patches failed to apply:"
 		for i in $failed; do
 			printf "  %s\n" "$i" >&2
@ -291,9 +295,9 @@ prepare() {
 		git config commit.gpgsign false
 		git add LICENSE
 		git commit -m "init"
-		git tag "v$_semver"
+		git tag "$_gittag"
 		git pack-refs
-		yarn install --frozen-lockfile --no-scripts
+		yarn install --frozen-lockfile --ignore-scripts
 	)

 	(
@ -303,10 +307,11 @@ prepare() {

 	# reusable system library settings
 	# flatbuffers - tensorflow has a few static_asserts for a specific patch version
+	# highway - requires highway>=1.1.0 (arm failures)
 	# libavif - https://github.com/AOMediaCodec/libavif/commit/50a541469c98009016af8dcc9f83a1be79f3a7d9
 	# libaom - https://aomedia.googlesource.com/aom/+/706ee36dcc82%5E%21/
 	#   but watch this space: https://aomedia-review.googlesource.com/c/aom/+/188606
-	# jsoncpp, re2, snappy, swiftshader, vulkan, woff2 - needs use_custom_libcxx=false
+	# jsoncpp, re2, snappy, swiftshader-*, woff2 - requires use_custom_libcxx=false
 	local chromium_use_system="
 		brotli
 		crc32c
@ -317,7 +322,6 @@ prepare() {
 		fontconfig
 		freetype
 		harfbuzz-ng
-		highway
 		icu
 		libdrm
 		libevent
@ -333,8 +337,9 @@ prepare() {
 		zstd
 		"

-	for _lib in $chromium_use_system jinja2 libjpeg_turbo; do
+	for _lib in $chromium_use_system jinja2 libjpeg_turbo unrar; do
 		msg "Removing buildscripts for system provided $_lib"
+		_lib="${_lib/swiftshader-/swiftshader/third_party/}"
 		find . -type f -path "*third_party/$_lib/*" \
 			\! -path "*third_party/$_lib/chromium/*" \
 			\! -path "*third_party/$_lib/google/*" \
@ -387,6 +392,12 @@ prepare() {
 		$chromium_use_system
 	python3 third_party/libaddressinput/chromium/tools/update-strings.py

+	# flatc is used in build workflows since https://crrev.com/c/5595037,
+	# but the pre-generated files are still checked-in. remove to make sure
+	# they're not used. (if used, they will break builds on version mismatch.)
+	# https://github.com/tensorflow/tensorflow/issues/62298
+	# find third_party/tflite/ -name '*_generated.h' -delete
+
 	# prevent annoying errors when regenerating gni
 	sed -i 's,^update_readme$,#update_readme,' \
 		third_party/libvpx/generate_gni.sh
@ -399,8 +410,7 @@ prepare() {
 	sed -i -e 's/\<xmlMalloc\>/malloc/' -e 's/\<xmlFree\>/free/' \
 		third_party/blink/renderer/core/xml/*.cc \
 		third_party/blink/renderer/core/xml/parser/xml_document_parser.cc \
-		third_party/libxml/chromium/*.cc \
-		third_party/maldoca/src/maldoca/ole/oss_utils.h
+		third_party/libxml/chromium/*.cc

 	_configure
 }
@ -409,8 +419,6 @@ _configure() {
 	cd "$builddir"
 	msg "Configuring build"

-	local clang_ver="$(clang -dumpversion)"
-
 	case "$USE_CCACHE" in
 	1)
 		local cc_wrapper="ccache"
@ -433,7 +441,7 @@ _configure() {
 		chrome_pgo_phase=0
 		clang_base_path=\"/usr\"
 		clang_use_chrome_plugins=false
-		clang_version=\"${clang_ver%%.*}\"
+		clang_version=\"$_llvmver\"
 		custom_toolchain=\"//build/toolchain/linux/unbundle:default\"
 		disable_fieldtrial_testing_config=true
 		enable_hangout_services_extension=true
@ -453,11 +461,12 @@ _configure() {
 		is_official_build=true
 		link_pulseaudio=true
 		proprietary_codecs=true
-		regenerate_x11_protos=true
 		rtc_link_pipewire=true
 		rtc_use_pipewire=true
 		rustc_version=\"yes\"
+		rust_bindgen_root=\"/usr\"
 		rust_sysroot_absolute=\"/usr\"
+		safe_browsing_use_unrar=false
 		symbol_level=$symbol_level
 		treat_warnings_as_errors=false
 		use_custom_libcxx=true
@ -490,15 +499,12 @@ _configure() {
 build() {
 	export PATH="$PATH:/usr/lib/qt5/bin"

-	# ~1 GB per concurrent job is not enough with gcc
-	_njobs="${NJOBS:-"$(python3 -c 'import os; print(max((os.cpu_count() - (10 if os.uname().machine == "aarch64" else 8), 1)))')"}"
-
-	ninja -C out/Release -j$_njobs \
+	ninja -C out/Release \
+		copy_node_headers \
 		electron_dist_zip \
 		node_gypi_headers \
 		node_version_header

-	cp -vf out/Release/gen/node_headers/include/node/config.gypi third_party/electron_node/config.gypi
 }

 package() {
@ -512,13 +518,7 @@ package() {
 	install -Dm755 "$srcdir"/default.conf "$pkgdir"/etc/electron/default.conf

 	mkdir -p "$pkgdir"/usr/include/electron
-
-	(
-		cd third_party/electron_node/
-		HEADERS_ONLY=1 python3 ./tools/install.py install "$pkgdir" "/usr/include/electron/node_headers"
-	)
-	# required overrides
-	install -Dm644 out/Release/gen/node_headers/include/node/* -t "$pkgdir"/usr/include/electron/node_headers/include/node
+	cp -rv "$builddir"/out/Release/gen/node_headers "$pkgdir"/usr/include/electron
 	ln -sv /usr/include/electron/node_headers/include/node "$pkgdir"/usr/include/electron/node

 	mkdir -p "$pkgdir"/usr/include/electron/node_headers/include/nan
@ -544,41 +544,34 @@ lang() {
 }

 sha512sums="
-97024407a16fb41ec56fcc6df5552165ce4eea34fc51b17ecbf30a7e35406baccf8a3001a795a06d1e92d32e134d9d7a18d59fa74eda1b1bc23b59bc4947929b  electron-30.0.9-124.0.6367.233.tar.zst
-13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88  copium-124.5.tar.gz
+e2df4454f4178af859c13aadee4ea04a5b6aa202972cad625e54bc68f5b8c25e098e50d428ec9c1886c37ccf49aaaedb4c5f02fc8bdd498314ba216901932185  electron-v33.2.1-130.0.6723.127.tar.zst
+6138b3dbf3903c78f4ca1ed5a6c3c3c485471ded31976010484ce8893d03953df2b8f066a4fe84bbde5ae7ef9bbff664ef917e247b2e95dd471de40f2774d7d0  copium-129.1.tar.gz
 29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020  chromium-revert-drop-of-system-java.patch
-54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15  compiler.patch
+53b7cdee8f7bfb4c9371cb385c473e34ed3d8ac7efaa43c0af061107560be30d8747b07fb0b16c01079b8c770f2c721bb5a8081313b7c126856ea4078a74da2a  compiler.patch
 4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa  disable-dns_config_service.patch
-111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b  disable-failing-tests.patch
+2470904846e3adde2c9506f9e78220daca0932320b628dd3d427bf2b7c17a8f7880cb97e787b046c28de7aca642e1a8d30824d6049905976da77e7473baa64da  disable-failing-tests.patch
 5fc5c012c1db6cf1ba82f38c6f3f4f5ca3a209e47ac708a74de379b018e0649b7694877c9571ef79002dde875ffc07b458a3355425f1c01867f362c66c2bc1bf  fc-cache-version.patch
-9200f78bad70e95c648a5e8392d50642190600f655c6baa366ff6467ebad52d3b3f305dad58f3610da67136f4b723557653b174ec5c25be8d8737ee04d9ee09f  fix-missing-cstdint-include-musl.patch
 b24563e9a738c00fce7ff2fbdee3d7c024d9125d7c74d9ab90af6bdb16f7ec8419f2c8aa78c0640f6d5d81c17dc2c673a194401d354f466749672729b48ed068  fix-opus.patch
 c63dee5044353eb306a39ca1526158c0f003ab310ecb03d1c368dc2a979454590c84b8d3c15484517d5e66bb8add9b231da9abbadf2e50850abd72ac1345c4ab  fstatat-32bit.patch
 33ee60863cc438ef57ffef92ba4cf67a856a5ffc16138bce241bcf87e47b15154aa86918e793c26f7ec4dc62a445257ad5673ed7001daf22c4043cf6cc57da7f  gdbinit.patch
 36a764fa73443b47d38050b52dbe6ad2fa8d67201ff4ccdbad13b52308ef165ca046aac6f9609fe35890a6485f0f3e672e78cc41e3e44f3cdc7f145e540524e8  generic-sensor-include.patch
-8de65109ece27ea63bd469f2220c56b8c752ba0a50fdf390082a2d5ae74b8e010199126175569f6d5084270dd4e0571e68aec32c0bca8211a6699925b3a09124  import-version.patch
-c49a1b06e061faa430d66dd5b404ef6c843e4d8a6e9012e963009a161b4726f8eb92c4da8fa710f8861f6e4daa8be5f68abee41a7d9fc02f2a0eb61ce53b5fdd  libstdc++13.patch
-e75f57ae34c97ca1caf15fa4b4106c6c1e79c31ed66869cf92ed9ea0c449886c9511e455047c17c1e9ad8b9a46ad4948511a4f2995a4b6030fb4d1c7ae21d038  mman.patch
 99bcc7dd485b404a90c606a96addab1d900852128d44fb8cea8acc7303189ef87c89a7b0e749fd0e10c5ef5f6bf1fadeb5c16a34503cab6a59938ce2653d887e  musl-auxv.patch
-50c274a420bb8a7f14fcb56e40920dac8f708792a4520789b4987facea459bef88113d5a2b60fa8c57bee6e92bff3617d6b73fa305c8c44614c638971cffd440  musl-sandbox.patch
+51f1959bd622af26a1c3a1f4b0ad9a5bfa461057aa4cf9960c568dddf8ac47d55989c277f5d5ab5db040a04c54925a531af7a1cc767559218b408eaa6bdd7577  musl-sandbox.patch
 e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2  musl-tid-caching.patch
 92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa  musl-v8-monotonic-pthread-cont_timedwait.patch
-73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708  no-execinfo.patch
-8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b  no-mallinfo.patch
+a250cff50d282b02ce0f28880d0a2b4fb8e7df51bc072bfeeddc561c29a7c76453dbcbc7b17b82966a7b30a31409d2555720d1dcf963e1b3fb8a2a06a6abcf46  no-execinfo.patch
+0b41aeb6b212f9c3f61aa0a8d3085c9e865a2e68f3270ceec2376aab67f337ac46eaea7da36d3fd7219e2a1cb731b7aa2d3fb619a374d2b7653976b9f4f384bb  no-mallinfo.patch
 e4c4e5bc6f828f9c883dd418c0ba01887949c29c311f76206a1ec29f620b0c0ba0452949dc2778a9c46ea066405857536964a36436a68eecf7da7952736333cf  no-res-ninit-nclose.patch
 6dc4d8dc92e685dace62265a1ddb3aebc558aed54d20ff6d36b030be0c48d7e84662326c31363612492574d9a03c62653cdc21a60995b97dee1d75cae86a9f9b  no-sandbox-settls.patch
-d4ac7f350806b4410ccb1df3b0ad7e90a7b6d724a16919761aa2d47a6f21008c7374da528b05b754ee712b85d23adfb113c7f7b9ca2ed5b47644fe3ea0cb9119  partalloc-no-tagging-arm64.patch
-8e1aca983890c78d81a6f888b2cf1aa42878d1f8523e87d63b800e1e468cbfd33e5ff6a0975775ca222fe82f30c6497da95505da01b091c8776a44c98ac86f0f  perfetto-libstdc++.patch
-2eb434b4fc6aee77026492644cd86772a543d9845f112a75cd4c3e1f25c9435cc31f8454c1c73223451fc9be69b86e822ff68821978f67f2fc8bcba50296d8e0  pvalloc.patch
-803b8117c65132f76bec42054a4b2257a078b15b07fd08645fec2dfd51aa4e0075a9015300cd579d4ae0d757d9850b9988e080cfc2eea093f6684fdf82c4722c  random-fixes.patch
-86f612dd2b39602984a75b1b11c2ab8bc8cc6b4e78fae998570a777a6901ae45fdcdb22e46dd006dab703a0674e64c72cf8120af2dc5b9e78004f402c7e65358  quiche-array.patch
-b3beb98b539fe160fbc493ba410ae0f68540cc4b6834f1f8ce9a22c3f4f59ef5d583ad48793e10549fd02a701f833a3969791ef4524322cd1e715ca5bf226bc8  system-zstd.patch
+f2b08538ff57c50b3772a07ca91845f9d45f4a5112f608b6192d4fb5d7be48f478c0c36194d95ab7bbf933e0278e5c6d578619d8643895cdc40386eebc5b975f  partalloc-no-tagging-arm64.patch
+03f829a2da633533ef3fd0f287f5ec602d936a97a98b53cd2415553c2537ae9d571f35397ca7c9fb3f4b0806c300e3b189569f8d979ca132e1a2a4dae7206396  pvalloc.patch
 e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb  temp-failure-retry.patch
 914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566  yes-musl.patch
-465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec  icon.patch
-e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3  python-jinja-3.10.patch
-2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30  webpack-hash.patch
-ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3  unbundle-node.patch
+465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec  electron_icon.patch
+e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3  electron_python-jinja-3.10.patch
+2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30  electron_webpack-hash.patch
+57aa81d46b9cc931092d9d9b3cb4a9859f86c183a236bc5cca6abbaeca86b82bf1b537dd9cb3412114fa4e86087c0022ee3f7e88de974d29b309e9d1714df7a5  electron_unbundle-node.patch
+1b35edcf0b41e39e20c4d64dbb978bcaab8036f2fe839930709b269c50cb1321458a15b4d0013246f9e03f58f250a1e3a57ea910db1aa0adbd602a6a11ad33b9  electron_system-zlib-headers.patch
 e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e  default.conf
 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463  electron.desktop
 5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648  electron-launcher.sh
--- a/backports/electron/compiler.patch
+++ b/backports/electron/compiler.patch
@ -1,12 +1,12 @@
 --- ./build/config/compiler/BUILD.gn.orig
 +++ ./build/config/compiler/BUILD.gn
-@@ -613,24 +613,6 @@
+@@ -568,24 +568,6 @@
       }
     }
 
-    # TODO(crbug.com/1488374): This causes binary size growth and potentially
+-    # TODO(crbug.com/40283598): This causes binary size growth and potentially
 -    # other problems.
-    # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
+-    # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
 -    if (default_toolchain != "//build/toolchain/cros:target" &&
 -        !llvm_android_mainline) {
 -      cflags += [
@ -22,10 +22,10 @@
 -      }
 -    }
 -
-     # TODO(crbug.com/1235145): Investigate why/if this should be needed.
+     # TODO(crbug.com/40192287): Investigate why/if this should be needed.
     if (is_win) {
       cflags += [ "/clang:-ffp-contract=off" ]
-@@ -1005,17 +987,6 @@
+@@ -998,17 +980,6 @@
     # `-nodefaultlibs` from the linker invocation from Rust, which would be used
     # to compile dylibs on Android, such as for constructing unit test APKs.
     "-Cdefault-linker-libraries",
@ -43,7 +43,7 @@
   ]
 
   if (!is_win || force_rustc_color_output) {
-@@ -1182,8 +1153,8 @@
+@@ -1175,8 +1146,8 @@
     } else if (current_cpu == "arm") {
       if (is_clang && !is_android && !is_nacl &&
           !(is_chromeos_lacros && is_chromeos_device)) {
@ -54,7 +54,7 @@
       }
       if (!is_nacl) {
         cflags += [
-@@ -1197,8 +1168,8 @@
+@@ -1190,8 +1161,8 @@
     } else if (current_cpu == "arm64") {
       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
           !(is_chromeos_lacros && is_chromeos_device)) {
@ -65,7 +65,7 @@
       }
     } else if (current_cpu == "mipsel" && !is_nacl) {
       ldflags += [ "-Wl,--hash-style=sysv" ]
-@@ -1983,7 +1954,7 @@
+@@ -1982,7 +1953,7 @@
       defines = [ "_HAS_NODISCARD" ]
     }
   } else {
@ -76,7 +76,7 @@
       cflags += [ "-Wextra" ]
 --- ./build/config/rust.gni.orig
 +++ ./build/config/rust.gni
-@@ -186,11 +186,11 @@
+@@ -185,11 +185,11 @@
 rust_abi_target = ""
 if (is_linux || is_chromeos) {
   if (current_cpu == "arm64") {
@ -91,7 +91,7 @@
   } else if (current_cpu == "arm") {
     if (arm_float_abi == "hard") {
       float_suffix = "hf"
-@@ -199,13 +199,13 @@
+@@ -198,15 +198,15 @@
     }
     if (arm_arch == "armv7-a" || arm_arch == "armv7") {
       # No way to inform Rust about the -a suffix.
@ -101,6 +101,9 @@
 -      rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
 +      rust_abi_target = "armv6-alpine-linux-musleabi" + float_suffix
     }
+   } else if (current_cpu == "riscv64") {
+-    rust_abi_target = "riscv64gc-unknown-linux-gnu"
+    rust_abi_target = "riscv64-alpine-linux-musl"
   } else {
     # Best guess for other future platforms.
 -    rust_abi_target = current_cpu + "-unknown-linux-gnu"
--- a/backports/electron/disable-failing-tests.patch
+++ b/backports/electron/disable-failing-tests.patch
@ -160,24 +160,6 @@ ProcessAlternativeServicesTest.Process*: crashed ?
 
 TEST_F(FileUtilTest, FILEToFile) {
   ScopedFILE stream;
--- a/base/debug/stack_trace_unittest.cc
-+++ b/base/debug/stack_trace_unittest.cc
-@@ -345,6 +345,7 @@
- // sometimes we read fp / pc from the place that previously held
- // uninitialized value.
- // TODO(crbug.com/1132511): Enable this test on Fuchsia.
-+#if 0
- #if defined(MEMORY_SANITIZER) || BUILDFLAG(IS_FUCHSIA)
- #define MAYBE_TraceStackFramePointersFromBuffer \
-   DISABLED_TraceStackFramePointersFromBuffer
-@@ -357,6 +358,7 @@
-   const void* frames[kDepth];
-   ExpectStackFramePointers<kDepth>(frames, kDepth, /*copy_stack=*/true);
- }
-+#endif
- 
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
- #define MAYBE_StackEnd StackEnd
 --- a/base/threading/platform_thread_unittest.cc
 +++ b/base/threading/platform_thread_unittest.cc
@@ -416,6 +416,7 @@
--- a/backports/electron/electron_icon.patch
+++ b/backports/electron/electron_icon.patch
--- a/backports/electron/electron_python-jinja-3.10.patch
+++ b/backports/electron/electron_python-jinja-3.10.patch
--- a/backports/electron/electron_system-zlib-headers.patch
+++ b/backports/electron/electron_system-zlib-headers.patch
@ -0,0 +1,10 @@
+--- ./electron/BUILD.gn.orig
+++ ./electron/BUILD.gn
+@@ -1565,7 +1565,6 @@
+   public_deps = header_groups + [
+                   ":node_gypi_headers",
+                   ":node_version_header",
+-                  ":zlib_headers",
+                 ]
+ }
+ 
--- a/backports/electron/electron_unbundle-node.patch
+++ b/backports/electron/electron_unbundle-node.patch
@ -52,9 +52,11 @@
   if (use_system_cares) {
     configs += [ ":cares" ]
   } else {
--- ./electron/script/generate-config-gypi.py.orig
-+++ ./electron/script/generate-config-gypi.py
-@@ -62,6 +62,11 @@
+diff --git a/./electron/script/generate-config-gypi.py.orig b/./electron/script/generate-config-gypi.py
+index b41cd7eb450..bc4098debb5 100755
+--- a/./electron/script/generate-config-gypi.py.orig
+++ b/./electron/script/generate-config-gypi.py
+@@ -62,6 +62,11 @@ def main(target_file, target_cpu):
   # Used by certain versions of node-gyp.
   v['build_v8_with_gn'] = 'false'
 
@ -63,6 +65,5 @@
 +      if v.get(f'node_shared_{dep}') is not None:
 +        v[f'node_shared_{dep}'] = 'true'
 +
-   with open(target_file, 'w+') as f:
-     f.write(pprint.pformat(config, indent=2))
- 
+   with open(target_file, 'w+', encoding='utf-8') as file_out:
+     file_out.write(pprint.pformat(config, indent=2))
--- a/backports/electron/electron_webpack-hash.patch
+++ b/backports/electron/electron_webpack-hash.patch
--- a/backports/electron/fix-missing-cstdint-include-musl.patch
+++ b/backports/electron/fix-missing-cstdint-include-musl.patch
@ -1,13 +0,0 @@
-Patch-Source: https://github.com/void-linux/void-packages/blob/378db3cf5087877588aebaaa8ca3c9d94dfb54e0/srcpkgs/chromium/patches/fix-missing-cstdint-include-musl.patch
-fixed in https://github.com/google/quiche/commit/4d4820f0a959be7fa22285d114a5b5b8676f10fe
--
--- a/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
-+++ b/net/third_party/quiche/src/quiche/http2/adapter/window_manager.h
-@@ -3,6 +3,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <functional>
- 
- #include "common/platform/api/quiche_export.h"
--- a/backports/electron/import-version.patch
+++ b/backports/electron/import-version.patch
@ -1,15 +0,0 @@
-they fixed the import to be glibc conditional, but now nothing is imported so
-all the string functions are missing.
--
--- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -61,8 +61,7 @@
- 
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
-#if defined(__GLIBC__) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-#include <gnu/libc-version.h>
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
- 
- #include "base/linux_util.h"
- #include "base/strings/string_split.h"
--- a/backports/electron/libstdc++13.patch
+++ b/backports/electron/libstdc++13.patch
@ -1,269 +0,0 @@
-missing libstdc++13 includes
--
--- a/third_party/openscreen/src/platform/base/error.h
-+++ b/third_party/openscreen/src/platform/base/error.h
-@@ -6,6 +6,7 @@
- #define PLATFORM_BASE_ERROR_H_
- 
- #include <cassert>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <utility>
--- a/ui/base/prediction/kalman_filter.h
-+++ b/ui/base/prediction/kalman_filter.h
-@@ -8,6 +8,8 @@
- #include "base/component_export.h"
- #include "ui/gfx/geometry/matrix3_f.h"
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- // This Kalman filter is used to predict state in one axles.
--- a/ui/events/types/scroll_types.h
-+++ b/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
- 
-+#include <cstdint>
-+
- namespace ui {
- 
- enum class ScrollGranularity : uint8_t {
--- a/third_party/webrtc/rtc_base/system/file_wrapper.h
-+++ b/third_party/webrtc/rtc_base/system/file_wrapper.h
-@@ -14,6 +14,7 @@
- #include <stddef.h>
- #include <stdio.h>
- 
-+#include <cstdint>
- #include <string>
- 
- #include "absl/strings/string_view.h"
--- a/third_party/pdfium/constants/annotation_flags.h
-+++ b/third_party/pdfium/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
- 
-+#include <cstdint>
-+
- namespace pdfium {
- namespace annotation_flags {
- 
--- a/third_party/s2cellid/src/s2/util/math/mathutil.h
-+++ b/third_party/s2cellid/src/s2/util/math/mathutil.h
-@@ -21,6 +21,7 @@
- #ifndef S2_UTIL_MATH_MATHUTIL_H_
- #define S2_UTIL_MATH_MATHUTIL_H_
- 
-+#include <cstdint>
- #include <type_traits>
- 
- class MathUtil {
--- a/third_party/s2cellid/src/s2/s1angle.h
-+++ b/third_party/s2cellid/src/s2/s1angle.h
-@@ -24,6 +24,7 @@
- #define S2_S1ANGLE_H_
- 
- #include <math.h>
-+#include <cstdint>
- #include <limits>
- #include <ostream>
- #include <type_traits>
--- a/third_party/maldoca/src/maldoca/ole/header.h
-+++ b/third_party/maldoca/src/maldoca/ole/header.h
-@@ -45,6 +45,8 @@
- 
- #include "absl/strings/string_view.h"
- 
-+#include <cstdint>
-+
- namespace maldoca {
- 
- class OLEHeader {
--- a/components/password_manager/core/browser/generation/password_generator.h
-+++ b/components/password_manager/core/browser/generation/password_generator.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
- 
-+#include <cstdint>
- #include <string>
- 
- 
--- a/base/debug/profiler.h
-+++ b/base/debug/profiler.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/base_export.h"
--- a/components/dom_distiller/core/url_utils.h
-+++ b/components/dom_distiller/core/url_utils.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_DOM_DISTILLER_CORE_URL_UTILS_H_
- #define COMPONENTS_DOM_DISTILLER_CORE_URL_UTILS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/strings/string_piece_forward.h"
--- a/components/feature_engagement/internal/event_storage_validator.h
-+++ b/components/feature_engagement/internal/event_storage_validator.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
- #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
- 
-+#include <cstdint>
- #include <string>
- 
- namespace feature_engagement {
--- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -8,6 +8,7 @@
- #include <algorithm>
- #include <memory>
- #include <queue>
-+#include <string>
- #include <utility>
- #include <vector>
- 
--- a/cc/trees/target_property.cc
-+++ b/cc/trees/target_property.cc
-@@ -2,6 +2,8 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include <cstdint>
-+
- #include "cc/trees/target_property.h"
- 
- #include "ui/gfx/animation/keyframe/target_property.h"
--- a/gpu/config/gpu_feature_info.h
-+++ b/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
--- a/gpu/config/gpu_driver_bug_workarounds.h
-+++ b/gpu/config/gpu_driver_bug_workarounds.h
-@@ -5,6 +5,7 @@
- #ifndef GPU_CONFIG_GPU_DRIVER_BUG_WORKAROUNDS_H_
- #define GPU_CONFIG_GPU_DRIVER_BUG_WORKAROUNDS_H_
- 
-+#include <cstdint>
- #include <vector>
- 
- #include "build/build_config.h"
--- a/third_party/blink/public/common/page_state/page_state.h
-+++ b/third_party/blink/public/common/page_state/page_state.h
-@@ -5,6 +5,7 @@
- #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_PAGE_STATE_PAGE_STATE_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
--- a/pdf/document_attachment_info.h
-+++ b/pdf/document_attachment_info.h
-@@ -5,6 +5,7 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
- 
-+#include <cstdint>
- #include <string>
- 
- 
--- a/components/payments/content/utility/fingerprint_parser.h
-+++ b/components/payments/content/utility/fingerprint_parser.h
-@@ -7,6 +7,7 @@
- 
- #include <stddef.h>
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
--- a/media/base/video_transformation.h
-+++ b/media/base/video_transformation.h
-@@ -5,6 +5,7 @@
- #ifndef MEDIA_BASE_VIDEO_TRANSFORMATION_H_
- #define MEDIA_BASE_VIDEO_TRANSFORMATION_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/numerics/math_constants.h"
--- a/components/omnibox/browser/on_device_head_model.h
-+++ b/components/omnibox/browser/on_device_head_model.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
- #define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
- 
-+#include <cstdint>
- #include <string>
- #include <utility>
- #include <vector>
--- a/components/autofill/core/browser/autofill_ablation_study.h
-+++ b/components/autofill/core/browser/autofill_ablation_study.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
- #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
- 
-+#include <cstdint>
- #include <string>
- 
- class GURL;
--- a/components/autofill/core/browser/strike_databases/strike_database_base.h
-+++ b/components/autofill/core/browser/strike_databases/strike_database_base.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_STRIKE_DATABASES_STRIKE_DATABASE_BASE_H_
- #define COMPONENTS_AUTOFILL_CORE_BROWSER_STRIKE_DATABASES_STRIKE_DATABASE_BASE_H_
- 
-+#include <cstdint>
- #include <map>
- #include <string>
- #include <vector>
--- a/chrome/browser/resource_coordinator/decision_details.h
-+++ b/chrome/browser/resource_coordinator/decision_details.h
-@@ -5,6 +5,7 @@
- #ifndef CHROME_BROWSER_RESOURCE_COORDINATOR_DECISION_DETAILS_H_
- #define CHROME_BROWSER_RESOURCE_COORDINATOR_DECISION_DETAILS_H_
- 
-+#include <cstdint>
- #include <string>
- #include <vector>
- 
--- a/net/third_party/quiche/src/quiche/quic/core/qpack/qpack_stream_sender_delegate.h
-+++ b/net/third_party/quiche/src/quiche/quic/core/qpack/qpack_stream_sender_delegate.h
-@@ -8,6 +8,8 @@
- #include "absl/strings/string_view.h"
- #include "quiche/quic/platform/api/quic_export.h"
- 
-+#include <cstdint>
-+
- namespace quic {
- 
- // This interface writes encoder/decoder data to peer.
--- a/third_party/perfetto/include/perfetto/base/export.h
-+++ b/third_party/perfetto/include/perfetto/base/export.h
-@@ -17,6 +17,8 @@
- #ifndef INCLUDE_PERFETTO_BASE_EXPORT_H_
- #define INCLUDE_PERFETTO_BASE_EXPORT_H_
- 
-+#include <cstdint>
-+
- #include "perfetto/base/build_config.h"
- #include "perfetto/public/abi/export.h"
- 
--- a/backports/electron/mman.patch
+++ b/backports/electron/mman.patch
@ -1,13 +0,0 @@
-needed for PKEY_DISABLE_WRITE. these are documented as also being from sys/
-mman.h with GNU_SOURCE, but musl doesn't do that, so these are strictly from
-kernel headers
--- a/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc
-+++ b/base/allocator/partition_allocator/src/partition_alloc/partition_alloc_unittest.cc
-@@ -60,6 +60,7 @@
- #include <sys/mman.h>
- #include <sys/resource.h>
- #include <sys/time.h>
-+#include <linux/mman.h>
- #endif  // BUILDFLAG(IS_POSIX)
- 
- #if BUILDFLAG(ENABLE_PARTITION_ALLOC_AS_MALLOC_SUPPORT) && BUILDFLAG(IS_MAC)
--- a/backports/electron/musl-sandbox.patch
+++ b/backports/electron/musl-sandbox.patch
@ -45,7 +45,7 @@ diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/s
 index d9d1882..0567557 100644
 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 +++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+@@ -438,6 +438,7 @@
 #if defined(__i386__)
     case __NR_waitpid:
 #endif
@ -53,7 +53,7 @@ index d9d1882..0567557 100644
       return true;
     case __NR_clone:  // Should be parameter-restricted.
     case __NR_setns:  // Privileged.
-@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) {
+@@ -450,7 +451,6 @@
 #if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
     case __NR_set_thread_area:
 #endif
@ -61,16 +61,16 @@ index d9d1882..0567557 100644
     case __NR_unshare:
 #if !defined(__mips__) && !defined(__aarch64__)
     case __NR_vfork:
-@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
-     case __NR_mlock:
+@@ -549,6 +549,8 @@
     case __NR_munlock:
     case __NR_munmap:
+     case __NR_mseal:
 +    case __NR_mremap:
 +    case __NR_membarrier:
       return true;
     case __NR_madvise:
     case __NR_mincore:
-@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) {
+@@ -566,7 +568,6 @@
     case __NR_modify_ldt:
 #endif
     case __NR_mprotect:
--- a/backports/electron/no-execinfo.patch
+++ b/backports/electron/no-execinfo.patch
@ -37,16 +37,16 @@ for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1
 #define HAVE_FCNTL_H 1
 --- a/base/debug/stack_trace.cc
 +++ b/base/debug/stack_trace.cc
-@@ -291,7 +291,7 @@
- }
- std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
+@@ -311,7 +311,7 @@
+ 
+ std::string StackTrace::ToStringWithPrefix(cstring_view prefix_string) const {
   std::stringstream stream;
 -#if !defined(__UCLIBC__) && !defined(_AIX)
 +#if defined(__GLIBC__) && !defined(_AIX)
-   if (ShouldSuppressOutput()) {
-     return "Backtrace suppressed.";
-   }
-@@ -301,7 +301,7 @@
+   OutputToStreamWithPrefix(&stream, prefix_string);
+ #endif
+   return stream.str();
+@@ -335,7 +335,7 @@
 }
 
 std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
--- a/backports/electron/no-mallinfo.patch
+++ b/backports/electron/no-mallinfo.patch
@ -102,23 +102,23 @@ musl does not implement mallinfo()/mallinfo2()
 #define HAVE_MALLOC_H 1
 --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
 +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc.cc
-@@ -717,7 +717,7 @@
+@@ -660,7 +660,7 @@
 
- #endif  // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID)
+ #endif  // !PA_BUILDFLAG(IS_APPLE) && !PA_BUILDFLAG(IS_ANDROID)
 
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
 +#if 0
 SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
-   base::SimplePartitionStatsDumper allocator_dumper;
+   partition_alloc::SimplePartitionStatsDumper allocator_dumper;
   Allocator()->DumpStats("malloc", true, &allocator_dumper);
 --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc
 +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_default_dispatch_to_partition_alloc_unittest.cc
-@@ -24,7 +24,7 @@
- #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
+@@ -29,7 +29,7 @@
+ #if PA_BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC)
 
 // Platforms on which we override weak libc symbols.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
+-#if PA_BUILDFLAG(IS_LINUX) || PA_BUILDFLAG(IS_CHROMEOS)
+#if (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || PA_BUILDFLAG(IS_CHROMEOS)
 
- NOINLINE void FreeForTest(void* data) {
+ PA_NOINLINE void FreeForTest(void* data) {
   free(data);
--- a/backports/electron/partalloc-no-tagging-arm64.patch
+++ b/backports/electron/partalloc-no-tagging-arm64.patch
@ -12,3 +12,14 @@ to make the partalloc support code for it work.
 
 declare_args() {
   # Causes all the allocations to be routed via allocator_shim.cc. Usually,
+--- ./base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.orig
+++ ./base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h
+@@ -10,7 +10,7 @@
+ #include "partition_alloc/build_config.h"
+ #include "partition_alloc/partition_alloc_buildflags.h"
+ 
+-#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_LINUX)
+#if PA_BUILDFLAG(IS_ANDROID) || (PA_BUILDFLAG(IS_LINUX) && defined(__GLIBC__))
+ #define HAS_HW_CAPS
+ #endif
+ 
--- a/backports/electron/perfetto-libstdc++.patch
+++ b/backports/electron/perfetto-libstdc++.patch
@ -1,20 +0,0 @@
--- a/third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc
-+++ b/third_party/perfetto/src/trace_processor/perfetto_sql/engine/created_function.cc
-@@ -107,7 +107,7 @@
-   // the destructors run correctly for non-trivial members of the
-   // union.
-   using Data =
-      std::variant<int64_t, double, OwnedString, OwnedBytes, nullptr_t>;
-+      std::variant<int64_t, double, OwnedString, OwnedBytes, std::nullptr_t>;
- 
-   StoredSqlValue(SqlValue value) {
-     switch (value.type) {
-@@ -132,7 +132,7 @@
-   }
- 
-   SqlValue AsSqlValue() {
-    if (std::holds_alternative<nullptr_t>(data)) {
-+    if (std::holds_alternative<std::nullptr_t>(data)) {
-       return SqlValue();
-     } else if (std::holds_alternative<int64_t>(data)) {
-       return SqlValue::Long(std::get<int64_t>(data));
--- a/backports/electron/pvalloc.patch
+++ b/backports/electron/pvalloc.patch
@ -2,24 +2,24 @@ the pvalloc/valloc symbols are obsolete and not implemented in musl
 --
 --- a/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
 +++ b/base/allocator/partition_allocator/src/partition_alloc/shim/allocator_shim_unittest.cc
-@@ -375,7 +375,7 @@
+@@ -410,7 +410,7 @@
   ASSERT_GE(aligned_allocs_intercepted_by_alignment[128], 1u);
   ASSERT_GE(aligned_allocs_intercepted_by_size[53], 1u);
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__)
+-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
+#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID)
   void* pvalloc_ptr = pvalloc(67);
   ASSERT_NE(nullptr, pvalloc_ptr);
   ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize);
-@@ -414,7 +414,7 @@
+@@ -449,7 +449,7 @@
   free(memalign_ptr);
   ASSERT_GE(frees_intercepted_by_addr[Hash(memalign_ptr)], 1u);
 
-#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
-+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && defined(__GLIBC__)
+-#if PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
+#if (PA_BUILDFLAG(IS_POSIX) && defined(__GLIBC__)) && !PA_BUILDFLAG(IS_ANDROID)
   free(pvalloc_ptr);
   ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
- #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
+ #endif  // PA_BUILDFLAG(IS_POSIX) && !PA_BUILDFLAG(IS_ANDROID)
 --- a/base/process/memory_unittest.cc
 +++ b/base/process/memory_unittest.cc
@@ -359,7 +359,7 @@
--- a/backports/electron/quiche-array.patch
+++ b/backports/electron/quiche-array.patch
@ -1,12 +0,0 @@
-needed for push_back on array
--
--- a/net/third_party/quiche/src/quiche/common/quiche_endian.h
-+++ b/net/third_party/quiche/src/quiche/common/quiche_endian.h
-@@ -6,6 +6,7 @@
- #define QUICHE_COMMON_QUICHE_ENDIAN_H_
- 
- #include <algorithm>
-+#include <array>
- #include <cstdint>
- #include <type_traits>
- 
--- a/backports/electron/random-fixes.patch
+++ b/backports/electron/random-fixes.patch
@ -1,94 +0,0 @@
-Patch-Source: https://gitlab.archlinux.org/archlinux/packaging/packages/chromium/-/blob/c073b0c20935d7eb452732e0f3b2860a96c3db21/random-build-fixes.patch
--
-diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc
-index 41b647f7b44..8940c6bb7fc 100644
--- a/chrome/browser/download/bubble/download_bubble_update_service.cc
-+++ b/chrome/browser/download/bubble/download_bubble_update_service.cc
-@@ -91,7 +91,7 @@ ItemSortKey GetSortKey(const Item& item) {
- // Helper to get an iterator to the last element in the cache. The cache
- // must not be empty.
- template <typename Item>
-SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-+typename SortedItems<Item>::const_iterator GetLastIter(const SortedItems<Item>& cache) {
-   CHECK(!cache.empty());
-   auto it = cache.end();
-   return std::prev(it);
-@@ -967,9 +967,9 @@ bool DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheImpl(
- }
- 
- template <typename Id, typename Item>
-SortedItems<Item>::iterator
-+typename SortedItems<Item>::iterator
- DownloadBubbleUpdateService::CacheManager::RemoveItemFromCacheByIter(
-    SortedItems<Item>::iterator iter,
-+    typename SortedItems<Item>::iterator iter,
-     SortedItems<Item>& cache,
-     IterMap<Id, Item>& iter_map) {
-   CHECK(iter != cache.end());
-diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
-index c0708681ebd..98b8494d170 100644
--- a/chrome/test/chromedriver/capabilities.cc
-+++ b/chrome/test/chromedriver/capabilities.cc
-@@ -355,7 +355,7 @@ Status ParseMobileEmulation(const base::Value& option,
-                         "'version' field of type string");
-         }
- 
-        brands.emplace_back(*brand, *version);
-+        brands.emplace_back(BrandVersion{*brand, *version});
-       }
- 
-       client_hints.brands = std::move(brands);
-@@ -392,7 +392,7 @@ Status ParseMobileEmulation(const base::Value& option,
-                         "a 'version' field of type string");
-         }
- 
-        full_version_list.emplace_back(*brand, *version);
-+        full_version_list.emplace_back(BrandVersion{*brand, *version});
-       }
- 
-       client_hints.full_version_list = std::move(full_version_list);
-diff --git a/components/optimization_guide/core/tflite_model_executor.h b/components/optimization_guide/core/tflite_model_executor.h
-index c4f750f4684..b5635f4108b 100644
--- a/components/optimization_guide/core/tflite_model_executor.h
-+++ b/components/optimization_guide/core/tflite_model_executor.h
-@@ -189,7 +189,7 @@ class TFLiteModelExecutor : public ModelExecutor<OutputType, InputType> {
-   void SendForBatchExecution(
-       BatchExecutionCallback callback_on_complete,
-       base::TimeTicks start_time,
-      ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-+      typename ModelExecutor<OutputType, InputType>::ConstRefInputVector inputs)
-       override {
-     DCHECK(execution_task_runner_->RunsTasksInCurrentSequence());
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-diff --git a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
-index 2dc0b304092..a82f255090b 100644
--- a/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
-+++ b/third_party/blink/renderer/core/html/parser/html_document_parser_fastpath.cc
-@@ -169,7 +169,7 @@ class HTMLFastPathParser {
-   using Span = base::span<const Char>;
-   using USpan = base::span<const UChar>;
-   // 32 matches that used by HTMLToken::Attribute.
-  typedef std::conditional<std::is_same_v<Char, UChar>,
-+  typedef typename std::conditional<std::is_same_v<Char, UChar>,
-                            UCharLiteralBuffer<32>,
-                            LCharLiteralBuffer<32>>::type LiteralBufferType;
-   typedef UCharLiteralBuffer<32> UCharLiteralBufferType;
-diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
-index f0b49139147..a308fb67982 100644
--- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
-+++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_style.cc
-@@ -91,12 +91,12 @@ void CanvasStyle::ApplyToFlags(cc::PaintFlags& flags,
-     case kGradient:
-       GetCanvasGradient()->GetGradient()->ApplyToFlags(flags, SkMatrix::I(),
-                                                        ImageDrawOptions());
-      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
-+      flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
-       break;
-     case kImagePattern:
-       GetCanvasPattern()->GetPattern()->ApplyToFlags(
-           flags, AffineTransformToSkMatrix(GetCanvasPattern()->GetTransform()));
-      flags.setColor(SkColor4f(0.0f, 0.0f, 0.0f, global_alpha));
-+      flags.setColor(SkColor4f{0.0f, 0.0f, 0.0f, global_alpha});
-       break;
-     default:
-       NOTREACHED();
--- a/backports/electron/system-zstd.patch
+++ b/backports/electron/system-zstd.patch
@ -1,46 +0,0 @@
-From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001
-From: Matt Jolly <Matt.Jolly@footclan.ninja>
-Date: Sun, 17 Sep 2023 16:51:42 +1000
-Subject: [PATCH] Add system-zstd
-
--- a/build/linux/unbundle/replace_gn_files.py
-+++ b/build/linux/unbundle/replace_gn_files.py
-@@ -74,6 +74,7 @@ REPLACEMENTS = {
-   #
-   'woff2': 'third_party/woff2/BUILD.gn',
-   'zlib': 'third_party/zlib/BUILD.gn',
-+  'zstd': 'third_party/zstd/BUILD.gn',
- }
- 
- 
--- /dev/null
-+++ b/build/linux/unbundle/zstd.gn
-@@ -0,0 +1,25 @@
-+import("//build/config/linux/pkg_config.gni")
-+import("//build/shim_headers.gni")
-+
-+pkg_config("system_zstd") {
-+  packages = [ "libzstd" ]
-+}
-+
-+shim_headers("zstd_shim") {
-+  root_path = "src/lib"
-+  headers = [
-+    "zdict.h",
-+    "zstd.h",
-+    "zstd_errors.h",
-+  ]
-+}
-+
-+source_set("zstd") {
-+  deps = [ ":zstd_shim" ]
-+  public_configs = [ ":system_zstd" ]
-+}
-+
-+source_set("decompress") {
-+  deps = [ ":zstd_shim" ]
-+  public_configs = [ ":system_zstd" ]
-+}
-- 
-2.42.0
-
--- a/backports/fdm-materials/APKBUILD
+++ b/backports/fdm-materials/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=fdm-materials
 pkgver=5.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="FDM Material Database"
 url="https://github.com/Ultimaker/fdm_materials"
 arch="noarch"
--- a/backports/freetube/APKBUILD
+++ b/backports/freetube/APKBUILD
@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=freetube
 pkgver=0.21.3
-pkgrel=0
+pkgrel=2
 pkgdesc="An open source desktop YouTube player built with privacy in mind."
 arch="x86_64 aarch64" # blocked by electron
 license="AGPL-3.0-only"
--- a/backports/libmedc/APKBUILD
+++ b/backports/libmedc/APKBUILD
@ -1,43 +0,0 @@
-# Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
-pkgname=libmedc
-pkgver=4.1.1
-pkgrel=3
-pkgdesc="Open source library for numerical simulation"
-url="https://www.salome-platform.org/"
-arch="all"
-license="GPL-3.0-or-later"
-makedepends="cmake hdf5-dev swig python3-dev samurai"
-options="!check" #test suite is nonfunctional with python bindings
-subpackages="$pkgname-dev $pkgname-doc $pkgname-python-pyc $pkgname-python:_py"
-source="
-	https://files.salome-platform.org/Salome/medfile/med-$pkgver.tar.gz
-	hdf5.patch
-	cmake-config-dir.patch
-	"
-builddir="$srcdir/med-$pkgver"
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMEDFILE_BUILD_TESTS=OFF \
-		-DMEDFILE_BUILD_PYTHON=ON
-	cmake --build build
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-
-_py() {
-	pkgdesc="Python bindings for libmedc"
-	depends="python3"
-	amove usr/lib/python3*
-}
-
-sha512sums="
-f211fa82750a7cc935baa3a50a55d16e40117a0f2254b482492ba8396d82781ca84960995da7a16b2b5be0b93ce76368bf4b311bb8af0e5f0243e7051c9c554c  med-4.1.1.tar.gz
-68d9291e73a68d674081314028c0fce7bbd4a7b78b93b7e5078117ce62f2d07318bc33ec95091ce677148ec3926c1ce653d0760c34e74b29257a7be59210f040  hdf5.patch
-8d0f58cd67d205fbacaff0e6da76e2ee5473457b478ede13a551ebe5853c0716c7406b74c3792e1ace33a34d352fccca8dd2940f063a7c060a12529d060a991a  cmake-config-dir.patch
-"
--- a/backports/libmedc/cmake-config-dir.patch
+++ b/backports/libmedc/cmake-config-dir.patch
@ -1,11 +0,0 @@
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -101,7 +101,7 @@
- IF(WIN32 AND NOT CYGWIN)
-    SET(INSTALL_CMAKE_CONFIG_DIR cmake)
- ELSE()
-   SET(INSTALL_CMAKE_CONFIG_DIR share/cmake/medfile-${MED_STR_VERSION})
-+   SET(INSTALL_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/medfile-${MED_STR_VERSION})
- ENDIF()
- SET(INSTALL_INCLUDE_DIR include)
- 
--- a/backports/libmedc/hdf5.patch
+++ b/backports/libmedc/hdf5.patch
@ -1,94 +0,0 @@
-Originally from https://gist.github.com/jedbrown/527ef81ff59a0dccf833da40fdd15a47
-diff -rupN med-4.1.0/config/cmake_files/medMacros.cmake med-4.1.0-new/config/cmake_files/medMacros.cmake
--- med-4.1.0/config/cmake_files/medMacros.cmake	2021-12-03 09:35:30.675827163 +0100
-+++ med-4.1.0-new/config/cmake_files/medMacros.cmake	2021-12-03 09:32:31.894994147 +0100
-@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5)
-     ##
-     ## Requires 1.10.x version
-     ##
-    IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1)
-+    IF (HDF5_VERSION VERSION_LESS 1.10.2)
-         MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.")
-     ENDIF()
-     ##
-diff -rupN med-4.1.0/src/ci/MEDfileCompatibility.c med-4.1.0-new/src/ci/MEDfileCompatibility.c
--- med-4.1.0/src/ci/MEDfileCompatibility.c	2021-12-03 09:35:30.676827162 +0100
-+++ med-4.1.0-new/src/ci/MEDfileCompatibility.c	2021-12-03 09:33:26.292942149 +0100
-@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const f
-   _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease;
-   /* ISCRUTE(_hversionMMR); */
-   /* ISCRUTE(HDF_VERSION_NUM_REF); */
-  if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE;
-+  if (_hversionMMR >= HDF_VERSION_NUM_REF) *hdfok = MED_TRUE;
- 
-   /* TODO : Vérifier si la version mineure HDF du fichier est supérieure
-      à la version mineure de la bibliothèque HDF utilisée :
-@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const f
- #if MED_NUM_MAJEUR != 4
- #error "Don't forget to update the test version here when you change the major version of the library !"
- #endif
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !"
- #error "Cf. _MEDfileCreate ..."
- #endif
-diff -rupN med-4.1.0/src/hdfi/_MEDfileCreate.c med-4.1.0-new/src/hdfi/_MEDfileCreate.c
--- med-4.1.0/src/hdfi/_MEDfileCreate.c	2021-12-03 09:35:30.677827161 +0100
-+++ med-4.1.0-new/src/hdfi/_MEDfileCreate.c	2021-12-03 09:32:31.894994147 +0100
-@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * cons
-    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff -rupN med-4.1.0/src/hdfi/_MEDfileOpen.c med-4.1.0-new/src/hdfi/_MEDfileOpen.c
--- med-4.1.0/src/hdfi/_MEDfileOpen.c	2021-12-03 09:35:30.677827161 +0100
-+++ med-4.1.0-new/src/hdfi/_MEDfileOpen.c	2021-12-03 09:32:31.894994147 +0100
-@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const
- 
-    •   The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). 
-   */
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to change the compatibility version of the library !"
- #endif
- /* L'avantage de bloquer le modèle interne HDF5 
-diff -rupN med-4.1.0/src/hdfi/_MEDmemFileOpen.c med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c
--- med-4.1.0/src/hdfi/_MEDmemFileOpen.c	2021-12-03 09:35:30.678827160 +0100
-+++ med-4.1.0-new/src/hdfi/_MEDmemFileOpen.c	2021-12-03 09:32:31.894994147 +0100
-@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * con
-     goto ERROR;
-   }
- 
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) {
-diff -rupN med-4.1.0/src/hdfi/_MEDparFileCreate.c med-4.1.0-new/src/hdfi/_MEDparFileCreate.c
--- med-4.1.0/src/hdfi/_MEDparFileCreate.c	2021-12-03 09:35:30.678827160 +0100
-+++ med-4.1.0-new/src/hdfi/_MEDparFileCreate.c	2021-12-03 09:32:31.894994147 +0100
-@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * c
-    * En HDF5-1.10.0p1 cela n'a aucun effet ! 
-    * Un test autoconf permet de fixer un intervalle de version HDF à MED.
-    */
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-    
-diff -rupN med-4.1.0/src/hdfi/_MEDparFileOpen.c med-4.1.0-new/src/hdfi/_MEDparFileOpen.c
--- med-4.1.0/src/hdfi/_MEDparFileOpen.c	2021-12-03 09:35:30.679827159 +0100
-+++ med-4.1.0-new/src/hdfi/_MEDparFileOpen.c	2021-12-03 09:32:31.894994147 +0100
-@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * con
-     MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG);
-     goto ERROR;
-   }
-#if H5_VERS_MINOR > 10
-+#if H5_VERS_MINOR > 14
- #error "Don't forget to change the compatibility version of the library !"
- #endif
-   if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) {
--- a/backports/nlopt/APKBUILD
+++ b/backports/nlopt/APKBUILD
@ -1,38 +1,71 @@
 # Contributor: Anjandev Momi <anjan@momi.ca>
-# Maintainer: Anjandev Momi <anjan@momi.ca>
+# Maintainer: Celeste <cielesti@protonmail.com>
+maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=nlopt
-pkgver=2.7.1
+pkgver=2.8.0
 pkgrel=0
-pkgdesc="library for nonlinear optimization, wrapping many algorithms for global and local, constrained or unconstrained, optimization"
-url="https://github.com/stevengj/nlopt/"
+pkgdesc="Library for nonlinear optimization"
+url="https://github.com/stevengj/nlopt"
 arch="all"
 license="LGPL-2.1-or-later"
-makedepends="samurai cmake"
-subpackages="$pkgname-dev $pkgname-doc"
+makedepends="
+	cmake
+	guile-dev
+	python3-dev
+	samurai
+	swig
+	"
+subpackages="
+	$pkgname-dev
+	$pkgname-doc
+	$pkgname-guile
+	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/stevengj/nlopt/archive/refs/tags/v$pkgver.tar.gz"

+case "$CARCH" in
+# octave unavailable on these 3 archs
+s390x|riscv64|ppc64le) ;;
+*)
+	makedepends="$makedepends octave-dev"
+	subpackages="$subpackages $pkgname-octave"
+	;;
+esac
+
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
-		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+		local crossopts="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
 	fi
 	cmake -B build -G Ninja \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
-		-DBUILD_SHARED_LIBS=True \
-		-DCMAKE_BUILD_TYPE=minsizerel \
-		$CMAKE_CROSSOPTS .
+		-DBUILD_SHARED_LIBS=ON \
+		-DCMAKE_BUILD_TYPE=MinSizeRel \
+		$crossopts
 	cmake --build build
 }

 check() {
-	cd build
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	ctest --test-dir build --output-on-failure
 }

 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }

+guile() {
+	pkgdesc="$pkgdesc (Guile bindings)"
+	depends="$pkgname=$pkgver-r$pkgrel guile"
+
+	amove usr/lib/guile usr/share/guile
+}
+
+octave() {
+	pkgdesc="$pkgdesc (Octave bindings)"
+	depends="$pkgname=$pkgver-r$pkgrel octave"
+
+	amove usr/lib/octave usr/share/octave
+}
+
 sha512sums="
-e23cb522fc696010574c14b72be85acc0f8ccf0bf208bf2b8789c57d6c5a6e6d419ee10330581518b1c1567018ae909b626ce7761d4fbd5bf112916871e420e2  nlopt-2.7.1.tar.gz
+cb294caa5532e11ae0d22ed849705920bbae79f712144c840a5ca865ef8e6a15c6c9540c81ced0c3c05b9f44c360d50f74e235e69d893be34b7e1c5599f07c71  nlopt-2.8.0.tar.gz
 "
--- a/backports/openssl1.1-compat/APKBUILD
+++ b/backports/openssl1.1-compat/APKBUILD
@ -3,7 +3,7 @@
 pkgname=openssl1.1-compat
 pkgver=1.1.1w
 _abiver=${pkgver%.*}
-pkgrel=0
+pkgrel=1
 pkgdesc="toolkit for transport layer security (TLS) - version 1.1"
 url="https://www.openssl.org/"
 arch="all"
@ -86,6 +86,7 @@ build() {
 		x86_64)		_target="linux-x86_64"; _optflags="enable-ec_nistp_64_gcc_128" ;;
 		s390x)		_target="linux64-s390x";;
 		riscv64)	_target="linux-generic64";;
+		loongarch64)	_target="linux-generic64";;
 		*)		msg "Unable to determine architecture from (CARCH=$CARCH)" ; return 1 ;;
 	esac

@ -103,7 +104,7 @@ build() {
 	perl ./Configure \
 		$_target \
 		--prefix=/usr \
-		--libdir=lib \
+		--libdir=/usr/lib \
 		--openssldir=/etc/ssl1.1 \
 		shared \
 		no-zlib \
@ -144,23 +145,16 @@ package() {
 _libcrypto() {
 	pkgdesc="Crypto library from openssl"
 	replaces="libressl2.7-libcrypto"
-	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
-	mv "$pkgdir"/etc "$subpkgdir"/
-	for i in "$pkgdir"/usr/lib/libcrypto*; do
-		mv $i "$subpkgdir"/lib/
-		ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
-	done
-	mv "$pkgdir"/usr/lib/engines-$_abiver "$subpkgdir"/usr/lib/
+
+	amove etc
+	amove usr/lib/libcrypto*
+	amove usr/lib/engines-$_abiver
 }

 _libssl() {
 	pkgdesc="SSL shared libraries"

-	mkdir -p "$subpkgdir"/lib "$subpkgdir"/usr/lib
-	for i in "$pkgdir"/usr/lib/libssl*; do
-		mv $i "$subpkgdir"/lib/
-		ln -s ../../lib/${i##*/} "$subpkgdir"/usr/lib/${i##*/}
-	done
+	amove usr/lib/libssl*
 }

 _static() {
--- a/backports/perl-math-random-isaac-xs/APKBUILD
+++ b/backports/perl-math-random-isaac-xs/APKBUILD
@ -1,47 +1,39 @@
-# Automatically generated by apkbuild-cpan, template 2
+# Automatically generated by apkbuild-cpan, template 4
 # Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Celeste <cielesti@protonmail.com>
+maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=perl-math-random-isaac-xs
-_pkgreal=Math-Random-ISAAC-XS
 pkgver=1.004
-pkgrel=7
+pkgrel=8
+#_pkgreal is used by apkbuild-cpan to find modules at MetaCpan
+_pkgreal=Math-Random-ISAAC-XS
 pkgdesc="C implementation of the ISAAC PRNG algorithm"
 url="https://metacpan.org/release/Math-Random-ISAAC-XS/"
 arch="all"
-license="unrestricted"
-cpandepends=""
-cpanmakedepends="perl-test-nowarnings"
-cpancheckdepends=""
-depends="$cpandepends"
-makedepends="perl-dev perl-module-build $cpanmakedepends"
-checkdepends="$cpancheckdepends"
+license="Public-Domain"
+depends="perl"
+makedepends="perl-dev perl-module-build"
+checkdepends="perl-test-nowarnings"
 subpackages="$pkgname-doc"
-source="https://cpan.metacpan.org/authors/id/J/JA/JAWNSY/$_pkgreal-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/J/JA/JAWNSY/Math-Random-ISAAC-XS-$pkgver.tar.gz"
 builddir="$srcdir/$_pkgreal-$pkgver"

-prepare() {
-	default_prepare || return 1
-
-	cd "$builddir"
-	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
-	perl Build.PL installdirs=vendor || return 1
-}
-
 build() {
-	cd "$builddir"
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
+	perl Build.PL \
+		--installdirs=vendor \
+		--create_packlist=0
 	./Build
 }

-package() {
-	cd "$builddir"
-	./Build install destdir="$pkgdir" || return 1
-	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
-}
-
 check() {
-	cd "$builddir"
 	./Build test
 }

-sha512sums="40c46b5f247f585a407ef9f36b5874d9cf03ec05963a9d92d988ebd63daf1e37b1b51308845d4596f47b5ad7203953bcb7fbb421c905b526dbe99b246ccb4d87  Math-Random-ISAAC-XS-1.004.tar.gz"
+package() {
+	./Build install --destdir="$pkgdir"
+}
+
+sha512sums="
+40c46b5f247f585a407ef9f36b5874d9cf03ec05963a9d92d988ebd63daf1e37b1b51308845d4596f47b5ad7203953bcb7fbb421c905b526dbe99b246ccb4d87  Math-Random-ISAAC-XS-1.004.tar.gz
+"
--- a/backports/py3-apsw/APKBUILD
+++ b/backports/py3-apsw/APKBUILD
@ -2,8 +2,8 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=py3-apsw
 _pkgname=apsw
-pkgver=3.45.2.0
-pkgrel=1
+pkgver=3.46.1.0
+pkgrel=0
 pkgdesc="Another Python SQLite Wrapper"
 url="https://github.com/rogerbinns/apsw"
 arch="all"
@ -41,6 +41,6 @@ package() {
 }

 sha512sums="
-0260f6479d5f1188ad172dfc0dd7e4a03c9d809d2f80c2296e587a19286681bb2ce759b0bd19ec6957e2902f18729b7e79410e4db79dff9918089f57dd510828  py3-apsw-3.45.2.0.zip
+8d24825c8346b05a99b8959ce1fd45ae5162c95b020ecc63bd3491bfd1579370a0e6b1a962f7f64a7e7e415846007e64d90b28e2065ae047e228d60b12b9cb02  py3-apsw-3.46.1.0.zip
 8f3957bd6fecb5660a7cab367043e4ccdacd87d8963bbe41cc3d525265de28f08aa207099658d785be29c5c90b818c1418f766995cd780d02b8e36252a389758  detect-sqlite-config.patch
 "
--- a/backports/py3-arcus/APKBUILD
+++ b/backports/py3-arcus/APKBUILD
@ -1,9 +1,9 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=py3-arcus
 # Needs to be upgraded in sync with libarcus
 pkgver=5.3.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Python bindings for libarcus"
 url="https://github.com/Ultimaker/pyArcus"
 arch="all"
--- a/backports/py3-colored/APKBUILD
+++ b/backports/py3-colored/APKBUILD
@ -2,13 +2,13 @@
 pkgname=py3-colored
 _pyname=${pkgname/py3-/}
 pkgver=1.4.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple Python library for color and formatting in terminal"
 url="https://gitlab.com/dslackw/colored"
 arch="noarch"
 license="MIT"
 depends="python3"
-makedepends="py3-setuptools"
+makedepends="py3-setuptools py3-gpep517"
 checkdepends="py3-pytest"
 subpackages="$pkgname-pyc"
 source="https://gitlab.com/dslackw/colored/-/archive/$pkgver/colored-$pkgver.tar.gz"
@ -16,11 +16,14 @@ builddir="$srcdir/$_pyname-$pkgver"
 options="!check" # No testsuite

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
--- a/backports/py3-daemon/APKBUILD
+++ b/backports/py3-daemon/APKBUILD
@ -1,40 +0,0 @@
-# Contributor: Noel Kuntze <noel.kuntze@thermi.consulting>
-# Maintainer: Noel Kuntze <noel.kuntze@thermi.consulting>
-pkgname=py3-daemon
-pkgver=2.3.2
-pkgrel=4
-pkgdesc="Library to implement a well-behaved Unix daemon process"
-url="https://pagure.io/python-daemon"
-options="!check" # Has lots of dependencies
-arch="noarch"
-license="Apache-2.0 AND GPL-3.0-or-later"
-depends="py3-setuptools py3-lockfile"
-makedepends="py3-docutils"
-subpackages="$pkgname-pyc"
-source="
-	https://pypi.io/packages/source/p/python-daemon/python-daemon-$pkgver.tar.gz
-	remove-docutils-depend.patch
-"
-builddir="$srcdir/python-daemon-$pkgver"
-
-prepare() {
-	default_prepare
-
-	# Remove unnecessary dependency for building, twine is
-	# required for uploading the package to pypi which we don't
-	# do
-	sed -e '/twine/d' -i setup.py
-}
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	python3 setup.py install --root="$pkgdir"
-}
-
-sha512sums="
-d9f6e6c376a496fae96bd9efed0a56d00a137617a3d1d5ef74802ef176bc813bb1d49bbb9164cdbec03213529f944b32b257bcc64283abfa4a3522ff00826bfd  python-daemon-2.3.2.tar.gz
-20bc4bce7fba9754d1c9bca298f9b4ff7fe90ecf51769df2020912f370650a5997f91c99c6be2ecffed10a6b359a29b1f64b0c391772451eb3c04769df381015  remove-docutils-depend.patch
-"
--- a/backports/py3-daemon/remove-docutils-depend.patch
+++ b/backports/py3-daemon/remove-docutils-depend.patch
@ -1,16 +0,0 @@
-diff --git a/setup.py.orig b/setup.py
-index 24f0e7cb98a..d712294c20b 100644
--- a/setup.py.orig
-+++ b/setup.py
-@@ -96,11 +96,6 @@ setup_kwargs = dict(
-             ],
-         )
- 
-# Docutils is only required for building, but Setuptools can't distinguish
-# dependencies properly.
-# See <URL:https://github.com/pypa/setuptools/issues/457>.
-setup_kwargs['install_requires'].append("docutils")
-
- 
- if __name__ == '__main__':
-     setup(**setup_kwargs)
--- a/backports/py3-dateparser/APKBUILD
+++ b/backports/py3-dateparser/APKBUILD
@ -1,8 +1,8 @@
-# Maintainer: Hoang Nguyen <folliekazetani@protonmail.com>
+maintainer="Hoang Nguyen <folliekazetani@protonmail.com>"
 pkgname=py3-dateparser
 _pyname=${pkgname#py3-}
 pkgver=1.2.0
-pkgrel=1
+pkgrel=0
 pkgdesc="Python parser for human readable dates"
 url="https://github.com/scrapinghub/dateparser"
 arch="noarch"
@ -40,13 +40,10 @@ build() {
 }

 check() {
-	_test_filter='not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english'
+	# test_relative_base_setting_2_en fails due to tzinfo mismatch
 	# test_custom_language_detect_fast_text fails due to wrong file format
-	case "$CARCH" in
-	s390x)
-		_test_filter="$_test_filter and not test_custom_language_detect_fast_text"
-		;;
-	esac
+	_test_filter="not test_parsing_date_should_fail_using_datetime_strptime_if_locale_is_non_english \
+		and not test_relative_base_setting_2_en and not test_custom_language_detect_fast_text"

 	python3 -m venv --clear --without-pip --system-site-packages .testenv
 	.testenv/bin/python3 -m installer .dist/*.whl
--- a/backports/py3-flask-limiter/APKBUILD
+++ b/backports/py3-flask-limiter/APKBUILD
@ -1,7 +1,7 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
-# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
+maintainer="lauren n. liberda <lauren@selfisekai.rocks>"
 pkgname=py3-flask-limiter
-pkgver=3.7.0
+pkgver=3.9.2
 pkgrel=0
 pkgdesc="Rate Limiting extension for Flask"
 url="https://github.com/alisaifee/flask-limiter"
@ -14,7 +14,7 @@ depends="
 	py3-rich
 	python3
 	"
-makedepends="py3-setuptools"
+makedepends="py3-setuptools py3-gpep517"
 checkdepends="
 	py3-flask-restful
 	py3-flask-restx
@ -23,7 +23,6 @@ checkdepends="
 	py3-pytest
 	py3-pytest-cov
 	"
-options="!check"	# tests depend on unpackaged modules
 subpackages="$pkgname-pyc"
 source="
 	https://github.com/alisaifee/flask-limiter/archive/refs/tags/$pkgver/flask-limiter-$pkgver.tar.gz
@ -31,20 +30,26 @@ source="
 	our-std-is-good-enough.patch
 	"
 builddir="$srcdir/flask-limiter-$pkgver"
+options="!check" # tests depend on unpackaged modules

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
-	pytest
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }

 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
-f546536e3efb86571515aac5b578155c240049fb1ccf96e55d4b1814d9e227e41cc18fc587f115706606154bb12a84b381533cf069cdfc56453b0f170ec19449  flask-limiter-3.7.0.tar.gz
+69e488a641ab39c088185fabcde19ebb4cbe1683e9143efdf146163bb0254e0c4f8b4b72df407542d540394e7e3b2d7498b9c93c25ae8a8128e05e319f342318  flask-limiter-3.9.2.tar.gz
 1b90e9134076cda249695d5ea741db9d205a2ae452c7d6edfe01eb37a221ce6f64b0e8ddcdbbee9b0e0fb16a28e5eabf14f1c1e41e965c7e3b93ea4f42caf553  our-std-is-good-enough.patch
 "
--- a/backports/py3-fuzzywuzzy/APKBUILD
+++ b/backports/py3-fuzzywuzzy/APKBUILD
@ -3,28 +3,33 @@
 pkgname=py3-fuzzywuzzy
 _pyname=fuzzywuzzy
 pkgver=0.18.0
-pkgrel=6
+pkgrel=7
 pkgdesc="Fuzzy string matching in python"
 url="https://github.com/seatgeek/fuzzywuzzy"
 arch="noarch"
 license="GPL-2.0-only"
 depends="python3 py3-levenshtein"
-makedepends="py3-setuptools"
+makedepends="py3-setuptools py3-gpep517"
 checkdepends="py3-pytest py3-pycodestyle py3-hypothesis"
 subpackages="$pkgname-pyc"
 source="https://files.pythonhosted.org/packages/source/${_pyname%${_pyname#?}}/$_pyname/$_pyname-$pkgver.tar.gz"
 builddir="$srcdir/$_pyname-$pkgver"

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
-	PYTHONPATH="$PWD/build/lib" pytest -v
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }

 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
--- a/backports/py3-limits/APKBUILD
+++ b/backports/py3-limits/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=py3-limits
-pkgver=3.12.0
-pkgrel=0
+pkgver=3.13.0
+pkgrel=1
 pkgdesc="Rate limiting using various strategies and storage backends such as redis & memcached"
 url="https://github.com/alisaifee/limits"
 arch="noarch"
@ -11,7 +11,7 @@ depends="
 	py3-deprecated
 	python3
 	"
-makedepends="py3-setuptools"
+makedepends="py3-setuptools py3-gpep517"
 checkdepends="
 	py3-flaky
 	py3-mongo
@ -31,20 +31,25 @@ source="
 builddir="$srcdir/limits-$pkgver"

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
-	pytest \
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
+	.testenv/bin/python3 -m pytest \
 		-m 'not benchmark and not etcd and not integration and not memcached' \
 		-k 'not aio and not Storage and not strategy' -v
 }

 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
-2803dc26b18015e177342ed89e879f4dd680908579c99f9069d695edfa2beb3008b5bc47454ea2120a425bbcbc8a08928ab93a3058b33e11a2ae29431dfd9cd1  limits-3.12.0.tar.gz
+0a13d08001c2f95e559ac1be35fa8cc178ad2d41bd5bf7b7e85781a428f550c350c21b92942b5b7e45f0f4c0604e96e579c8a26b5e9ca1196e6605608721030a  limits-3.13.0.tar.gz
 0364d51f9f879b95c6a4a3c9e9fd3d7d1e15ea214c50ae98cd36826b8c0b2d903cf1128741ac83738e305a207dae8955a0b2c8679484d2d6643e334595bdb1d7  our-std-is-good-enough.patch
 "
--- a/backports/py3-mapbox-earcut/APKBUILD
+++ b/backports/py3-mapbox-earcut/APKBUILD
@ -1,30 +1,33 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=py3-mapbox-earcut
 pkgver=1.0.1
-pkgrel=0
+pkgrel=2
 pkgdesc="Python bindings for the mapbox earcut c++ library"
 url="https://github.com/skogler/mapbox_earcut_python"
 arch="all"
 license="ISC"
 depends="py3-numpy"
-makedepends="py3-setuptools py3-pybind11-dev python3-dev"
-checkdepends="pytest"
+makedepends="py3-setuptools py3-pybind11-dev python3-dev py3-gpep517"
+checkdepends="py3-pytest"
 source="$pkgname-$pkgver.tar.gz::https://github.com/skogler/mapbox_earcut_python/archive/refs/tags/v$pkgver.tar.gz"
 builddir="$srcdir/mapbox_earcut_python-$pkgver"

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
-	python3 -m venv --clear --without-pip --system-site-packages test-env
-	test-env/bin/python3 setup.py install
-	test-env/bin/python3 -m pytest
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }

 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
--- a/backports/py3-microdata/APKBUILD
+++ b/backports/py3-microdata/APKBUILD
@ -1,37 +0,0 @@
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-pkgname=py3-microdata
-#_pkgreal is used by apkbuild-pypi to find modules at PyPI
-_pkgreal=microdata
-pkgver=0.8.0
-pkgrel=0
-pkgdesc="html5lib extension for parsing microdata"
-url="https://pypi.python.org/project/microdata"
-license="CC0-1.0"
-arch="noarch"
-depends="py3-html5lib"
-makedepends="py3-setuptools py3-gpep517 py3-wheel"
-source="$pkgname-$pkgver.tar.gz::https://github.com/edsu/microdata/archive/refs/tags/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-subpackages="$pkgname-pyc"
-
-build() {
-	gpep517 build-wheel \
-		--wheel-dir .dist \
-		--output-fd 3 3>&1 >&2
-}
-
-check() {
-	python3 -m venv --clear --without-pip --system-site-packages .testenv
-	.testenv/bin/python3 -m installer .dist/*.whl
-	.testenv/bin/python3 setup.py test
-}
-
-package() {
-	python3 -m installer -d "$pkgdir" \
-		.dist/*.whl
-}
-
-sha512sums="
-e48c8c267f595faec97397fae470a3aa1f4f33d9f4ea7d186f07b104166b373ea768db7d73423aedd28af3e310f6b9fa268d946420c6aed9676d15f38396b07e  py3-microdata-0.8.0.tar.gz
-"
--- a/backports/py3-numpy-stl/APKBUILD
+++ b/backports/py3-numpy-stl/APKBUILD
@ -1,34 +1,39 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=py3-numpy-stl
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.2.0
+pkgrel=0
 pkgdesc="Library for working with STLs"
 url="https://github.com/WoLpH/numpy-stl"
 # s390x: no py3-utils
 arch="noarch !s390x"
 license="BSD-3-Clause"
 depends="python3 py3-utils py3-numpy"
-makedepends="py3-setuptools"
-checkdepends="py3-pytest"
+makedepends="py3-setuptools py3-gpep517"
+checkdepends="py3-pytest py3-pytest-cov py3-pygments"
 subpackages="$pkgname-pyc"
-source="$pkgname-$pkgver.tar.gz::https://github.com/wolph/numpy-stl/releases/download/v$pkgver/numpy-stl-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/wolph/numpy-stl/archive/refs/tags/v$pkgver.tar.gz"
 builddir="$srcdir/numpy-stl-$pkgver"

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
 	# deselected test needs xvfb-run and fails
-	pytest \
+	.testenv/bin/python3 -m pytest \
 		--deselect tests/test_ascii.py::test_use_with_qt_with_custom_locale_decimal_delimeter
 }

 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
-d01abb8f54738600ce36c8c44e1392957061030e7accbbfa0352aea4a904323a96712099146b311ce9518f243317c25c47cfb30930469602c0ad439de9f43c5f  py3-numpy-stl-3.0.1.tar.gz
+a08053ed264dbfd629229af3db9c38deed2932b28feced56e2d4c20476f1ba85ddc80881fb82330ea3f4fff9a3f91da20db7447050da5c75f1c04455a67538dc  py3-numpy-stl-3.2.0.tar.gz
 "
--- a/backports/py3-pathvalidate/APKBUILD
+++ b/backports/py3-pathvalidate/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: lauren n. liberda <lauren@selfisekai.rocks>
 # Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=py3-pathvalidate
-pkgver=3.2.0
-pkgrel=1
+pkgver=3.2.1
+pkgrel=0
 pkgdesc="Python library to sanitize/validate a string such as filenames/file-paths/etc"
 url="https://github.com/thombashi/pathvalidate"
 arch="noarch"
@ -11,6 +11,7 @@ depends="python3"
 makedepends="
 	py3-gpep517
 	py3-setuptools
+	py3-setuptools_scm
 	py3-wheel
 	"
 checkdepends="py3-pytest py3-click py3-faker"
@ -20,6 +21,7 @@ source="https://github.com/thombashi/pathvalidate/archive/refs/tags/v$pkgver/pat
 builddir="$srcdir/pathvalidate-$pkgver"

 build() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION="$pkgver"
 	gpep517 build-wheel \
 		--wheel-dir .dist \
 		--output-fd 3 3>&1 >&2
@ -31,5 +33,5 @@ package() {
 }

 sha512sums="
-d1b0e49028bc5497558d9a0c15b4e3c301cacb439bebccffc467fc23001854877dbc81a214cc6eb34c5a905a88c4f9394f5865a4de42f354b2450a3bfe10bb9e  pathvalidate-3.2.0.tar.gz
+094bb442258ba58fff11691f5b60976513924443247e808effbc26b9dd6c336f5f84d8e4563643b7def19d9f82170eb9ec6cd89491f9115df8d1634d2aa12206  pathvalidate-3.2.1.tar.gz
 "
--- a/backports/py3-pivy/APKBUILD
+++ b/backports/py3-pivy/APKBUILD
@ -1,11 +1,11 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=py3-pivy
-pkgver=0.6.9_alpha0
-pkgrel=0
+pkgver=0.6.9
+pkgrel=2
 pkgdesc="Python3 bindings for coin"
 url="https://github.com/coin3d/pivy"
-# riscv64 blocked by py3-pyside6
+# riscv64: blocked by py3-pyside6
 arch="all !riscv64"
 license="ISC"
 depends="py3-pyside6"
@ -32,5 +32,5 @@ package() {
 }

 sha512sums="
-1bfefd58d2921c8be170a97efa30cad53b01f636ea0cf236acca242be4f691669a4c310cd61c64d3e0c55e55e8be96d36945cd244380ddc0b3a06170d0f8b691  py3-pivy-0.6.9_alpha0.tar.gz
+fd9587c69ad7468b771fbae59e68620f67a3c20850edadd65bf7994c1789d3444feb419e65dce34c6ee897c98eaca9f2f29f0bbfb4d1f0bbde26e4db56f74f78  py3-pivy-0.6.9.tar.gz
 "
--- a/backports/py3-pyinstrument/APKBUILD
+++ b/backports/py3-pyinstrument/APKBUILD
@ -1,18 +1,29 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=py3-pyinstrument
-pkgver=4.6.2
-pkgrel=1
+pkgver=4.7.3
+pkgrel=0
 pkgdesc="Call stack profiler for Python"
 url="https://github.com/joerick/pyinstrument"
 arch="all"
 license="BSD-3-Clause"
-makedepends="py3-gpep517 py3-setuptools py3-wheel python3-dev"
-checkdepends="py3-pytest py3-flaky py3-trio py3-greenlet"
+makedepends="
+	py3-gpep517
+	py3-setuptools
+	py3-wheel
+	python3-dev
+	"
+checkdepends="
+	py3-flaky
+	py3-greenlet
+	py3-pytest
+	py3-pytest-asyncio
+	py3-trio
+	"
 subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/joerick/pyinstrument/archive/refs/tags/v$pkgver.tar.gz"
 builddir="$srcdir/pyinstrument-$pkgver"
-options="!check" # currently not working

 build() {
 	gpep517 build-wheel \
@ -21,9 +32,13 @@ build() {
 }

 check() {
+	[ -d "pyinstrument" ] && mv -v pyinstrument pyinstrument.src
+
 	python3 -m venv --clear --without-pip --system-site-packages .testenv
 	.testenv/bin/python3 -m installer .dist/*.whl
-	.testenv/bin/python3 -m pytest
+
+	# test_cmdline.py tries to run "pyinstrument" executable
+	PATH="$builddir/.testenv/bin:$PATH" .testenv/bin/python3 -m pytest
 }

 package() {
@ -31,5 +46,5 @@ package() {
 }

 sha512sums="
-da23988e6c68876cb8920ce284326f349425303ae36718c5c479b72b5f5ca5d48ced1674bcab71851f60e81a0985bb668bfa89a8b96cc20a1faa0dd7e623ec50  py3-pyinstrument-4.6.2.tar.gz
+24feac08a9726379b749f391bdb6ddbca6d3631cf3515d3ead85ace7a96f213bf60e2cd4d4f3c7cade68b5e481b4bfd562482817befe6322579101a8d91add66  py3-pyinstrument-4.7.3.tar.gz
 "
--- a/backports/py3-pytube/APKBUILD
+++ b/backports/py3-pytube/APKBUILD
@ -1,42 +0,0 @@
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-pkgname=py3-pytube
-#_pkgreal is used by apkbuild-pypi to find modules at PyPI
-_pkgreal=pytube
-pkgver=15.0.0
-pkgrel=1
-pkgdesc="Python 3 library for downloading YouTube Videos."
-url="https://pypi.python.org/project/pytube"
-arch="noarch"
-license="Unlicense"
-checkdepends="py3-pytest"
-makedepends="py3-setuptools py3-gpep517 py3-wheel"
-source="$pkgname-$pkgver.tar.gz::https://github.com/pytube/pytube/archive/refs/tags/v$pkgver.tar.gz"
-builddir="$srcdir/$_pkgreal-$pkgver"
-subpackages="$pkgname-pyc"
-# 7/131 units failing due to:
-#   AttributeError: 'NoneType' object has no attribute 'register_on_progress_callback'
-#   AttributeError: 'YouTube' object has no attribute 'stream_monostate'
-#   StopIteration
-options="!check"
-
-build() {
-	gpep517 build-wheel \
-		--wheel-dir .dist \
-		--output-fd 3 3>&1 >&2
-}
-
-check() {
-	python3 -m venv --clear --without-pip --system-site-packages .testenv
-	.testenv/bin/python3 -m installer "$builddir"/.dist/*.whl
-	.testenv/bin/python3 -m pytest -v
-}
-
-package() {
-	python3 -m installer -d "$pkgdir" \
-		.dist/*.whl
-}
-
-sha512sums="
-fc28d87c56bae9da3def68224a03687cc521c26e6f38dd41abe81e84f91bb2cab73dc8c7dbbc388787cf066f7d7304c78162cc60c544b99e75187b760c64b4a3  py3-pytube-15.0.0.tar.gz
-"
--- a/backports/py3-rapidjson/APKBUILD
+++ b/backports/py3-rapidjson/APKBUILD
@ -1,56 +0,0 @@
-# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-pkgname=py3-rapidjson
-pkgver=1.12
-pkgrel=1
-pkgdesc="Python3 wrapper around RapidJSON"
-url="https://github.com/python-rapidjson/python-rapidjson"
-arch="all"
-license="MIT"
-depends="
-	python3
-	"
-makedepends="
-	py3-gpep517
-	py3-setuptools
-	py3-wheel
-	python3-dev
-	rapidjson-dev
-	"
-checkdepends="
-	py3-pytest
-	py3-tz
-	"
-source="$pkgname-$pkgver.tar.gz::https://github.com/python-rapidjson/python-rapidjson/archive/refs/tags/v$pkgver.tar.gz"
-builddir="$srcdir/"python-rapidjson-$pkgver
-
-prepare() {
-	default_prepare
-
-	# workaround setup.py complaining about "sources not found"
-	mkdir -v rapidjson/include
-}
-
-build() {
-	gpep517 build-wheel \
-		--wheel-dir .dist \
-		--output-fd 3 3>&1 >&2
-}
-
-check() {
-	PYTHONPATH="$(echo "$PWD"/build/lib.linux*)" pytest \
-		--ignore benchmarks \
-		--deselect tests/test_base_types.py::test_base_values \
-		--deselect tests/test_unicode.py::test_unicode_decode_error \
-		--deselect tests/test_validator.py::test_additional_and_pattern_properties_valid \
-		#
-}
-
-package() {
-	python3 -m installer -d "$pkgdir" \
-		.dist/*.whl
-}
-
-sha512sums="
-15d021491c64db53352830d8f3f62c8b48476fcb001f97c174bcbb9053d973eb135ceb92f14290a58f6ad6c5dfb24d02f6385c8cad70f4a74f5a5726aa0728e7  py3-rapidjson-1.12.tar.gz
-"
--- a/backports/py3-rtree/APKBUILD
+++ b/backports/py3-rtree/APKBUILD
@ -3,7 +3,7 @@
 pkgname=py3-rtree
 _pkgname=rtree
 pkgver=1.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Python3 library for r-tree spatial index (wrapper for libspatialindex)"
 url="https://pypi.org/project/Rtree/"
 # s390x: Test failed: IndexSerialization::test_interleaving - AssertionError
@ -11,22 +11,27 @@ url="https://pypi.org/project/Rtree/"
 arch="noarch !s390x"
 license="MIT"
 depends="python3 libspatialindex-dev"
-makedepends="py3-setuptools py3-wheel"
+makedepends="py3-setuptools py3-wheel py3-gpep517"
 checkdepends="py3-pytest py3-numpy"
 subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/Toblerity/rtree/archive/$pkgver.tar.gz"
 builddir="$srcdir"/$_pkgname-$pkgver

 build() {
-	python3 setup.py build
+	gpep517 build-wheel \
+		--wheel-dir .dist \
+		--output-fd 3 3>&1 >&2
 }

 check() {
-	python3 -m pytest -v --doctest-modules rtree tests
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	gpep517 install-wheel --destdir .testenv --prefix '' .dist/*.whl
+	.testenv/bin/python3 -m pytest -v --doctest-modules rtree tests
 }

 package() {
-	python3 setup.py install --skip-build --root="$pkgdir"
+	gpep517 install-wheel --destdir "$pkgdir" \
+		.dist/*.whl
 }

 sha512sums="
--- a/backports/py3-svgpath/APKBUILD
+++ b/backports/py3-svgpath/APKBUILD
@ -1,8 +1,9 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Celeste <cielesti@protonmail.com>
+maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=py3-svgpath
 pkgver=6.3
-pkgrel=2
+pkgrel=3
 pkgdesc="SVG path and object parser"
 url="https://github.com/regebro/svg.path"
 arch="noarch"
@ -12,7 +13,8 @@ checkdepends="py3-pytest py3-pillow"
 subpackages="$pkgname-pyc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/regebro/svg.path/archive/refs/tags/$pkgver.tar.gz
 	105_use-better-than-nothing-font.patch
-	no-install-tests.patch"
+	no-install-tests.patch
+	"
 builddir="$srcdir/svg.path-$pkgver"

 build() {
@ -22,7 +24,9 @@ build() {
 }

 check() {
-	PYTHONPATH=build/lib pytest
+	python3 -m venv --clear --without-pip --system-site-packages .testenv
+	.testenv/bin/python3 -m installer .dist/*.whl
+	.testenv/bin/python3 -m pytest
 }

 package() {
--- a/backports/py3-trimesh/APKBUILD
+++ b/backports/py3-trimesh/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=py3-trimesh
 pkgver=3.22.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Python library for working with triangular meshes"
 url="https://github.com/mikedh/trimesh"
 # x86, armhf, armv7 Tests fail on int64 to int32 casts on these arches
--- a/backports/py3-utils/APKBUILD
+++ b/backports/py3-utils/APKBUILD
@ -1,46 +0,0 @@
-# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-pkgname=py3-utils
-_pkgname=python-utils
-pkgver=3.8.1
-pkgrel=1
-pkgdesc="Convenient utilities not included with the standard Python install"
-url="https://github.com/WoLpH/python-utils"
-arch="noarch"
-license="BSD-3-Clause"
-makedepends="py3-gpep517 py3-setuptools py3-wheel"
-checkdepends="py3-pytest py3-pytest-asyncio py3-loguru"
-subpackages="$pkgname-pyc"
-source="
-	https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz
-
-	fix-setuptools-deprecation.patch
-	pytest.patch
-	typing-ext.patch
-	"
-
-builddir="$srcdir/$_pkgname-$pkgver"
-
-build() {
-	gpep517 build-wheel \
-		--wheel-dir .dist \
-		--output-fd 3 3>&1 >&2
-}
-
-check() {
-	python3 -m venv --clear --without-pip --system-site-packages .testenv
-	.testenv/bin/python3 -m installer .dist/*.whl
-	.testenv/bin/python3 -m pytest
-}
-
-package() {
-	python3 -m installer -d "$pkgdir" \
-		.dist/*.whl
-}
-
-sha512sums="
-ccba9651cc99a8f4e3f13e7ff66a43a40d2e85bc735b6246524269495ff321225a0dcad9abd03ca9cb61b4b1b35a27009fac3fe87e3f748ffc5c87a956acd335  python-utils-3.8.1.tar.gz
-c001453b958b8231806ef6a04fcd21e1d252eeec36d4e6cbfce35f0662bae76c3f7484e0e8ff06d68a3e9cc7d19c9cdbf792c13e0101c580bb5e8de9d837fde7  fix-setuptools-deprecation.patch
-99cc91ad155f8140aedc9420659c0e560a4d816ac1f85468ddb3a9fdc87526d591da916441d63b601146a86fb2c26f61c9dfbe37e31b86ee605f732e24e7b465  pytest.patch
-d68943e3301eaafe2a9ea27f382a2eba1ce98149d8cbbe91aa9222cf76a8f7bebba3d9dbfced54bd88c90688a6e18373f011fbb83cd36cbf2ecd3e36b034aa22  typing-ext.patch
-"
--- a/backports/py3-utils/fix-setuptools-deprecation.patch
+++ b/backports/py3-utils/fix-setuptools-deprecation.patch
@ -1,11 +0,0 @@
--- a/setup.cfg
-+++ b/setup.cfg
-@@ -2,7 +2,7 @@
- test = pytest
- 
- [metadata]
-description-file = README.rst
-+description_file = README.rst
- 
- [nosetests]
- verbosity = 3
--- a/backports/py3-utils/pytest.patch
+++ b/backports/py3-utils/pytest.patch
@ -1,14 +0,0 @@
-diff --git a/pytest.ini b/pytest.ini
-index a8e632a..e28ed7d 100644
--- a/pytest.ini
-+++ b/pytest.ini
-@@ -5,9 +5,6 @@ python_files =
- 
- addopts =
-     --doctest-modules
-    --cov python_utils
-    --cov-report term-missing
-;    --mypy
- 
- doctest_optionflags =
-     ALLOW_UNICODE
--- a/backports/py3-utils/typing-ext.patch
+++ b/backports/py3-utils/typing-ext.patch
@ -1,22 +0,0 @@
-diff --git a/python_utils/types.py b/python_utils/types.py
-index 01c319a..79ef950 100644
--- a/python_utils/types.py
-+++ b/python_utils/types.py
-@@ -1,7 +1,6 @@
- # pyright: reportWildcardImportFromLibrary=false
- import datetime
- import decimal
-from typing_extensions import *  # type: ignore  # noqa: F403
- from typing import *  # type: ignore  # pragma: no cover  # noqa: F403
- from types import *  # type: ignore  # pragma: no cover  # noqa: F403
- 
--- a/setup.py
-+++ b/setup.py
-@@ -29,7 +29,6 @@
-         ),
-         package_data={'python_utils': ['py.typed']},
-         long_description=long_description,
-        install_requires=['typing_extensions>3.10.0.2'],
-         tests_require=['pytest'],
-         extras_require={
-             'loguru': [
--- a/backports/signal-desktop/APKBUILD
+++ b/backports/signal-desktop/APKBUILD
@ -2,7 +2,7 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=signal-desktop
-pkgver=7.29.0
+pkgver=7.34.0
 pkgrel=0
 pkgdesc="A messaging app for simple private communication with friends"
 url="https://github.com/signalapp/Signal-Desktop/"
@ -66,9 +66,9 @@ makedepends="
 options="net !check"

 # use _check_depends to validate this
-_libsignalver=0.58.0
-_ringrtcver=2.48.3
-_webrtcver=6613c
+_libsignalver=0.60.2
+_ringrtcver=2.48.7
+_webrtcver=6723a
 _stokenizerver=0.2.1

 source="
@ -78,8 +78,8 @@ source="
 	https://ayakael.net/api/packages/mirrors/generic/webrtc/$_webrtcver/webrtc-$_webrtcver.tar.zst
 	https://github.com/signalapp/Signal-FTS5-Extension/archive/refs/tags/v$_stokenizerver/stokenizer-$_stokenizerver.tar.gz

-	bettersqlite-use-system-sqlcipher.patch
 	libsignal-auditable.patch
+	signal-use-system-sqlcipher.patch
 	signal-disable-updates.patch
 	signal-update-links.patch
 	signal-show-window-please.patch
@ -123,7 +123,8 @@ _check_depends() {
 	local _ringrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/ringrtc\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1)
 	local _bsqlitever=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Desktop/v$pkgver/package-lock.json | grep "@signalapp/better-sqlite3\": \"" | awk '{print $2}' | tr -d ',' | tr -d '"' | head -n 1)
 	local _webrtcver=$(curl --silent https://raw.githubusercontent.com/signalapp/ringrtc/v$_ringrtcver/config/version.properties | awk -F '=' '{if($1 == "webrtc.version"){print $2}}' | head -n 1)
-	local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const TOKENIZER_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' |  head -n 1)
+	local _extensionver=$(curl --silent https://raw.githubusercontent.com/signalapp/better-sqlite3/v$_bsqlitever/deps/download.js | grep "const EXTENSION_VERSION" | awk '{print $4}' | tr -d "'" | tr -d ';' |  head -n 1)
+	local _stokenizerver=$(curl --silent https://raw.githubusercontent.com/signalapp/Signal-Sqlcipher-Extension/refs/tags/v$_extensionver/Cargo.lock | sed -n "/^name = \"signal-tokenizer\"$/,/^$/p" | awk -F ' = ' '{if($1=="version"){print $2}}' | tr -d '"')

 	echo _libsignalver=$_libsignalver
 	echo _ringrtcver=$_ringrtcver
@ -180,38 +181,19 @@ target_cpu_only = True
 	mcli cp "$SRCDEST"/webrtc-$_webrtcver.tar.zst "$_distbucket"
 }

-# manual patches
-default_prepare() { :; }
-
 prepare() {
-	default_prepare
-	msg "Applying patches"
-	for x in $source; do
-		case "$x" in
-		signal-*.patch)
-			msg "$x"
-			patch -p1 -i "$srcdir"/$x -d "$srcdir"/Signal-Desktop-$pkgver
-			;;
-		libsignal-*.patch)
-			msg "$x"
-			patch -p1 -i "$srcdir"/$x -d "$srcdir"/libsignal-$_libsignalver
-			;;
-		ringrtc-*.patch)
-			msg "$x"
-			patch -p1 -i "$srcdir"/$x -d "$srcdir"/ringrtc-$_ringrtcver
-			;;
-		webrtc-*.patch)
-			msg "$x"
-			patch -p1 -i "$srcdir"/$x -d "$srcdir"/webrtc-$_webrtcver
-			;;
-		esac
+	# Moves to builddir to use abuild patch logics
+	for i in libsignal-$_libsignalver ringrtc-$_ringrtcver webrtc-$_webrtcver Signal-FTS5-Extension-$_stokenizerver; do
+		mv "$srcdir"/$i "$builddir"/${i%-*}
 	done

 	msg "Installing signal-desktop JS dependencies"
 	npm ci --ignore-scripts

+	default_prepare
+
 	(
-		cd "$srcdir"/webrtc-$_webrtcver
+		cd "$builddir"/webrtc

 		local use_system="
 			brotli
@ -272,35 +254,35 @@ prepare() {
 	)

 	(
-		cd "$srcdir"/ringrtc-$_ringrtcver/src/rust
+		cd "$builddir"/ringrtc/src/rust

 		msg "Installing ringrtc rust dependencies"
 		cargo fetch --target="$CTARGET" --locked
 	)

 	(
-		cd "$srcdir"/libsignal-$_libsignalver
+		cd "$builddir"/libsignal

 		msg "Installing libsignal rust dependencies"
 		cargo fetch --target="$CTARGET" --locked
 	)

 	(
-		cd "$srcdir"/Signal-FTS5-Extension-$_stokenizerver
+		cd "$builddir"/Signal-FTS5-Extension

 		msg "Installing signal tokenizer rust dependencies"
 		cargo fetch --target="$CTARGET" --locked
 	)

 	(
-		cd "$srcdir"/ringrtc-$_ringrtcver/src/node
+		cd "$builddir"/ringrtc/src/node

 		msg "Installing ringrtc js dependencies"
 		npm ci --ignore-scripts
 	)

 	(
-		cd "$srcdir"/libsignal-$_libsignalver/node
+		cd "$builddir"/libsignal/node

 		# fix target
 		sed -i 's/unknown-linux-gnu/alpine-linux-musl/g' binding.gyp
@ -318,7 +300,7 @@ build() {

 	# required dependency of ringrtc
 	(
-		cd "$srcdir"/webrtc-$_webrtcver
+		cd "$builddir"/webrtc
 		export PATH="$PWD/path:$PATH"

 		# shellcheck disable=2089
@ -350,18 +332,18 @@ build() {
 			use_lld=true
 			use_sysroot=false
 		"
-		mkdir -p "$srcdir"/ringrtc-$_ringrtcver/out/release
+		mkdir -p "$builddir"/ringrtc/out/release
 		msg "Building signal's webrtc"
 		# shellcheck disable=2090,2116
-		gn gen "$srcdir"/ringrtc-$_ringrtcver/out/release --args="$(echo $webrtc_args)"
-		ninja -C "$srcdir"/ringrtc-$_ringrtcver/out/release signaldeswebrtc
+		gn gen "$builddir"/ringrtc/out/release --args="$(echo $webrtc_args)"
+		ninja -C "$builddir"/ringrtc/out/release signaldeswebrtc
 	)

 	(
-		cd "$srcdir"/ringrtc-$_ringrtcver
+		cd "$builddir"/ringrtc

 		msg "Building libringrtc"
-		OUTPUT_DIR="$srcdir"/ringrtc-$_ringrtcver/out \
+		OUTPUT_DIR="$builddir"/ringrtc/out \
 			cargo auditable build --features electron --release -p ringrtc

 		mkdir -p src/node/build/linux
@ -370,7 +352,7 @@ build() {
 	)

 	(
-		cd "$srcdir"/ringrtc-$_ringrtcver/src/node
+		cd "$builddir"/ringrtc/src/node
 		msg "Building ringrtc JS glue code"
 		npm run build

@ -380,7 +362,7 @@ build() {

 	# module on npm intentionally unbuildable: https://github.com/signalapp/libsignal/issues/464#issuecomment-1160665052
 	(
-		cd "$srcdir"/libsignal-$_libsignalver/node
+		cd "$builddir"/libsignal/node

 		msg "Building libsignal"
 		node-gyp configure --nodedir=/usr/include/electron/node_headers --build-from-source
@ -397,7 +379,7 @@ build() {
 	)

 	(
-		cd "$srcdir"/Signal-FTS5-Extension-$_stokenizerver
+		cd "$builddir"/Signal-FTS5-Extension

 		msg "Building signal tokenizer"
 		cargo auditable build --features extension --release --frozen
@ -423,25 +405,15 @@ build() {

 	# use our libsignal
 	rm -rf node_modules/@signalapp/libsignal-client/
-	mv "$srcdir"/libsignal-$_libsignalver/node/ node_modules/@signalapp/libsignal-client
+	mv libsignal/node/ node_modules/@signalapp/libsignal-client

 	# use our libringrtc
 	rm -rf node_modules/@signalapp/ringrtc/
-	mv "$srcdir"/ringrtc-$_ringrtcver/src/node/ node_modules/@signalapp/ringrtc
-
-	# patch the sqlcipher module
-	for x in $source; do
-		case "$x" in
-		bettersqlite-*.patch)
-			msg "$x"
-			patch -Np1 -i "$srcdir"/$x -d "$srcdir"/Signal-Desktop-$pkgver/node_modules/@signalapp/better-sqlite3/
-			;;
-		esac
-	done
+	mv ringrtc/src/node/ node_modules/@signalapp/ringrtc

 	mkdir node_modules/@signalapp/better-sqlite3/tokenizer
-	mv "$srcdir"/Signal-FTS5-Extension-$_stokenizerver/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
-	mv "$srcdir"/Signal-FTS5-Extension-$_stokenizerver/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/
+	mv Signal-FTS5-Extension/target/release/libsignal_tokenizer.a node_modules/@signalapp/better-sqlite3/tokenizer/
+	mv Signal-FTS5-Extension/target/release/signal-tokenizer.h node_modules/@signalapp/better-sqlite3/tokenizer/

 	npm rebuild \
 		sharp @signalapp/better-sqlite3 spellchecker websocket \
@ -465,9 +437,9 @@ package() {
 	install -Dm644 signal.desktop "$pkgdir"/usr/share/applications/$pkgname.desktop

 	# this should be in /usr/lib/signal-desktop. however, it does not simply work and I stopped to care
-	install -Dm755 "$srcdir"/ringrtc-$_ringrtcver/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so
+	install -Dm755 "$builddir"/ringrtc/out/release/libsignaldeswebrtc.so "$pkgdir"/usr/lib/libsignaldeswebrtc.so

-	install -Dm755 "$srcdir"/$pkgname "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 "$srcdir"/signal-desktop "$pkgdir"/usr/bin/signal-desktop

 	while read -r size; do
 		install -Dm644 icons/$size.png "$pkgdir"/usr/share/icons/hicolor/$size/apps/$pkgname.png
@ -475,19 +447,19 @@ package() {
 }

 sha512sums="
-b97155dc2ca70436d6fdf15fff059f905f065738a288679aeee2199d43824206f4c7e4bae0c228b55b4cc76b7e00875b738ee4f7dea3c2a5414acec3e208aa1e  Signal-Desktop-7.29.0.tar.gz
-6fb62213d8177ac5abe83ea71a18ea4b1c7b323983c41087166658fe9c47c1fd39e5323ca6acefe3db2a9a9376b6f385b5f2c006154da3ab705741d848b28943  libsignal-0.58.0.tar.gz
-6777354b60650c6c3d359714f3aff92a315996f3725ba05c74ed054d3c4ba5506406b30c940853b5ba426ac0271cdb4dd930a759c570f486a70e1f5adc5a2aae  ringrtc-2.48.3.tar.gz
-fe04fcf13f55b124f03ce9d516b1c53fc4f20c6a016819c62eeaa0500eda92c5a0c0d7dc5d1e360a27691dfd404c254e91bed9fb25d0fc40a27795c1b674a82e  webrtc-6613c.tar.zst
+30e06721b01e580414c5e57b63350fc42edbe837b0a60a9cd100bc6ab1758fa6fd5744dc3a35d991db62f363eab791c45b43e1d9d5c81af9e67685114ae2e630  Signal-Desktop-7.34.0.tar.gz
+26780a0a6a529cee18f5c3b58f0395c6b5b630dbc8d2bbaa345dd7dd319a0e8548575c915dc16de6ac5d421fffdbe898f2dedb1fa3b4eab5d26debdfc1da515b  libsignal-0.60.2.tar.gz
+e5e5ab27dc3bd37ef577c248d450e70fa11e72bdfab00fef233aad84d3d8aa3434166c03267f6b95b69d593e9da2f37017b5b7a0913f68499f387354742ba50a  ringrtc-2.48.7.tar.gz
+64eed5c2a6f5a505d014bc4fa80e15b21103df1ea27825eaa1dfecc23c269f198a7e98472f29de7cae4ac7fa4fede6e837c27494b8ec4d03e36b85b029c64831  webrtc-6723a.tar.zst
 84a1f2fc29262a12842e94698d124a85b823128e72a493b0be8ea92fbb72c5c268499f4a6827cdedaae06ec73cce4039a39fe5c5d536cbef330e59ba0183da28  stokenizer-0.2.1.tar.gz
-be5b4e823543b79175a12314f10c6326d9f0d59f470136962daed4665887006acc05b48b40dc1b67747396d8f6f7d23be298c1e110ccdd35ff9b09d5e6b80bab  bettersqlite-use-system-sqlcipher.patch
-2e5fadff725f1d62e7134c8929c672ec88cae602b065480f1b799d34160daa0cb1ad0f5511e60676f81464ae8752c3bec7b3d7bc5a432533be004b4d20ac32c2  libsignal-auditable.patch
+8d2d2d82c8546c2dd1fef161b61df79918f8c22235a56a46adb375a0beb4acef12c5fe53e67242a4be97f77adc522ff79b47949c352956c742a70d50f4179f7f  libsignal-auditable.patch
+cee74edb504ee5ae685e8a449ac35fabf949c33bfee5905778f850c3b18e17f9ae9bd501c89a7fd2c9c81a5bb2b0af0c0b3c72e32128603b3923c32d2a493ce9  signal-use-system-sqlcipher.patch
 152435231cdcf52a17a9e24aadf95d77511258e818172941ba074a73a90a541f0136feb58868674f2bcb19191a6d12933fe6cd5baf3ee99e508915c72523163b  signal-disable-updates.patch
 d50eb5724502df9ea4d795db8cfc27af767c25168d7db2af512e615be7cc2ca290210a9ae78e1abb153c0198677e858ad3d74926c958099d0319295e7d9e7f1d  signal-update-links.patch
 bfc8acdd13aa48d29c7657311733cc9d33c4899782efbd1ef6d25ad1698be4de7cc67e829324bc0309715d69ae37ea9f782cf54887317e817213e110d73d68e7  signal-show-window-please.patch
-b11fdd930943ca327650e4738ed85cd6b5eea779455a5895bccebba98e449bafc6b0f09bcf4545f2b2e16644355664e9768dd6d4d62f87619207c430367f72c5  ringrtc-webrtc-renamed.patch
-0888673ba687747beda61cd50efbc25095f4a3d26f1dd58bf003e3a0bf1d302c3f2ebd1deecf630fbf04aedb7b8cd409e9efda4d1e6fda63234c9a9b9755bff4  webrtc-shared-libs.patch
-e07ae8544988d402aaf0fbd95ea36a64c94c59566c561132578aa6dcf8ff11a34058530e64dc204e5cadc2482f1401e74b32384a144e5e08017c663d0cf7c2fc  webrtc-compiler.patch
-88515d8b8cc82355c9f9b0f44fac83b7ff149b13e9fb102fd46036ec5234cfb2385fa5ad58a0520ee604b93dc4ddd6ae18a7005978ef207841645724ef7a9749  webrtc-gcc13.patch
+10284e0d86ab88de161ae689871082194f689ce416f3ebada8991d5db707994ea1cb8b4212756dd93ba5a3469964050988220f18afc37e38f3404a6e17ec8caf  ringrtc-webrtc-renamed.patch
+98a7e4df27c3ed56c5968ebc3ae8e08bfb54362d0c910f9af1d414079a6d5fe0f18aa570ae3c38042f4691af6a130cb3ff689625e26a3987720dd319a5f587b1  webrtc-shared-libs.patch
+fe78cdc58c18826fc4227cc8e9377980766229390544578f6a1a6f7322bc3243c066963b589323dbfe4f2bfd37f8859ad84f63cb3783317892e5ae3652270a3a  webrtc-compiler.patch
+48ab5c733e643eaff08ccbe839086bebbb68d397984ad7c5c5b68df8071f75d2dfe92c3f52d9fbf9b81754934bdfa8a67c69addd476ce4265b978592fb4ff9bd  webrtc-gcc13.patch
 87534e7b5ad7365509eab75629e6bd1a9ed61ee92f7e358405a0abaf0df57de14623fb3894eb082f8785422e5c087e1c50f9e2e5cafbb2529591fd7bf447f7f5  signal-desktop
 "
--- a/backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch
+++ b/backports/signal-desktop/bettersqlite-use-system-sqlcipher.patch
@ -1,56 +0,0 @@
--- a/binding.gyp
-+++ b/binding.gyp
-@@ -7,7 +7,16 @@
-   'targets': [
-     {
-       'target_name': 'better_sqlite3',
-      'dependencies': ['deps/sqlite3.gyp:sqlite3'],
-+      'include_dirs': [
-+      	'/usr/include/sqlcipher',
-+      	'tokenizer',
-+      ],
-+      'link_settings': {
-+        'libraries': [
-+          '-lsqlcipher',
-+          '<!(pwd)/tokenizer/libsignal_tokenizer.a',
-+        ]
-+      },
-       'sources': ['src/better_sqlite3.cpp'],
-       'cflags_cc': ['-std=c++17'],
-       'xcode_settings': {
-@@ -24,14 +33,22 @@
-         ['OS=="linux"', {
-           'ldflags': [
-             '-Wl,-Bsymbolic',
-            '-Wl,--exclude-libs,ALL',
-           ],
-         }],
-       ],
-     },
-     {
-       'target_name': 'test_extension',
-      'dependencies': ['deps/sqlite3.gyp:sqlite3'],
-+      'include_dirs': [
-+      	'/usr/include/sqlcipher',
-+      	'tokenizer',
-+      ],
-+      'link_settings': {
-+        'libraries': [
-+          '-lsqlcipher',
-+          '<!(pwd)/tokenizer/libsignal_tokenizer.a',
-+        ]
-+      },
-       'conditions': [['sqlite3 == ""', { 'sources': ['deps/test_extension.c'] }]],
-     },
-   ],
--- a/package.json
-+++ b/package.json
-@@ -34,7 +34,7 @@
-     "sqlite3": "^5.0.2"
-   },
-   "scripts": {
-    "install": "npm run download && npm run build-release",
-+    "install": "npm run build-release",
-     "build-release": "node-gyp rebuild --release",
-     "build-debug": "node-gyp rebuild --debug",
-     "rebuild-release": "npm run lzz && npm run build-release",
--- a/backports/signal-desktop/libsignal-auditable.patch
+++ b/backports/signal-desktop/libsignal-auditable.patch
@ -1,7 +1,7 @@
-diff --git a/node/build_node_bridge.py.orig b/node/build_node_bridge.py
+diff --git a/libsignal/node/build_node_bridge.py.orig b/libsignal/node/build_node_bridge.py
 index e75c2d0..3bdb328 100755
--- a/node/build_node_bridge.py.orig
-+++ b/node/build_node_bridge.py
+--- a/libsignal/node/build_node_bridge.py.orig
+++ b/libsignal/node/build_node_bridge.py
@@ -97,7 +97,7 @@ def main(args: Optional[List[str]] = None) -> int:
     if 'npm_config_libsignal_debug_level_logs' not in os.environ:
         features.append('log/release_max_level_info')
--- a/backports/signal-desktop/ringrtc-webrtc-renamed.patch
+++ b/backports/signal-desktop/ringrtc-webrtc-renamed.patch
@ -1,5 +1,5 @@
--- ./src/rust/build.rs.orig
-+++ ./src/rust/build.rs
+--- ./ringrtc/src/rust/build.rs.orig
+++ ./ringrtc/src/rust/build.rs
@@ -79,6 +79,7 @@
 
     if cfg!(feature = "native") {
--- a/backports/signal-desktop/signal-use-system-sqlcipher.patch
+++ b/backports/signal-desktop/signal-use-system-sqlcipher.patch
@ -0,0 +1,43 @@
+diff --git a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig b/node_modules/@signalapp/better-sqlite3/binding.gyp
+index c370c30b309..bf0207e6fec 100644
+--- a/node_modules/@signalapp/better-sqlite3/binding.gyp.orig
+++ b/node_modules/@signalapp/better-sqlite3/binding.gyp
+@@ -7,7 +7,16 @@
+   'targets': [
+     {
+       'target_name': 'better_sqlite3',
+-      'dependencies': ['deps/sqlite3.gyp:sqlite3'],
+      'include_dirs': [
+      	'/usr/include/sqlcipher',
+      	'tokenizer',
+      ],
+      'link_settings': {
+        'libraries': [
+          '-lsqlcipher',
+          '<!(pwd)/tokenizer/libsignal_tokenizer.a',
+        ]
+      },
+       'sources': ['src/better_sqlite3.cpp'],
+       'cflags_cc': ['-std=c++20'],
+       'msvs_settings': {
+@@ -21,7 +30,6 @@
+         ['OS=="linux"', {
+           'ldflags': [
+             '-Wl,-Bsymbolic',
+-            '-Wl,--exclude-libs,ALL',
+           ],
+         }],
+       ],
+diff --git a/node_modules/@signalapp/better-sqlite3/package.json.orig b/node_modules/@signalapp/better-sqlite3/package.json
+index fbb9d360352..a9217039c01 100644
+--- a/node_modules/@signalapp/better-sqlite3/package.json.orig
+++ b/node_modules/@signalapp/better-sqlite3/package.json
+@@ -35,7 +35,7 @@
+   },
+   "scripts": {
+     "format": "xcrun clang-format --style=chromium -Werror --verbose -i src/*.cpp src/*.hpp",
+-    "install": "npm run download && npm run build-release",
+    "install": "npm run build-release",
+     "build-release": "node-gyp rebuild --release",
+     "build-debug": "node-gyp rebuild --debug",
+     "test": "mocha --exit --slow=75 --timeout=5000",
--- a/backports/signal-desktop/webrtc-compiler.patch
+++ b/backports/signal-desktop/webrtc-compiler.patch
@ -1,5 +1,5 @@
--- ./build/config/compiler/BUILD.gn.orig
-+++ ./build/config/compiler/BUILD.gn
+--- ./webrtc/build/config/compiler/BUILD.gn.orig
+++ ./webrtc/build/config/compiler/BUILD.gn
@@ -624,14 +624,14 @@
     if (default_toolchain != "//build/toolchain/cros:target" &&
         !llvm_android_mainline) {
--- a/backports/signal-desktop/webrtc-gcc13.patch
+++ b/backports/signal-desktop/webrtc-gcc13.patch
@ -1,5 +1,5 @@
--- ./rtc_base/system/file_wrapper.h.orig
-+++ ./rtc_base/system/file_wrapper.h
+--- ./webrtc/rtc_base/system/file_wrapper.h.orig
+++ ./webrtc/rtc_base/system/file_wrapper.h
@@ -13,6 +13,7 @@
 
 #include <stddef.h>
@ -8,8 +8,8 @@
 
 #include <string>
 
--- ./modules/audio_coding/neteq/reorder_optimizer.cc.orig
-+++ ./modules/audio_coding/neteq/reorder_optimizer.cc
+--- ./webrtc/modules/audio_coding/neteq/reorder_optimizer.cc.orig
+++ ./webrtc/modules/audio_coding/neteq/reorder_optimizer.cc
@@ -11,6 +11,7 @@
 #include "modules/audio_coding/neteq/reorder_optimizer.h"
 
--- a/backports/signal-desktop/webrtc-shared-libs.patch
+++ b/backports/signal-desktop/webrtc-shared-libs.patch
@ -1,5 +1,5 @@
--- ./BUILD.gn.orig
-+++ ./BUILD.gn
+--- ./webrtc/BUILD.gn.orig
+++ ./webrtc/BUILD.gn
@@ -38,7 +38,7 @@
   # 'ninja default' and then 'ninja all', the second build should do no work.
   group("default") {
@ -26,10 +26,10 @@
     suppressed_configs += [ "//build/config/compiler:thin_archive" ]
     defines = []
 
-diff --git a/third_party/googletest/BUILD.gn.orig b/third_party/googletest/BUILD.gn
+diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn
 index 14089f0..b7dc621 100644
--- a/third_party/googletest/BUILD.gn.orig
-+++ b/third_party/googletest/BUILD.gn
+--- a/webrtc/third_party/googletest/BUILD.gn.orig
+++ b/webrtc/third_party/googletest/BUILD.gn
@@ -48,7 +48,6 @@ config("gtest_config") {
 
   configs = [
@ -38,10 +38,10 @@ index 14089f0..b7dc621 100644
   ]
 }
 
-diff --git a/third_party/googletest/BUILD.gn.orig b/third_party/googletest/BUILD.gn
+diff --git a/webrtc/third_party/googletest/BUILD.gn.orig b/webrtc/third_party/googletest/BUILD.gn
 index b7dc621..367f929 100644
--- a/third_party/googletest/BUILD.gn.orig
-+++ b/third_party/googletest/BUILD.gn
+--- a/webrtc/third_party/googletest/BUILD.gn.orig
+++ b/webrtc/third_party/googletest/BUILD.gn
@@ -133,7 +133,6 @@ source_set("gtest") {
 
   # googletest only needs `absl`, but this makes gn check happier.
@ -50,10 +50,10 @@ index b7dc621..367f929 100644
   if (is_nacl || !build_with_chromium) {
     defines += [ "GTEST_DISABLE_PRINT_STACK_TRACE" ]
     sources -= [
-diff --git a/third_party/fuzztest/BUILD.gn.orig b/third_party/fuzztest/BUILD.gn
+diff --git a/webrtc/third_party/fuzztest/BUILD.gn.orig b/webrtc/third_party/fuzztest/BUILD.gn
 index 57ee790..ba1d297 100644
--- a/third_party/fuzztest/BUILD.gn.orig
-+++ b/third_party/fuzztest/BUILD.gn
+--- a/webrtc/third_party/fuzztest/BUILD.gn.orig
+++ b/webrtc/third_party/fuzztest/BUILD.gn
@@ -309,7 +309,6 @@ source_set("fuzztest_internal") {
     # For RE2 mutators. It's questionable whether we want to pull this library
     # into every fuzztest target, but this is the approach used in other
--- a/backports/soqt/APKBUILD
+++ b/backports/soqt/APKBUILD
@ -1,8 +1,8 @@
 # Contributor: Aiden Grossman <agrossman154@yahoo.com>
-# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer:
 pkgname=soqt
 pkgver=1.6.0
-pkgrel=0
+pkgrel=1
 pkgdesc="GUI binding library for coin"
 url="https://github.com/coin3d/soqt"
 arch="all"
--- a/backports/uranium/APKBUILD
+++ b/backports/uranium/APKBUILD
@ -42,7 +42,7 @@ build() {

 check() {
 	# useless code style test with another dependency
-	ctest -j $JOBS --output-on-failure -T Test
+	ctest --output-on-failure -T Test
 }

 package() {
--- a/unmaintained/papermc/APKBUILD
+++ b/unmaintained/papermc/APKBUILD
@ -1,56 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=papermc
-_pkgver=1.18.1
-_build=99
-_license_commit=4a7962c
-pkgver="$_pkgver.$_build"
-pkgrel=1
-pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
-pkgusers="craftbukkit"
-pkggroups="craftbukkit"
-arch='noarch'
-url="https://papermc.io/"
-license='custom'
-depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
-options="!check"
-provides="craftbukkit=$_pkgver"
-subpackages="$pkgname-openrc"
-source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
-	papermc.initd
-	papermc.conf
-	papermc.sh
-	LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
-"
-
-_game="papermc"
-_server_root="/var/lib/papermc"
-
-package() {
-	install -Dm644 "$srcdir"/$_game.conf              "$pkgdir"/etc/conf.d/$_game
-	install -Dm755 "$srcdir"/$_game.sh                "$pkgdir"/usr/bin/$_game
-	install -Dm755 "$srcdir"/$_game.initd           "$pkgdir"/etc/init.d/$_game
-	install -Dm644 "$srcdir"/$_game.$pkgver.jar     "$pkgdir"/$_server_root/$_game/$pkgver.jar
-	ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
-
-	# Link to craftbukkit plugins var
-	ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
-
-	# Link the log files
-	mkdir -p "$pkgdir"/var/log/
-	install -dm2755 "$pkgdir"/$_server_root/logs
-	ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
-
-	# Give the group write permissions and set user or group ID on execution
-	chmod g+ws "$pkgdir"/$_server_root
-
-	install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
-sha512sums="
-623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
-c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
-9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
-943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
-d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5  LICENSE_1.18.1.99.md
-"
--- a/unmaintained/papermc/APKBUILD.orig
+++ b/unmaintained/papermc/APKBUILD.orig
@ -1,56 +0,0 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
-# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
-pkgname=papermc
-_pkgver=1.18.1
-_build=99
-_license_commit=4a7962c
-pkgver="$_pkgver.$_build"
-pkgrel=1
-pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
-pkgusers="craftbukkit"
-pkggroups="craftbukkit"
-arch='noarch'
-url="https://papermc.io/"
-license='custom'
-depends='openjdk17-jre-headless screen sudo bash gawk sed netcat-openbsd tar'
-options="!check"
-provides="craftbukkit=$_pkgver"
-subpackages="$pkgname.openrc"
-source="papermc.$pkgver.jar::https://papermc.io/api/v2/projects/paper/versions/$_pkgver/builds/$_build/downloads/paper-$_pkgver-$_build.jar
-	papermc.initd
-	papermc.conf
-	papermc.sh
-	LICENSE_$pkgver.md::https://raw.githubusercontent.com/PaperMC/Paper/$_license_commit/LICENSE.md
-"
-
-_game="papermc"
-_server_root="/var/lib/papermc"
-
-package() {
-	install -Dm644 $srcdir.$_game.conf              "$pkgdir.etc/conf.d/$_game"
-	install -Dm755 $srcdir.$_game.sh                "$pkgdir.usr/bin/$_game"
-	install -Dm755 $srcdir.$_game.initd           "$pkgdir.etc/init.d/$_game"
-	install -Dm644 $srcdir.$_game.$pkgver.jar     "$pkgdir.$_server_root.$_game.$pkgver.jar"
-	ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
-
-	# Link to craftbukkit plugins var
-	ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
-
-	# Link the log files
-	mkdir -p "$pkgdir.var/log/"
-	install -dm2755 "$pkgdir.$_server_root.logs"
-	ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
-
-	# Give the group write permissions and set user or group ID on execution
-	chmod g+ws "$pkgdir._server_root"
-
-	install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
-}
-sha512sums="
-623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
-c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
-9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
-943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
-d4c645a58e1a17a0a1e42856a3cc43097711a05bf3d9f18c77c3bc9874417f223552859042ff00b7d3dda0003f49a9ee568540c2eb24e9f8fbb3c055f3b6e0a5  LICENSE_1.18.1.99.md
-"
--- a/unmaintained/papermc/APKBUILD.rej
+++ b/unmaintained/papermc/APKBUILD.rej
@ -1,38 +0,0 @@
--- user/papermc/APKBUILD
-+++ user/papermc/APKBUILD
-@@ -28,24 +28,24 @@ _game="papermc"
- _server_root="/var/lib/papermc"
- 
- package() {
-       install -Dm644 $srcdir.$_game.conf              "$pkgdir.etc/conf.d/$_game"
-       install -Dm755 $srcdir.$_game.sh                "$pkgdir.usr/bin/$_game"
-       install -Dm755 $srcdir.$_game.initd           "$pkgdir.etc/init.d/$_game"
-       install -Dm644 $srcdir.$_game.$pkgver.jar     "$pkgdir.$_server_root.$_game.$pkgver.jar"
-       ln -s "$_game.$pkgver.jar" "$pkgdir._server_root.$_game.server.jar"
-+       install -Dm644 "$srcdir"/$_game.conf              "$pkgdir"/etc/conf.d/$_game
-+       install -Dm755 "$srcdir"/$_game.sh                "$pkgdir"/usr/bin/$_game
-+       install -Dm755 "$srcdir"/$_game.initd           "$pkgdir"/etc/init.d/$_game
-+       install -Dm644 "$srcdir"/$_game.$pkgver.jar     "$pkgdir"/$_server_root/$_game/$pkgver.jar
-+       ln -s "$_game"/$pkgver.jar "$pkgdir"/$_server_root/$_game/server.jar
- 
-        # Link to craftbukkit plugins var
-       ln -s "/var/lib/craftbukkit/plugins" "$pkgdir.$_server_root.plugins"
-+       ln -s "/var/lib/craftbukkit/plugins" "$pkgdir"/$_server_root/plugins
- 
-        # Link the log files
-       mkdir -p "$pkgdir.var/log/"
-       install -dm2755 "$pkgdir.$_server_root.logs"
-       ln -s "$_server_root.logs" "$pkgdir.var/log/$_game"
-+       mkdir -p "$pkgdir"/var/log/
-+       install -dm2755 "$pkgdir"/$_server_root/logs
-+       ln -s "$_server_root"/logs "$pkgdir"/var/log/$_game
- 
-        # Give the group write permissions and set user or group ID on execution
-       chmod g+ws "$pkgdir._server_root"
-+       chmod g+ws "$pkgdir"/$_server_root
- 
-       install -D $srcdir../LICENSE_$pkgver.md "$pkgdir.usr/share/licenses/$pkgname.LICENSE"
-+       install -D "$srcdir"/LICENSE_$pkgver.md "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
- }
- sha512sums="
- 623d6423ee337671d546469e6bf1821005484192a1ae56d7b77f547f79102df50462e1d0144be13a0de9021c9d931bc974143b1e1526114627ba28688589d76a  papermc.1.18.1.99.jar
--- a/backports/freecad/APKBUILD
+++ b/backports/freecad/APKBUILD
--- a/backports/freecad/missing-include-cstdint.patch
+++ b/backports/freecad/missing-include-cstdint.patch
--- a/backports/freecad/no-execinfo.patch
+++ b/backports/freecad/no-execinfo.patch
--- a/backports/freecad/no-workaround-spnav.patch
+++ b/backports/freecad/no-workaround-spnav.patch
--- a/backports/freecad/numpy-1.20.patch
+++ b/backports/freecad/numpy-1.20.patch
--- a/backports/freecad/opencascade-7.8.0.patch
+++ b/backports/freecad/opencascade-7.8.0.patch
--- a/backports/freecad/resourceDirectory.patch
+++ b/backports/freecad/resourceDirectory.patch
--- a/backports/freecad/tests.patch
+++ b/backports/freecad/tests.patch
--- a/backports/looking-glass/APKBUILD
+++ b/backports/looking-glass/APKBUILD
--- a/backports/looking-glass/looking-glass.post-deinstall
+++ b/backports/looking-glass/looking-glass.post-deinstall
--- a/backports/looking-glass/missing-includes.patch
+++ b/backports/looking-glass/missing-includes.patch
--- a/backports/looking-glass/module_1075-fix-build-linux64.patch
+++ b/backports/looking-glass/module_1075-fix-build-linux64.patch
--- a/backports/looking-glass/module_1124-fix-build-linux610.patch
+++ b/backports/looking-glass/module_1124-fix-build-linux610.patch
--- a/backports/looking-glass/obs-plugins-lib.patch
+++ b/backports/looking-glass/obs-plugins-lib.patch
--- a/backports/looking-glass/werror.patch
+++ b/backports/looking-glass/werror.patch
--- a/user/paperless-ngx/APKBUILD
+++ b/user/paperless-ngx/APKBUILD
@ -8,7 +8,8 @@ url="https://github.com/paperless-ngx/paperless-ngx"
 license="GPL-3.0-only"
 # s390x: ocrmypdf py3-joblib py3-scikit-learn py3-watchfiles
 # armhf / ppc64le: py3-uvloop
-arch="noarch !s390x !armhf !ppc64le"
+# all: uvicorn doesn't yet work with websockets 14
+# arch="noarch !s390x !armhf !ppc64le"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-install"
 depends="
 	file
--- a/user/papermc/APKBUILD
+++ b/user/papermc/APKBUILD
@ -0,0 +1,50 @@
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
+# Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
+pkgname=papermc
+pkgver=1.21.3
+_gittag=${pkgver/.0}
+pkgrel=0
+pkgdesc="Next generation of Minecraft server, compatible with Spigot plugins and offering uncompromising performance"
+arch='noarch'
+url="https://papermc.io/"
+license='custom'
+depends='openjdk21-jdk screen sudo bash gawk sed netcat-openbsd'
+makedepends="gradle zstd"
+options="!check"
+subpackages="$pkgname-openrc"
+source="
+	https://ayakael.net/api/packages/mirrors/generic/papermc/$_gittag/papermc-$_gittag.tar.zst
+	papermc.initd
+	papermc.conf
+	papermc.sh
+"
+
+build() {
+	./gradlew --parallel createMojmapBundlerJar
+}
+
+check() {
+	./gradlew --parallel check
+}
+
+package() {
+	install -Dm644 "$srcdir"/$pkgname.conf              "$pkgdir"/etc/conf.d/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.sh                "$pkgdir"/usr/bin/$pkgname
+	install -Dm755 "$srcdir"/$pkgname.initd           "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$builddir"/build/libs/paper*.jar     "$pkgdir"/var/lib/$pkgname/$pkgver.jar
+	ln -s $pkgver.jar "$pkgdir"/var/lib/$pkgname/server.jar
+
+	# Link the log files
+	mkdir -p "$pkgdir"/var/log/
+	install -dm2755 "$pkgdir"/var/lib/$pkgname/logs
+	ln -s "/var/lib/$pkgname"/logs "$pkgdir"/var/log/$pkgname
+
+	# Give the group write permissions and set user or group ID on execution
+	chmod g+ws "$pkgdir"/var/lib/$pkgname
+}
+sha512sums="
+630c0fafd53082bec3992234f7422c4714c30ad0fac240c6dc80091fc7d49b57bc2cb7365366ac015d2a9217c4fd561f0649f738cb0d90ea7a7b6355f9839ff6  papermc-1.21.3.tar.zst
+c5d1bf85ceb74162aaaf2bcd2d06dc2e3dd2e37c39f0cee2be7c8dbff9970a6aff1e48a43e6d1e83e6a0ac610bd89f62b1279bf27b64afa88d9831a36aebbd3e  papermc.initd
+9b8e267428731ee9255f82a93f1e8674d7e917a0f154bd395cd2280a49aa248a4b8427520b08dbb4b3a74a5471dac0e439eedc8ab94bf2e53bb8d411d2d8a789  papermc.conf
+943ba0d4c10173246bdc6497dcedd54da0788f966841c8d3381398711d79f8d5eb07a24ce28f519b6f24f59d99fa9e74bc6bb882059f343df4eeda5de3660ac7  papermc.sh
+"
--- a/unmaintained/papermc/papermc.conf
+++ b/unmaintained/papermc/papermc.conf
--- a/unmaintained/papermc/papermc.initd
+++ b/unmaintained/papermc/papermc.initd
--- a/unmaintained/papermc/papermc.post-install
+++ b/unmaintained/papermc/papermc.post-install
--- a/unmaintained/papermc/papermc.service
+++ b/unmaintained/papermc/papermc.service
--- a/unmaintained/papermc/papermc.sh
+++ b/unmaintained/papermc/papermc.sh
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@ -1,168 +0,0 @@
-# Contributor: Sheila Aman <sheila@vulpine.house>
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-pkgname=protobuf
-_gemname=google-protobuf
-pkgver=23.4
-_rubyver=3.23.4
-pkgrel=2
-pkgdesc="Library for extensible, efficient structure packing"
-url="https://github.com/protocolbuffers/protobuf"
-arch="all"
-license="BSD-3-Clause"
-depends="
-	protoc=$pkgver-r$pkgrel
-	libprotoc=$pkgver-r$pkgrel
-	libprotobuf=$pkgver-r$pkgrel
-	libprotobuf-lite=$pkgver-r$pkgrel
-	"
-depends_dev="
-	protoc=$pkgver-r$pkgrel
-	zlib-dev
-	"
-makedepends="
-	$depends_dev
-	abseil-cpp-dev
-	cmake
-	ruby3.2
-	ruby3.2-dev
-	ruby3.2-rake
-	samurai
-	"
-checkdepends="gtest-dev"
-subpackages="
-	ruby3.2-$_gemname:_ruby
-	$pkgname-dev
-	$pkgname-vim::noarch
-	protoc
-	libprotoc
-	libprotobuf
-	libprotobuf-lite
-	"
-	# exclude.patch
-source="$pkgname-$pkgver.tar.gz::https://github.com/protocolbuffers/protobuf/archive/refs/tags/v$pkgver.tar.gz
-	exclude.patch
-	protoc-cmake.patch
-	ruby-fix-cflags.patch
-	skip-failing-tests.patch
-	soversion.patch
-	trim-rakefile.patch
-	"
-
-# fails some
-case "$CARCH" in
-armhf) options="$options !check" ;;
-esac
-
-build() {
-	export CFLAGS="$CFLAGS -DNDEBUG -O2 -flto=auto"
-	export CXXFLAGS="$CXXFLAGS -DNDEBUG -O2 -flto=auto -Wno-deprecated-declarations"
-
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_SHARED_LIBS=ON \
-		-Dprotobuf_BUILD_TESTS="$(want_check && echo ON || echo OFF)" \
-		-Dprotobuf_BUILD_LIBPROTOC=ON \
-		-Dprotobuf_ABSL_PROVIDER="package" \
-		-Dprotobuf_ALLOW_CCACHE=ON \
-		-Dprotobuf_USE_EXTERNAL_GTEST=ON
-	cmake --build build
-
-	cd "$builddir"/ruby
-
-	export PATH="$PATH:$builddir/build"
-
-	# Generate proto files for built-in protocols.
-	rake genproto
-
-	gem build $_gemname.gemspec
-	gem install --local \
-		--install-dir dist \
-		--ignore-dependencies \
-		--no-document \
-		--verbose \
-		$_gemname
-}
-
-# TODO: Run tests for ruby gem.
-check() {
-	ctest --test-dir build --output-on-failure
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-
-	sed -i \
-		-e "/Requires:/s|;| |g" \
-		-e "/Requires:/s|::|_|g" \
-		"$pkgdir"/usr/lib/pkgconfig/protobuf.pc
-
-	install -Dm644 editors/proto.vim \
-		"$pkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
-
-	local gemdir="$pkgdir/$(ruby -e 'puts Gem.default_dir')"
-	cd ruby/dist
-
-	mkdir -p "$gemdir"
-	cp -r extensions gems specifications "$gemdir"/
-
-	# Remove duplicated .so libs (should be only in extensions directory).
-	find "$gemdir"/gems/ -name "*.so" -delete
-
-	# Remove unnecessary files.
-	cd "$gemdir"/gems/$_gemname-$_rubyver
-	rm -r ext/
-}
-
-_ruby() {
-	depends=""
-	pkgdesc="Ruby bindings to Google's data interchange format"
-
-	amove usr/lib/ruby/gems
-}
-
-vim() {
-	pkgdesc="Vim syntax for $pkgname"
-	depends=""
-	install_if="$pkgname=$pkgver-r$pkgrel vim"
-
-	amove usr/share/vim/vimfiles/syntax/proto.vim
-}
-
-libprotoc() {
-	depends=""
-	pkgdesc="Runtime library for Protocol Buffer compiler"
-
-	amove usr/lib/libprotoc.so.*
-}
-
-protoc() {
-	depends=""
-	pkgdesc="Protocol buffer compiler binary and library"
-
-	amove usr/bin/protoc*
-}
-
-libprotobuf() {
-	depends=""
-	pkgdesc="Runtime library for C++ users of protocol buffers"
-
-	amove usr/lib/libprotobuf.so.*
-}
-
-lite() {
-	depends=""
-	pkgdesc="Runtime library for C++ users with 'lite runtime' setting of protocol buffers"
-
-	amove usr/lib/libprotobuf-lite.so.*
-}
-
-sha512sums="
-b93a4e0339ecbe085796de5b6c61feae35229d40db9019c043090bcaa483a1cce78a99487c5638482c68832fcede5579a0e5ec731221a88359b80db9bb6dc566  protobuf-23.4.tar.gz
-0d46d105a0670ab5cfcb04ed534927a71613234a88efede0b20d426e1caaa708e6ff275a09c5dab7786fe26e69e0882f022b893302e4869006b4ac55fc6172e5  exclude.patch
-16b8ee0e50dbb2144ddb83654a63e410b4218e667b6b8b77c7b6f9797508f63c3e8be0f9711841bb6ebbed0883cda2394b219a62b468240f65f4dac418b5a56e  protoc-cmake.patch
-0cb202a6151ae3746c09e85f2e4ce9abb0d810d4a3c84cb647fde407cf8d13894d3c9b340e06d7a3a85669da1899db265d26d8309d59249f841a40a66e045c83  ruby-fix-cflags.patch
-b5070f8e150920c316130ba40f46c66eefddc634844f5d6b8ee11f6824a3707b3e74f68aa0612c16305bf096050214c6120e693225e07e0cea80e68a7830f863  skip-failing-tests.patch
-850dc1d6fd3ea01f1689fd700ac35e7da0882092ab34c616702e01bdf4b5327b8ab27381ecf291431a94f54c89d31707a4a171929937e880543974cb64f9e685  soversion.patch
-13514a456a50d7243baa23fe43586fc4544cda87b9e2a5afe9d2fac8afca8e8853f9b42232c3fff4c5cf2df443af32f944f451daa1d604d80fd03ee4e7abed3e  trim-rakefile.patch
-"
--- a/user/protobuf/exclude.patch
+++ b/user/protobuf/exclude.patch
@ -1,40 +0,0 @@
-don't install the utf8_range lib into disk.
-also remove it from .pc/cmake, it's statically linked into protobuf and never needed on disk after
--
-diff --git a/cmake/install.cmake b/cmake/install.cmake
-index e7eb210..73e1897 100644
--- a/cmake/install.cmake
-+++ b/cmake/install.cmake
-@@ -4,7 +4,6 @@ foreach(_target IN LISTS protobuf_ABSL_USED_TARGETS)
-   string(REPLACE :: _ _modified_target ${_target})
-   list(APPEND _pc_targets ${_modified_target})
- endforeach()
-list(APPEND _pc_targets "utf8_range")
- 
- set(_protobuf_PC_REQUIRES "")
- set(_sep "")
-diff --git a/cmake/protobuf-config.cmake.in b/cmake/protobuf-config.cmake.in
-index 44805c7..1a8d243 100644
--- a/cmake/protobuf-config.cmake.in
-+++ b/cmake/protobuf-config.cmake.in
-@@ -4,7 +4,6 @@ include("${CMAKE_CURRENT_LIST_DIR}/protobuf-options.cmake")
- # Depend packages
- @_protobuf_FIND_ZLIB@
- @_protobuf_FIND_ABSL@
-@_protobuf_FIND_UTF8_RANGE@
- 
- # Imported targets
- include("${CMAKE_CURRENT_LIST_DIR}/protobuf-targets.cmake")
-diff --git a/cmake/utf8_range.cmake b/cmake/utf8_range.cmake
-index f411a8c..770f94c 100644
--- a/cmake/utf8_range.cmake
-+++ b/cmake/utf8_range.cmake
-@@ -8,7 +8,7 @@ if (NOT TARGET utf8_range)
-   endif()
- 
-   set(utf8_range_ENABLE_INSTALL ${protobuf_INSTALL} CACHE BOOL "Set install")
-  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range third_party/utf8_range)
-+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range third_party/utf8_range EXCLUDE_FROM_ALL)
-   include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/utf8_range)
- endif ()
- 
--- a/user/protobuf/protoc-cmake.patch
+++ b/user/protobuf/protoc-cmake.patch
@ -1,27 +0,0 @@
-Patch-Source: https://github.com/protocolbuffers/protobuf/pull/13206
--
-From 2e62ef1eaa2e712afc5f87aa2c55d478fe96230d Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Wed, 5 Jul 2023 13:03:11 +0200
-Subject: [PATCH] Handle BUILD_TYPE=None in protobuf-module.cmake
-
-Fixes Protobuf_PROTOC_EXECUTABLE being undefined in that case.
---
- cmake/protobuf-module.cmake.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/cmake/protobuf-module.cmake.in b/cmake/protobuf-module.cmake.in
-index 0bb05e38fad..e5b2b2e4b3a 100644
--- a/cmake/protobuf-module.cmake.in
-+++ b/cmake/protobuf-module.cmake.in
-@@ -153,6 +153,10 @@ if(NOT Protobuf_PROTOC_EXECUTABLE AND TARGET protobuf::protoc)
-     get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-       IMPORTED_LOCATION_NOCONFIG)
-   endif()
-+  if(NOT EXISTS "${Protobuf_PROTOC_EXECUTABLE}")
-+    get_target_property(Protobuf_PROTOC_EXECUTABLE protobuf::protoc
-+      IMPORTED_LOCATION_NONE)
-+  endif()
- endif()
- 
- # Version info variable
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Antoine Martin	233a098355	backports/py3-rapidjson: drop due to orphan dependency	2024-12-13 11:20:41 -05:00
Antoine Martin	9ee55e001b	forgejo: add special case for dotnet9-stage0	2024-12-13 10:29:04 -05:00
Antoine Martin	a053fd35f3	forgejo: add special case for dotnet9-sdk	2024-12-13 10:26:58 -05:00
Antoine Martin	88d9198fee	forgejo: add special case for freetube	2024-12-13 10:20:15 -05:00
Antoine Martin	9e7a9c464e	user/papermc: move from unmaintained, upgrade to 1.21.3 All checks were successful / lint (pull_request) Successful in 42s Details / deploy-x86_64 (pull_request) Successful in 29s Details / build-x86_64 (pull_request) Successful in 4m14s Details / deploy-aarch64 (pull_request) Successful in 1m2s Details / build-aarch64 (pull_request) Successful in 15m44s Details	2024-12-10 16:20:45 -05:00
Antoine Martin	0a88d5c3a3	README: update notice for backports	2024-12-01 14:55:11 -05:00
Antoine Martin	f853f9956d	README: add notice for backports	2024-12-01 14:53:38 -05:00
Antoine Martin	b8f608772c	forgejo-ci: add clear-repo binary	2024-12-01 13:39:18 -05:00
Antoine Martin	89c8805846	forgejo-ci: backports use its own label	2024-12-01 13:12:13 -05:00
Antoine Martin	7a2cb83701	forgejo-ci: add ALL_PACKAGES var to skip maintainer filter	2024-12-01 12:44:29 -05:00
Antoine Martin	a068733225	forgejo-ci: add check-backports workflow	2024-12-01 12:35:57 -05:00
Antoine Martin	ab9d5e9650	backports/py3-numpy-stl: upgrade to 3.2.0	2024-12-01 01:47:25 +00:00
Antoine Martin	d7b083ff8c	backports/libmedc: drop	2024-12-01 01:47:25 +00:00
Antoine Martin	43cc51f815	backports/signal-desktop: upgrade to 7.34.0	2024-12-01 01:47:25 +00:00
Antoine Martin	76f4a5af17	backports/py3-privy: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	e21b82beb4	backports/py3-flask-limiter: upgrade to 3.9.2	2024-12-01 01:47:25 +00:00
Antoine Martin	e1ba44fb3b	backports/py3-dateparser: fix tests	2024-12-01 01:47:25 +00:00
Antoine Martin	b91f3b9ff9	backports/electron: upgrade to 33.2.1	2024-12-01 01:47:25 +00:00
Antoine Martin	7bdf12e9ba	backports/calibre: upgrade to 7.21.0	2024-12-01 01:47:25 +00:00
Antoine Martin	c73afaf110	backports/uranium: fix check	2024-12-01 01:47:25 +00:00
Antoine Martin	b5577c66f1	backports/soqt: fix check	2024-12-01 01:47:25 +00:00
Antoine Martin	37d498e0ef	backports/signal-desktop: upgrade to 7.30.0	2024-12-01 01:47:25 +00:00
Antoine Martin	0f5a3715ce	backports/py3-trimesh: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	43a45d318c	backports/py3-svgpath: build using gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	ea2def9dd2	backports/py3-rtree: build using gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	1a345ce163	backports/py3-rapidjson: build using gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	404979f01b	backports/py3-pyinstrument: upgrade to 4.7.3	2024-12-01 01:47:25 +00:00
Antoine Martin	813dd51cbf	backports/py3-pivy: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	0f88617c94	backports/py3-pathvalidate: upgrade to 3.2.1	2024-12-01 01:47:25 +00:00
Antoine Martin	88d35e2b2a	backports/py3-numpy-stl: move to gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	a24da23d5d	backports/py3-mapbox-earcut: move to gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	55ac054f92	backports/py3-limits: upgrade to 3.13.0	2024-12-01 01:47:25 +00:00
Antoine Martin	5e12f12d1e	backports/py3-fuzzywuzzy: move to gpep517	2024-12-01 01:47:25 +00:00
Antoine Martin	559e9ced7a	backports/py3-flask-limiter: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	b970b53d5b	backports/py3-dataparser: fix check	2024-12-01 01:47:25 +00:00
Antoine Martin	42fba3ec09	backports/py3-microdata: drop due to community	2024-12-01 01:47:25 +00:00
Antoine Martin	192fefd457	backports/py3-utils: drop due to community	2024-12-01 01:47:25 +00:00
Antoine Martin	f4893f439f	backports/py3-pytube: drop due to community	2024-12-01 01:47:25 +00:00
Antoine Martin	c34ae73f08	backports/py3-daemon: drop due to community	2024-12-01 01:47:25 +00:00
Antoine Martin	ca399a31cc	backports/py3-colored: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	5e4808302b	backports/py3-arcus: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	dcd308946a	backports/py3-apsw: upgrade at 3.46.1.0	2024-12-01 01:47:25 +00:00
Antoine Martin	1253b5be22	backports/perl-math-random-isaac-xs: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	ea066664d7	backports/openssl1.1-compat: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	d7fb3c5419	backports/nlopt: upgrade to 2.8.0	2024-12-01 01:47:25 +00:00
Antoine Martin	f2e1f14f99	user/looking-glass: move from backports due to custom version	2024-12-01 01:47:25 +00:00
Antoine Martin	ad6f3d1c77	backports/libmedc: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	86b3f95e1b	backports/freetube: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	b0845ca9b6	user/freecad: move from backports due to aports drop	2024-12-01 01:47:25 +00:00
Antoine Martin	8006b26b74	backports/fdm-materials: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	3bea445fde	backports/electron-tasje: upgrade to 0.7.3	2024-12-01 01:47:25 +00:00
Antoine Martin	53280efc87	backports/electron: upgrade to 33.0.2	2024-12-01 01:47:25 +00:00
Antoine Martin	7c899e25cb	backports/cura: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	53e39d64e5	backports/coin: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	88653d4dbd	backports/caprine: bump pkgrel	2024-12-01 01:47:25 +00:00
Antoine Martin	3ea85f37b5	backports/calibre: upgrade to 7.20.0	2024-12-01 01:47:25 +00:00
Antoine Martin	00e5379973	user/tandoor-recipes: FTBFS	2024-11-30 20:34:19 -05:00
Antoine Martin	9e18a02c6a	user/sane: FTBFS	2024-11-30 20:33:41 -05:00
Antoine Martin	4fce7364ca	user/protobuf: drop	2024-11-30 20:33:21 -05:00
Antoine Martin	a362d7747a	user/paperless-ngx: disable due to uvicorn	2024-11-30 20:32:09 -05:00