backports/caprine: new aport

This reverts commit cd8c8dc55d.

.forgejo/bin/build.sh

@@ -0,0 +1,260 @@
+#!/bin/sh
+# shellcheck disable=SC3043
+
+. /usr/local/lib/functions.sh
+
+# shellcheck disable=SC3040
+set -eu -o pipefail
+
+readonly APORTSDIR=$CI_PROJECT_DIR
+readonly REPOS="backports user"
+readonly ALPINE_REPOS="main community testing"
+readonly ARCH=$(apk --print-arch)
+# gitlab variables
+readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
+
+: "${REPODEST:=$HOME/packages}"
+: "${MIRROR:=https://ayakael.net/api/packages/forge/alpine}"
+: "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine}"
+: "${MAX_ARTIFACT_SIZE:=300000000}" #300M
+: "${CI_DEBUG_BUILD:=}"
+
+: "${CI_ALPINE_BUILD_OFFSET:=0}"
+: "${CI_ALPINE_BUILD_LIMIT:=9999}"
+
+msg() {
+	local color=${2:-green}
+	case "$color" in
+		red) color="31";;
+		green) color="32";;
+		yellow) color="33";;
+		blue) color="34";;
+		*) color="32";;
+	esac
+	printf "\033[1;%sm>>>\033[1;0m %s\n" "$color" "$1" | xargs >&2
+}
+
+verbose() {
+	echo "> " "$@"
+	# shellcheck disable=SC2068
+	$@
+}
+
+debugging() {
+	[ -n "$CI_DEBUG_BUILD" ]
+}
+
+debug() {
+	if debugging; then
+		verbose "$@"
+	fi
+}
+
+die() {
+	msg "$1" red
+	exit 1
+}
+
+capture_stderr() {
+	"$@" 2>&1
+}
+
+report() {
+	report=$1
+
+	reportsdir=$APORTSDIR/logs/
+	mkdir -p "$reportsdir"
+
+	tee -a "$reportsdir/$report.log"
+}
+
+get_release() {
+	case $BASEBRANCH in
+		v*) echo "$BASEBRANCH";;
+		edge) echo edge;;
+		*) die "Branch \"$BASEBRANCH\" not supported!"
+	esac
+}
+
+build_aport() {
+	local repo="$1" aport="$2"
+	cd "$APORTSDIR/$repo/$aport"
+	if abuild -r 2>&1 | report "build-$aport"; then
+		checkapk 2>&1 | report "checkapk-$aport" || true
+		aport_ok="$aport_ok $repo/$aport"
+	else
+		aport_ng="$aport_ng $repo/$aport"
+	fi
+}
+
+check_aport() {
+	local repo="$1" aport="$2"
+	cd "$APORTSDIR/$repo/$aport"
+	if ! abuild check_arch 2>/dev/null; then
+		aport_na="$aport_na $repo/$aport"
+		return 1
+	fi
+}
+
+set_repositories_for() {
+	local target_repo="$1" repos='' repo=''
+	local release
+
+	release=$(get_release)
+	for repo in $REPOS; do
+		[ "$repo" = "non-free" ] && continue
+		[ "$release" == "edge" ] && [ "$repo" == "backports" ] && continue
+		repos="$repos $MIRROR/$release/$repo $REPODEST/$repo"
+		[ "$repo" = "$target_repo" ] && break
+	done
+	doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories"
+	doas apk update
+}
+
+apply_offset_limit() {
+	start=$1
+	limit=$2
+	end=$((start+limit))
+
+	sed -n "$((start+1)),${end}p"
+}
+
+setup_system() {
+	local repos='' repo=''
+	local release
+
+	release=$(get_release)
+	for repo in $ALPINE_REPOS; do
+		[ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue
+		repos="$repos $ALPINE_MIRROR/$release/$repo"
+	done
+	doas sh -c "printf '%s\n' $repos > /etc/apk/repositories"
+	doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system"
+	abuild-keygen -ain
+	doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf
+	( . /etc/abuild.conf && echo "Building with $JOBS jobs" )
+	mkdir -p "$REPODEST"
+	git config --global init.defaultBranch master
+}
+
+sysinfo() {
+	printf ">>> Host system information (arch: %s, release: %s) <<<\n" "$ARCH" "$(get_release)"
+	printf "- Number of Cores: %s\n" "$(nproc)"
+	printf "- Memory: %s Gb\n" "$(awk '/^MemTotal/ {print ($2/1024/1024)}' /proc/meminfo)"
+	printf "- Free space: %s\n" "$(df -hP / | awk '/\/$/ {print $4}')"
+}
+
+copy_artifacts() {
+	cd "$APORTSDIR"
+
+	packages_size="$(du -sk "$REPODEST" | awk '{print $1 * 1024}')"
+	if [ -z "$packages_size" ]; then
+		return
+	fi
+
+	echo "Artifact size: $packages_size bytes"
+
+	mkdir -p keys/ packages/
+
+	if [ "$packages_size" -lt $MAX_ARTIFACT_SIZE ]; then
+		msg "Copying packages for artifact upload"
+		cp -ar "$REPODEST"/* packages/ 2>/dev/null
+		cp ~/.abuild/*.rsa.pub keys/
+	else
+		msg "Artifact size $packages_size larger than max ($MAX_ARTIFACT_SIZE), skipping uploading them" yellow
+	fi
+}
+
+section_start setup "Setting up the system" collapse
+
+if debugging; then
+	set -x
+fi
+
+aport_ok=
+aport_na=
+aport_ng=
+failed=
+
+sysinfo || true
+setup_system || die "Failed to setup system"
+
+# git no longer allows to execute in repositories owned by different users
+doas chown -R buildozer: .
+
+fetch_flags="-qn"
+debugging && fetch_flags="-v"
+
+git fetch $fetch_flags "$CI_MERGE_REQUEST_PROJECT_URL" \
+	"+refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH"
+
+if debugging; then
+	merge_base=$(git merge-base "$BASEBRANCH" HEAD) || echo "Could not determine merge-base"
+	echo "Merge base: $merge_base"
+	git --version
+	git config -l
+	[ -n "$merge_base" ] && git tag -f merge-base "$merge_base"
+	git --no-pager log -200 --oneline --graph --decorate --all
+fi
+
+section_end setup
+
+build_start=$CI_ALPINE_BUILD_OFFSET
+build_limit=$CI_ALPINE_BUILD_LIMIT
+
+for repo in $(changed_repos); do
+	set_repositories_for "$repo"
+	built_aports=0
+	changed_aports_in_repo=$(changed_aports "$repo")
+	changed_aports_in_repo_count=$(echo "$changed_aports_in_repo" | wc -l)
+	changed_aports_to_build=$(echo "$changed_aports_in_repo" | apply_offset_limit "$build_start" "$build_limit")
+
+	msg "Changed aports in $repo:"
+	# shellcheck disable=SC2086 # Splitting is expected here
+	printf " - %s\n" $changed_aports_to_build
+	for pkgname in $changed_aports_to_build; do
+		section_start "build_$pkgname" "Building package $pkgname"
+		built_aports=$((built_aports+1))
+		if check_aport "$repo" "$pkgname"; then
+			build_aport "$repo" "$pkgname"
+		fi
+		section_end "build_$pkgname"
+	done
+
+	build_start=$((build_start-(changed_aports_in_repo_count-built_aports)))
+	build_limit=$((build_limit-built_aports))
+
+	if [ $build_limit -le 0 ]; then
+		msg "Limit reached, breaking"
+		break
+	fi
+done
+
+section_start artifacts "Handeling artifacts" collapse
+copy_artifacts || true
+section_end artifacts
+
+section_start summary "Build summary"
+
+echo "### Build summary ###"
+
+for ok in $aport_ok; do
+	msg "$ok: build succesfully"
+done
+
+for na in $aport_na; do
+	msg "$na: disabled for $ARCH" yellow
+done
+
+for ng in $aport_ng; do
+	msg "$ng: build failed" red
+	failed=true
+done
+section_end summary
+
+if [ "$failed" = true ]; then
+	exit 1
+elif [ -z "$aport_ok" ]; then
+	msg "No packages found to be built." yellow
+fi
+

.forgejo/bin/check_ver.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# expects the following env variables:
+# downstream: downstream repo
+
+repo=${downstream/*\/}
+
+curl --silent $downstream/x86_64/APKINDEX.tar.gz | tar -O -zx APKINDEX > APKINDEX
+
+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"
+
+rm -f out_of_date not_in_anitya
+
+for pkg in $owned_by_you; do
+	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.[].stable_version')
+	downstream_version=$(sed -n "/^P:$pkg$/,/^$/p" APKINDEX | awk -F ':' '{if($1=="V"){print $2}}' | sort -V | tail -n 1)
+	downstream_version=${downstream_version/-*}
+
+	if [ -z "$upstream_version" ]; then
+		echo "$pkg not in anitya"
+		echo "$pkg" >> not_in_anitya
+	elif [ "$downstream_version" != "$(printf '%s\n' $upstream_version $downstream_version | sort -V | head -n 1)" ]; then
+		echo "$pkg higher downstream"
+		continue
+	elif [ "$upstream_version" != "$downstream_version" ]; then
+		echo "$pkg upstream version $upstream_version does not match downstream version $downstream_version"
+		echo "$pkg $downstream_version $upstream_version $repo" >> out_of_date
+	fi
+done

.forgejo/bin/create_issue.sh

@@ -0,0 +1,165 @@
+#!/bin/bash
+
+# expects:
+# env variable FORGEJO_TOKEN
+# file out_of_date
+
+IFS='
+'
+repo=${downstream/*\/}
+
+does_it_exist() {
+	name=$1
+	downstream_version=$2
+	upstream_version=$3
+	repo=$4
+
+	query="$repo/$name: upgrade to $upstream_version"
+	query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
+
+	result="$(curl --silent -X 'GET' \
+		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
+		-H 'accept: application/json' \
+		-H "authorization: Basic $FORGEJO_TOKEN"
+	)"
+
+	if [ "$result" == "[]" ]; then
+		return 1
+	fi
+}
+
+is_it_old() {
+	name=$1
+	downstream_version=$2
+	upstream_version=$3
+	repo=$4
+
+	query="$repo/$name: upgrade to"
+	query="$(echo $query | sed 's| |%20|g' | sed 's|:|%3A|g' | sed 's|/|%2F|g' )"
+
+	result="$(curl --silent -X 'GET' \
+		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
+		-H 'accept: application/json' \
+		-H "authorization: Basic $FORGEJO_TOKEN"
+	)"
+
+	result_title="$(echo $result | jq -r '.[].title' )"
+	result_id="$(echo $result | jq -r '.[].number' )"
+	result_upstream_version="$(echo $result_title | awk '{print $4}')"
+
+	if [ "$upstream_version" != "$result_upstream_version" ]; then
+		echo $result_id
+	else
+		echo 0
+	fi
+}
+
+update_title() {
+	name=$1
+	downstream_version=$2
+	upstream_version=$3
+	repo=$4
+	id=$5
+
+	result=$(curl --silent -X 'PATCH' \
+		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$id" \
+		-H 'accept: application/json' \
+		-H "authorization: Basic $FORGEJO_TOKEN" \
+		-H 'Content-Type: application/json' \
+		-d "{
+			\"title\": \"$repo/$name: upgrade to $upstream_version\"
+		}"
+	)
+	
+	return 0
+}
+
+create_issue() {
+	name=$1
+	downstream_version=$2
+	upstream_version=$3
+	repo=$4
+
+	result=$(curl --silent -X 'POST' \
+		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
+		-H 'accept: application/json' \
+		-H "authorization: Basic $FORGEJO_TOKEN" \
+		-H 'Content-Type: application/json' \
+		-d "{
+			\"title\": \"$repo/$name: upgrade to $upstream_version\",
+			\"labels\": [
+				$LABEL_NUMBER
+			]
+		}")
+
+	return 0
+}
+
+if [ -f out_of_date ]; then
+	out_of_date="$(cat out_of_date)"
+
+	echo "Detected $(wc -l out_of_date) out-of-date packages, creating issues"
+
+	for pkg in $out_of_date; do
+		name="$(echo $pkg | awk '{print $1}')"
+		downstream_version="$(echo $pkg | awk '{print $2}')"
+		upstream_version="$(echo $pkg | awk '{print $3}')"
+		repo="$(echo $pkg | awk '{print $4}')"
+
+		if does_it_exist $name $downstream_version $upstream_version $repo; then
+			echo "Issue for $repo/$name already exists"
+			continue
+		fi
+
+		id=$(is_it_old $name $downstream_version $upstream_version $repo)
+	
+		if [  "$id" != "0" ] && [ -n "$id" ]; then
+			echo "Issue for $repo/$name needs updating"
+			update_title $name $downstream_version $upstream_version $repo $id
+			continue
+		fi
+
+		echo "Creating issue for $repo/$name"
+		create_issue $name $downstream_version $upstream_version $repo
+	done
+fi
+
+if [ -f not_in_anitya ]; then
+	query="Add missing $repo packages to anitya"
+	query="$(echo $query | sed 's| |%20|g')"
+
+	result="$(curl --silent -X 'GET' \
+		"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues?state=open&q=$query&type=issues" \
+		-H 'accept: application/json' \
+		-H "authorization: Basic $FORGEJO_TOKEN"
+	)"
+
+	if [ "$result" == "[]" ]; then
+		echo "Creating anitya issue"
+		result=$(curl --silent -X 'POST' \
+			"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues" \
+			-H 'accept: application/json' \
+			-H "authorization: Basic $FORGEJO_TOKEN" \
+			-H 'Content-Type: application/json' \
+			-d "{
+				\"title\": \"Add missing $repo packages to anitya\",
+				\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\",
+				\"labels\": [
+					$LABEL_NUMBER
+				]
+			}")
+
+	else
+		echo "Updating anitya issue"
+		result_id="$(echo $result | jq -r '.[].number' )"
+		result=$(curl --silent -X 'PATCH' \
+			"$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/issues/$result_id" \
+			-H 'accept: application/json' \
+			-H "authorization: Basic $FORGEJO_TOKEN" \
+			-H 'Content-Type: application/json' \
+			-d "{
+				\"body\": \"- [ ] $(sed '{:q;N;s/\n/\\n- [ ] /g;t q}' not_in_anitya)\"
+			}"
+		)
+	fi
+fi

.forgejo/patches/build.patch

@@ -1,66 +0,0 @@
-diff --git a/usr/local/bin/build.sh.orig b/usr/local/bin/build.sh
-old mode 100644
-new mode 100755
-index c3b8f7a..f609018
---- a/usr/local/bin/build.sh.orig
-+++ b/usr/local/bin/build.sh
-@@ -7,13 +7,15 @@
- set -eu -o pipefail
- 
- readonly APORTSDIR=$CI_PROJECT_DIR
--readonly REPOS="main community testing non-free"
-+readonly REPOS="backports user"
-+readonly ALPINE_REPOS="main community testing"
- readonly ARCH=$(apk --print-arch)
- # gitlab variables
- readonly BASEBRANCH=$CI_MERGE_REQUEST_TARGET_BRANCH_NAME
- 
- : "${REPODEST:=$HOME/packages}"
--: "${MIRROR:=https://dl-cdn.alpinelinux.org/alpine}"
-+: "${MIRROR:=https://ayakael.net/api/packages/forge/alpine}"
-+: "${ALPINE_MIRROR:=http://dl-cdn.alpinelinux.org/alpine}"
- : "${MAX_ARTIFACT_SIZE:=300000000}" #300M
- : "${CI_DEBUG_BUILD:=}"
- 
-@@ -68,8 +70,8 @@ report() {
- 
- get_release() {
- 	case $BASEBRANCH in
--		*-stable) echo v"${BASEBRANCH%-*}";;
--		master) echo edge;;
-+		v*) echo v"${BASEBRANCH%-*}";;
-+		edge) echo edge;;
- 		*) die "Branch \"$BASEBRANCH\" not supported!"
- 	esac
- }
-@@ -101,11 +103,11 @@ set_repositories_for() {
- 	release=$(get_release)
- 	for repo in $REPOS; do
- 		[ "$repo" = "non-free" ] && continue
--		[ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue
-+		[ "$release" == "edge" ] && [ "$repo" == "backports" ] && continue
- 		repos="$repos $MIRROR/$release/$repo $REPODEST/$repo"
- 		[ "$repo" = "$target_repo" ] && break
- 	done
--	doas sh -c "printf '%s\n' $repos > /etc/apk/repositories"
-+	doas sh -c "printf '%s\n' $repos >> /etc/apk/repositories"
- 	doas apk update
- }
- 
-@@ -118,7 +120,15 @@ apply_offset_limit() {
- }
- 
- setup_system() {
--	doas sh -c "echo $MIRROR/$(get_release)/main > /etc/apk/repositories"
-+	local repos='' repo=''
-+	local release
-+
-+	release=$(get_release)
-+	for repo in $ALPINE_REPOS; do
-+		[ "$release" != "edge" ] && [ "$repo" == "testing" ] && continue
-+		repos="$repos $ALPINE_MIRROR/$release/$repo"
-+	done
-+	doas sh -c "printf '%s\n' $repos > /etc/apk/repositories"
- 	doas apk -U upgrade -a || apk fix || die "Failed to up/downgrade system"
- 	abuild-keygen -ain
- 	doas sed -i -E 's/export JOBS=[0-9]+$/export JOBS=$(nproc)/' /etc/abuild.conf

.forgejo/workflows/build-aarch64.yaml

@@ -24,8 +24,8 @@ jobs:
           fetch-depth: 500
       - name: Package build
         run: |
-          doas patch -d / -p1 -i ${{ github.workspace }}/.forgejo/patches/build.patch
-          build.sh
+          ${{ github.workspace }}/.forgejo/bin/build.sh
+          touch packages/dummy
       - name: Package upload
         uses: forgejo/upload-artifact@v3
         with:

.forgejo/workflows/build-x86_64.yaml

@@ -24,8 +24,8 @@ jobs:
           fetch-depth: 500
       - name: Package build
         run: |
-          doas patch -d / -p1 -i ${{ github.workspace }}/.forgejo/patches/build.patch
-          build.sh
+          ${{ github.workspace }}/.forgejo/bin/build.sh
+          touch packages/dummy
       - name: Package upload
         uses: forgejo/upload-artifact@v3
         with:

.forgejo/workflows/check-community.yml

@@ -0,0 +1,27 @@
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  check-community:
+    name: Check community repo
+    runs-on: x86_64
+    container:
+      image: alpine:latest
+    env:
+      downstream: https://dl-cdn.alpinelinux.org/alpine/edge/community
+      FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
+      LABEL_NUMBER: 4
+    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

.forgejo/workflows/check-testing.yml

@@ -0,0 +1,27 @@
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  check-community:
+    name: Check testing repo
+    runs-on: x86_64
+    container:
+      image: alpine:latest
+    env:
+      downstream: https://dl-cdn.alpinelinux.org/alpine/edge/testing
+      FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
+      LABEL_NUMBER: 4
+    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

.forgejo/workflows/check-user.yml

@@ -0,0 +1,27 @@
+on:
+  workflow_dispatch:
+
+  schedule:
+    - cron: '0 5 * * *'
+
+jobs:
+  check-user:
+    name: Check user repo
+    runs-on: x86_64
+    container:
+      image: alpine:latest
+    env:
+      downstream: https://ayakael.net/api/packages/forge/alpine/edge/user
+      FORGEJO_TOKEN: ${{ secrets.forgejo_token }}
+      LABEL_NUMBER: 4
+    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

README.md

@@ -18,14 +18,14 @@ Affixed to each repository description is the appropriate link for use in
 
 #### Backports
 ```
-https://ayakael.net/api/packages/forge/alpine/v3.17/backports
+https://ayakael.net/api/packages/forge/alpine/edge/backports
 ```
 
 Aports from the official Alpine repositories backported from edge.
 
 #### User
 ```
-https://ayakael.net/api/packages/forge/alpine/v3.17/user
+https://ayakael.net/api/packages/forge/alpine/edge/user
 ```
 
 Aports that have yet to be (or may never be) upstreamed to the official
@@ -33,11 +33,11 @@ aports.
 
 
 ## How to use
-Add security key of the repo-apk repository to your /etc/apk/keys:
+Add security key of the apk repository to your /etc/apk/keys:
 
 ```shell
 cd /etc/apk/keys
-wget https://ayakael.net/api/packages/forge/alpine/v3.17/antoine.martin@protonmail.com-5b3109ad.rsa.pub
+curl -JO https://ayakael.net/api/packages/forge/alpine/key
 ```
 Add repositories that you want to use (see above) to `/etc/apk/repositories`.
 

backports/airsonic-advanced/APKBUILD

@@ -16,6 +16,7 @@ pkgusers="airsonic-advanced"
 pkggroups="airsonic-advanced"
 install="$pkgname.pre-install"
 source="$pkgname-$pkgver.tar.gz::https://github.com/airsonic-advanced/airsonic-advanced/archive/$_sha.tar.gz
+	maven.patch
 	airsonic-advanced.initd
 	"
 builddir="$srcdir/$pkgname-$_sha"
@@ -42,5 +43,6 @@ package() {
 
 sha512sums="
 f415620bdbed9fb3874afbf30d9362e68b1e9e8e90dbbed4ca3206b643cad97ca0558e64ec5b4440382f0ec908c3325e321ea3631c38ff9a2109163c8f0cfe0b  airsonic-advanced-11.0.0_git20230217.tar.gz
+6cb52fee19815fcdf2596e55d97d3e750321b1df7a4fec36fc9bc2a57d4be979a3905a42d3aa9dbeb2bf0d4f56edbf344f13551219b8e4d2ca583abd4bb5c8f9  maven.patch
 ca87e6a7199950e6ac52aeb076a03f831d60ee9d4ceed47366bbd78443765d205796d895ebb244051d8033e5b2e9ccd648d20434039c854b8b50e766cc5cd10d  airsonic-advanced.initd
 "

backports/airsonic-advanced/maven.patch

@@ -0,0 +1,8 @@
+fixes maven 3.9 breaking change
+https://maven.apache.org/docs/3.9.0/release-notes.html#potentially-breaking-core-changes
+--- airsonic-advanced-1397446f979b1cdea283eec89ce4f0eae7d63450/.mvn/maven.config
++++ airsonic-advanced-1397446f979b1cdea283eec89ce4f0eae7d63450/.mvn/maven.config
+@@ -1 +1,2 @@
+---settings ./.mvn/settings.xml
++--settings
++./.mvn/settings.xml

backports/calibre/0001-calibre-no-update.patch

@@ -0,0 +1,25 @@
+diff --color -Nur calibre-6.17.0.orig/src/calibre/gui2/update.py calibre-6.17.0/src/calibre/gui2/update.py
+--- calibre-6.17.0.orig/src/calibre/gui2/update.py	2023-05-06 11:36:35.678461036 -0700
++++ calibre-6.17.0/src/calibre/gui2/update.py	2023-05-06 11:39:10.365134930 -0700
+@@ -82,20 +82,6 @@
+         while not self.shutdown_event.is_set():
+             calibre_update_version = NO_CALIBRE_UPDATE
+             plugins_update_found = 0
+-            try:
+-                version = get_newest_version()
+-                if version[:2] > numeric_version[:2]:
+-                    calibre_update_version = version
+-            except Exception as e:
+-                prints('Failed to check for calibre update:', as_unicode(e))
+-            try:
+-                update_plugins = get_plugin_updates_available(raise_error=True)
+-                if update_plugins is not None:
+-                    plugins_update_found = len(update_plugins)
+-            except Exception as e:
+-                prints('Failed to check for plugin update:', as_unicode(e))
+-            if calibre_update_version != NO_CALIBRE_UPDATE or plugins_update_found > 0:
+-                self.signal.update_found.emit(calibre_update_version, plugins_update_found)
+             self.shutdown_event.wait(self.INTERVAL)
+ 
+     def shutdown(self):
+

backports/calibre/APKBUILD

@@ -0,0 +1,116 @@
+# Maintainer: Cowington Post <cowingtonpost@gmail.com>
+pkgname=calibre
+pkgver=7.12.0
+pkgrel=0
+pkgdesc="Ebook management application"
+# qt6-webengine
+arch="x86_64 aarch64"
+url="https://calibre-ebook.com"
+license="GPL-3.0-or-later"
+depends="
+	font-liberation
+	libwmf
+	mtdev
+	optipng
+	poppler
+	py3-apsw
+	py3-beautifulsoup4
+	py3-css-parser
+	py3-cssselect
+	py3-dateutil
+	py3-dnspython
+	py3-feedparser
+	py3-fonttools
+	py3-html2text
+	py3-html5-parser
+	py3-html5lib
+	py3-jeepney
+	py3-lxml
+	py3-markdown
+	py3-mechanize
+	py3-msgpack
+	py3-netifaces
+	py3-pillow
+	py3-psutil
+	py3-pycryptodome
+	py3-pygments
+	py3-pyqt6-webengine
+	py3-regex
+	py3-xxhash
+	py3-zeroconf
+	qt6-qtimageformats
+	qt6-qtsvg
+	qt6-qtwebengine
+	udisks2
+	"
+makedepends="
+	cmake
+	curl
+	hunspell-dev
+	hyphen-dev
+	libmtp-dev
+	libstemmer-dev
+	libusb-dev
+	podofo-dev
+	py3-pyqt-builder
+	py3-pyqt6-sip
+	py3-sip
+	python3-dev
+	qt6-qtbase-dev
+	uchardet-dev
+	xdg-utils
+	"
+subpackages="
+	$pkgname-pyc
+	$pkgname-doc
+	$pkgname-bash-completion
+	$pkgname-zsh-completion
+	"
+source="https://download.calibre-ebook.com/$pkgver/calibre-$pkgver.tar.xz
+	0001-$pkgname-no-update.patch
+	"
+# net: downloads iso-codes
+# !check: no tests ran
+options="net !check"
+
+export LANG="en_US.UTF-8"
+
+prepare() {
+	default_prepare
+
+	rm -f resources/calibre-portable.*
+}
+
+build() {
+	python3 setup.py build
+	python3 setup.py iso639
+	python3 setup.py iso3166
+	python3 setup.py liberation_fonts --system-liberation_fonts --path-to-liberation_fonts /usr/share/fonts/liberation
+	python3 setup.py mathjax
+	python3 setup.py gui
+}
+
+check() {
+	python3 -m unittest discover
+}
+
+package() {
+	# needed for zsh
+	mkdir -p "$pkgdir"/usr/share/zsh/site-functions
+
+	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
+
+	rm -r "$pkgdir"/usr/share/calibre/rapydscript/
+
+	python3 -m compileall -fq "$pkgdir"/usr
+}
+
+sha512sums="
+ee654260d7047f0579a659b8907439a407fb561affcef84141126840452e7b98d10bb5e0a69e0cc809d9ba68729570900a0e7251f18b2056a94b0213880f1363  calibre-7.12.0.tar.xz
+eb8e7ce40ff8b8daf6e7e55a5dff8ec4dff06c45744266bb48b3194e92ab1196bc91468203e3c2ca1e5144166a7d6be90e6cf0253513e761b56a4c85be4c2c76  0001-calibre-no-update.patch
+"

backports/caprine/APKBUILD

@@ -1,19 +1,19 @@
-# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
-
+# Maintainer: Antoine Martin (ayakael) <dev@ayakael.net>
 pkgname=caprine
-pkgver=2.57.0
-pkgrel=0
+pkgver=2.60.1
+pkgrel=1
 pkgdesc="Elegant Facebook Messenger desktop app"
-arch="noarch"
+arch="x86_64 aarch64" # blocked by electron
 url="https://github.com/sindresorhus/caprine"
 license="MIT"
 depends="electron"
-makedepends="npm findutils"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/sindresorhus/caprine/archive/refs/tags/v$pkgver.tar.gz
-        caprine.desktop
-        caprine.js
+makedepends="npm findutils coreutils"
+options="!check" # No test suite
+source="
+	$pkgname-$pkgver.tar.gz::https://github.com/sindresorhus/caprine/archive/refs/tags/v$pkgver.tar.gz
+	caprine.desktop
+	caprine.sh
 	"
 
 build() {
@@ -26,21 +26,21 @@ build() {
 }
 
 package() {
-	local appdir=/usr/lib/$pkgname
+	local appdir=/usr/lib/caprine
 
 	install -d "$pkgdir"$appdir
-	cp -r * "$pkgdir"$appdir
+	cp -r ./* "$pkgdir"$appdir
 
 	install -dm755 "$pkgdir/usr/share/pixmaps"
 	install -m644 build/icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
 
-	install -Dm755 "$srcdir"/$pkgname.js "$pkgdir"/usr/bin/$pkgname
-	install -Dm644 "$srcdir"/$pkgname.desktop \
-            "$pkgdir"/usr/share/applications/$pkgname.desktop
+	install -Dm755 "$srcdir"/caprine.sh "$pkgdir"/usr/bin/caprine
+	install -Dm644 "$srcdir"/caprine.desktop \
+		"$pkgdir"/usr/share/applications/caprine.desktop
 
-	install -dm755 "$pkgdir"/usr/share/licenses/$pkgname
-	ln -s $(realpath -m --relative-to=/usr/share/licenses/$pkgname $appdir/license) \
-        "$pkgdir"/usr/share/licenses/$pkgname
+	install -dm755 "$pkgdir"/usr/share/licenses/caprine
+	ln -s "$(realpath -m --relative-to=/usr/share/licenses/caprine $appdir/license)" \
+		"$pkgdir"/usr/share/licenses/caprine
 
 	# Clean up
 	rm -r "$pkgdir"$appdir/build
@@ -48,7 +48,7 @@ package() {
 	rm -r "$pkgdir"$appdir/tsconfig.json
 	find "$pkgdir"$appdir \
 		-name "package.json" \
-			-exec sed -e "s|$srcdir/$pkgname|$appdir|" \
+			-exec sed -e "s|$srcdir/caprine|$appdir|" \
 				-i {} \; \
 		-or -name ".*" -prune -exec rm -r '{}' \; \
 		-or -name "bin" -prune -exec rm -r '{}' \; \
@@ -59,7 +59,7 @@ package() {
 		-or -name "test" -prune -exec rm -r '{}' \;
 }
 sha512sums="
-9d019e4aa61f94ffb627f1b647266d28d47c005515d9193ae8a6e67dbac4b4d931ca907dcb2627e4c8eb00e59ab825fc9dd3d9791064cf1cfbd28d8eff4d2589  caprine-2.57.0.tar.gz
+0df7f233c91f5a044dcffde94b976c6ad71e6d355518615c48cd825a249c01d63f455de31ece69193a66ca0fd8157506f9b88088da1bd47fc75e9d3800784ed0  caprine-2.60.1.tar.gz
 a469e3bea24926119e51642b777ef794c5fa65421107903f967c36d81bbb1adb3d52469ce3a3301b2c890f1aa53ab989ded22a7c6e811fb8cf0a582dbd835e19  caprine.desktop
-44280c62ce43bdafa8528729371fccb16b8a0e3db7aca28d5c157ae0144dca5fbb023b8883b561955aa28ab62e967f2674d8c6bcaff186e2cdd0e7ba8beab9ac  caprine.js
+3ad8994c1a0417e73d622587769e527b4236a32c1a89442ff76413b75b4392d667c9e2908979b453e5926e54db6d94b31625340c5a94e84e91ea77f56feae778  caprine.sh
 "

backports/caprine/caprine.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/bin/electron "/usr/lib/caprine"

backports/celery/APKBUILD

@@ -1,48 +0,0 @@
-# Maintainer: Drew DeVault <sir@cmpwn.com>
-pkgname=celery
-pkgver=5.2.7
-pkgrel=0
-pkgdesc="An asynchronous task queue/job queue based on distributed message passing"
-url="http://www.celeryproject.org/"
-arch="noarch !s390x" # lmited by py3-kombu
-license="Apache-2.0"
-depends="py3-urllib3 py3-redis py3-vine py3-kombu py3-billiard py3-tz"
-makedepends="python3-dev py3-setuptools"
-install="$pkgname.pre-install"
-source="https://files.pythonhosted.org/packages/source/c/celery/celery-$pkgver.tar.gz
-	celery.confd
-	celery.initd"
-pkgusers="celery"
-pkggroups="celery"
-subpackages="$pkgname-openrc"
-provides="py3-celery=$pkgver-r$pkgrel"
-
-# TODO: requires many many many dependencies
-options="!check"
-
-build() {
-	python3 setup.py build
-}
-
-package() {
-	install -dm755 "$pkgdir/$confdir"
-	install -dm755 "$pkgdir/$confdir/conf.d"
-
-	# install scripts
-	install -m755 -D "$srcdir"/$pkgname.initd \
-		"$pkgdir"/etc/init.d/$pkgname
-	install -m644 -D "$srcdir"/$pkgname.confd \
-		"$pkgdir"/etc/conf.d/$pkgname
-
-	python3 setup.py install --prefix=/usr --root="$pkgdir"
-}
-
-check() {
-	python3 setup.py test
-}
-
-sha512sums="
-68e3bb082f97ebe20391293cc8fa96c41c8f5ac5e8c24b2b7bd66eb104ec459bdfa49741e47486676e5daa88d7a71e3eb0d9432851aeafc74b0d4352e567e853  celery-5.2.7.tar.gz
-f9458bce0d8990de646df564bec96baa0e45867f44e41380d38520905e00c941b1ce261314bb78edaa14c591e0aa9386d24c58a61f69fb0fecc616c34a24dea1  celery.confd
-ff8c0451efa7157fd61f2335f4187bef6cbdd51856c7cfad4de02244c6c5ca7c584f9108731b52f020fee866365d9f092ded266c90d13cb34e92a7ffb63fed57  celery.initd
-"

backports/celery/celery.confd

@@ -1,4 +0,0 @@
-CELERY_USER=celery
-CELERY_LOG=/var/log/celery.log
-CELERY_REDIR="1>/dev/null 2>> ${CELERY_LOG}"
-CELERY_OPTS="-A celeryapp -B --loglevel=info $CELERY_REDIR"

backports/celery/celery.initd

@@ -1,16 +0,0 @@
-#!/sbin/openrc-run
-supervisor=supervise-daemon
-
-description="celery queue worker"
-
-: ${CELERY_USER:="celery"}
-: ${CELERY_GROUP:="$(id -gn $LS_USER)"}
-
-pidfile="/run/$RC_SVCNAME.sd.pid"
-supervise_daemon_args="-u $CELERY_USER -g $CELERY_GROUP -p $pidfile"
-command=/usr/bin/celery
-command_args="${CELERY_OPTS}"
-
-depends() {
-	use net
-}

backports/celery/celery.pre-install

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-addgroup -S celery 2>/dev/null
-adduser -S -D -H -h /usr/share/celery -s /sbin/nologin -G celery -g celery celery 2>/dev/null
-
-exit 0
-

backports/coin/APKBUILD

@@ -0,0 +1,36 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=coin
+pkgver=4.0.0
+pkgrel=6
+pkgdesc="OpenGL OpenInventor compatible graphics library"
+url="https://github.com/coin3d/coin"
+license="BSD-3-Clause"
+arch="all"
+makedepends="boost-dev cmake glu-dev graphviz samurai"
+subpackages="$pkgname-dev"
+source="https://github.com/coin3d/coin/releases/download/Coin-$pkgver/coin-$pkgver-src.tar.gz
+	TestSuitePatch.patch
+	"
+builddir="$srcdir/coin"
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCOIN_BUILD_TESTS=ON
+	cmake --build build
+}
+
+check() {
+	cmake --build build --target test
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+e036276a243bfe252569cee1b67d38b8633fcf35bdf4e366a92ca67e23799d54d91fe272c23b383c451d330cee284809f28f237857493948149e0da1ebd64fae  coin-4.0.0-src.tar.gz
+aab464244b13371badf0878e5bfbcce859a42756cf8c7657d1480318aa291d296eac2741219c346bae056f761c5f46857f8fd1ec1c4129f86bc10236d3869deb  TestSuitePatch.patch
+"

backports/coin/TestSuitePatch.patch

@@ -0,0 +1,11 @@
+--- ./testsuite/TestSuiteUtils.cpp
++++ ./testsuite/TestSuiteUtils.cpp
+@@ -39,7 +39,7 @@
+ #elif defined(_WIN32)
+ #define USE_WIN32
+ #else //_WIN32
+-#error Unknown system
++#define USE_POSIX
+ #endif //POSIX
+ 
+ #include <Inventor/errors/SoDebugError.h>

backports/cura/APKBUILD

@@ -0,0 +1,75 @@
+# Contributor: Anjandev Momi <anjan@momi.ca>
+# Maintainer: Anjandev Momi <anjan@momi.ca>
+pkgname=cura
+# uranium and curaengine packages must be updated in sync with this verion number
+# py3-pynest2d and fdm-materials should be checked as well, but their versions are not always in sync
+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
+# 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
+license="LGPL-3.0-or-later"
+# add cura-binary-data to depends when packaged
+depends="
+	curaengine
+	fdm-materials
+	uranium
+	py3-arcus
+	py3-keyring
+	py3-numpy-stl
+	py3-pyclipper
+	py3-pynest2d
+	py3-pyserial
+	py3-qt6
+	py3-requests
+	py3-trimesh
+	py3-zeroconf
+	"
+makedepends="samurai cmake gettext gettext-dev" # needs msginit from gettext
+checkdepends="py3-pytest"
+subpackages="$pkgname-lang"
+source="$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/Cura/archive/refs/tags/$pkgver.tar.gz
+	AppDesktopData.patch
+	CuraVersion.patch
+	cmake-helpers.patch
+	cmake.patch"
+builddir="$srcdir/Cura-$pkgver"
+options="!check" # tests broken after v5.x
+
+build() {
+	local pyver="$(python3 -c 'import sys; print(f"{sys.version_info.major}.{sys.version_info.minor}")')"
+	cmake -B build -G Ninja \
+		-DCURA_VERSION=$pkgver \
+		-DPython_VERSION=$pyver \
+		-DURANIUM_DIR=/usr/share/uranium \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DGETTEXT_MSGINIT_EXECUTABLE=msginit \
+		-DCURA_BINARY_DATA_DIRECTORY=/usr/share/cura \
+		-DCMAKE_BUILD_TYPE=minsizerel
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+	mv $pkgdir/usr/bin/cura_app.py $pkgdir/usr/bin/cura
+
+	# don't ever send any user or print info through the internet to Ultimaker
+	rm -rf "$pkgdir/usr/lib/cura/plugins/SliceInfoPlugin"
+
+	install -d "$pkgdir"/usr/share/locale
+	mv "$pkgdir"/usr/share/cura/resources/i18n/* "$pkgdir"/usr/share/locale/
+}
+
+sha512sums="
+5d4e0fdc740d0c048905e2b87cc8c73eedea59b54766b74760505902007b365582d22b46b1cfdcd6914828840865c10a3beb0ef6a1f04ea181c81d44f42434bc  cura-5.2.2.tar.gz
+214e373f6cab7e3ccac12c96d1b5ca636d8d1e9ecdadaae84fc28fb429969c7c2d6055ce2a01b6db3ad85ab6cbc8d135cf2c26c77d7cfe13a73eb81aa5e85f11  AppDesktopData.patch
+e3bb302db70ca195b2ce9831e71302c8ee2a51955fecc7264a495d7d4fc9c107cfd48811aa5865f16671e7b1ae126f95d3d7bbb6a70f367f7f91a2b32bce377b  CuraVersion.patch
+0db4ff97e7f82ae1a9dbc9c330d08c3e46249feeb3fb630f7c4e2de73749327337ec041680c39a07e0b5034c1b3f3656d75614ab4dc2f39861c8e27bdb2a58ef  cmake-helpers.patch
+05a73f892700ff6279230385b04180873a62b7413fa7f7d55ae150f1bcee57ef05eda0bd7fe444fe660ab66a044c958f42badd33b743fca81033ae8f19dd3805  cmake.patch
+"

backports/cura/AppDesktopData.patch

@@ -0,0 +1,58 @@
+--- /dev/null
++++ ./com.ultimaker.cura.appdata.xml
+@@ -0,0 +1,33 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!-- Copyright 2016 Richard Hughes <richard@hughsie.com> -->
++<component type="desktop">
++  <id>com.ultimaker.cura.desktop</id>
++  <metadata_license>CC0-1.0</metadata_license>
++  <project_license>LGPL-3.0 and CC-BY-SA-4.0</project_license>
++  <name>Cura</name>
++  <summary>The world's most advanced 3d printer software</summary>
++  <description>
++    <p>
++      Cura creates a seamless integration between hardware, software and
++      materials for the best 3D printing experience around.
++      Cura supports the 3MF, OBJ and STL file formats and is available on
++      Windows, Mac and Linux.
++    </p>
++    <ul>
++      <li>Novices can start printing right away</li>
++      <li>Experts are able to customize 300 settings to achieve the best results</li>
++      <li>Optimized profiles for Ultimaker materials</li>
++      <li>Supported by a global network of Ultimaker certified service partners</li>
++      <li>Print multiple objects at once with different settings for each object</li>
++      <li>Cura supports STL, 3MF and OBJ file formats</li>
++      <li>Open source and completely free</li>
++    </ul>
++  </description>
++  <screenshots>
++    <screenshot type="default">
++      <image>https://raw.githubusercontent.com/Ultimaker/Cura/master/screenshot.png</image>
++    </screenshot>
++  </screenshots>
++  <url type="homepage">https://ultimaker.com/software/ultimaker-cura?utm_source=cura&amp;utm_medium=software&amp;utm_campaign=cura-update-linux</url>
++  <translation type="gettext">Cura</translation>
++</component>
+--- /dev/null
++++ ./com.ultimaker.cura.desktop.in
+@@ -0,0 +1,19 @@
++[Desktop Entry]
++Name=Ultimaker Cura
++Name[de]=Ultimaker Cura
++Name[nl]=Ultimaker Cura
++GenericName=3D Printing Software
++GenericName[de]=3D-Druck-Software
++GenericName[nl]=3D-printsoftware
++Comment=Cura converts 3D models into paths for a 3D printer. It prepares your print for maximum accuracy, minimum printing time and good reliability with many extra features that make your print come out great.
++Comment[de]=Cura wandelt 3D-Modelle in Pfade für einen 3D-Drucker um. Es bereitet Ihren Druck für maximale Genauigkeit, minimale Druckzeit und guter Zuverlässigkeit mit vielen zusätzlichen Funktionen vor, damit Ihr Druck großartig wird.
++Comment[nl]=Cura converteert 3D-modellen naar paden voor een 3D printer. Het bereidt je print voor om zeer precies, snel en betrouwbaar te kunnen printen, met veel extra functionaliteit om je print er goed uit te laten komen.
++Exec=@CMAKE_INSTALL_FULL_BINDIR@/cura %F
++TryExec=@CMAKE_INSTALL_FULL_BINDIR@/cura
++Icon=cura-icon
++Terminal=false
++Type=Application
++MimeType=model/stl;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png;text/x-gcode;application/x-amf;application/x-ply;application/x-ctm;model/vnd.collada+xml;model/gltf-binary;model/gltf+json;model/vnd.collada+xml+zip;
++Categories=Graphics;
++Keywords=3D;Printing;Slicer;
++StartupWMClass=cura.real

backports/cura/CuraVersion.patch

@@ -0,0 +1,16 @@
+--- /dev/null
++++ ./cura/CuraVersion.py.in
+@@ -0,0 +1,13 @@
++# Copyright (c) 2020 Ultimaker B.V.
++# Cura is released under the terms of the LGPLv3 or higher.
++
++CuraAppName = "@CURA_APP_NAME@"
++CuraAppDisplayName = "@CURA_APP_DISPLAY_NAME@"
++CuraVersion = "@CURA_VERSION@"
++CuraBuildType = "@CURA_BUILDTYPE@"
++CuraDebugMode = True if "@_cura_debugmode@" == "ON" else False
++CuraCloudAPIRoot = "@CURA_CLOUD_API_ROOT@"
++CuraCloudAPIVersion = "@CURA_CLOUD_API_VERSION@"
++CuraCloudAccountAPIRoot = "@CURA_CLOUD_ACCOUNT_API_ROOT@"
++CuraMarketplaceRoot = "@CURA_MARKETPLACE_ROOT@"
++CuraDigitalFactoryURL = "@CURA_DIGITAL_FACTORY_URL@"

backports/cura/cmake-helpers.patch

@@ -0,0 +1,95 @@
+--- /dev/null
++++ ./cmake/CuraPluginInstall.cmake
+@@ -0,0 +1,92 @@
++# Copyright (c) 2022 Ultimaker B.V.
++# CuraPluginInstall.cmake is released under the terms of the LGPLv3 or higher.
++
++#
++# This module detects all plugins that need to be installed and adds them using the CMake install() command.
++# It detects all plugin folder in the path "plugins/*" where there's a "plugin.json" in it.
++#
++# Plugins can be configured to NOT BE INSTALLED via the variable "CURA_NO_INSTALL_PLUGINS" as a list of string in the
++# form of "a;b;c" or "a,b,c". By default all plugins will be installed.
++#
++
++option(PRINT_PLUGIN_LIST "Should the list of plugins that are installed be printed?" ON)
++
++# Options or configuration variables
++set(CURA_NO_INSTALL_PLUGINS "" CACHE STRING "A list of plugins that should not be installed, separated with ';' or ','.")
++
++file(GLOB_RECURSE _plugin_json_list ${CMAKE_SOURCE_DIR}/plugins/*/plugin.json)
++list(LENGTH _plugin_json_list _plugin_json_list_len)
++
++# Sort the lists alphabetically so we can handle cases like this:
++#   - plugins/my_plugin/plugin.json
++#   - plugins/my_plugin/my_module/plugin.json
++# In this case, only "plugins/my_plugin" should be added via install().
++set(_no_install_plugin_list ${CURA_NO_INSTALL_PLUGINS})
++# Sanitize the string so the comparison will be case-insensitive.
++string(STRIP   "${_no_install_plugin_list}" _no_install_plugin_list)
++string(TOLOWER "${_no_install_plugin_list}" _no_install_plugin_list)
++
++# WORKAROUND counterpart of what's in cura-build.
++string(REPLACE "," ";" _no_install_plugin_list "${_no_install_plugin_list}")
++
++list(LENGTH _no_install_plugin_list _no_install_plugin_list_len)
++
++if(_no_install_plugin_list_len GREATER 0)
++    list(SORT _no_install_plugin_list)
++endif()
++if(_plugin_json_list_len GREATER 0)
++    list(SORT _plugin_json_list)
++endif()
++
++# Check all plugin directories and add them via install() if needed.
++set(_install_plugin_list "")
++foreach(_plugin_json_path ${_plugin_json_list})
++    get_filename_component(_plugin_dir ${_plugin_json_path} DIRECTORY)
++    file(RELATIVE_PATH _rel_plugin_dir ${CMAKE_CURRENT_SOURCE_DIR} ${_plugin_dir})
++    get_filename_component(_plugin_dir_name ${_plugin_dir} NAME)
++
++    # Make plugin name comparison case-insensitive
++    string(TOLOWER "${_plugin_dir_name}" _plugin_dir_name_lowercase)
++
++    # Check if this plugin needs to be skipped for installation
++    set(_add_plugin ON)  # Indicates if this plugin should be added to the build or not.
++    set(_is_no_install_plugin OFF)  # If this plugin will not be added, this indicates if it's because the plugin is
++                                    # specified in the NO_INSTALL_PLUGINS list.
++    if(_no_install_plugin_list)
++        if("${_plugin_dir_name_lowercase}" IN_LIST _no_install_plugin_list)
++            set(_add_plugin OFF)
++            set(_is_no_install_plugin ON)
++        endif()
++    endif()
++
++    # Make sure this is not a subdirectory in a plugin that's already in the install list
++    if(_add_plugin)
++        foreach(_known_install_plugin_dir ${_install_plugin_list})
++            if(_plugin_dir MATCHES "${_known_install_plugin_dir}.+")
++                set(_add_plugin OFF)
++                break()
++            endif()
++        endforeach()
++    endif()
++
++    if(_add_plugin)
++        if(${PRINT_PLUGIN_LIST})
++            message(STATUS "[+] PLUGIN TO INSTALL: ${_rel_plugin_dir}")
++        endif()
++        get_filename_component(_rel_plugin_parent_dir ${_rel_plugin_dir} DIRECTORY)
++        install(DIRECTORY ${_rel_plugin_dir}
++                DESTINATION lib${LIB_SUFFIX}/cura/${_rel_plugin_parent_dir}
++                PATTERN "__pycache__" EXCLUDE
++                PATTERN "*.qmlc" EXCLUDE
++                )
++        list(APPEND _install_plugin_list ${_plugin_dir})
++    elseif(_is_no_install_plugin)
++        if(${PRINT_PLUGIN_LIST})
++            message(STATUS "[-] PLUGIN TO REMOVE : ${_rel_plugin_dir}")
++        endif()
++        execute_process(COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/mod_bundled_packages_json.py
++                        -d ${CMAKE_CURRENT_SOURCE_DIR}/resources/bundled_packages
++                        ${_plugin_dir_name}
++                        RESULT_VARIABLE _mod_json_result)
++    endif()
++endforeach()

backports/cura/cmake.patch

@@ -0,0 +1,85 @@
+--- ./CMakeLists.txt.orig
++++ ./CMakeLists.txt
+@@ -1,10 +1,6 @@
+ # Copyright (c) 2022 Ultimaker B.V.
+ # Cura is released under the terms of the LGPLv3 or higher.
+ 
+-# NOTE: This is only being used for translation scripts.
+-
+-# For MSVC flags, will be ignored on non-Windows OS's and this project in general. Only needed for cura-build-environment.
+-cmake_policy(SET CMP0091 NEW)
+ project(cura)
+ cmake_minimum_required(VERSION 3.18)
+ 
+@@ -15,8 +11,44 @@
+ set(URANIUM_DIR "${CMAKE_SOURCE_DIR}/../Uranium" CACHE PATH "The location of the Uranium repository")
+ set(URANIUM_SCRIPTS_DIR "${URANIUM_DIR}/scripts" CACHE PATH "The location of the scripts directory of the Uranium repository")
+ 
++option(CURA_DEBUGMODE "Enable debug dialog and other debug features" OFF)
++if(CURA_DEBUGMODE)
++    set(_cura_debugmode "ON")
++endif()
++
+ option(GENERATE_TRANSLATIONS "Should the translations be generated?" ON)
+ 
++set(CURA_APP_NAME "cura" CACHE STRING "Short name of Cura, used for configuration folder")
++set(CURA_APP_DISPLAY_NAME "Ultimaker Cura" CACHE STRING "Display name of Cura")
++set(CURA_VERSION "master" CACHE STRING "Version name of Cura")
++set(CURA_BUILDTYPE "" CACHE STRING "Build type of Cura, eg. 'PPA'")
++set(CURA_CLOUD_API_ROOT "" CACHE STRING "Alternative Cura cloud API root")
++set(CURA_CLOUD_API_VERSION "" CACHE STRING "Alternative Cura cloud API version")
++set(CURA_CLOUD_ACCOUNT_API_ROOT "" CACHE STRING "Alternative Cura cloud account API version")
++set(CURA_MARKETPLACE_ROOT "" CACHE STRING "Alternative Marketplace location")
++set(CURA_DIGITAL_FACTORY_URL "" CACHE STRING "Alternative Digital Factory location")
++
++configure_file(${CMAKE_SOURCE_DIR}/com.ultimaker.cura.desktop.in ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop @ONLY)
++
++configure_file(cura/CuraVersion.py.in CuraVersion.py @ONLY)
++
++if(NOT DEFINED Python_VERSION)
++    set(Python_VERSION
++            3.11
++            CACHE STRING "Python Version" FORCE)
++    message(STATUS "Setting Python version to ${Python_VERSION}. Set Python_VERSION if you want to compile against an other version.")
++endif()
++if(APPLE)
++    set(Python_FIND_FRAMEWORK NEVER)
++endif()
++find_package(Python ${Python_VERSION} EXACT REQUIRED COMPONENTS Interpreter)
++message(STATUS "Linking and building ${project_name} against Python ${Python_VERSION}")
++if(NOT DEFINED Python_SITELIB_LOCAL)
++    set(Python_SITELIB_LOCAL
++            "${Python_SITELIB}"
++            CACHE PATH "Local alternative site-package location to install Cura" FORCE)
++endif()
++
+ if(NOT ${URANIUM_DIR} STREQUAL "")
+     set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${URANIUM_DIR}/cmake")
+ endif()
+@@ -29,4 +61,24 @@
+     if(${GENERATE_TRANSLATIONS})
+         CREATE_TRANSLATION_TARGETS()
+     endif()
+-endif()
+\ No newline at end of file
++endif()
++
++install(DIRECTORY resources DESTINATION ${CMAKE_INSTALL_DATADIR}/cura)
++
++include(CuraPluginInstall)
++
++install(FILES cura_app.py DESTINATION ${CMAKE_INSTALL_BINDIR}
++        PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++install(DIRECTORY cura DESTINATION "${Python_SITELIB_LOCAL}")
++install(FILES ${CMAKE_BINARY_DIR}/CuraVersion.py DESTINATION "${Python_SITELIB_LOCAL}/cura/")
++if(NOT APPLE AND NOT WIN32)
++    install(FILES ${CMAKE_BINARY_DIR}/com.ultimaker.cura.desktop
++            DESTINATION ${CMAKE_INSTALL_DATADIR}/applications)
++    install(FILES ${CMAKE_SOURCE_DIR}/resources/images/cura-icon.png
++            DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/128x128/apps/)
++    install(FILES com.ultimaker.cura.appdata.xml
++            DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo)
++    install(FILES cura.sharedmimeinfo
++            DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages/
++            RENAME cura.xml )
++endif()

backports/dex/APKBUILD

@@ -0,0 +1,26 @@
+# Contributor: Anjandev Momi <anjan@momi.ca>
+# Maintainer: Anjandev Momi <anjan@momi.ca>
+pkgname=dex
+pkgver=0.9.0
+pkgrel=1
+pkgdesc="program to generate and execute DesktopEntry files of the Application type"
+url="https://github.com/jceb/dex"
+arch="all"
+license="GPL-3.0-or-later"
+depends="python3"
+makedepends="py3-sphinx"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/jceb/dex/archive/refs/tags/v$pkgver.tar.gz"
+options="!check" # no testsuite
+
+build() {
+	make
+}
+
+package() {
+	make install PREFIX=/usr MANPREFIX=/usr/share/man DESTDIR="$pkgdir"
+}
+
+sha512sums="
+d68f5482cb0948f27a724437ddfc6de9a0f502bfd0d5c60c76fb85dda3c30e4c432013e530f6a91138c9ac9ff36b3824cd5e382e9d29bb9fb2ec2b9de4133094  dex-0.9.0.tar.gz
+"

backports/electron-tasje/APKBUILD

@@ -1,17 +1,16 @@
-# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
-# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
+# Contributor: lauren n. liberda <lauren@selfisekai.rocks>
+# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=electron-tasje
-pkgver=0.5.7
+pkgver=0.7.1
 pkgrel=0
 pkgdesc="Tiny replacement for electron-builder"
 url="https://codeberg.org/selfisekai/electron_tasje/"
 arch="aarch64 x86_64"	# only useful on platforms with electron
-license="Apache-2.0"
-makedepends="cargo"
-source="electron_tasje-$pkgver.tar.gz::https://codeberg.org/selfisekai/electron_tasje/archive/v$pkgver.tar.gz"
+license="Apache-2.0 OR MIT"
+makedepends="cargo cargo-auditable"
+source="electron_tasje-${_rev:-"$pkgver"}.tar.gz::https://codeberg.org/selfisekai/electron_tasje/archive/${_rev:-"v$pkgver"}.tar.gz"
 builddir="$srcdir/electron_tasje"
 
-export CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"
 
 prepare() {
 	default_prepare
@@ -20,7 +19,7 @@ prepare() {
 }
 
 build() {
-	cargo build --frozen --release
+	cargo auditable build --frozen --release
 }
 
 check() {
@@ -32,5 +31,5 @@ package() {
 }
 
 sha512sums="
-90649d6c7ac10edc6b50e9bfba54d5df472c0621768886fcdb039874152dbd2a72c1a23f38a5e25e4983f16f49546039eca2b79b9386f261b3c5d31a93c439f5  electron_tasje-0.5.7.tar.gz
+665ccbd6cb357c25d55daed4ad3b3ce008da258054951d9d069a5b12e72dd5812d534f906868e6b18e78949f058069a961c394c6f21ab3b3fab5393c330445e5  electron_tasje-0.7.1.tar.gz
 "

backports/electron/APKBUILD

@@ -1,17 +1,21 @@
-# Maintainer: psykose <alice@ayaya.dev>
+# Maintainer: lauren n. liberda <lauren@selfisekai.rocks>
 pkgname=electron
-pkgver=21.3.3
-pkgrel=3
-_chromium=106.0.5249.199
-_depot_tools=6fde0fbe9226ae3fc9f5c709adb93249924e5c49
+pkgver=30.0.9
+_semver="${pkgver/_beta/-beta.}"
+pkgrel=0
+_chromium=124.0.6367.233
+_copium_tag=124.5
+_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"
 makedepends="
+	ada-dev
 	alsa-lib-dev
 	aom-dev
+	base64-dev
 	bash
 	brotli-dev
 	bsd-compat-headers
@@ -21,14 +25,17 @@ makedepends="
 	clang-dev
 	clang-extra-tools
 	compiler-rt
+	crc32c-dev
 	cups-dev
 	curl-dev
 	dav1d-dev
 	dbus-glib-dev
+	double-conversion-dev
 	eudev-dev
 	ffmpeg-dev
 	findutils
 	flac-dev
+	flatbuffers-dev
 	flex
 	freetype-dev
 	gperf
@@ -36,23 +43,26 @@ makedepends="
 	gn
 	gzip
 	harfbuzz-dev
+	hdrhistogram-c-dev
+	highway-dev
 	hunspell-dev
 	http-parser-dev
-	hwids-usb
+	hwdata-dev
 	java-jdk
 	jpeg-dev
-	jsoncpp-dev
 	krb5-dev
 	lcms2-dev
 	libarchive-tools
 	libavif-dev
 	libbsd-dev
 	libcap-dev
+	libdrm-dev
 	libevent-dev
 	libexif-dev
 	libgcrypt-dev
 	libjpeg-turbo-dev
 	libnotify-dev
+	libsecret-dev
 	libusb-dev
 	libva-dev
 	libwebp-dev
@@ -72,73 +82,82 @@ makedepends="
 	nodejs
 	npm
 	nss-dev
+	openh264-dev
 	opus-dev
 	pciutils-dev
 	perl
 	pipewire-dev
 	pulseaudio-dev
 	py3-httplib2
+	py3-jinja2
 	py3-parsing
+	py3-setuptools
 	py3-six
 	python3
-	re2-dev
+	qt5-qtbase-dev
+	rsync
+	rust
 	samurai
-	snappy-dev
 	speex-dev
 	sqlite-dev
-	woff2-dev
 	xcb-proto
 	yarn
 	zlib-dev
+	zstd-dev
 	"
 subpackages="$pkgname-lang $pkgname-dev"
 # the lower patches are specific to electron, the top ones are from the equivalent chromium version
-source="https://dev.alpinelinux.org/archive/electron/electron-$pkgver.tar.xz
-	angle-wayland-include.patch
-	canonicalize-file-name.patch
-	chromium-VirtualCursor-standard-layout.patch
+source="https://ab-sn.lnl.gay/electron-$_semver-$_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
-	chromium-use-alpine-target.patch
-	credentials-sys-types-header.patch
-	default-pthread-stacksize.patch
-	dns-resolver.patch
-	fix-crashpad.patch
+	compiler.patch
+	disable-dns_config_service.patch
+	disable-failing-tests.patch
+	fc-cache-version.patch
 	fix-missing-cstdint-include-musl.patch
-	fix-narrowing-cast.patch
+	fix-opus.patch
+	fstatat-32bit.patch
 	gdbinit.patch
-	jsoncpp.patch
-	memory-tagging-arm64.patch
+	generic-sensor-include.patch
+	import-version.patch
+	libstdc++13.patch
+	mman.patch
+	musl-auxv.patch
 	musl-sandbox.patch
 	musl-tid-caching.patch
 	musl-v8-monotonic-pthread-cont_timedwait.patch
 	no-execinfo.patch
-	no-glibc-version.patch
 	no-mallinfo.patch
 	no-res-ninit-nclose.patch
-	no-stat-redefine.patch
-	nullptr-t.patch
-	partition-atfork.patch
-	py3.11.patch
-	quiche-arena-size.patch
-	roll-src-third_party-ffmpeg-102.patch
-	roll-src-third_party-ffmpeg-106.patch
-	scoped-file-no-close.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
-	wtf-stacksize.patch
+	yes-musl.patch
 
 	icon.patch
 	python-jinja-3.10.patch
-	system-node.patch
-	vector-const.patch
 	webpack-hash.patch
+	unbundle-node.patch
 
 	default.conf
 	electron.desktop
 	electron-launcher.sh
 	"
-options="!check suid"
+_copium_patches="
+	cr124-iwyu-sys-select-dawn-terminal.patch
+	cr124-libwebp-shim-sharpyuv.patch
+	"
+# tests are todo for some base checks
+options="!check net suid"
+builddir="$srcdir/electron-$_semver-$_chromium"
+
+export PATH="$PATH:/usr/lib/qt5/bin"
 
-# clang uses much less memory (and this doesn't support gcc)
 export CC=clang
 export CXX=clang++
 
@@ -148,49 +167,56 @@ export NM=llvm-nm
 export LD=clang++
 
 # less log spam, reproducible
-export CFLAGS="${CFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined"
-export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-unknown-warning-option -Wno-builtin-macro-redefined"
-export CPPFLAGS="$CPPFLAGS -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__="
+export CFLAGS="${CFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-shift-count-overflow -Wno-ignored-attributes"
+export CXXFLAGS="${CXXFLAGS/-g/} -O2 -Wno-builtin-macro-redefined -Wno-deprecated-declarations -Wno-invalid-constexpr"
+export CPPFLAGS="${CPPFLAGS/-g/} -D__DATE__=  -D__TIME__=  -D__TIMESTAMP__="
+case "$CARCH" in
+	aarch64|arm*|riscv64)
+		# not supported by clang here
+		export CFLAGS="${CFLAGS/-fstack-clash-protection}"
+		export CXXFLAGS="${CXXFLAGS/-fstack-clash-protection}"
+		;;
+esac
 
-_gn_flags() {
-	echo "$@"
-}
+# breaks chromium-based stuff
+export CXXFLAGS="${CXXFLAGS/-D_GLIBCXX_ASSERTIONS=1}"
 
 # creates a dist tarball that does not need to git clone everything at build time.
+_distbucket="sakamoto/lnl-aports-snapshots/"
 snapshot() {
+	deps
+	# 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"
 	mkdir -p "$srcdir"
 	cd "$srcdir"
-	git clone --branch=$_chromium --depth=1 \
-		https://chromium.googlesource.com/chromium/src.git
 
-	git clone https://github.com/electron/electron.git
-
-	(
-		git clone --depth 1 -b main https://chromium.googlesource.com/chromium/tools/depot_tools.git
-		cd depot_tools
-		git fetch --depth 1 origin $_depot_tools
-		git checkout $_depot_tools
-	)
+	if ! [ -d depot_tools ]; then
+		(
+			git clone --depth 1 -b main https://chromium.googlesource.com/chromium/tools/depot_tools.git
+			cd depot_tools
+			git fetch --depth 1 origin $_depot_tools
+			git checkout $_depot_tools
+		)
+	fi
 
 	export PATH="$PATH:$srcdir/depot_tools"
 
 	echo "solutions = [
 	{
 		\"name\": \"src/electron\",
-		\"url\": \"file://$srcdir/electron@v$pkgver\",
+		\"url\": \"https://github.com/electron/electron.git@v$_semver\",
 		\"deps_file\": \"DEPS\",
 		\"managed\": False,
 		\"custom_deps\": {
-			\"src\": None,
+			\"src\": \"https://chromium.googlesource.com/chromium/src.git@$_chromium\",
 		},
 		\"custom_vars\": {},
 	},
 	]" > .gclient
 
 	python3 depot_tools/gclient.py sync \
-		--with_branch_heads \
-		--with_tags \
+		--no-history \
 		--nohooks
 
 	python3 src/build/landmines.py
@@ -202,42 +228,54 @@ snapshot() {
 	python3 src/build/util/lastchange.py -m SKIA_COMMIT_HASH \
 		-s src/third_party/skia --header src/skia/ext/skia_commit_hash.h
 
-	# why?
-	cp -r electron/patches/ffmpeg src/electron/patches/
+	# rolled newer chromium with it included
+	sed -i '/reland_mojom_ts_generator_handle_empty_module_path_identically_to.patch/d' src/electron/patches/chromium/.patches
 
-	python3 electron/script/apply_all_patches.py \
-		electron/patches/config.json
-	python3 src/tools/download_optimization_profile.py \
-		--newest_state=src/chrome/android/profiles/newest.txt \
-		--local_state=src/chrome/android/profiles/local.txt \
-		--output_name=src/chrome/android/profiles/afdo.prof \
-		--gs_url_base=chromeos-prebuilt/afdo-job/llvm
+	python3 src/electron/script/apply_all_patches.py \
+		src/electron/patches/config.json
 
-	mv src $pkgname-$pkgver
+	mv src $pkgname-$_semver-$_chromium
 
 	# extra binaries are most likely things we don't want, so nuke them all
-	for elf in $(scanelf -RA -F "%F" $pkgname-$pkgver); do
+	for elf in $(scanelf -RA -F "%F" $pkgname-$_semver-$_chromium); do
 		rm -f "$elf"
 	done
 
 	msg "generating tarball.. (this takes a while)"
-	tar -cf $pkgname-$pkgver.tar \
+	tar -cf $pkgname-$_semver-$_chromium.tar \
 		--exclude="ChangeLog*" \
-		--exclude="testdata/" \
-		--exclude="test_data/" \
-		--exclude="android_rust_toolchain/toolchain/" \
+		--exclude="testdata/*" \
+		--exclude="test_data/*" \
+		--exclude="android_rust_toolchain/*" \
 		--exclude-backups \
 		--exclude-caches-all \
 		--exclude-vcs \
-		$pkgname-$pkgver
+		$pkgname-$_semver-$_chromium
 
-	xz -T0 -e -9 -vv -k $pkgname-$pkgver.tar
+	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"
 }
 
 prepare() {
 	default_prepare
 
-	git init .
+	for i in $_copium_patches; do
+		case "$i" in
+			*.patch)
+				msg "${i%::*}"
+				patch -p1 -i "$srcdir/copium/$i" || failed="$failed $i"
+				;;
+		esac
+	done
+	if [ ! -z "$failed" ]; then
+		error "The following patches failed to apply:"
+		for i in $failed; do
+			printf "  %s\n" "$i" >&2
+		done
+		exit 1
+	fi
+
+	git init -q .
 
 	# link to system tools
 	ln -sfv /usr/bin/clang-format buildtools/linux64/clang-format
@@ -247,48 +285,55 @@ prepare() {
 
 	(
 		cd electron
-		git init .
+		git init -q .
 		git config user.email "example@example.com"
 		git config user.name "example"
+		git config commit.gpgsign false
 		git add LICENSE
 		git commit -m "init"
-		git tag "v$pkgver"
-		# jesus christ what the fuck is wrong with you?
-		touch .git/packed-refs
-		yarn install --frozen-lockfile
+		git tag "v$_semver"
+		git pack-refs
+		yarn install --frozen-lockfile --no-scripts
 	)
 
 	(
 		cd third_party/node
-		npm ci
+		./update_npm_deps
 	)
 
-	local use_system="
+	# reusable system library settings
+	# flatbuffers - tensorflow has a few static_asserts for a specific patch version
+	# 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
+	local chromium_use_system="
 		brotli
+		crc32c
 		dav1d
+		double-conversion
 		ffmpeg
 		flac
 		fontconfig
 		freetype
 		harfbuzz-ng
+		highway
 		icu
-		jsoncpp
-		libaom
-		libavif
 		libdrm
 		libevent
 		libjpeg
+		libsecret
+		libusb
 		libwebp
 		libxml
 		libxslt
+		openh264
 		opus
-		re2
-		snappy
-		woff2
 		zlib
+		zstd
 		"
 
-	for _lib in $use_system libjpeg_turbo; do
+	for _lib in $chromium_use_system jinja2 libjpeg_turbo; do
 		msg "Removing buildscripts for system provided $_lib"
 		find . -type f -path "*third_party/$_lib/*" \
 			\! -path "*third_party/$_lib/chromium/*" \
@@ -298,18 +343,48 @@ prepare() {
 			\! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \
 			\! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \
 			\! -path './third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h' \
-			\! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+			\! -regex '.*\.\(gn\|gni\|gyp\|gypi\|isolate\|py\)' \
 			-delete
 	done
 
+	# llhttp - 9.x needed, 8.x in repo (2023-12-17)
+	# ada - needs use_custom_libcxx=false
+	local node_use_system="
+		base64
+		brotli
+		cares
+		corepack
+		histogram
+		nghttp2
+		nghttp3
+		ngtcp2
+		zlib
+		"
+	# some of these are provided by system, e.g. brotli. some are from chromium,
+	# e.g. boringssl (as openssl). some are not in use at all (corepack)
+	for _lib in $node_use_system openssl; do
+		msg "Removing buildscripts for $_lib"
+		find . -type f -path "*third_party/electron_node/deps/$_lib/*" \
+			\! -path "*third_party/electron_node/deps/$_lib/chromium/*" \
+			\! -path "*third_party/electron_node/deps/$_lib/google/*" \
+			\! -regex '.*\.\(gn\|gni\|gyp\|gypi\|isolate\|py\)' \
+			-delete
+	done
+	# XXX: hack. unbundle-node.patch uses this list to switch things
+	# in config.gypi. https://github.com/electron/electron/issues/40836
+	echo $node_use_system > third_party/electron_node/use_system.txt
+
+	rm -rf third_party/electron_node/tools/inspector_protocol/jinja2
+
 	# https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion
 	touch chrome/test/data/webui/i18n_process_css_test.html
 	# Use the file at run time instead of effectively compiling it in
 	sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \
 		-i services/device/public/cpp/usb/BUILD.gn
 
+	msg "Running debundle script"
 	python3 build/linux/unbundle/replace_gn_files.py --system-libraries \
-		$use_system
+		$chromium_use_system
 	python3 third_party/libaddressinput/chromium/tools/update-strings.py
 
 	# prevent annoying errors when regenerating gni
@@ -327,58 +402,103 @@ prepare() {
 		third_party/libxml/chromium/*.cc \
 		third_party/maldoca/src/maldoca/ole/oss_utils.h
 
+	_configure
+}
+
+_configure() {
+	cd "$builddir"
 	msg "Configuring build"
 
+	local clang_ver="$(clang -dumpversion)"
+
+	case "$USE_CCACHE" in
+	1)
+		local cc_wrapper="ccache"
+		;;
+	*)
+		local cc_wrapper=""
+		;;
+	esac
+
+	local maglev=true
+	local symbol_level=0
+	local vaapi=true
+
+	# shellcheck disable=2089
 	local gn_config="
 		import(\"//electron/build/args/release.gn\")
+
 		blink_enable_generated_code_formatting=false
+		cc_wrapper=\"$cc_wrapper\"
 		chrome_pgo_phase=0
+		clang_base_path=\"/usr\"
 		clang_use_chrome_plugins=false
+		clang_version=\"${clang_ver%%.*}\"
 		custom_toolchain=\"//build/toolchain/linux/unbundle:default\"
 		disable_fieldtrial_testing_config=true
 		enable_hangout_services_extension=true
 		enable_nacl=false
+		enable_nocompile_tests=false
 		enable_stripping=false
+		enable_rust=true
 		enable_vr=false
 		fatal_linker_warnings=false
 		ffmpeg_branding=\"Chrome\"
 		host_toolchain=\"//build/toolchain/linux/unbundle:default\"
-		icu_use_data_file=true
+		icu_use_data_file=false
 		is_cfi=false
+		is_clang=true
 		is_component_ffmpeg=true
 		is_debug=false
 		is_official_build=true
 		link_pulseaudio=true
 		proprietary_codecs=true
+		regenerate_x11_protos=true
 		rtc_link_pipewire=true
 		rtc_use_pipewire=true
-		symbol_level=0
+		rustc_version=\"yes\"
+		rust_sysroot_absolute=\"/usr\"
+		symbol_level=$symbol_level
 		treat_warnings_as_errors=false
-		use_custom_libcxx=false
-		use_gnome_keyring=false
+		use_custom_libcxx=true
+		use_lld=true
 		use_pulseaudio=true
+		use_safe_libstdcxx=false
+		use_system_libffi=true
 		use_sysroot=false
-		use_system_freetype=true
-		use_system_harfbuzz=true
-		use_system_lcms2=true
-		use_system_libdrm=true
-		use_system_libjpeg=true
-		use_system_wayland_scanner=true
-		use_system_zlib=true
-		use_vaapi=true
-	"
+		use_thin_lto=false
+		use_vaapi=$vaapi
+		v8_enable_maglev=$maglev
 
-	gn gen out/Release \
-		--args="$(echo $gn_config)" \
+		skia_use_dawn=false
+		use_dawn=false
+		use_system_ada=false
+		use_system_base64=true
+		use_system_cares=true
+		use_system_histogram=true
+		use_system_lcms2=true
+		use_system_libffi=true
+		use_system_llhttp=false
+		use_system_nghttp2=true
+		"
+
+	# shellcheck disable=2086,2090,2116
+	gn gen out/Release --args="$(echo $gn_config)" \
 		--export-compile-commands
 }
 
 build() {
-	ninja -C out/Release \
+	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 \
 		electron_dist_zip \
 		node_gypi_headers \
-		node_version_header \
-		tar_headers
+		node_version_header
+
+	cp -vf out/Release/gen/node_headers/include/node/config.gypi third_party/electron_node/config.gypi
 }
 
 package() {
@@ -393,7 +513,12 @@ package() {
 
 	mkdir -p "$pkgdir"/usr/include/electron
 
-	mv -v "$builddir"/out/Release/gen/node_headers "$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
 	ln -sv /usr/include/electron/node_headers/include/node "$pkgdir"/usr/include/electron/node
 
 	mkdir -p "$pkgdir"/usr/include/electron/node_headers/include/nan
@@ -419,44 +544,42 @@ lang() {
 }
 
 sha512sums="
-1d21e74875ade836625c28d8d9351b41d2776def248193e9c82d4cd50375e9e9b2f7c40026673fe2a191a936f05c3fe639b0423964356ad678f41545aceede3c  electron-21.3.3.tar.xz
-f19ba0c0f542115e6f53019659df256471e811a23d2f37569c9d4dfa265c0c1ace3e62c74d7507f82e6b7b4152c704e651810a00616f8f531592b14bb2af01d9  angle-wayland-include.patch
-252b37a2ecc5e7a25385943045f426dc2e30991b28d206ceaff1be7fd8ffeeb024310a8fca6b3e69a4b1c57db535d51c570935351053525f393682d5ecd0f9a9  canonicalize-file-name.patch
-ac0a80174f95d733f33ddc06fc88cdcf7db0973378c28d8544dc9c19e2dabeac47f91c99b3e7384f650b3405554a9e222543f0860b6acc407c078a8c9180d727  chromium-VirtualCursor-standard-layout.patch
-c4654d5b23c6f5d9502507e534fe1951d6749c62251e49b6adfe10d1569431e7f7a5a6fa5ff09ec30984415ced27a5e20985df8c91295de34af3c84557fa5b91  chromium-revert-drop-of-system-java.patch
-d2b5b0396173367fcf1804aaee8e7fbefce9c63ac2a91c3a1ede759cb85e567317a57e4d4f82d3ca021682fb7856e15c074276a03eda946d9b28e1cb706b07ad  chromium-use-alpine-target.patch
-ec04bf43278a19d4bb090eddd636ad7093c7e757cb2ffa1875971e0709761174790e109b9be03a8e299d4077a87fbd8dabd301b8754bb6fe53c055396e8af556  credentials-sys-types-header.patch
-4ab8261bf95547b10df44e4d528c06a64c33602c10a1e09d531190dc8947ba6ef9e69145405b801cd364707570f791fee6d93e3bf5d57831f5a85212ddf01729  default-pthread-stacksize.patch
-f011f66e5aae5a6f0d440492ee9400878b47b66214c1bc8dc1477fdd07ad0a508cdbb74415e55e27085c4e61e112e7c2ae2edfa217f2fb387e13097b24cb17b1  dns-resolver.patch
-9d1edb1e0624ee61825e3af23fbb8c5dbc09d2b92d7769d19f8ca618edae8de8a3e051fedf4ad92c230e1373dc8495922c46971aef93a580c04ad80bc33516c0  fix-crashpad.patch
-8bebf4a9d5225c6e47edc5b07c4b97be24a45cc221f49632836915ceeb4ecb69b7f79a31ea7f82171cde3443f45fec541f409892542cf1014e81aa6acd01566d  fix-missing-cstdint-include-musl.patch
-efe97b9dd2ec5965fa0cdf1b2a3c01253835c2df710da7ea105c4ce008c11f9caaf8b4321736a2b91f06d8d61972c08e225b16509dc05176a2c39337688ad5b9  fix-narrowing-cast.patch
-cf73cbe5bf19d6a22157fb7aafb43f326885e852fc6292728f4ed1cd145d07ba5af51b6ec808095136cd406478aaa427ee1b9611c855fbd87976e1a91e1609bd  gdbinit.patch
-fa2637f92f851614347e296fbab744af2c5d7edcbb444aeb4a5d3182a8ec2549593d75e717d7e78e9b2a7257e693b48fc88c149c1591052d7ae802f4fda0a775  jsoncpp.patch
-e0afb7066c2cb41aa461feb9e45e571517229deab9d06186490b527783a7ba826a4d67d3a14a33a164eea64fa561eb5b93a1d4dfd0acc2e7a9eb038e6ee273db  memory-tagging-arm64.patch
-fdf8ba7badbd5b61d415ad9d49c66b6ef0a6a40ec95a47e13af48711fe1bd3a5574e987929a3c486cdd02c239863b8517e7f834cecd30f156479e43a9441a18e  musl-sandbox.patch
-85c2842a251a3f8aa59c701ca5f2ce2f5d49b5c7e4773d5387dc597447fb47c9d876f5fb308576686c9a8abc7e35cfc172b6cdfb9f5f1dc1509329e3590b38d8  musl-tid-caching.patch
-d2825aa9525fcbb53791f0ef2502c0f444a9d668f09db6ae4987b94dc4d0e6f1cf58a6e9e772ab11c896a469ca32242feb3ad9c9dbb20df9316cd74151ab0ec9  musl-v8-monotonic-pthread-cont_timedwait.patch
-ebd5cf28277853dc5e984961c370ab4a6331488ae7cff45083fea0470262f56486664bc9bd7947fdd796c8635e479633c4d08cfd89270c0310f3ec21cc6642d2  no-execinfo.patch
-f0bf97a80e663041e33cb0468fd8c47c5f351d6de61059ce1f359a813c40db8e247eaef294c3f562c0a8204e4f1992a918f1d879b1da9891027500e21f482b79  no-glibc-version.patch
-10ae0f74a4c1db899b571508100af63e5af8d0f7c41a37fc9b7987cbf9f27f4c55894c02d6820957d7522a528929059f562f96c2f05fd6509f60c6c71d9d8256  no-mallinfo.patch
-a5aa82c30402773903db1d3876208132fdef175f56ebc0ce1ee4c104a98d498d709c5565c4381736c04c238203b3c8a9cd7a5b5e69876f6afb65d7fc48df23d0  no-res-ninit-nclose.patch
-2c0d7239728d98c0564ad7b81d6d243e58e56de58a21357fa30c39e333fc29c1aa98529c6e1b6fa7694169b513391ca27fa542f69b483bbde644cc2ed739bbdd  no-stat-redefine.patch
-5e9f6279698195467e3b506cea9be0d97ec2d970672b1b12d3d7880eec4f6f53b8f92942dc3fc6738b02889382534ce0f4310a1f94b33e21f8fbc70b85640b81  nullptr-t.patch
-ad563e29ac7d83c203f5af966c4ed3ebdeb5c997835a45fb28ecde08dde5231d0a775fb413f44867af28724504c42316b27d5a6aaa602057642dcbdf7ec20a7a  partition-atfork.patch
-65aa0c7c9909a803e59b88ecb6d79c4db491079f3324f7bd02ee485a7bb7a81674b8f0591dab766c97070a401116db7f629fee36af7416a0fefc38f4ae0ad13d  py3.11.patch
-083ed731e0a3788f2cb04a3035022fbb3e4db99eba01516ea233ea3229f7d898943d8115463a48655ac83eb3cc7a48aceb8bf17c68930a5a1d83b1af95dfade8  quiche-arena-size.patch
-128ec0fd14349e065c8bb0910d53cbea7423182a06e06f7b7765f3cba1e5ba5e7a8bccbcdab079335b5235abb7bf0d46dee21ecc8c221be7e1c5c6d9795f958e  roll-src-third_party-ffmpeg-102.patch
-1063e68f477645914ddf5641eabdd3eaf744e569635d645ea860c3546f67a7ef91eded99331378ee75071b67ecfe9bd4be307bd3da7c7ad93509e2bd634d1ec3  roll-src-third_party-ffmpeg-106.patch
-3cf36b269e9fcfa74975d267bbf31bef68b533a51672e5ed81ae511a70f28a45206168af370961a3dab5695ddaff41cb8839c8c2fa53f22a9f3c88d207cb2996  scoped-file-no-close.patch
-f2f7673f9e793dfbf4456ff8c2be785ea551c36bd512572245d04bf44da08b0133e98d85a1ffd51158009754c83121cad48d755cbc153735df2d2e73233856c0  temp-failure-retry.patch
-1d4e8c6e65205e6b72af47b9a2fa6f96aaada9b7d5a74f4e11a345a885df3078b523d02aaf8e9dac3aa30d72bbbd07cd6dc7edcf44fb9ae57a7f81251c398f65  wtf-stacksize.patch
-905565c10f5e5600e7d4db965c892cc45009a258e9995da958974d838ace469e1db1019195307e8807860d5b55ba6bfeea478b1f39a9b99e82c619b2816a1a22  icon.patch
+97024407a16fb41ec56fcc6df5552165ce4eea34fc51b17ecbf30a7e35406baccf8a3001a795a06d1e92d32e134d9d7a18d59fa74eda1b1bc23b59bc4947929b  electron-30.0.9-124.0.6367.233.tar.zst
+13c647dc2024e27ae8a4d7e8f1202037a342f4a7054477226665c332029e1b6f1d8b99004c2b2809bcf1e6c19b1359ef5e1c971552d7ced59c5b43d5a836af88  copium-124.5.tar.gz
+29bb685e03356a77df5fd347cdf55194cc8b3265c421cc76e54d64edefc329dbcb052deb26b22e8f587ce68456876c071de1b7d258dd0fcc6ee66c875ec4a020  chromium-revert-drop-of-system-java.patch
+54eb147c0af2ba096d1df375a289b339ee855ab1a9114e7c747753f0274a6bafb7212c1859b7885454c4529d9a5e3bd9559fc14e8e006f23ccd381895fa68d15  compiler.patch
+4057cc78f10bfd64092bc35a373869abb1d68b880cdbca70422f39ffd78a929c19c7728d4d4c40709aaba25581148a93ae5343e724849fd35323062ed68753fa  disable-dns_config_service.patch
+111bc22fb704d97759988268a40d6b356c51b0bd7a8119a694e905ffe21850ff64e91566cd0dd0c9d62fcb46dca8acc821436c34eb0ba78be872ee4f7ec88a7b  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
+e7163ac5810ac85366cef2447412287c856e3d67c6b77f219a6e5a418b1965b98e449c409424ad0704a5bded9355dd0aec3dc4585918ce5a2ab36c079707afe2  musl-tid-caching.patch
+92eb002718026611f5542362ad69b67f0a398ff71b3fca5c05d55cb5c6f9f29334e5e127bb4860cfaa3fba0f0d4c901e2b98808217e7dc02e254a64a5c9521aa  musl-v8-monotonic-pthread-cont_timedwait.patch
+73bca6c6f9873f2f11cef04f3f41f71e0ae86e7e2d77e14db4298675fec390744c5081f6fdb14052e5ee2b5885be1198c3aa6068eb2b656d1a665c0c3f36e708  no-execinfo.patch
+8e17101d69e23b456a9c03dc2fe95bcd56846389707ba6f4720192a9e9168406d20d9168dbebbb3a47d921ec92e478f0e390f46e6b9bb43a34dda217c6e6448b  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
+e48693e6b7aeebf69a5acbf80d9a35defe4c23835121dfeb58b051ac7c527e758a41004f4d193274fe1b01c0bfb1dbc77b09cb6a404a3fdee507a2918afb0edb  temp-failure-retry.patch
+914ccf649d7771f19f209ab97f99c481aebc6f66174d68e8b539f6ad4a70bc8cb0fae2df6dadbf0415958ffb3574c420fe029079dcce45f5e5add4db2e903566  yes-musl.patch
+465107da7818b237e3c144a318ab80c3c9343b51ed38b8971ef204692d13346929becbe94cefad4c153788d3a200642143584d5ca070f6304e768ba2139c19ec  icon.patch
 e05180199ee1d559e4e577cedd3e589844ecf40d98a86321bf1bea5607b02eeb5feb486deddae40e1005b644550331f6b8500177aa7e79bcb3750d3c1ceb76c3  python-jinja-3.10.patch
-26a8e4040e69f335a7104f42d012b9d933a40985b33a7be02add27a801c097c5a2be4c6e69faf9175ce8945210ae4c5592ecad2123ccff2beee5473194a765e3  system-node.patch
-71571b15cf8bd6259b7fd22bea0e46b64890f3db776365de33fe539f26ce9ef99459e05c3dde9434c3657225bc67160abc915acd93033cb487c770c6a2a5975f  vector-const.patch
 2aa340854316f1284217c0ca17cbf44953684ad6c7da90815117df30928612eb9fb9ffb734b948dfc309cd25d1a67cd57f77aac2d052a3dd9aca07a3a58cbb30  webpack-hash.patch
-08460b15037511a4e5469ceac6ae5dd4db4c8cb87c129aaaf40ba58b16c60b8a307ffdd85805efead235758abed09ec31db1ef4cf9159f7b9acdcee3031bc96c  default.conf
+ebb18a0e2eba4b4606e900fa82f4b57fe91dcbdc943e17544bccb3c9a011a49b4331cdbee59629e44b80184bad4ea54ec887c0bfcd00cda8d5686060dbf365e3  unbundle-node.patch
+e8ea87c547546011c4c8fc2de30e4f443b85cd4cfcff92808e2521d2f9ada03feefb8e1b0cf0f6b460919c146e56ef8d5ad4bb5e2461cc5247c30d92eb4d068e  default.conf
 191559fc7aa1ea0353c6fb0cc321ee1d5803a0e44848c8be941cfab96277b0de6a59962d373e2a2a1686c8f9be2bcf2d2f33706759a339a959e297d3f7fda463  electron.desktop
-03750694e5e0b66f084c6e43135e60be15abb059e23486346ee4352dcc236984f2f35467b47f2b2ad46c98c22091cc2b978de8e73680febadba169d960f13f9f  electron-launcher.sh
+5f7ba5ad005f196facec1c0f26108356b64cafb1e5cfa462ff714a33b8a4c757ac00bfcb080da09eb5b65032f8eb245d9676a61ec554515d125ed63912708648  electron-launcher.sh
 "

backports/electron/angle-wayland-include.patch

@@ -1,39 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/a353833a5a731abfaa465b658f61894a516aa49b/trunk/angle-wayland-include-protocol.patch
-diff -upr third_party/angle.orig/BUILD.gn third_party/angle/BUILD.gn
---- a/third_party/angle.orig/BUILD.gn	2022-08-17 19:38:11.000000000 +0000
-+++ b/third_party/angle/BUILD.gn	2022-08-18 11:04:09.061751111 +0000
-@@ -489,6 +489,12 @@ config("angle_vulkan_wayland_config") {
-   if (angle_enable_vulkan && angle_use_wayland &&
-       defined(vulkan_wayland_include_dirs)) {
-     include_dirs = vulkan_wayland_include_dirs
-+  } else if (angle_enable_vulkan && angle_use_wayland) {
-+    include_dirs = [
-+      "$wayland_gn_dir/src/src",
-+      "$wayland_gn_dir/include/src",
-+      "$wayland_gn_dir/include/protocol",
-+    ]
-   }
- }
- 
-@@ -1073,6 +1079,7 @@ if (angle_use_wayland) {
-     include_dirs = [
-       "$wayland_dir/egl",
-       "$wayland_dir/src",
-+      "$wayland_gn_dir/include/protocol",
-     ]
-   }
- 
-diff -upr third_party/angle.orig/src/third_party/volk/BUILD.gn third_party/angle/src/third_party/volk/BUILD.gn
---- a/third_party/angle.orig/src/third_party/volk/BUILD.gn	2022-08-17 19:38:12.000000000 +0000
-+++ b/third_party/angle/src/third_party/volk/BUILD.gn	2022-08-18 11:04:36.499828006 +0000
-@@ -21,6 +21,9 @@ source_set("volk") {
-   configs += [ "$angle_root:angle_no_cfi_icall" ]
-   public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ]
-   if (angle_use_wayland) {
--    include_dirs = [ "$wayland_dir/src" ]
-+    include_dirs = [
-+      "$wayland_dir/src",
-+      "$wayland_gn_dir/include/protocol",
-+    ]
-   }
- }

backports/electron/canonicalize-file-name.patch

@@ -1,13 +0,0 @@
-no canonicalize_file_name on musl. funnily, the file using this says this is
-not portable, but avoids the nonportability of realpath(path, NULL);
---- a/third_party/nasm/config/config-linux.h
-+++ b/third_party/nasm/config/config-linux.h
-@@ -139,7 +139,7 @@
- #define HAVE_ACCESS 1
- 
- /* Define to 1 if you have the `canonicalize_file_name' function. */
--#define HAVE_CANONICALIZE_FILE_NAME 1
-+/* #define HAVE_CANONICALIZE_FILE_NAME 1 */
- 
- /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */
- /* #undef HAVE_CPU_TO_LE16 */

backports/electron/chromium-VirtualCursor-standard-layout.patch

@@ -1,217 +0,0 @@
-needed for libstdc++11 + clang only
-diff --git a/sql/recover_module/btree.cc b/sql/recover_module/btree.cc
-index 9ecaafe..839318a 100644
---- a/sql/recover_module/btree.cc
-+++ b/sql/recover_module/btree.cc
-@@ -135,16 +135,25 @@
-               "Move the destructor to the .cc file if it's non-trival");
- #endif  // !DCHECK_IS_ON()
- 
--LeafPageDecoder::LeafPageDecoder(DatabasePageReader* db_reader) noexcept
--    : page_id_(db_reader->page_id()),
--      db_reader_(db_reader),
--      cell_count_(ComputeCellCount(db_reader)),
--      next_read_index_(0),
--      last_record_size_(0) {
-+void LeafPageDecoder::Initialize(DatabasePageReader* db_reader) {
-+  DCHECK(db_reader);
-   DCHECK(IsOnValidPage(db_reader));
-+  page_id_ = db_reader->page_id();
-+  db_reader_ = db_reader;
-+  cell_count_ = ComputeCellCount(db_reader);
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-   DCHECK(DatabasePageReader::IsValidPageId(page_id_));
- }
- 
-+void LeafPageDecoder::Reset() {
-+  db_reader_ = nullptr;
-+  page_id_ = 0;
-+  cell_count_ = 0;
-+  next_read_index_ = 0;
-+  last_record_size_ = 0;
-+}
-+
- bool LeafPageDecoder::TryAdvance() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(CanAdvance());
-diff --git a/sql/recover_module/btree.h b/sql/recover_module/btree.h
-index d76d076..33114b0 100644
---- a/sql/recover_module/btree.h
-+++ b/sql/recover_module/btree.h
-@@ -102,7 +102,7 @@
-   //
-   // |db_reader| must have been used to read an inner page of a table B-tree.
-   // |db_reader| must outlive this instance.
--  explicit LeafPageDecoder(DatabasePageReader* db_reader) noexcept;
-+  explicit LeafPageDecoder() noexcept = default;
-   ~LeafPageDecoder() noexcept = default;
- 
-   LeafPageDecoder(const LeafPageDecoder&) = delete;
-@@ -150,6 +150,15 @@
-   // read as long as CanAdvance() returns true.
-   bool TryAdvance();
- 
-+  // Initialize with DatabasePageReader
-+  void Initialize(DatabasePageReader* db_reader);
-+
-+  // Reset internal DatabasePageReader
-+  void Reset();
-+
-+  // True if DatabasePageReader is valid
-+  bool IsValid() { return (db_reader_ != nullptr); }
-+
-   // True if the given reader may point to an inner page in a table B-tree.
-   //
-   // The last ReadPage() call on |db_reader| must have succeeded.
-@@ -163,14 +172,14 @@
-   static int ComputeCellCount(DatabasePageReader* db_reader);
- 
-   // The number of the B-tree page this reader is reading.
--  const int64_t page_id_;
-+  int64_t page_id_;
-   // Used to read the tree page.
-   //
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the DatabasePageReader outlives this.
--  DatabasePageReader* const db_reader_;
-+  DatabasePageReader* db_reader_;
-   // Caches the ComputeCellCount() value for this reader's page.
--  const int cell_count_ = ComputeCellCount(db_reader_);
-+  int cell_count_;
- 
-   // The reader's cursor state.
-   //
-diff --git a/sql/recover_module/cursor.cc b/sql/recover_module/cursor.cc
-index 0029ff9..42548bc 100644
---- a/sql/recover_module/cursor.cc
-+++ b/sql/recover_module/cursor.cc
-@@ -26,7 +26,7 @@
- int VirtualCursor::First() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   inner_decoders_.clear();
--  leaf_decoder_ = nullptr;
-+  leaf_decoder_.Reset();
- 
-   AppendPageDecoder(table_->root_page_id());
-   return Next();
-@@ -36,18 +36,18 @@
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   record_reader_.Reset();
- 
--  while (!inner_decoders_.empty() || leaf_decoder_.get()) {
--    if (leaf_decoder_.get()) {
--      if (!leaf_decoder_->CanAdvance()) {
-+  while (!inner_decoders_.empty() || leaf_decoder_.IsValid()) {
-+    if (leaf_decoder_.IsValid()) {
-+      if (!leaf_decoder_.CanAdvance()) {
-         // The leaf has been exhausted. Remove it from the DFS stack.
--        leaf_decoder_ = nullptr;
-+        leaf_decoder_.Reset();
-         continue;
-       }
--      if (!leaf_decoder_->TryAdvance())
-+      if (!leaf_decoder_.TryAdvance())
-         continue;
- 
--      if (!payload_reader_.Initialize(leaf_decoder_->last_record_size(),
--                                      leaf_decoder_->last_record_offset())) {
-+      if (!payload_reader_.Initialize(leaf_decoder_.last_record_size(),
-+                                      leaf_decoder_.last_record_offset())) {
-         continue;
-       }
-       if (!record_reader_.Initialize())
-@@ -99,13 +99,13 @@
- int64_t VirtualCursor::RowId() {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-   DCHECK(record_reader_.IsInitialized());
--  DCHECK(leaf_decoder_.get());
--  return leaf_decoder_->last_record_rowid();
-+  DCHECK(leaf_decoder_.IsValid());
-+  return leaf_decoder_.last_record_rowid();
- }
- 
- void VirtualCursor::AppendPageDecoder(int page_id) {
-   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
--  DCHECK(leaf_decoder_.get() == nullptr)
-+  DCHECK(!leaf_decoder_.IsValid())
-       << __func__
-       << " must only be called when the current path has no leaf decoder";
- 
-@@ -113,7 +113,7 @@
-     return;
- 
-   if (LeafPageDecoder::IsOnValidPage(&db_reader_)) {
--    leaf_decoder_ = std::make_unique<LeafPageDecoder>(&db_reader_);
-+    leaf_decoder_.Initialize(&db_reader_);
-     return;
-   }
- 
-diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h
-index afcd690..b15c31d 100644
---- a/sql/recover_module/cursor.h
-+++ b/sql/recover_module/cursor.h
-@@ -129,7 +129,7 @@
-   std::vector<std::unique_ptr<InnerPageDecoder>> inner_decoders_;
- 
-   // Decodes the leaf page containing records.
--  std::unique_ptr<LeafPageDecoder> leaf_decoder_;
-+  LeafPageDecoder leaf_decoder_;
- 
-   SEQUENCE_CHECKER(sequence_checker_);
- };
-diff --git a/sql/recover_module/pager.cc b/sql/recover_module/pager.cc
-index 58e75de..5fe9620 100644
---- a/sql/recover_module/pager.cc
-+++ b/sql/recover_module/pager.cc
-@@ -23,8 +23,7 @@
-               "ints are not appropriate for representing page IDs");
- 
- DatabasePageReader::DatabasePageReader(VirtualTable* table)
--    : page_data_(std::make_unique<uint8_t[]>(table->page_size())),
--      table_(table) {
-+    : page_data_(), table_(table) {
-   DCHECK(table != nullptr);
-   DCHECK(IsValidPageSize(table->page_size()));
- }
-@@ -57,8 +56,8 @@
-                     std::numeric_limits<int64_t>::max(),
-                 "The |read_offset| computation above may overflow");
- 
--  int sqlite_status =
--      RawRead(sqlite_file, read_size, read_offset, page_data_.get());
-+  int sqlite_status = RawRead(sqlite_file, read_size, read_offset,
-+                              const_cast<uint8_t*>(page_data_.data()));
- 
-   // |page_id_| needs to be set to kInvalidPageId if the read failed.
-   // Otherwise, future ReadPage() calls with the previous |page_id_| value
-diff --git a/sql/recover_module/pager.h b/sql/recover_module/pager.h
-index 0e388ddc..99314e3 100644
---- a/sql/recover_module/pager.h
-+++ b/sql/recover_module/pager.h
-@@ -5,6 +5,7 @@
- #ifndef SQL_RECOVER_MODULE_PAGER_H_
- #define SQL_RECOVER_MODULE_PAGER_H_
- 
-+#include <array>
- #include <cstdint>
- #include <memory>
- 
-@@ -70,7 +71,7 @@
-     DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
-     DCHECK_NE(page_id_, kInvalidPageId)
-         << "Successful ReadPage() required before accessing pager state";
--    return page_data_.get();
-+    return page_data_.data();
-   }
- 
-   // The number of bytes in the page read by the last ReadPage() call.
-@@ -137,7 +138,7 @@
-   int page_id_ = kInvalidPageId;
-   // Stores the bytes of the last page successfully read by ReadPage().
-   // The content is undefined if the last call to ReadPage() did not succeed.
--  const std::unique_ptr<uint8_t[]> page_data_;
-+  const std::array<uint8_t, kMaxPageSize> page_data_;
-   // Raw pointer usage is acceptable because this instance's owner is expected
-   // to ensure that the VirtualTable outlives this.
-   VirtualTable* const table_;

backports/electron/chromium-revert-drop-of-system-java.patch

@@ -1,4 +1,6 @@
 This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef
+allows using /usr/bin/java instead of a downloaded one (that doesn't work on musl)
+--
 --- a/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
 +++ b/third_party/closure_compiler/compiler.py	2021-05-20 04:17:53.000000000 +0200
 @@ -13,8 +13,9 @@

backports/electron/chromium-use-alpine-target.patch

@@ -1,13 +0,0 @@
---- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -917,8 +917,8 @@
-     } else if (current_cpu == "arm64") {
-       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
-           !(is_chromeos_lacros && is_chromeos_device)) {
--        cflags += [ "--target=aarch64-linux-gnu" ]
--        ldflags += [ "--target=aarch64-linux-gnu" ]
-+        cflags += [ "--target=aarch64-alpine-linux-musl" ]
-+        ldflags += [ "--target=aarch64-alpine-linux-musl" ]
-       }
-       if (is_android) {
-         # Outline atomics crash on Exynos 9810. http://crbug.com/1272795

backports/electron/compiler.patch

@@ -0,0 +1,132 @@
+--- ./build/config/compiler/BUILD.gn.orig
++++ ./build/config/compiler/BUILD.gn
+@@ -613,24 +613,6 @@
+       }
+     }
+ 
+-    # TODO(crbug.com/1488374): This causes binary size growth and potentially
+-    # other problems.
+-    # TODO(crbug.com/1491036): This isn't supported by Cronet's mainline llvm version.
+-    if (default_toolchain != "//build/toolchain/cros:target" &&
+-        !llvm_android_mainline) {
+-      cflags += [
+-        "-mllvm",
+-        "-split-threshold-for-reg-with-hint=0",
+-      ]
+-      if (use_thin_lto && is_a_target_toolchain) {
+-        if (is_win) {
+-          ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
+-        } else {
+-          ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
+-        }
+-      }
+-    }
+-
+     # TODO(crbug.com/1235145): Investigate why/if this should be needed.
+     if (is_win) {
+       cflags += [ "/clang:-ffp-contract=off" ]
+@@ -1005,17 +987,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",
+-
+-    # To make Rust .d files compatible with ninja
+-    "-Zdep-info-omit-d-target",
+-
+-    # If a macro panics during compilation, show which macro and where it is
+-    # defined.
+-    "-Zmacro-backtrace",
+-
+-    # For deterministic builds, keep the local machine's current working
+-    # directory from appearing in build outputs.
+-    "-Zremap-cwd-prefix=.",
+   ]
+ 
+   if (!is_win || force_rustc_color_output) {
+@@ -1182,8 +1153,8 @@
+     } else if (current_cpu == "arm") {
+       if (is_clang && !is_android && !is_nacl &&
+           !(is_chromeos_lacros && is_chromeos_device)) {
+-        cflags += [ "--target=arm-linux-gnueabihf" ]
+-        ldflags += [ "--target=arm-linux-gnueabihf" ]
++        cflags += [ "--target=armv7-alpine-linux-musleabihf" ]
++        ldflags += [ "--target=armv7-alpine-linux-musleabihf" ]
+       }
+       if (!is_nacl) {
+         cflags += [
+@@ -1197,8 +1168,8 @@
+     } else if (current_cpu == "arm64") {
+       if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
+           !(is_chromeos_lacros && is_chromeos_device)) {
+-        cflags += [ "--target=aarch64-linux-gnu" ]
+-        ldflags += [ "--target=aarch64-linux-gnu" ]
++        cflags += [ "--target=aarch64-alpine-linux-musl" ]
++        ldflags += [ "--target=aarch64-alpine-linux-musl" ]
+       }
+     } else if (current_cpu == "mipsel" && !is_nacl) {
+       ldflags += [ "-Wl,--hash-style=sysv" ]
+@@ -1983,7 +1954,7 @@
+       defines = [ "_HAS_NODISCARD" ]
+     }
+   } else {
+-    cflags = [ "-Wall" ]
++    cflags = []
+     if (is_clang) {
+       # Enable extra warnings for chromium_code when we control the compiler.
+       cflags += [ "-Wextra" ]
+--- ./build/config/rust.gni.orig
++++ ./build/config/rust.gni
+@@ -186,11 +186,11 @@
+ rust_abi_target = ""
+ if (is_linux || is_chromeos) {
+   if (current_cpu == "arm64") {
+-    rust_abi_target = "aarch64-unknown-linux-gnu"
++    rust_abi_target = "aarch64-alpine-linux-musl"
+   } else if (current_cpu == "x86") {
+-    rust_abi_target = "i686-unknown-linux-gnu"
++    rust_abi_target = "i586-alpine-linux-musl"
+   } else if (current_cpu == "x64") {
+-    rust_abi_target = "x86_64-unknown-linux-gnu"
++    rust_abi_target = "x86_64-alpine-linux-musl"
+   } else if (current_cpu == "arm") {
+     if (arm_float_abi == "hard") {
+       float_suffix = "hf"
+@@ -199,13 +199,13 @@
+     }
+     if (arm_arch == "armv7-a" || arm_arch == "armv7") {
+       # No way to inform Rust about the -a suffix.
+-      rust_abi_target = "armv7-unknown-linux-gnueabi" + float_suffix
++      rust_abi_target = "armv7-alpine-linux-musleabi" + float_suffix
+     } else {
+-      rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix
++      rust_abi_target = "armv6-alpine-linux-musleabi" + float_suffix
+     }
+   } else {
+     # Best guess for other future platforms.
+-    rust_abi_target = current_cpu + "-unknown-linux-gnu"
++    rust_abi_target = current_cpu + "-alpine-linux-musl"
+   }
+ } else if (is_android) {
+   import("//build/config/android/abi.gni")
+--- ./build/config/clang/BUILD.gn.orig
++++ ./build/config/clang/BUILD.gn
+@@ -128,14 +128,15 @@
+       } else if (is_apple) {
+         _dir = "darwin"
+       } else if (is_linux || is_chromeos) {
++        _dir = "linux"
+         if (current_cpu == "x64") {
+-          _dir = "x86_64-unknown-linux-gnu"
++          _suffix = "-x86_64"
+         } else if (current_cpu == "x86") {
+-          _dir = "i386-unknown-linux-gnu"
++          _suffix = "-i386"
+         } else if (current_cpu == "arm") {
+-          _dir = "armv7-unknown-linux-gnueabihf"
++          _suffix = "-armhf"
+         } else if (current_cpu == "arm64") {
+-          _dir = "aarch64-unknown-linux-gnu"
++          _suffix = "-aarch64"
+         } else {
+           assert(false)  # Unhandled cpu type
+         }

backports/electron/credentials-sys-types-header.patch

@@ -1,11 +0,0 @@
---- a/sandbox/linux/services/credentials.h
-+++ b/sandbox/linux/services/credentials.h
-@@ -14,6 +14,8 @@
- #include <string>
- #include <vector>
- 
-+#include <sys/types.h>
-+
- #include "sandbox/linux/system_headers/capability.h"
- #include "sandbox/sandbox_export.h"
- 

backports/electron/default-pthread-stacksize.patch

@@ -1,45 +0,0 @@
---- a/base/threading/platform_thread_linux.cc
-+++ b/base/threading/platform_thread_linux.cc
-@@ -186,7 +186,8 @@
- 
- size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
- #if !defined(THREAD_SANITIZER)
--  return 0;
-+  // use 2mb to avoid running out of space. This is what android uses
-+  return 2 * (1 << 20);
- #else
-   // ThreadSanitizer bloats the stack heavily. Evidence has been that the
-   // default stack size isn't enough for some browser tests.
---- a/base/threading/platform_thread_unittest.cc
-+++ b/base/threading/platform_thread_unittest.cc
-@@ -420,7 +420,7 @@
-     ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&                \
-      !defined(THREAD_SANITIZER)) ||                                    \
-     (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER))
--  EXPECT_EQ(0u, stack_size);
-+  EXPECT_EQ(2u << 20, stack_size);
- #else
-   EXPECT_GT(stack_size, 0u);
-   EXPECT_LT(stack_size, 20u * (1 << 20));
---- a/chrome/browser/shutdown_signal_handlers_posix.cc
-+++ b/chrome/browser/shutdown_signal_handlers_posix.cc
-@@ -187,11 +187,19 @@
-   g_shutdown_pipe_read_fd = pipefd[0];
-   g_shutdown_pipe_write_fd = pipefd[1];
- #if !defined(ADDRESS_SANITIZER)
-+# if defined(__GLIBC__)
-   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
-+# else
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
-+# endif
- #else
-+# if defined(__GLIBC__)
-   // ASan instrumentation bloats the stack frames, so we need to increase the
-   // stack size to avoid hitting the guard page.
-   const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
-+# else
-+  const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k
-+# endif
- #endif
-   ShutdownDetector* detector = new ShutdownDetector(
-       g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner);

backports/electron/default.conf

@@ -2,4 +2,8 @@
 # the electron launcher.
 
 # Options to pass to electron.
-ELECTRON_FLAGS="--ozone-platform-hint=auto"
+ELECTRON_FLAGS="--enable-features=WebRTCPipeWireCapturer"
+
+# This can be 'x11', 'wayland', or 'auto'. Overriding default to 'auto',
+# but respecting the variable content if any
+ELECTRON_OZONE_PLATFORM_HINT="${ELECTRON_OZONE_PLATFORM_HINT:-auto}"

backports/electron/disable-dns_config_service.patch

@@ -0,0 +1,15 @@
+diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn
+index f36bf68..805d9a6 100644
+--- a/net/dns/BUILD.gn
++++ b/net/dns/BUILD.gn
+@@ -130,8 +130,8 @@ source_set("dns") {
+     ]
+   } else if (is_linux) {
+     sources += [
+-      "dns_config_service_linux.cc",
+-      "dns_config_service_linux.h",
++      "dns_config_service_fuchsia.cc",
++      "dns_config_service_fuchsia.h",
+     ]
+   } else if (is_posix) {
+     sources += [

backports/electron/disable-failing-tests.patch

@@ -0,0 +1,361 @@
+safesprintf emitnull:
+ error: conversion from 'std::nullptr_t' to 'const internal::Arg' is ambiguous
+ const internal::Arg arg_array[] = { args... };
+
+flatmap incompletetype:
+ error: static assertion failed due to requirement 'std::__is_complete_or_unbounded(std::__type_identity<std::pair<A, A>>{})': template argument must be a complete class or an unbounded array
+  static_assert(std::__is_complete_or_unbounded(__type_identity<_Tp>{}),
+
+i18n, time:
+ various icu failures (new icu time formatting? internal api difference?)
+ a ton of these fail:
+
+ Expected equality of these values:
+  u"Monday 16 May – Saturday 28 May"
+    Which is: u"Monday 16 May \x2013 Saturday 28 May"
+  DateIntervalFormat(begin_time, end_time, DATE_FORMAT_MONTH_WEEKDAY_DAY)
+    Which is: u"Monday 16\x2009\x2013\x2009Saturday 28 May"
+
+  ../../base/i18n/time_formatting_unittest.cc:84: Failure
+   Expected equality of these values:
+    clock12h_pm
+     Which is: u"3:42 PM"
+    TimeFormatTimeOfDay(time)
+     Which is: u"3:42\x202FPM"
+
+ .. and so on
+
+fileutiltest filetofile:
+ ../../base/files/file_util_unittest.cc:2692: Failure
+ Value of: stream
+  Actual: true
+ Expected: false
+
+stacktracetest: crashes (this doesn't seem to use execinfo so probably relies on glibc internal layout for tracing here)
+
+platformthreadtest canchangethreadtype:
+ ../../base/threading/platform_thread_unittest.cc:445: Failure
+ Expected equality of these values:
+  PlatformThread::CanChangeThreadType(ThreadType::kBackground, ThreadType::kResourceEfficient)
+    Which is: true
+  kCanIncreasePriority
+    Which is: false
+
+scopedfdownershiptrackingtest crashonunownedclose: fails due to scoped-file-no-close.patch
+
+stackcontainer customallocator:
+ ../../base/containers/stack_container_unittest.cc:211: Failure
+ Expected equality of these values:
+  1
+  Allocator::deallocated
+    Which is: 0
+
+nativelibrarytest loadlibrarypreferownsymbols: crashes (probably musl dlopen does not play nice here)
+
+spantest empty: crashes (this looks fishy)
+
+readelfbuildid: crashes (this looks like glibc dynamic linker semantics)
+
+nss db unittest: various nss failures: e.g.:
+ ../../net/cert/nss_cert_database_unittest.cc:209: Failure
+  Expected equality of these values:
+   OK
+    Which is: 0
+   cert_db_->ImportFromPKCS12(GetPublicSlot(), pkcs12_data, u"12345", true, nullptr)
+    Which is: -702
+
+processutiltest cloneflags: fails in CI (ulimit? too many threads?)
+ ../../base/process/process_util_unittest.cc:1434: Failure
+  Value of: process.IsValid()
+   Actual: false
+  Expected: true
+
+addresstrackerlinuxnetlinktest:
+  ../../net/base/address_tracker_linux_unittest.cc:886: Failure
+   Value of: child.process.IsValid()
+     Actual: false
+   Expected: true
+
+ToAddressDoesNotDereference: ; Expected `get_for_extraction_cnt` to be 1 but got 0; 
+
+DataCapturedManyThreads: flaky
+
+ProcessAlternativeServicesTest.Process*: crashed ?
+
+--- a/base/strings/safe_sprintf_unittest.cc
++++ b/base/strings/safe_sprintf_unittest.cc
+@@ -740,6 +740,7 @@
+ #endif
+ }
+ 
++#if 0
+ TEST(SafeSPrintfTest, EmitNULL) {
+   char buf[40];
+ #if defined(__GNUC__)
+@@ -756,6 +757,7 @@
+ #pragma GCC diagnostic pop
+ #endif
+ }
++#endif
+ 
+ TEST(SafeSPrintfTest, PointerSize) {
+   // The internal data representation is a 64bit value, independent of the
+--- a/base/containers/flat_map_unittest.cc
++++ b/base/containers/flat_map_unittest.cc
+@@ -52,6 +52,7 @@
+ 
+ }  // namespace
+ 
++#if 0
+ TEST(FlatMap, IncompleteType) {
+   struct A {
+     using Map = flat_map<A, A>;
+@@ -65,6 +66,7 @@
+ 
+   A a;
+ }
++#endif
+ 
+ TEST(FlatMap, RangeConstructor) {
+   flat_map<int, int>::value_type input_vals[] = {
+--- a/base/BUILD.gn
++++ b/base/BUILD.gn
+@@ -3194,21 +3194,6 @@
+     "hash/md5_constexpr_unittest.cc",
+     "hash/md5_unittest.cc",
+     "hash/sha1_unittest.cc",
+-    "i18n/break_iterator_unittest.cc",
+-    "i18n/case_conversion_unittest.cc",
+-    "i18n/char_iterator_unittest.cc",
+-    "i18n/character_encoding_unittest.cc",
+-    "i18n/file_util_icu_unittest.cc",
+-    "i18n/icu_string_conversions_unittest.cc",
+-    "i18n/icu_util_unittest.cc",
+-    "i18n/message_formatter_unittest.cc",
+-    "i18n/number_formatting_unittest.cc",
+-    "i18n/rtl_unittest.cc",
+-    "i18n/streaming_utf8_validator_unittest.cc",
+-    "i18n/string_search_unittest.cc",
+-    "i18n/time_formatting_unittest.cc",
+-    "i18n/timezone_unittest.cc",
+-    "i18n/transliterator_unittest.cc",
+     "immediate_crash_unittest.cc",
+     "json/json_parser_unittest.cc",
+     "json/json_reader_unittest.cc",
+--- a/base/files/file_util_unittest.cc
++++ b/base/files/file_util_unittest.cc
+@@ -2686,6 +2686,7 @@
+   }
+ }
+ 
++#if 0
+ TEST_F(FileUtilTest, FileToFILE) {
+   File file;
+   FILE* stream = FileToFILE(std::move(file), "w");
+@@ -2700,6 +2701,7 @@
+   EXPECT_FALSE(file.IsValid());
+   EXPECT_TRUE(CloseFile(stream));
+ }
++#endif
+ 
+ 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 @@
+ // platforms for all priorities. This not being the case. This test documents
+ // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
+ // proprerty changes for a given platform.
++#if 0
+ TEST(PlatformThreadTest, CanChangeThreadType) {
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+   // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be
+@@ -472,6 +473,7 @@
+                                                   ThreadType::kBackground));
+ #endif
+ }
++#endif
+ 
+ TEST(PlatformThreadTest, SetCurrentThreadTypeTest) {
+   TestPriorityResultingFromThreadType(ThreadType::kBackground,
+--- a/base/files/scoped_file_linux_unittest.cc
++++ b/base/files/scoped_file_linux_unittest.cc
+@@ -42,11 +42,13 @@
+   EXPECT_DEATH(ScopedFD(fd.get()), "");
+ }
+ 
++#if 0
+ TEST_F(ScopedFDOwnershipTrackingTest, CrashOnUnownedClose) {
+   ScopedFD fd = OpenFD();
+   subtle::EnableFDOwnershipEnforcement(true);
+   EXPECT_DEATH(close(fd.get()), "");
+ }
++#endif
+ 
+ #endif  // defined(GTEST_HAS_DEATH_TEST)
+ 
+--- a/base/native_library_unittest.cc
++++ b/base/native_library_unittest.cc
+@@ -139,6 +139,7 @@
+ // Verifies that the |prefer_own_symbols| option satisfies its guarantee that
+ // a loaded library will always prefer local symbol resolution before
+ // considering global symbols.
++#if 0
+ TEST(NativeLibraryTest, LoadLibraryPreferOwnSymbols) {
+   NativeLibraryOptions options;
+   options.prefer_own_symbols = true;
+@@ -171,6 +172,7 @@
+   EXPECT_EQ(2, NativeLibraryTestIncrement());
+   EXPECT_EQ(3, NativeLibraryTestIncrement());
+ }
++#endif
+ 
+ #endif  // !BUILDFLAG(IS_ANDROID) && !defined(THREAD_SANITIZER) && \
+         // !defined(MEMORY_SANITIZER)
+--- a/base/containers/span_unittest.cc
++++ b/base/containers/span_unittest.cc
+@@ -995,6 +995,7 @@
+   }
+ }
+ 
++#if 0
+ TEST(SpanTest, Empty) {
+   {
+     span<int> span;
+@@ -1014,6 +1015,7 @@
+     EXPECT_TRUE(span_of_checked_iterators.empty());
+   }
+ }
++#endif
+ 
+ TEST(SpanTest, OperatorAt) {
+   static constexpr int kArray[] = {1, 6, 1, 8, 0};
+--- a/base/debug/elf_reader_unittest.cc
++++ b/base/debug/elf_reader_unittest.cc
+@@ -194,6 +194,7 @@
+   }
+ }
+ 
++#if 0
+ TEST(ElfReaderTestWithCurrentImage, ReadElfBuildId) {
+ #if BUILDFLAG(IS_ANDROID)
+   // On Android the library loader memory maps the full so file.
+@@ -229,6 +230,7 @@
+   UnloadNativeLibrary(library);
+ #endif
+ }
++#endif
+ 
+ }  // namespace debug
+ }  // namespace base
+--- a/net/BUILD.gn
++++ b/net/BUILD.gn
+@@ -4826,7 +4826,6 @@
+     sources += [
+       "cert/internal/system_trust_store_nss_unittest.cc",
+       "cert/internal/trust_store_nss_unittest.cc",
+-      "cert/nss_cert_database_unittest.cc",
+       "cert/x509_util_nss_unittest.cc",
+     ]
+     if (!is_castos) {
+--- a/base/process/process_util_unittest.cc
++++ b/base/process/process_util_unittest.cc
+@@ -1419,7 +1419,7 @@
+   return kSuccess;
+ }
+ 
+-#if defined(CLONE_NEWUSER) && defined(CLONE_NEWPID)
++#if 0 && defined(CLONE_NEWUSER) && defined(CLONE_NEWPID)
+ TEST_F(ProcessUtilTest, CloneFlags) {
+   if (!PathExists(FilePath("/proc/self/ns/user")) ||
+       !PathExists(FilePath("/proc/self/ns/pid"))) {
+--- a/net/base/address_tracker_linux_unittest.cc
++++ b/net/base/address_tracker_linux_unittest.cc
+@@ -831,6 +831,7 @@
+ //
+ // This test creates multiple concurrent `AddressTrackerLinux` instances in
+ // separate processes, each in their own PID namespaces.
++#if 0
+ TEST(AddressTrackerLinuxNetlinkTest, TestInitializeTwoTrackersInPidNamespaces) {
+   // This test initializes `kNumChildren` instances of `AddressTrackerLinux` in
+   // tracking mode, each in their own child process running in a PID namespace.
+@@ -901,6 +902,7 @@
+     ASSERT_EQ(exit_code, 0);
+   }
+ }
++#endif
+ 
+ MULTIPROCESS_TEST_MAIN(ChildProcessInitializeTrackerForTesting) {
+   base::test::TaskEnvironment task_env(
+--- a/base/trace_event/trace_event_unittest.cc
++++ b/base/trace_event/trace_event_unittest.cc
+@@ -1368,6 +1368,7 @@
+ }
+ 
+ // Test that data sent from multiple threads is gathered
++#if 0
+ TEST_F(TraceEventTestFixture, DataCapturedManyThreads) {
+   BeginTrace();
+ 
+@@ -1408,6 +1409,7 @@
+     delete task_complete_events[i];
+   }
+ }
++#endif
+ 
+ // Test that thread and process names show up in the trace.
+ // In SDK build, thread names are not tracked inside //base. Instead, there's
+--- a/base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_unittest.cc
++++ b/base/allocator/partition_allocator/src/partition_alloc/pointers/raw_ptr_unittest.cc
+@@ -1481,6 +1481,7 @@
+ // `base::to_address()` will use the dereference operator. This is not
+ // what we want; this test enforces extraction semantics for
+ // `to_address()`.
++#if 0
+ TEST_F(RawPtrTest, ToAddressDoesNotDereference) {
+   CountingRawPtr<int> ptr = nullptr;
+   int* raw = base::to_address(ptr);
+@@ -1492,6 +1493,7 @@
+                   .get_for_duplication_cnt = 0}),
+               CountersMatch());
+ }
++#endif
+ 
+ TEST_F(RawPtrTest, ToAddressGivesBackRawAddress) {
+   int* raw = nullptr;
+--- a/net/http/http_stream_factory_unittest.cc
++++ b/net/http/http_stream_factory_unittest.cc
+@@ -3477,6 +3477,7 @@
+   DefaultCTPolicyEnforcer ct_policy_enforcer_;
+ };
+ 
++#if 0
+ TEST_F(ProcessAlternativeServicesTest, ProcessEmptyAltSvc) {
+   session_ =
+       std::make_unique<HttpNetworkSession>(session_params_, session_context_);
+@@ -3585,6 +3586,7 @@
+             alternatives[0].host_port_pair());
+   EXPECT_EQ(0u, alternatives[0].advertised_versions().size());
+ }
++#endif
+ 
+ }  // namespace
+ 

backports/electron/dns-resolver.patch

@@ -1,36 +0,0 @@
---- a/net/dns/host_resolver_manager.cc
-+++ b/net/dns/host_resolver_manager.cc
-@@ -3014,8 +3014,7 @@
-   NetworkChangeNotifier::AddConnectionTypeObserver(this);
-   if (system_dns_config_notifier_)
-     system_dns_config_notifier_->AddObserver(this);
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
--    !BUILDFLAG(IS_ANDROID)
-+#if defined(__GLIBC__)
-   EnsureDnsReloaderInit();
- #endif
- 
---- a/net/dns/dns_reloader.cc
-+++ b/net/dns/dns_reloader.cc
-@@ -6,8 +6,7 @@
- 
- #include "build/build_config.h"
- 
--#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \
--    !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_FUCHSIA)
-+#if defined(__GLIBC__)
- 
- #include <resolv.h>
- 
---- a/net/dns/host_resolver_proc.cc
-+++ b/net/dns/host_resolver_proc.cc
-@@ -176,8 +176,7 @@
-   base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
-                                                 base::BlockingType::WILL_BLOCK);
- 
--#if BUILDFLAG(IS_POSIX) && \
--    !(BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_OPENBSD) || BUILDFLAG(IS_ANDROID))
-+#if defined(__GLIBC__)
-   DnsReloaderMaybeReload();
- #endif
-   absl::optional<AddressInfo> ai;

backports/electron/electron-launcher.sh

@@ -9,6 +9,12 @@ done
 
 # Prefer user defined ELECTRON_USER_FLAGS (from env) over system
 # default ELECTRON_FLAGS (from /etc/electron/default.conf).
-ELECTRON_FLAGS=${ELECTRON_USER_FLAGS:-"$ELECTRON_FLAGS"}
+export ELECTRON_FLAGS="$ELECTRON_FLAGS ${ELECTRON_USER_FLAGS:-"$ELECTRON_USER_FLAGS"}"
+# Re-export, for it to be accessible by the process
+export ELECTRON_OZONE_PLATFORM_HINT="${ELECTRON_OZONE_PLATFORM_HINT}"
+
+if [ "$ELECTRON_RUN_AS_NODE" == "1" ] && [ "$ELECTRON_STILL_PASS_THE_DEFAULT_FLAGS" != "1" ]; then
+	exec "/usr/lib/electron/electron" "$@"
+fi
 
 exec "/usr/lib/electron/electron" "$@" ${ELECTRON_FLAGS}

backports/electron/fc-cache-version.patch

@@ -0,0 +1,13 @@
+instead of hardcoding the version, use the defined macro.
+--
+--- a/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
++++ b/third_party/test_fonts/fontconfig/generate_fontconfig_caches.cc
+@@ -56,7 +56,7 @@
+   FcFini();
+ 
+   // Check existence of intended fontconfig cache file.
+-  auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-9";
++  auto cache = fontconfig_caches + "/" + kCacheKey + "-le64.cache-" + FC_CACHE_VERSION;
+   bool cache_exists = access(cache.c_str(), F_OK) == 0;
+   return !cache_exists;
+ }

backports/electron/fix-crashpad.patch

@@ -1,31 +0,0 @@
---- a/third_party/crashpad/crashpad/client/BUILD.gn
-+++ b/third_party/crashpad/crashpad/client/BUILD.gn
-@@ -81,6 +81,7 @@
-   deps = [
-     ":common",
-     "$mini_chromium_source_parent:chromeos_buildflags",
-+    "../util",
-   ]
- 
-   if (crashpad_is_win) {
---- a/third_party/crashpad/crashpad/util/linux/ptracer.cc
-+++ b/third_party/crashpad/crashpad/util/linux/ptracer.cc
-@@ -26,6 +26,7 @@
- 
- #if defined(ARCH_CPU_X86_FAMILY)
- #include <asm/ldt.h>
-+#include <asm/ptrace-abi.h>
- #endif
- 
- namespace crashpad {
---- a/third_party/crashpad/crashpad/util/linux/thread_info.h
-+++ b/third_party/crashpad/crashpad/util/linux/thread_info.h
-@@ -273,7 +273,7 @@ union FloatContext {
-                 "Size mismatch");
- #elif defined(ARCH_CPU_ARMEL)
-   static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch");
--#if !defined(__GLIBC__)
-+#if defined(OS_ANDROID)
-   static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch");
- #endif
- #elif defined(ARCH_CPU_ARM64)

backports/electron/fix-missing-cstdint-include-musl.patch

@@ -1,4 +1,6 @@
 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 @@

backports/electron/fix-narrowing-cast.patch

@@ -1,44 +0,0 @@
---- a/base/files/file_util_linux.cc
-+++ b/base/files/file_util_linux.cc
-@@ -30,7 +30,7 @@
-     case EXT2_SUPER_MAGIC:  // Also ext3 and ext4
-     case MSDOS_SUPER_MAGIC:
-     case REISERFS_SUPER_MAGIC:
--    case static_cast<int>(BTRFS_SUPER_MAGIC):
-+    case BTRFS_SUPER_MAGIC:
-     case 0x5346544E:  // NTFS
-     case 0x58465342:  // XFS
-     case 0x3153464A:  // JFS
-@@ -40,14 +40,14 @@
-       *type = FILE_SYSTEM_NFS;
-       break;
-     case SMB_SUPER_MAGIC:
--    case static_cast<int>(0xFF534D42):  // CIFS
-+    case 0xFF534D42:  // CIFS
-       *type = FILE_SYSTEM_SMB;
-       break;
-     case CODA_SUPER_MAGIC:
-       *type = FILE_SYSTEM_CODA;
-       break;
--    case static_cast<int>(HUGETLBFS_MAGIC):
--    case static_cast<int>(RAMFS_MAGIC):
-+    case HUGETLBFS_MAGIC:
-+    case RAMFS_MAGIC:
-     case TMPFS_MAGIC:
-       *type = FILE_SYSTEM_MEMORY;
-       break;
---- a/base/system/sys_info_posix.cc
-+++ b/base/system/sys_info_posix.cc
-@@ -100,10 +100,10 @@
-   if (HANDLE_EINTR(statfs(path.value().c_str(), &stats)) != 0)
-     return false;
- 
-   switch (stats.f_type) {
-     case TMPFS_MAGIC:
--    case static_cast<int>(HUGETLBFS_MAGIC):
--    case static_cast<int>(RAMFS_MAGIC):
-+    case HUGETLBFS_MAGIC:
-+    case RAMFS_MAGIC:
-       return true;
-   }
-   return false;

backports/electron/fix-opus.patch

@@ -0,0 +1,12 @@
+--- a/media/filters/ffmpeg_glue.cc
++++ b/media/filters/ffmpeg_glue.cc
+@@ -142,7 +142,7 @@ const char* FFmpegGlue::GetAllowedAudioDecoders() {
+   static const base::NoDestructor<std::string> kAllowedAudioCodecs([]() {
+     // This should match the configured lists in //third_party/ffmpeg.
+     std::string allowed_decoders(
+-        "vorbis,libopus,flac,pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,"
++        "vorbis,opus,libopus,flac,pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,"
+         "mp3,pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw");
+ #if BUILDFLAG(USE_PROPRIETARY_CODECS)
+     allowed_decoders += ",aac";
+

backports/electron/fstatat-32bit.patch

@@ -0,0 +1,17 @@
+fstatat64 is macrod to fstatat in sys/stat.h in musl- but then that fstatat is
+used in the _syscall4 macro mapping to __NR_$name, and __NR_fstatat is not
+defined anywhere here, as it wants the 64 name.
+
+so, just let it keep the name with an undef of the stat.h macro, then the macro
+expansion below evaluates correctly.
+--- a/third_party/lss/linux_syscall_support.h
++++ b/third_party/lss/linux_syscall_support.h
+@@ -4947,7 +4947,8 @@
+   # endif
+   #endif
+   #if defined(__NR_fstatat64)
++    #undef fstatat64
+     LSS_INLINE _syscall4(int,   fstatat64,        int,   d,
+                          const char *,      p,
+                          struct kernel_stat64 *,   b,    int,   f)
+   #endif

backports/electron/gdbinit.patch

@@ -1,3 +1,4 @@
+aports is a git tree so these git commands get the wrong directory
 --- a/tools/gdb/gdbinit
 +++ b/tools/gdb/gdbinit
 @@ -50,17 +50,7 @@

backports/electron/generic-sensor-include.patch

@@ -0,0 +1,11 @@
+--- a/services/device/public/cpp/generic_sensor/sensor_reading.h
++++ b/services/device/public/cpp/generic_sensor/sensor_reading.h
+@@ -5,6 +5,8 @@
+ #ifndef SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_
+ #define SERVICES_DEVICE_PUBLIC_CPP_GENERIC_SENSOR_SENSOR_READING_H_
+ 
++#include <cstddef>
++#include <cstdint>
+ #include <type_traits>
+ 
+ namespace device {

backports/electron/icon.patch

@@ -1,11 +1,11 @@
 --- a/electron/default_app/default_app.ts
 +++ b/electron/default_app/default_app.ts
-@@ -60,7 +60,7 @@
+@@ -61,7 +61,7 @@
    };
  
    if (process.platform === 'linux') {
--    options.icon = path.join(__dirname, 'icon.png');
-+    options.icon = '/usr/share/icons/hicolor/1024x1024/apps/electron.png';
+-    options.icon = url.fileURLToPath(new URL('icon.png', import.meta.url));
++    options.icon = 'file:///usr/share/icons/hicolor/1024x1024/apps/electron.png';
    }
  
    mainWindow = new BrowserWindow(options);

backports/electron/import-version.patch

@@ -0,0 +1,15 @@
+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"

backports/electron/jsoncpp.patch

@@ -1,39 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/bf2401407df5bcc938382eb03748fbef41e41c89/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch
-From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001
-From: Evangelos Foutras <evangelos@foutrelis.com>
-Date: Tue, 27 Sep 2022 22:20:41 +0000
-Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true
-
-Ensure jsoncpp symbols have public visibility and are thus excluded from
-CFI checks and whole-program optimization. This is achieved by defining
-JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as
-__attribute__((visibility("default"))). The latter macro is used to tag
-jsoncpp classes and namespace functions throughout jsoncpp's headers.
-
-BUG=1365218
-
-Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1052077}
----
- build/linux/unbundle/jsoncpp.gn | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn
-index 544f9d13c9..e84a0ef27a 100644
---- a/build/linux/unbundle/jsoncpp.gn
-+++ b/build/linux/unbundle/jsoncpp.gn
-@@ -3,6 +3,11 @@ import("//build/shim_headers.gni")
- 
- pkg_config("jsoncpp_config") {
-   packages = [ "jsoncpp" ]
-+
-+  # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes
-+  # thus deactivating CFI checks for them. This avoids CFI violations in
-+  # virtual calls to system jsoncpp library (https://crbug.com/1365218).
-+  defines = [ "JSON_DLL_BUILD" ]
- }
- 
- shim_headers("jsoncpp_shim") {

backports/electron/libstdc++13.patch

@@ -0,0 +1,269 @@
+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"
+ 

backports/electron/memory-tagging-arm64.patch

@@ -1,18 +0,0 @@
---- a/base/allocator/partition_allocator/tagging.cc
-+++ b/base/allocator/partition_allocator/tagging.cc
-@@ -19,15 +19,6 @@
- #define PR_GET_TAGGED_ADDR_CTRL 56
- #define PR_TAGGED_ADDR_ENABLE (1UL << 0)
- 
--#if BUILDFLAG(IS_LINUX)
--#include <linux/version.h>
--
--// Linux headers already provide these since v5.10.
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
--#define HAS_PR_MTE_MACROS
--#endif
--#endif
--
- #ifndef HAS_PR_MTE_MACROS
- #define PR_MTE_TCF_SHIFT 1
- #define PR_MTE_TCF_NONE (0UL << PR_MTE_TCF_SHIFT)

backports/electron/mman.patch

@@ -0,0 +1,13 @@
+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)

backports/electron/musl-auxv.patch

@@ -0,0 +1,11 @@
+--- ./v8/src/base/cpu.cc.orig
++++ ./v8/src/base/cpu.cc
+@@ -14,7 +14,7 @@
+ #if V8_OS_LINUX
+ #include <linux/auxvec.h>  // AT_HWCAP
+ #endif
+-#if V8_GLIBC_PREREQ(2, 16) || V8_OS_ANDROID
++#if 1
+ #include <sys/auxv.h>  // getauxval()
+ #endif
+ #if V8_OS_QNX

backports/electron/musl-sandbox.patch

@@ -1,7 +1,10 @@
+musl uses different syscalls from glibc for some functions, so the sandbox has
+to account for that
+--
 diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 index ff5a1c0..da56b9b 100644
 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
 @@ -139,21 +139,11 @@ namespace sandbox {
  // present (as in newer versions of posix_spawn).
  ResultExpr RestrictCloneToThreadsAndEPERMFork() {
@@ -41,7 +44,7 @@ index ff5a1c0..da56b9b 100644
 diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
 index d9d1882..0567557 100644
 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/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) {
  #if defined(__i386__)
      case __NR_waitpid:
@@ -87,21 +90,35 @@ index 2b78a0c..b6fedb5 100644
  
  #if defined(__x86_64__)
  #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h"
-diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc
-index a85c0ea..715aa1e 100644
 --- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
 +++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -102,11 +102,11 @@
- #if defined(__arm__) || defined(__aarch64__)
-     case __NR_getcpu:
- #endif
--      return Allow();
--    case __NR_sched_getaffinity:
-     case __NR_sched_getparam:
-     case __NR_sched_getscheduler:
-     case __NR_sched_setscheduler:
-+      return Allow();
-+    case __NR_sched_getaffinity:
-       return RestrictSchedTarget(GetPolicyPid(), sysno);
-     case __NR_prlimit64:
-       // See crbug.com/662450 and setrlimit comment above.
+@@ -94,6 +94,9 @@
+     case __NR_pwrite64:
+     case __NR_sched_get_priority_max:
+     case __NR_sched_get_priority_min:
++    case __NR_sched_getparam:
++    case __NR_sched_getscheduler:
++    case __NR_sched_setscheduler:
+     case __NR_sysinfo:
+     case __NR_times:
+     case __NR_uname:
+--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -225,10 +225,15 @@
+   if (sysno == __NR_getpriority || sysno ==__NR_setpriority)
+     return RestrictGetSetpriority(current_pid);
+ 
++  // XXX: hacks for musl sandbox, calls needed?
++  if (sysno == __NR_sched_getparam || sysno == __NR_sched_getscheduler ||
++      sysno == __NR_sched_setscheduler) {
++    return Allow();
++  }
++
+   // The scheduling syscalls are used in threading libraries and also heavily in
+   // abseil. See for example https://crbug.com/1370394.
+-  if (sysno == __NR_sched_getaffinity || sysno == __NR_sched_getparam ||
+-      sysno == __NR_sched_getscheduler || sysno == __NR_sched_setscheduler) {
++  if (sysno == __NR_sched_getaffinity) {
+     return RestrictSchedTarget(current_pid, sysno);
+   }
+ 

backports/electron/musl-tid-caching.patch

@@ -1,3 +1,7 @@
+the sandbox caching of thread id's only works with glibc
+see: https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/32356
+see: https://gitlab.alpinelinux.org/alpine/aports/-/issues/13579
+--
 --- a/sandbox/linux/services/namespace_sandbox.cc
 +++ b/sandbox/linux/services/namespace_sandbox.cc
 @@ -209,6 +209,70 @@

backports/electron/musl-v8-monotonic-pthread-cont_timedwait.patch

@@ -1,5 +1,6 @@
-Use monotonic clock for pthread_cond_timedwait with musl too.
-
+use monotonic clock for pthread_cond_timedwait with musl too, since it supports
+it
+--
 --- a/v8/src/base/platform/condition-variable.cc
 +++ b/v8/src/base/platform/condition-variable.cc
 @@ -16,7 +16,7 @@

backports/electron/no-execinfo.patch

@@ -1,57 +1,8 @@
---- a/base/debug/stack_trace_posix.cc
-+++ b/base/debug/stack_trace_posix.cc
-@@ -27,7 +27,7 @@
- #if !defined(USE_SYMBOLIZE)
- #include <cxxabi.h>
- #endif
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- #include <execinfo.h>
- #endif
- 
-@@ -89,7 +89,7 @@
-   // Note: code in this function is NOT async-signal safe (std::string uses
-   // malloc internally).
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
-   std::string::size_type search_from = 0;
-   while (search_from < text->size()) {
-     // Look for the start of a mangled symbol, from search_from.
-@@ -136,7 +136,7 @@
-   virtual ~BacktraceOutputHandler() = default;
- };
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void OutputPointer(void* pointer, BacktraceOutputHandler* handler) {
-   // This should be more than enough to store a 64-bit number in hex:
-   // 16 hex digits + 1 for null-terminator.
-@@ -839,7 +839,7 @@
-   // If we do not have unwind tables, then try tracing using frame pointers.
-   return base::debug::TraceStackFramePointers(const_cast<const void**>(trace),
-                                               count, 0);
--#elif !defined(__UCLIBC__) && !defined(_AIX)
-+#elif defined(__GLIBC__) && !defined(_AIX)
-   // Though the backtrace API man page does not list any possible negative
-   // return values, we take no chance.
-   return base::saturated_cast<size_t>(backtrace(trace, count));
-@@ -852,13 +852,13 @@
- // NOTE: This code MUST be async-signal safe (it's used by in-process
- // stack dumping signal handler). NO malloc or stdio is allowed here.
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
-   PrintBacktraceOutputHandler handler;
-   ProcessBacktrace(trace_, count_, prefix_string, &handler);
- #endif
- }
- 
--#if !defined(__UCLIBC__) && !defined(_AIX)
-+#if defined(__GLIBC__) && !defined(_AIX)
- void StackTrace::OutputToStreamWithPrefix(std::ostream* os,
-                                           const char* prefix_string) const {
-   StreamBacktraceOutputHandler handler(os);
+musl does not have execinfo.h, and hence no implementation of
+. backtrace()
+. backtrace_symbols()
+for discussion about this, see https://www.openwall.com/lists/musl/2021/07/16/1
+--
 --- a/v8/src/codegen/external-reference-table.cc
 +++ b/v8/src/codegen/external-reference-table.cc
 @@ -11,7 +11,9 @@
@@ -86,22 +37,32 @@
  #define HAVE_FCNTL_H 1
 --- a/base/debug/stack_trace.cc
 +++ b/base/debug/stack_trace.cc
-@@ -251,7 +253,9 @@
- }
- 
- void StackTrace::OutputToStream(std::ostream* os) const {
-+#if defined(__GLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(os, nullptr);
-+#endif
- }
- 
- std::string StackTrace::ToString() const {
-@@ -281,7 +281,7 @@
+@@ -291,7 +291,7 @@
  }
  std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const {
    std::stringstream stream;
 -#if !defined(__UCLIBC__) && !defined(_AIX)
 +#if defined(__GLIBC__) && !defined(_AIX)
-   OutputToStreamWithPrefix(&stream, prefix_string);
+   if (ShouldSuppressOutput()) {
+     return "Backtrace suppressed.";
+   }
+@@ -301,7 +301,7 @@
+ }
+ 
+ std::ostream& operator<<(std::ostream& os, const StackTrace& s) {
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if defined(__GLIBC__) && !defined(_AIX)
+   s.OutputToStream(&os);
+ #else
+   os << "StackTrace::OutputToStream not implemented.";
+--- a/base/debug/stack_trace_unittest.cc
++++ b/base/debug/stack_trace_unittest.cc
+@@ -33,7 +33,7 @@
+ typedef testing::Test StackTraceTest;
  #endif
-   return stream.str();
+ 
+-#if !defined(__UCLIBC__) && !defined(_AIX)
++#if !defined(__UCLIBC__) && !defined(_AIX) && defined(__GLIBC__)
+ // StackTrace::OutputToStream() is not implemented under uclibc, nor AIX.
+ // See https://crbug.com/706728
+ 

backports/electron/no-glibc-version.patch

@@ -1,19 +0,0 @@
---- a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-+++ b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -61,7 +61,6 @@
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
--#include <gnu/libc-version.h>
- 
- #include "base/linux_util.h"
- #include "base/strings/string_split.h"
-@@ -324,7 +323,7 @@
- void RecordLinuxGlibcVersion() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if defined(__GLIBC__) || BUILDFLAG(IS_CHROMEOS_LACROS)
-   base::Version version(gnu_get_libc_version());
- 
-   UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE;

backports/electron/no-mallinfo.patch

@@ -1,3 +1,6 @@
+musl does not implement mallinfo()/mallinfo2()
+(or rather, malloc-ng, musl's allocator, doesn't)
+--
 --- a/base/trace_event/malloc_dump_provider.cc
 +++ b/base/trace_event/malloc_dump_provider.cc
 @@ -185,7 +185,6 @@
@@ -57,8 +60,8 @@
    // TODO(fuchsia): Not currently exposed. https://crbug.com/735087.
    return 0;
  #endif
---- a/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
-+++ b/third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
+--- ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc.orig
++++ ./third_party/tflite/src/tensorflow/lite/profiling/memory_info.cc
 @@ -35,7 +35,7 @@
  
  MemoryUsage GetMemoryUsage() {
@@ -68,8 +71,8 @@
    rusage res;
    if (getrusage(RUSAGE_SELF, &res) == 0) {
      result.max_rss_kb = res.ru_maxrss;
---- a/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
-+++ b/third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
+--- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc
++++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Process.inc.orig
 @@ -86,11 +86,11 @@
  }
 
@@ -85,8 +88,8 @@
    mi = ::mallinfo();
    return mi.uordblks;
 
---- a/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
-+++ b/third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h
+--- ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig	2019-09-30 13:03:42.556880537 -0400
++++ ./third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h	2019-09-30 13:07:27.989821227 -0400
 @@ -122,7 +122,9 @@
  /* #undef HAVE_MALLCTL */
  
@@ -97,8 +100,8 @@
  
  /* Define to 1 if you have the <malloc.h> header file. */
  #define HAVE_MALLOC_H 1
---- a/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc
-+++ b/base/allocator/allocator_shim_default_dispatch_to_partition_alloc.cc
+--- 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 @@
  
  #endif  // !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_ANDROID)
@@ -108,3 +111,14 @@
  SHIM_ALWAYS_EXPORT struct mallinfo mallinfo(void) __THROW {
    base::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)
+ 
+ // Platforms on which we override weak libc symbols.
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
+ 
+ NOINLINE void FreeForTest(void* data) {
+   free(data);

backports/electron/no-res-ninit-nclose.patch

@@ -1,3 +1,5 @@
+similar to dns-resolver.patch, musl doesn't have res_ninit and so on
+--
 --- a/net/dns/public/scoped_res_state.cc
 +++ b/net/dns/public/scoped_res_state.cc
 @@ -13,7 +13,7 @@

backports/electron/no-sandbox-settls.patch

@@ -0,0 +1,14 @@
+this optimisation of CLONE_SETTLS is not valid used like this, and future musl
+clone(3) will EINVAL on this use
+--
+--- a/sandbox/linux/services/credentials.cc
++++ b/sandbox/linux/services/credentials.cc
+@@ -89,7 +89,7 @@
+ 
+   int clone_flags = CLONE_FS | LINUX_SIGCHLD;
+   void* tls = nullptr;
+-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
++#if 0 && (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
+     !defined(MEMORY_SANITIZER)
+   // Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables.
+   // Since clone writes to the new child's TLS before returning, we must set a

backports/electron/no-stat-redefine.patch

@@ -1,12 +0,0 @@
---- a/base/files/file.h
-+++ b/base/files/file.h
-@@ -19,7 +19,8 @@
- #include "build/build_config.h"
- 
- #if BUILDFLAG(IS_BSD) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_NACL) || \
--    BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21)
-+    BUILDFLAG(IS_FUCHSIA) || (BUILDFLAG(IS_ANDROID) && __ANDROID_API__ < 21) || \
-+    (defined(OS_LINUX) && !defined(__GLIBC__))
- struct stat;
- namespace base {
- typedef struct stat stat_wrapper_t;

backports/electron/nullptr-t.patch

@@ -1,11 +0,0 @@
---- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
-+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
-@@ -178,7 +178,7 @@
-   class AutofillPopupViewPtr {
-    public:
-     AutofillPopupViewPtr() = default;
--    AutofillPopupViewPtr(nullptr_t) : ptr_(nullptr) {}
-+    AutofillPopupViewPtr(std::nullptr_t) : ptr_(nullptr) {}
-     AutofillPopupViewPtr(AutofillPopupView* ptr) : ptr_(ptr) {}
- 
-     explicit operator bool() const { return ptr_; }

backports/electron/partalloc-no-tagging-arm64.patch

@@ -0,0 +1,14 @@
+Hard-disable memory tagging on ARM64 - it does exist there but musl is
+missing some required interface headers for it, and it's not clear how
+to make the partalloc support code for it work.
+--- ./base/allocator/partition_allocator/partition_alloc.gni.orig
++++ ./base/allocator/partition_allocator/partition_alloc.gni
+@@ -30,7 +30,7 @@
+ }
+ 
+ has_memory_tagging =
+-    current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
++    false
+ 
+ declare_args() {
+   # Causes all the allocations to be routed via allocator_shim.cc. Usually,

backports/electron/partition-atfork.patch

@@ -1,15 +0,0 @@
---- a/base/allocator/partition_allocator/partition_root.cc
-+++ b/base/allocator/partition_allocator/partition_root.cc
-@@ -248,9 +248,9 @@
-   // However, no perfect solution really exists to make threads + fork()
-   // cooperate, but deadlocks are real (and fork() is used in DEATH_TEST()s),
-   // and other malloc() implementations use the same techniques.
--  int err =
--      pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild);
--  PA_CHECK(err == 0);
-+  //int err =
-+  //    pthread_atfork(BeforeForkInParent, AfterForkInParent, AfterForkInChild);
-+  //PA_CHECK(err == 0);
- #endif  // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
- }
- 

backports/electron/perfetto-libstdc++.patch

@@ -0,0 +1,20 @@
+--- 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));

backports/electron/pvalloc.patch

@@ -0,0 +1,33 @@
+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 @@
+   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__)
+   void* pvalloc_ptr = pvalloc(67);
+   ASSERT_NE(nullptr, pvalloc_ptr);
+   ASSERT_EQ(0u, reinterpret_cast<uintptr_t>(pvalloc_ptr) % kPageSize);
+@@ -414,7 +414,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__)
+   free(pvalloc_ptr);
+   ASSERT_GE(frees_intercepted_by_addr[Hash(pvalloc_ptr)], 1u);
+ #endif  // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID)
+--- a/base/process/memory_unittest.cc
++++ b/base/process/memory_unittest.cc
+@@ -359,7 +359,7 @@
+ #endif  // BUILDFLAG(IS_WIN)
+ #endif  // !BUILDFLAG(IS_MAC)
+ 
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if (BUILDFLAG(IS_LINUX) && defined(__GLIBC__)) || BUILDFLAG(IS_CHROMEOS)
+ 
+ TEST_F(OutOfMemoryDeathTest, Valloc) {
+   ASSERT_OOM_DEATH({

backports/electron/py3.11.patch

@@ -1,11 +0,0 @@
---- a/tools/grit/grit/util.py
-+++ b/tools/grit/grit/util.py
-@@ -209,7 +209,7 @@
-     mode = 'rb'
-     encoding = None
-   else:
--    mode = 'rU'
-+    mode = 'r'
- 
-   with io.open(filename, mode, encoding=encoding) as f:
-     return f.read()

backports/electron/quiche-arena-size.patch

@@ -1,11 +0,0 @@
---- a/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
-+++ b/net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
-@@ -69,7 +69,7 @@
- 
- // QuicConnections currently use around 1KB of polymorphic types which would
- // ordinarily be on the heap. Instead, store them inline in an arena.
--using QuicConnectionArena = QuicOneBlockArena<1280>;
-+using QuicConnectionArena = QuicOneBlockArena<1504>;
- 
- }  // namespace quic
- 

backports/electron/quiche-array.patch

@@ -0,0 +1,12 @@
+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>
+ 

backports/electron/random-fixes.patch

@@ -0,0 +1,94 @@
+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();

backports/electron/roll-src-third_party-ffmpeg-102.patch

@@ -1,287 +0,0 @@
---- a/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
-+++ b/media/cdm/library_cdm/clear_key_cdm/ffmpeg_cdm_audio_decoder.cc
-@@ -74,7 +74,7 @@
-       codec_context->sample_fmt = AV_SAMPLE_FMT_NONE;
-   }
- 
--  codec_context->ch_layout.nb_channels = config.channel_count;
-+  codec_context->channels = config.channel_count;
-   codec_context->sample_rate = config.samples_per_second;
- 
-   if (config.extra_data) {
-@@ -124,8 +124,8 @@
-     case cdm::kAudioFormatPlanarS16:
-     case cdm::kAudioFormatPlanarF32: {
-       const int decoded_size_per_channel =
--          decoded_audio_size / av_frame.ch_layout.nb_channels;
--      for (int i = 0; i < av_frame.ch_layout.nb_channels; ++i) {
-+          decoded_audio_size / av_frame.channels;
-+      for (int i = 0; i < av_frame.channels; ++i) {
-         memcpy(output_buffer, av_frame.extended_data[i],
-                decoded_size_per_channel);
-         output_buffer += decoded_size_per_channel;
-@@ -185,14 +185,13 @@
-   // Success!
-   decoding_loop_ = std::make_unique<FFmpegDecodingLoop>(codec_context_.get());
-   samples_per_second_ = config.samples_per_second;
--  bytes_per_frame_ =
--      codec_context_->ch_layout.nb_channels * config.bits_per_channel / 8;
-+  bytes_per_frame_ = codec_context_->channels * config.bits_per_channel / 8;
-   output_timestamp_helper_ =
-       std::make_unique<AudioTimestampHelper>(config.samples_per_second);
-   is_initialized_ = true;
- 
-   // Store initial values to guard against midstream configuration changes.
--  channels_ = codec_context_->ch_layout.nb_channels;
-+  channels_ = codec_context_->channels;
-   av_sample_format_ = codec_context_->sample_fmt;
- 
-   return true;
-@@ -292,19 +291,17 @@
-   for (auto& frame : audio_frames) {
-     int decoded_audio_size = 0;
-     if (frame->sample_rate != samples_per_second_ ||
--        frame->ch_layout.nb_channels != channels_ ||
--        frame->format != av_sample_format_) {
-+        frame->channels != channels_ || frame->format != av_sample_format_) {
-       DLOG(ERROR) << "Unsupported midstream configuration change!"
-                   << " Sample Rate: " << frame->sample_rate << " vs "
--                  << samples_per_second_
--                  << ", Channels: " << frame->ch_layout.nb_channels << " vs "
--                  << channels_ << ", Sample Format: " << frame->format << " vs "
--                  << av_sample_format_;
-+                  << samples_per_second_ << ", Channels: " << frame->channels
-+                  << " vs " << channels_ << ", Sample Format: " << frame->format
-+                  << " vs " << av_sample_format_;
-       return cdm::kDecodeError;
-     }
- 
-     decoded_audio_size = av_samples_get_buffer_size(
--        nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
-+        nullptr, codec_context_->channels, frame->nb_samples,
-         codec_context_->sample_fmt, 1);
-     if (!decoded_audio_size)
-       continue;
-@@ -323,9 +320,9 @@
-     size_t* total_size,
-     std::vector<std::unique_ptr<AVFrame, ScopedPtrAVFreeFrame>>* audio_frames,
-     AVFrame* frame) {
--  *total_size += av_samples_get_buffer_size(
--      nullptr, codec_context_->ch_layout.nb_channels, frame->nb_samples,
--      codec_context_->sample_fmt, 1);
-+  *total_size += av_samples_get_buffer_size(nullptr, codec_context_->channels,
-+                                            frame->nb_samples,
-+                                            codec_context_->sample_fmt, 1);
-   audio_frames->emplace_back(av_frame_clone(frame));
-   return true;
- }
---- a/media/ffmpeg/ffmpeg_common.cc
-+++ b/media/ffmpeg/ffmpeg_common.cc
-@@ -345,11 +345,10 @@
-       codec_context->sample_fmt, codec_context->codec_id);
- 
-   ChannelLayout channel_layout =
--      codec_context->ch_layout.nb_channels > 8
-+      codec_context->channels > 8
-           ? CHANNEL_LAYOUT_DISCRETE
--          : ChannelLayoutToChromeChannelLayout(
--                codec_context->ch_layout.u.mask,
--                codec_context->ch_layout.nb_channels);
-+          : ChannelLayoutToChromeChannelLayout(codec_context->channel_layout,
-+                                               codec_context->channels);
- 
-   int sample_rate = codec_context->sample_rate;
-   switch (codec) {
-@@ -402,7 +401,7 @@
-                      extra_data, encryption_scheme, seek_preroll,
-                      codec_context->delay);
-   if (channel_layout == CHANNEL_LAYOUT_DISCRETE)
--    config->SetChannelsForDiscrete(codec_context->ch_layout.nb_channels);
-+    config->SetChannelsForDiscrete(codec_context->channels);
- 
- #if BUILDFLAG(ENABLE_PLATFORM_AC3_EAC3_AUDIO)
-   // These are bitstream formats unknown to ffmpeg, so they don't have
-@@ -471,7 +470,7 @@
- 
-   // TODO(scherkus): should we set |channel_layout|? I'm not sure if FFmpeg uses
-   // said information to decode.
--  codec_context->ch_layout.nb_channels = config.channels();
-+  codec_context->channels = config.channels();
-   codec_context->sample_rate = config.samples_per_second();
- 
-   if (config.extra_data().empty()) {
---- a/media/filters/audio_file_reader.cc
-+++ b/media/filters/audio_file_reader.cc
-@@ -113,15 +113,14 @@
- 
-   // Verify the channel layout is supported by Chrome.  Acts as a sanity check
-   // against invalid files.  See http://crbug.com/171962
--  if (ChannelLayoutToChromeChannelLayout(
--          codec_context_->ch_layout.u.mask,
--          codec_context_->ch_layout.nb_channels) ==
-+  if (ChannelLayoutToChromeChannelLayout(codec_context_->channel_layout,
-+                                         codec_context_->channels) ==
-       CHANNEL_LAYOUT_UNSUPPORTED) {
-     return false;
-   }
- 
-   // Store initial values to guard against midstream configuration changes.
--  channels_ = codec_context_->ch_layout.nb_channels;
-+  channels_ = codec_context_->channels;
-   audio_codec_ = CodecIDToAudioCodec(codec_context_->codec_id);
-   sample_rate_ = codec_context_->sample_rate;
-   av_sample_format_ = codec_context_->sample_fmt;
-@@ -224,7 +223,7 @@
-   if (frames_read < 0)
-     return false;
- 
--  const int channels = frame->ch_layout.nb_channels;
-+  const int channels = frame->channels;
-   if (frame->sample_rate != sample_rate_ || channels != channels_ ||
-       frame->format != av_sample_format_) {
-     DLOG(ERROR) << "Unsupported midstream configuration change!"
---- a/media/filters/audio_file_reader_unittest.cc
-+++ b/media/filters/audio_file_reader_unittest.cc
-@@ -121,11 +121,11 @@
-     EXPECT_FALSE(reader_->Open());
-   }
- 
--  void RunTestFailingDecode(const char* fn, int expect_read = 0) {
-+  void RunTestFailingDecode(const char* fn) {
-     Initialize(fn);
-     EXPECT_TRUE(reader_->Open());
-     std::vector<std::unique_ptr<AudioBus>> decoded_audio_packets;
--    EXPECT_EQ(reader_->Read(&decoded_audio_packets), expect_read);
-+    EXPECT_EQ(reader_->Read(&decoded_audio_packets), 0);
-   }
- 
-   void RunTestPartialDecode(const char* fn) {
-@@ -219,7 +219,7 @@
- }
- 
- TEST_F(AudioFileReaderTest, MidStreamConfigChangesFail) {
--  RunTestFailingDecode("midstream_config_change.mp3", 42624);
-+  RunTestFailingDecode("midstream_config_change.mp3");
- }
- #endif
- 
---- a/media/filters/audio_video_metadata_extractor.cc
-+++ b/media/filters/audio_video_metadata_extractor.cc
-@@ -113,15 +113,6 @@
-     if (!stream)
-       continue;
- 
--    void* display_matrix =
--        av_stream_get_side_data(stream, AV_PKT_DATA_DISPLAYMATRIX, nullptr);
--    if (display_matrix) {
--      rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
--                      static_cast<int32_t*>(display_matrix))
--                      .rotation;
--      info.tags["rotate"] = base::NumberToString(rotation_);
--    }
--
-     // Extract dictionary from streams also. Needed for containers that attach
-     // metadata to contained streams instead the container itself, like OGG.
-     ExtractDictionary(stream->metadata, &info.tags);
-@@ -264,6 +255,8 @@
-     if (raw_tags->find(tag->key) == raw_tags->end())
-       (*raw_tags)[tag->key] = tag->value;
- 
-+    if (ExtractInt(tag, "rotate", &rotation_))
-+      continue;
-     if (ExtractString(tag, "album", &album_))
-       continue;
-     if (ExtractString(tag, "artist", &artist_))
---- a/media/filters/ffmpeg_aac_bitstream_converter.cc
-+++ b/media/filters/ffmpeg_aac_bitstream_converter.cc
-@@ -195,15 +195,14 @@
-   if (!header_generated_ || codec_ != stream_codec_parameters_->codec_id ||
-       audio_profile_ != stream_codec_parameters_->profile ||
-       sample_rate_index_ != sample_rate_index ||
--      channel_configuration_ !=
--          stream_codec_parameters_->ch_layout.nb_channels ||
-+      channel_configuration_ != stream_codec_parameters_->channels ||
-       frame_length_ != header_plus_packet_size) {
-     header_generated_ =
-         GenerateAdtsHeader(stream_codec_parameters_->codec_id,
-                            0,  // layer
-                            stream_codec_parameters_->profile, sample_rate_index,
-                            0,  // private stream
--                           stream_codec_parameters_->ch_layout.nb_channels,
-+                           stream_codec_parameters_->channels,
-                            0,  // originality
-                            0,  // home
-                            0,  // copyrighted_stream
-@@ -215,7 +214,7 @@
-     codec_ = stream_codec_parameters_->codec_id;
-     audio_profile_ = stream_codec_parameters_->profile;
-     sample_rate_index_ = sample_rate_index;
--    channel_configuration_ = stream_codec_parameters_->ch_layout.nb_channels;
-+    channel_configuration_ = stream_codec_parameters_->channels;
-     frame_length_ = header_plus_packet_size;
-   }
- 
---- a/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
-+++ b/media/filters/ffmpeg_aac_bitstream_converter_unittest.cc
-@@ -34,7 +34,7 @@
-     memset(&test_parameters_, 0, sizeof(AVCodecParameters));
-     test_parameters_.codec_id = AV_CODEC_ID_AAC;
-     test_parameters_.profile = FF_PROFILE_AAC_MAIN;
--    test_parameters_.ch_layout.nb_channels = 2;
-+    test_parameters_.channels = 2;
-     test_parameters_.extradata = extradata_header_;
-     test_parameters_.extradata_size = sizeof(extradata_header_);
-   }
---- a/media/filters/ffmpeg_audio_decoder.cc
-+++ b/media/filters/ffmpeg_audio_decoder.cc
-@@ -28,7 +28,7 @@
- 
- // Return the number of channels from the data in |frame|.
- static inline int DetermineChannels(AVFrame* frame) {
--  return frame->ch_layout.nb_channels;
-+  return frame->channels;
- }
- 
- // Called by FFmpeg's allocation routine to allocate a buffer. Uses
-@@ -231,7 +231,7 @@
-   // Translate unsupported into discrete layouts for discrete configurations;
-   // ffmpeg does not have a labeled discrete configuration internally.
-   ChannelLayout channel_layout = ChannelLayoutToChromeChannelLayout(
--      codec_context_->ch_layout.u.mask, codec_context_->ch_layout.nb_channels);
-+      codec_context_->channel_layout, codec_context_->channels);
-   if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED &&
-       config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE) {
-     channel_layout = CHANNEL_LAYOUT_DISCRETE;
-@@ -348,11 +348,11 @@
-   // Success!
-   av_sample_format_ = codec_context_->sample_fmt;
- 
--  if (codec_context_->ch_layout.nb_channels != config.channels()) {
-+  if (codec_context_->channels != config.channels()) {
-     MEDIA_LOG(ERROR, media_log_)
-         << "Audio configuration specified " << config.channels()
-         << " channels, but FFmpeg thinks the file contains "
--        << codec_context_->ch_layout.nb_channels << " channels";
-+        << codec_context_->channels << " channels";
-     ReleaseFFmpegResources();
-     state_ = DecoderState::kUninitialized;
-     return false;
-@@ -403,7 +403,7 @@
-   if (frame->nb_samples <= 0)
-     return AVERROR(EINVAL);
- 
--  if (s->ch_layout.nb_channels != channels) {
-+  if (s->channels != channels) {
-     DLOG(ERROR) << "AVCodecContext and AVFrame disagree on channel count.";
-     return AVERROR(EINVAL);
-   }
-@@ -436,8 +436,7 @@
-   ChannelLayout channel_layout =
-       config_.channel_layout() == CHANNEL_LAYOUT_DISCRETE
-           ? CHANNEL_LAYOUT_DISCRETE
--          : ChannelLayoutToChromeChannelLayout(s->ch_layout.u.mask,
--                                               s->ch_layout.nb_channels);
-+          : ChannelLayoutToChromeChannelLayout(s->channel_layout, s->channels);
- 
-   if (channel_layout == CHANNEL_LAYOUT_UNSUPPORTED) {
-     DLOG(ERROR) << "Unsupported channel layout.";

backports/electron/roll-src-third_party-ffmpeg-106.patch

@@ -1,15 +0,0 @@
---- a/media/filters/audio_file_reader.cc
-+++ b/media/filters/audio_file_reader.cc
-@@ -243,10 +243,10 @@
-   // silence from being output. In the case where we are also discarding some
-   // portion of the packet (as indicated by a negative pts), we further want to
-   // adjust the duration downward by however much exists before zero.
--  if (audio_codec_ == AudioCodec::kAAC && frame->duration) {
-+  if (audio_codec_ == AudioCodec::kAAC && frame->pkt_duration) {
-     const base::TimeDelta pkt_duration = ConvertFromTimeBase(
-         glue_->format_context()->streams[stream_index_]->time_base,
--        frame->duration + std::min(static_cast<int64_t>(0), frame->pts));
-+        frame->pkt_duration + std::min(static_cast<int64_t>(0), frame->pts));
-     const base::TimeDelta frame_duration =
-         base::Seconds(frames_read / static_cast<double>(sample_rate_));
- 

backports/electron/scoped-file-no-close.patch

@@ -1,22 +0,0 @@
-for some reason this breaks and the fd returned after close() after a few
-cycles is still in the lock array
-
-so, just don't enforce or wrap anything.
---- a/base/files/scoped_file_linux.cc
-+++ b/base/files/scoped_file_linux.cc
-@@ -77,15 +77,3 @@
- }
- 
- }  // namespace base
--
--extern "C" {
--
--int __close(int);
--
--__attribute__((visibility("default"), noinline)) int close(int fd) {
--  if (base::IsFDOwned(fd) && g_is_ownership_enforced)
--    CrashOnFdOwnershipViolation();
--  return __close(fd);
--}
--
--}  // extern "C"

backports/electron/system-node.patch

@@ -1,53 +0,0 @@
---- a/third_party/electron_node/BUILD.gn
-+++ b/third_party/electron_node/BUILD.gn
-@@ -42,6 +42,18 @@
-   node_module_version = ""
- }
- 
-+if (is_linux) {
-+  import("//build/config/linux/pkg_config.gni")
-+
-+  pkg_config("cares") {
-+    packages = [ "libcares" ]
-+  }
-+
-+  pkg_config("nghttp2") {
-+    packages = [ "libnghttp2" ]
-+  }
-+}
-+
- assert(!node_use_dtrace, "node_use_dtrace not supported in GN")
- assert(!node_use_etw, "node_use_etw not supported in GN")
- 
-@@ -182,11 +194,9 @@
- component("node_lib") {
-   deps = [
-     ":node_js2c",
--    "deps/cares",
-     "deps/histogram",
-     "deps/googletest:gtest",
-     "deps/llhttp",
--    "deps/nghttp2",
-     "deps/uvwasi",
-     "//third_party/zlib",
-     "//third_party/brotli:dec",
-@@ -202,6 +212,19 @@
-   public_configs = [ ":node_lib_config" ]
-   include_dirs = [ "src" ]
-   libs = []
-+  if (is_linux) {
-+    configs += [
-+      ":cares",
-+      ":nghttp2",
-+    ]
-+    libs += [ "http_parser" ]
-+  } else {
-+    deps += [
-+      "deps/cares",
-+      "deps/http_parser",
-+      "deps/nghttp2",
-+    ]
-+  }
-   frameworks = []
-   cflags_cc = [
-     "-Wno-deprecated-declarations",

backports/electron/system-zstd.patch

@@ -0,0 +1,46 @@
+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
+

backports/electron/temp-failure-retry.patch

@@ -1,4 +1,5 @@
-random glibc macro
+random glibc macro, not provided by musl.
+https://www.gnu.org/software/libc/manual/html_node/Interrupted-Primitives.html
 --- a/sandbox/linux/suid/process_util.h
 +++ b/sandbox/linux/suid/process_util.h
 @@ -11,6 +11,14 @@

backports/electron/unbundle-node.patch

@@ -0,0 +1,68 @@
+--- ./third_party/electron_node/BUILD.gn.orig
++++ ./third_party/electron_node/BUILD.gn
+@@ -40,6 +40,8 @@
+   node_release_urlbase = ""
+ 
+   # Allows downstream packagers (eg. Linux distributions) to build Electron against system shared libraries.
++  use_system_ada = false
++  use_system_base64 = false
+   use_system_cares = false
+   use_system_nghttp2 = false
+   use_system_llhttp = false
+@@ -48,6 +50,16 @@
+ 
+ if (is_linux) {
+  import("//build/config/linux/pkg_config.gni")
++ if (use_system_ada) {
++  config("ada") {
++    libs = [ "ada" ]
++  }
++ }
++ if (use_system_base64) {
++  pkg_config("base64") {
++    packages = [ "base64" ]
++  }
++ }
+  if (use_system_cares) {
+   pkg_config("cares") {
+     packages = [ "libcares" ]
+@@ -258,8 +270,6 @@
+   deps = [
+     ":node_js2c_exec",
+     "deps/googletest:gtest",
+-    "deps/ada",
+-    "deps/base64",
+     "deps/simdutf",
+     "deps/uvwasi",
+     "//third_party/zlib",
+@@ -267,6 +277,16 @@
+     "//third_party/brotli:enc",
+     "//v8:v8_libplatform",
+   ]
++  if (use_system_ada) {
++    configs += [ ":ada" ]
++  } else {
++    deps += [ "deps/ada" ]
++  }
++  if (use_system_base64) {
++    configs += [ ":base64" ]
++  } else {
++    deps += [ "deps/base64" ]
++  }
+   if (use_system_cares) {
+     configs += [ ":cares" ]
+   } else {
+--- ./electron/script/generate-config-gypi.py.orig
++++ ./electron/script/generate-config-gypi.py
+@@ -62,6 +62,11 @@
+   # Used by certain versions of node-gyp.
+   v['build_v8_with_gn'] = 'false'
+ 
++  with open(os.path.join(NODE_DIR, 'use_system.txt')) as f:
++    for dep in f.read().strip().split(' '):
++      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))
+ 

backports/electron/vector-const.patch

@@ -1,113 +0,0 @@
---- a/chrome/browser/process_singleton_posix.cc
-+++ b/chrome/browser/process_singleton_posix.cc
-@@ -607,7 +607,7 @@
-   // |reader| is for sending back ACK message.
-   void HandleMessage(const std::string& current_dir,
-                      const std::vector<std::string>& argv,
--                     const std::vector<const uint8_t> additional_data,
-+                     const std::vector<uint8_t> additional_data,
-                      SocketReader* reader);
- 
-  private:
-@@ -664,7 +664,7 @@
- void ProcessSingleton::LinuxWatcher::HandleMessage(
-     const std::string& current_dir,
-     const std::vector<std::string>& argv,
--    const std::vector<const uint8_t> additional_data,
-+    const std::vector<uint8_t> additional_data,
-     SocketReader* reader) {
-   DCHECK(ui_task_runner_->BelongsToCurrentThread());
-   DCHECK(reader);
-@@ -754,7 +754,7 @@
-   base::StringToSizeT(tokens[0], &num_args);
-   std::vector<std::string> command_line(tokens.begin() + 1, tokens.begin() + 1 + num_args);
- 
--  std::vector<const uint8_t> additional_data;
-+  std::vector<uint8_t> additional_data;
-   if (tokens.size() >= 3 + num_args) {
-     size_t additional_data_size;
-     base::StringToSizeT(tokens[1 + num_args], &additional_data_size);
-@@ -763,7 +763,7 @@
-         std::string(1, kTokenDelimiter));
-     const uint8_t* additional_data_bits =
-         reinterpret_cast<const uint8_t*>(remaining_args.c_str());
--    additional_data = std::vector<const uint8_t>(
-+    additional_data = std::vector<uint8_t>(
-         additional_data_bits, additional_data_bits + additional_data_size);
-   }
- 
---- a/chrome/browser/process_singleton.h
-+++ b/chrome/browser/process_singleton.h
-@@ -102,7 +102,7 @@
-   using NotificationCallback =
-        base::RepeatingCallback<bool(const base::CommandLine& command_line,
-                                    const base::FilePath& current_directory,
--                                   const std::vector<const uint8_t> additional_data)>;
-+                                   const std::vector<uint8_t> additional_data)>;
- 
- #if BUILDFLAG(IS_WIN)
-   ProcessSingleton(const std::string& program_name,
---- a/chrome/browser/process_singleton_win.cc
-+++ b/chrome/browser/process_singleton_win.cc
-@@ -81,7 +81,7 @@
- bool ParseCommandLine(const COPYDATASTRUCT* cds,
-                       base::CommandLine* parsed_command_line,
-                       base::FilePath* current_directory,
--                      std::vector<const uint8_t>* parsed_additional_data) {
-+                      std::vector<uint8_t>* parsed_additional_data) {
-   // We should have enough room for the shortest command (min_message_size)
-   // and also be a multiple of wchar_t bytes. The shortest command
-   // possible is L"START\0\0" (empty command line, current directory,
-@@ -163,7 +163,7 @@
-         msg.substr(fourth_null + 1, fifth_null - fourth_null);
-     const uint8_t* additional_data_bytes =
-         reinterpret_cast<const uint8_t*>(additional_data.c_str());
--    *parsed_additional_data = std::vector<const uint8_t>(additional_data_bytes,
-+    *parsed_additional_data = std::vector<uint8_t>(additional_data_bytes,
-         additional_data_bytes + additional_data_length);
- 
-     return true;
-@@ -187,7 +187,7 @@
- 
-   base::CommandLine parsed_command_line(base::CommandLine::NO_PROGRAM);
-   base::FilePath current_directory;
--  std::vector<const uint8_t> additional_data;
-+  std::vector<uint8_t> additional_data;
-   if (!ParseCommandLine(cds, &parsed_command_line, &current_directory, &additional_data)) {
-     *result = TRUE;
-     return true;
---- a/electron/shell/browser/api/electron_api_app.cc
-+++ b/electron/shell/browser/api/electron_api_app.cc
-@@ -519,10 +519,10 @@
-     const base::RepeatingCallback<
-         void(const base::CommandLine& command_line,
-              const base::FilePath& current_directory,
--             const std::vector<const uint8_t> additional_data)>& callback,
-+             const std::vector<uint8_t> additional_data)>& callback,
-     const base::CommandLine& cmd,
-     const base::FilePath& cwd,
--    const std::vector<const uint8_t> additional_data) {
-+    const std::vector<uint8_t> additional_data) {
-   // Make sure the callback is called after app gets ready.
-   if (Browser::Get()->is_ready()) {
-     callback.Run(cmd, cwd, std::move(additional_data));
-@@ -1082,7 +1082,7 @@
- 
- void App::OnSecondInstance(const base::CommandLine& cmd,
-                            const base::FilePath& cwd,
--                           const std::vector<const uint8_t> additional_data) {
-+                           const std::vector<uint8_t> additional_data) {
-   v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
-   v8::Locker locker(isolate);
-   v8::HandleScope handle_scope(isolate);
---- a/electron/shell/browser/api/electron_api_app.h
-+++ b/electron/shell/browser/api/electron_api_app.h
-@@ -195,7 +195,7 @@
-   std::string GetLocaleCountryCode();
-   void OnSecondInstance(const base::CommandLine& cmd,
-                         const base::FilePath& cwd,
--                        const std::vector<const uint8_t> additional_data);
-+                        const std::vector<uint8_t> additional_data);
-   bool HasSingleInstanceLock() const;
-   bool RequestSingleInstanceLock(gin::Arguments* args);
-   void ReleaseSingleInstanceLock();

backports/electron/wtf-stacksize.patch

@@ -1,20 +0,0 @@
---- a/third_party/blink/renderer/platform/wtf/stack_util.cc
-+++ b/third_party/blink/renderer/platform/wtf/stack_util.cc
-@@ -29,7 +29,7 @@
- // FIXME: On Mac OSX and Linux, this method cannot estimate stack size
- // correctly for the main thread.
- 
--#elif defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-     BUILDFLAG(IS_FUCHSIA)
-   // pthread_getattr_np() can fail if the thread is not invoked by
-   // pthread_create() (e.g., the main thread of blink_unittests).
-@@ -97,7 +97,7 @@
- }
- 
- void* GetStackStart() {
--#if defined(__GLIBC__) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FREEBSD) || \
-     BUILDFLAG(IS_FUCHSIA)
-   pthread_attr_t attr;
-   int error;

backports/electron/yes-musl.patch

@@ -0,0 +1,11 @@
+--- ./buildtools/third_party/libc++/__config_site.orig
++++ ./buildtools/third_party/libc++/__config_site
+@@ -18,7 +18,7 @@
+ /* #undef _LIBCPP_ABI_FORCE_MICROSOFT */
+ /* #undef _LIBCPP_HAS_NO_THREADS */
+ /* #undef _LIBCPP_HAS_NO_MONOTONIC_CLOCK */
+-/* #undef _LIBCPP_HAS_MUSL_LIBC */
++#define _LIBCPP_HAS_MUSL_LIBC 1
+ /* #undef _LIBCPP_HAS_THREAD_API_PTHREAD */
+ /* #undef _LIBCPP_HAS_THREAD_API_EXTERNAL */
+ /* #undef _LIBCPP_HAS_THREAD_API_WIN32 */

backports/fdm-materials/APKBUILD

@@ -0,0 +1,27 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=fdm-materials
+pkgver=5.2.2
+pkgrel=0
+pkgdesc="FDM Material Database"
+url="https://github.com/Ultimaker/fdm_materials"
+arch="noarch"
+license="CC0-1.0"
+makedepends="cmake samurai"
+options="!check" # no checks provided
+source="$pkgname-$pkgver.tar.gz::https://github.com/Ultimaker/fdm_materials/archive/refs/tags/$pkgver.tar.gz"
+builddir="$srcdir/fdm_materials-$pkgver"
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	cmake --build build
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="
+73eefec8b7b88af73afc578ffba583480bda30309945b1720d7a1a075bd7ab3279599d53fe83f4c96695f294a5a3e11297abc334ca6cc9db163d4eb0fbdaf0f9  fdm-materials-5.2.2.tar.gz
+"

backports/font-barlow/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
-# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
-pkgname=font-barlow
-pkgver=1.422
-pkgrel=0
-pkgdesc="Barlow is a slightly rounded, low-contrast, grotesk font superfamily"
-url="https://tribby.com/fonts/barlow/"
-arch="noarch"
-license="OFL-1.1"
-source="https://tribby.com/fonts/barlow/download/barlow-$pkgver.zip"
-options="!check" # No code to test
-builddir="$srcdir/fonts/otf"
-
-package() {
-	install -Dm644 ./*.otf -t "$pkgdir"/usr/share/fonts/$pkgname
-}
-
-sha512sums="
-ecd9d3c66161e5043cf5ae7edf60863a27d51655b13ea01fabe83abcb4adf6a84366ad14f7c01cd0a7160dda357e81996dceae272fac65f97b3384bef9589df8  barlow-1.422.zip
-"

backports/font-eb-garamond/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
-# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
-pkgname=font-eb-garamond
-pkgver=0.016
-pkgrel=0
-pkgdesc="Digitization of the Garamond shown on the Egenolff-Berner specimen"
-url="http://www.georgduffner.at/ebgaramond/"
-arch="noarch"
-license="OFL-1.1"
-source="https://bitbucket.org/georgd/eb-garamond/downloads/EBGaramond-$pkgver.zip"
-options="!check" # No code to test
-builddir="$srcdir/EBGaramond-$pkgver/otf"
-
-package() {
-	install -Dm644 ./*.otf -t "$pkgdir"/usr/share/fonts/$pkgname
-}
-
-sha512sums="
-f7d67d6fb47ff7aa614b08d97f953cd50122935b40ff191c7b226ad0714b738a5b359b04342ebea10109e7ab8b4260256ce0f8592fd70dc3e7fe29c77188a955  EBGaramond-0.016.zip
-"

backports/font-inter/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
-# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
-pkgname=font-inter
-pkgver=3.19
-pkgrel=0
-pkgdesc="A typeface carefully crafted & designed for computer screens"
-url="https://rsms.me/inter/"
-arch="noarch"
-license="OFL-1.1"
-source="https://github.com/rsms/inter/releases/download/v$pkgver/Inter-$pkgver.zip"
-options="!check" # No code to test
-builddir="$srcdir/Inter Desktop"
-
-package() {
-	install -Dm644 ./*.otf -t "$pkgdir"/usr/share/fonts/font-inter
-}
-
-sha512sums="
-5a602c9da3c75aff3817066a5cf01489d54b2a2a93f13aa7eb61ac4f4f3453e91cb6153dfa5d7d72c8d9008c47bcbdf704f19909dbaef247dc7b2c14ff2d3041  Inter-3.19.zip
-"

backports/font-parisienne/APKBUILD

@@ -1,20 +0,0 @@
-# Contributor: Lauren N. Liberda <lauren@selfisekai.rocks>
-# Maintainer: Lauren N. Liberda <lauren@selfisekai.rocks>
-pkgname=font-parisienne
-pkgver=1
-pkgrel=0
-pkgdesc="Parisienne is a casual connecting script inspired by a 1960s Bra advertisement"
-url="https://fonts.google.com/specimen/Parisienne"
-arch="noarch"
-license="OFL-1.1"
-source="Parisienne-$pkgver.zip::https://fonts.google.com/download?family=Parisienne"
-options="!check" # No code to test
-builddir="$srcdir/"
-
-package() {
-	install -Dm644 ./Parisienne-Regular.ttf -t "$pkgdir"/usr/share/fonts/$pkgname
-}
-
-sha512sums="
-a5099b4952b26c31bc1aa363318b4a13a3c156712e58b601534a6530780bc1938420970a50a3a22cbf3f4dff647660b3cafdc4d05a4c86b86a8d21a7bb5efab0  Parisienne-1.zip
-"

backports/freecad/APKBUILD

@@ -0,0 +1,108 @@
+# Contributor: Aiden Grossman <agrossman154@yahoo.com>
+# Maintainer: Aiden Grossman <agrossman154@yahoo.com>
+pkgname=freecad
+pkgver=0.20.2
+pkgrel=5
+pkgdesc="Free and open source 3D parametric modeler"
+url="https://freecadweb.org/"
+license="LGPL-2.0-or-later"
+arch="" # removed dependency py3-pyside2
+#arch="x86_64" # dependency OpenCascade is only x86_64
+depends="
+	graphviz
+	hdf5
+	opencascade
+	py3-matplotlib
+	py3-numpy
+	py3-pivy
+	py3-ply
+	py3-pyside2
+	py3-six
+	py3-yaml
+	python3
+	"
+makedepends="
+	boost-dev
+	cmake
+	coin-dev
+	doxygen
+	eigen-dev
+	freeimage-dev
+	glu-dev
+	hdf5-dev
+	libmedc-dev
+	libshiboken2-dev
+	onetbb-dev
+	opencascade-dev
+	py3-pyside2-dev
+	python3-dev
+	shiboken2
+	qt5-qtsvg-dev
+	qt5-qtwebengine-dev
+	qt5-qtxmlpatterns-dev
+	samurai
+	swig
+	vtk-dev
+	xerces-c-dev
+	"
+checkdepends="xvfb-run mesa mesa-dri-gallium font-opensans"
+source="https://github.com/FreeCAD/FreeCAD/archive/$pkgver/freecad-$pkgver.tar.gz
+	$pkgname-python3.11-1.patch::https://github.com/FreeCAD/FreeCAD/commit/fe02d63c8c9b1280978be841d04e68a0a55cceb9.patch
+	numpy-1.20.patch
+	no-execinfo.patch
+	no-workaround-spnav.patch
+	resourceDirectory.patch
+	tests.patch
+	opencascade-7.8.0.patch
+	missing-include-cstdint.patch
+	"
+builddir="$srcdir/FreeCAD-$pkgver"
+
+build() {
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_C_FLAGS="$CFLAGS -fPIC -w" \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS -fPIC -w" \
+		-DCMAKE_INSTALL_PREFIX=/usr/lib/freecad \
+		-DCMAKE_INSTALL_DATADIR=/usr/share/freecad \
+		-DCMAKE_INSTALL_DATAROOTDIR=/usr/share \
+		-DCMAKE_INSTALL_DOCDIR=/usr/share/freecad/doc \
+		-DBUILD_ENABLE_CXX_STD=C++17 \
+		-DBUILD_QT5=ON \
+		-DFREECAD_USE_EXTERNAL_PIVY=ON \
+		-DFREECAD_USE_OCC_VARIANT="Official Version" \
+		-DFREECAD_USE_QT_FILEDIALOG=ON \
+		-DPYTHON_EXECUTABLE=/usr/bin/python3
+	cmake --build build
+}
+
+check() {
+	DESTDIR=test_install cmake --install build
+	mkdir -p test_install/usr/bin
+	ln -s ../lib/freecad/bin/FreeCAD test_install/usr/bin/FreeCAD
+	ln -s ../lib/freecad/bin/FreeCADCmd test_install/usr/bin/FreeCADCmd
+	LD_LIBRARY_PATH="$PWD"/test_install/usr/lib/freecad/lib \
+		xvfb-run "$PWD"/test_install/usr/bin/FreeCAD -t 0
+}
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+
+	# FreeCAD does not initialize correctly when binaries
+	# are located under /usr/bin; thus, symlinks are necessary.
+	install -d "$pkgdir"/usr/bin
+	ln -s /usr/lib/freecad/bin/FreeCAD "$pkgdir"/usr/bin/FreeCAD
+	ln -s /usr/lib/freecad/bin/FreeCADCmd "$pkgdir"/usr/bin/FreeCADCmd
+}
+
+sha512sums="
+c3acd77dd2bb9a2a23ac354da3b6102effb89c95d675e91421d65486414dfe8cc0188a7212245e0deb63f17b9c5df76133017be09e4cd14b833be8cbec52a08d  freecad-0.20.2.tar.gz
+75a237f7ed7a89a98c0e5bdb3d3f0788749602daf718089aa0814e05f93ced1e15ad5867c7c87f170b48c5984f9ace1bbc95c4f386ce72bfb8d616323b47f1e5  freecad-python3.11-1.patch
+80b08b031810fce7b6d698c662f64fa4f8a904f283f46b478b1d718529164c0ee61ce190f633abf04e03212720480f3f0603b0c1e160af79d7b6bb82da3bd0e4  numpy-1.20.patch
+73aaba7015dce7048eb7d2456131b5b5ba4673cc980503331987be54d99daed5f61db015ca33d7d2ef0f02bd3192da8ce122c103c3b93f9959927deb4f0b933e  no-execinfo.patch
+15696bdaaf77482f1b5d3806535a8004c8cec7d598d62092d9f0394b4ca9e2ad6cedd77c4b86a83a06324d16678c1c6bbf3a390b807729717a2f513e858afd50  no-workaround-spnav.patch
+8ba13b17bad66316757d180c1b9e9e72a24382627eac7c43a2264b3b5101e6e8f701775f2b805ed733f500fbcd8b0e8e422ec58a9ab3d948d613b666157d4c52  resourceDirectory.patch
+5db19e0aa2ca1fd21f4c56afc9db54390a799262aaa0a741704c2c304b0068fd6ca1dcc086465e12e9c0cfe06aac750aaf9b8f5f4db324539af4dd3394803ff9  tests.patch
+f933680dea8744e147f38abce389cb7fd0ec3fb3566454fdd5e6ea07b2faaac5fe61aabe1df3bda9f0d7b4fca16055aa2ad700e9cce10d2604ae37b761b68ade  opencascade-7.8.0.patch
+fec515cc63830f0e715527c7890173705b24e7d99d225821ec4300104cf3affdee49243bbd4d0a331a902cf04db756a1b8f18f0a17cc71f5757f8b5c73c78ede  missing-include-cstdint.patch
+"

backports/freecad/missing-include-cstdint.patch

@@ -0,0 +1,11 @@
+diff --color -rupN a/src/3rdParty/libE57Format/include/E57Format.h b/src/3rdParty/libE57Format/include/E57Format.h
+--- a/src/3rdParty/libE57Format/include/E57Format.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/libE57Format/include/E57Format.h	2024-02-27 14:06:29.308892531 +0100
+@@ -32,6 +32,7 @@
+ //! @file  E57Format.h header file for the E57 API
+ 
+ #include <cfloat>
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 

backports/freecad/no-execinfo.patch

@@ -0,0 +1,46 @@
+diff --git a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
+index 23c5083..54c7ecf 100644
+--- a/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
++++ b/src/3rdParty/salomesmesh/src/DriverSTL/Basics_Utils.cpp
+@@ -29,7 +29,6 @@
+ #ifndef WIN32
+ #include <unistd.h>
+ #include <sys/stat.h>
+-#include <execinfo.h>
+ #endif
+ 
+ 
+@@ -109,20 +108,7 @@ namespace Kernel_Utils
+ #ifndef WIN32
+   void print_traceback()
+   {
+-    void *array[50];
+-    size_t size;
+-    char **strings;
+-    size_t i;
+-
+-    size = backtrace (array, 40);
+-    strings = backtrace_symbols (array, size);
+-
+-    for (i = 0; i < size; i++)
+-      {
+-        std::cerr << strings[i] << std::endl;
+-      }
+-
+-    free (strings);
++    std::cerr << "there is no backtrace." << std::endl;
+   }
+ #else
+   #if (_MSC_VER >= 1400) // Visual Studio 2005
+diff --git a/src/App/Application.cpp b/src/App/Application.cpp
+index 3081623..ba3525f 100644
+--- a/src/App/Application.cpp
++++ b/src/App/Application.cpp
+@@ -1732,7 +1732,6 @@ static void freecadNewHandler ()
+ #endif
+ 
+ #if defined(FC_OS_LINUX)
+-#include <execinfo.h>
+ #include <dlfcn.h>
+ #include <cxxabi.h>
+ 

backports/freecad/no-workaround-spnav.patch

@@ -0,0 +1,69 @@
+Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/7b377a216b9185960e4cee980a6504dc1a755f50
+fixes stderr reassignment
+--
+From 7b377a216b9185960e4cee980a6504dc1a755f50 Mon Sep 17 00:00:00 2001
+From: wmayer <wmayer@users.sourceforge.net>
+Date: Wed, 29 Jun 2022 15:19:18 +0200
+Subject: [PATCH] Gui: remove workaround for spnav 0.23 due to build failure
+ with musl libc
+
+---
+ src/Gui/3Dconnexion/GuiNativeEventLinux.cpp | 27 ---------------------
+ 1 file changed, 27 deletions(-)
+
+diff --git a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
+index 7f0ddd75d262..455ece0b36bd 100644
+--- a/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
++++ b/src/Gui/3Dconnexion/GuiNativeEventLinux.cpp
+@@ -21,42 +21,17 @@
+  ***************************************************************************/
+ 
+ #include <FCConfig.h>
+-#include <cstdio>
+ 
+ #include "GuiNativeEventLinux.h"
+ 
+ #include "GuiApplicationNativeEventAware.h"
+ #include <Base/Console.h>
+-#include <Base/FileInfo.h>
+ #include <QMainWindow>
+ 
+ #include <QSocketNotifier>
+ 
+ #include <spnav.h>
+ 
+-namespace {
+-class RedirectStdErr
+-{
+-public:
+-    RedirectStdErr()
+-        : fi(Base::FileInfo::getTempFileName())
+-        , file(stderr)
+-    {
+-        stderr = fopen(fi.filePath().c_str(), "w");
+-    }
+-    ~RedirectStdErr()
+-    {
+-        fclose(stderr);
+-        fi.deleteFile();
+-        stderr = file;
+-    }
+-
+-private:
+-    Base::FileInfo fi;
+-    FILE* file;
+-};
+-}
+-
+ Gui::GuiNativeEvent::GuiNativeEvent(Gui::GUIApplicationNativeEventAware *app)
+ : GuiAbstractNativeEvent(app)
+ {
+@@ -72,8 +47,6 @@ Gui::GuiNativeEvent::~GuiNativeEvent()
+ 
+ void Gui::GuiNativeEvent::initSpaceball(QMainWindow *window)
+ {
+-    // tmp. redirect stderr to a file to suppress an error message from spnav_open()
+-    RedirectStdErr err;
+     Q_UNUSED(window)
+     if (spnav_open() == -1) {
+         Base::Console().Log("Couldn't connect to spacenav daemon. Please ignore if you don't have a spacemouse.\n");

backports/freecad/numpy-1.20.patch

@@ -0,0 +1,25 @@
+Patch-Source: https://github.com/FreeCAD/FreeCAD/commit/8b0df1dc936b544091f6a2d68df1c1a14ae3de5b
+--
+From 8b0df1dc936b544091f6a2d68df1c1a14ae3de5b Mon Sep 17 00:00:00 2001
+From: lorenz <looooo@users.noreply.github.com>
+Date: Tue, 27 Dec 2022 04:59:35 +0100
+Subject: [PATCH] FEM: femmesh: fix AttributeError: module 'numpy' has no
+ attribute 'int'
+
+---
+ src/Mod/Fem/femmesh/meshtools.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py
+index dd8671b..d2e2b0a 100644
+--- a/src/Mod/Fem/femmesh/meshtools.py
++++ b/src/Mod/Fem/femmesh/meshtools.py
+@@ -485,7 +485,7 @@ def get_femelement_sets(
+     # fem_objects = FreeCAD FEM document objects
+     # get femelements for reference shapes of each obj.References
+     count_femelements = 0
+-    referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=np.int)
++    referenced_femelements = np.zeros((max(femelement_table.keys())+1,),dtype=int)
+     has_remaining_femelements = None
+     for fem_object_i, fem_object in enumerate(fem_objects):
+         obj = fem_object["Object"]

backports/freecad/opencascade-7.8.0.patch

@@ -0,0 +1,877 @@
+Fix compilation with opencascase 7.8.0
+
+Base on https://github.com/FreeCAD/FreeCAD/pull/11909
+
+diff --color -rupN a/cMake/FindOCC.cmake b/cMake/FindOCC.cmake
+--- a/cMake/FindOCC.cmake	2022-12-07 03:35:37.000000000 +0100
++++ b/cMake/FindOCC.cmake	2024-02-27 15:00:48.248873883 +0100
+@@ -127,8 +127,6 @@ if(OCC_FOUND)
+     TKG2d
+     TKG3d
+     TKMath
+-    TKIGES
+-    TKSTL
+     TKShHealing
+     TKXSBase
+     TKBool
+@@ -139,10 +137,6 @@ if(OCC_FOUND)
+     TKGeomBase
+     TKOffset
+     TKPrim
+-    TKSTEPBase
+-    TKSTEPAttr
+-    TKSTEP209
+-    TKSTEP
+     TKHLR
+     TKFeat
+   )
+@@ -154,17 +148,19 @@ if(OCC_FOUND)
+     TKLCAF
+     TKVCAF
+     TKCDF
+-    TKXDESTEP
+-    TKXDEIGES
+     TKMeshVS
+     TKService
+     TKV3d
+   )
+-  if(OCC_VERSION_STRING VERSION_LESS 6.7.3)
+-    list(APPEND OCC_OCAF_LIBRARIES TKAdvTools)
+-  elseif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
++  if(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
+     list(APPEND OCC_OCAF_LIBRARIES TKRWMesh)
+-  endif(OCC_VERSION_STRING VERSION_LESS 6.7.3)
++  endif(NOT OCC_VERSION_STRING VERSION_LESS 7.5.0)
++  if(OCC_VERSION_STRING VERSION_LESS 7.8.0)
++    list(APPEND OCC_LIBRARIES TKIGES TKSTL TKSTEPBase TKSTEPAttr TKSTEP209 TKSTEP)
++    list(APPEND OCC_OCAF_LIBRARIES TKXDESTEP TKXDEIGES)
++  else(OCC_VERSION_STRING VERSION_LESS 7.8.0)
++    list(APPEND OCC_LIBRARIES TKDESTEP TKDEIGES TKDEGLTF TKDESTL)
++  endif(OCC_VERSION_STRING VERSION_LESS 7.8.0)
+   message(STATUS "-- Found OCE/OpenCASCADE version: ${OCC_VERSION_STRING}")
+   message(STATUS "-- OCE/OpenCASCADE include directory: ${OCC_INCLUDE_DIR}")
+   message(STATUS "-- OCE/OpenCASCADE shared libraries directory: ${OCC_LIBRARY_DIR}")
+diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx
+--- a/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/inc/SMESHDS_DataMapOfShape.hxx	2024-02-27 15:00:48.248873883 +0100
+@@ -29,22 +29,35 @@
+ 
+ #include <TopoDS_Shape.hxx>
+ 
++#include <Standard_Version.hxx>
++
+ /*
+  * This method needed for instance NCollection_DataMap with TopoDS_Shape as key
+  */
++#if OCC_VERSION_HEX >= 0x070800
+ struct SMESHDS_Hasher
+ {
+-  static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
+-                                         const TopoDS_Shape& S2)
+-  {
+-    return S1.IsSame(S2);
++  size_t operator()(const TopoDS_Shape& S) const noexcept {
++    return std::hash<TopoDS_Shape>{}(S);
+   }
+-  static inline Standard_Integer HashCode(const TopoDS_Shape& S,
+-                                          const Standard_Integer Upper)
+-  {
+-    return ::HashCode( S, Upper);
++  size_t operator()(const TopoDS_Shape& S1, const TopoDS_Shape& S2) const noexcept {
++    return S1.IsSame(S2);
+   }
+ };
+-
++#else
++struct SMESHDS_Hasher
++{
++static inline Standard_Boolean IsEqual(const TopoDS_Shape& S1,
++                                       const TopoDS_Shape& S2)
++{
++  return S1.IsSame(S2);
++}
++static inline Standard_Integer HashCode(const TopoDS_Shape& S,
++                                        const Standard_Integer Upper)
++{
++  return ::HashCode( S, Upper);
++}
++};
++#endif
+ 
+ #endif
+diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx
+--- a/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/inc/SMESH_MeshVSLink.hxx	2024-02-27 15:00:48.248873883 +0100
+@@ -57,9 +57,6 @@
+ #ifndef _MeshVS_EntityType_HeaderFile
+ #include <MeshVS_EntityType.hxx>
+ #endif
+-#ifndef _Standard_Address_HeaderFile
+-#include <Standard_Address.hxx>
+-#endif
+ #ifndef _TColStd_HArray1OfInteger_HeaderFile
+ #include <TColStd_HArray1OfInteger.hxx>
+ #endif
+diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx
+--- a/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/inc/SMESH_SMESH.hxx	2024-02-27 15:00:48.248873883 +0100
+@@ -37,4 +37,5 @@
+  #define SMESH_EXPORT
+ #endif
+ 
++#include <Standard_Version.hxx>
+ #endif
+diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx
+--- a/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/inc/SMESH_SequenceOfNode.hxx	2024-02-27 15:00:48.252207183 +0100
+@@ -28,10 +28,11 @@
+ 
+ #include "SMESH_SMESH.hxx"
+ 
+-#include <NCollection_DefineSequence.hxx>
+ #if OCC_VERSION_HEX >= 0x060703
+ #include <NCollection_IncAllocator.hxx>
+ #include <NCollection_Sequence.hxx>
++#else
++#include <NCollection_DefineSequence.hxx>
+ #endif
+ 
+ typedef const SMDS_MeshNode* SMDS_MeshNodePtr;
+diff --color -rupN a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx
+--- a/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/inc/SMESH_TypeDefs.hxx	2024-02-27 15:00:48.252207183 +0100
+@@ -185,11 +185,18 @@ typedef std::vector< UVPtStruct > UVPtSt
+ 
+ // --------------------------------------------------------------------------------
+ // class SMESH_SequenceOfElemPtr
++#include <Standard_Version.hxx>
++#if OCC_VERSION_HEX >= 0x060703
++#include <NCollection_Sequence.hxx>
++#else
+ #include <NCollection_DefineSequence.hxx>
++#endif
+ 
+ class SMDS_MeshElement;
+ 
+ typedef const SMDS_MeshElement* SMDS_MeshElementPtr;
++#define DEFINE_SEQUENCE(_ClassName_, _BaseCollection_, TheItemType)            \
++typedef NCollection_Sequence<TheItemType > _ClassName_;
+ 
+ DEFINE_SEQUENCE (SMESH_SequenceOfElemPtr, SMESH_BaseCollectionElemPtr, SMDS_MeshElementPtr)
+ 
+diff --color -rupN a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp
+--- a/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/src/DriverSTL/DriverSTL_R_SMDS_Mesh.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -33,10 +33,33 @@
+ #include "SMDS_MeshNode.hxx"
+ #include "SMESH_File.hxx"
+ 
++#include <Standard_Version.hxx>
++
+ namespace
+ {
+   struct Hasher
+   {
++#if OCC_VERSION_HEX >= 0x070800
++    size_t operator()(const gp_Pnt& point) const noexcept
++    {
++      union
++      {
++        Standard_Real    R[3];
++        Standard_Integer I[6];
++      } U;
++
++      point.Coord( U.R[0], U.R[1], U.R[2] );
++      return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
++    }
++
++    size_t operator()(const gp_Pnt& point1, const gp_Pnt& point2) const noexcept
++    {
++      static Standard_Real tab1[3], tab2[3];
++      point1.Coord(tab1[0],tab1[1],tab1[2]);
++      point2.Coord(tab2[0],tab2[1],tab2[2]);
++      return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
++    }
++#else
+     //=======================================================================
+     //function : HashCode
+     //purpose  :
+@@ -51,9 +74,9 @@ namespace
+       } U;
+ 
+       point.Coord( U.R[0], U.R[1], U.R[2] );
+-
+-      return ::HashCode(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7,Upper);
++      return std::hash<Standard_Integer>{}(U.I[0]/23+U.I[1]/19+U.I[2]/17+U.I[3]/13+U.I[4]/11+U.I[5]/7);
+     }
++ 
+     //=======================================================================
+     //function : IsEqual
+     //purpose  :
+@@ -66,7 +89,9 @@ namespace
+       point2.Coord(tab2[0],tab2[1],tab2[2]);
+       return (memcmp(tab1,tab2,sizeof(tab1)) == 0);
+     }
++#endif
+   };
++
+   typedef NCollection_DataMap<gp_Pnt,SMDS_MeshNode*,Hasher> TDataMapOfPntNodePtr;
+ 
+   const int HEADER_SIZE           = 84;
+diff --color -rupN a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp
+--- a/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_Quadrangle_2D.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -48,7 +48,6 @@
+ #include <Bnd_Box.hxx>
+ #include <GeomAPI_ProjectPointOnSurf.hxx>
+ #include <Geom_Surface.hxx>
+-#include <NCollection_DefineArray2.hxx>
+ #include <Precision.hxx>
+ #include <Standard_Real.hxx>
+ #include <TColStd_SequenceOfInteger.hxx>
+diff --color -rupN a/src/Mod/Drawing/App/PreCompiled.h b/src/Mod/Drawing/App/PreCompiled.h
+--- a/src/Mod/Drawing/App/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Drawing/App/PreCompiled.h	2024-02-27 15:00:48.252207183 +0100
+@@ -70,7 +70,6 @@
+ #include <Standard_LicenseError.hxx>
+ #include <Standard_LicenseNotFound.hxx>
+ #include <Standard_Macro.hxx>
+-#include <Standard_math.hxx>
+ #include <Standard_MultiplyDefined.hxx>
+ #include <Standard_NegativeValue.hxx>
+ #include <Standard_NoMoreObject.hxx>
+diff --color -rupN a/src/Mod/Drawing/Gui/TaskDialog.cpp b/src/Mod/Drawing/Gui/TaskDialog.cpp
+--- a/src/Mod/Drawing/Gui/TaskDialog.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Drawing/Gui/TaskDialog.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -29,7 +29,6 @@
+ #endif
+ 
+ 
+-#include <Standard_math.hxx>
+ #include "TaskDialog.h"
+ #include <Gui/Application.h>
+ #include <Gui/Command.h>
+diff --color -rupN a/src/Mod/Fem/Gui/PreCompiled.h b/src/Mod/Fem/Gui/PreCompiled.h
+--- a/src/Mod/Fem/Gui/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Fem/Gui/PreCompiled.h	2024-02-27 15:00:48.252207183 +0100
+@@ -63,7 +63,6 @@
+ #endif
+ 
+ // OCC
+-#include <Standard_math.hxx>
+ #include <Precision.hxx>
+ #include <TopoDS.hxx>
+ #include <BRepAdaptor_Surface.hxx>
+diff --color -rupN a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
+--- a/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Fem/Gui/TaskCreateNodeSet.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -28,7 +28,6 @@
+ 
+ # include <SMESH_Mesh.hxx>
+ # include <SMESHDS_Mesh.hxx>
+-# include <Standard_math.hxx>
+ #endif
+ 
+ #include <Base/Console.h>
+diff --color -rupN a/src/Mod/Import/App/ImportOCAF.cpp b/src/Mod/Import/App/ImportOCAF.cpp
+--- a/src/Mod/Import/App/ImportOCAF.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Import/App/ImportOCAF.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -165,7 +165,11 @@ void ImportOCAF::loadShapes(const TDF_La
+     std::vector<App::DocumentObject *> localValue;
+ 
+     if (aShapeTool->GetShape(label,aShape)) {
++#if OCC_VERSION_HEX >= 0x070800
++        hash = std::hash<TopoDS_Shape>{}(aShape);
++#else
+         hash = aShape.HashCode(HashUpper);
++#endif
+     }
+ 
+     Handle(TDataStd_Name) name;
+@@ -235,7 +239,11 @@ void ImportOCAF::loadShapes(const TDF_La
+     if (isRef || myRefShapes.find(hash) == myRefShapes.end()) {
+         TopoDS_Shape aShape;
+         if (isRef && aShapeTool->GetShape(label, aShape))
++#if OCC_VERSION_HEX >= 0x070800
++            myRefShapes.insert(std::hash<TopoDS_Shape>{}(aShape));
++#else
+             myRefShapes.insert(aShape.HashCode(HashUpper));
++#endif
+ 
+         if (aShapeTool->IsSimpleShape(label) && (isRef || aShapeTool->IsFree(label))) {
+             if (!asm_name.empty())
+@@ -565,7 +573,11 @@ void ImportXCAF::createShape(const TopoD
+     part->Label.setValue(default_name);
+     part->Shape.setValue(shape);
+     std::map<Standard_Integer, Quantity_ColorRGBA>::const_iterator jt;
++#if OCC_VERSION_HEX >= 0x070800
++    jt = myColorMap.find(std::hash<TopoDS_Shape>{}(shape));
++#else
+     jt = myColorMap.find(shape.HashCode(INT_MAX));
++#endif
+ 
+     App::Color partColor(0.8f,0.8f,0.8f);
+ #if 0//TODO
+@@ -586,7 +598,11 @@ void ImportXCAF::createShape(const TopoD
+     // set label name if defined
+     if (setname && !myNameMap.empty()) {
+         std::map<Standard_Integer, std::string>::const_iterator jt;
++#if OCC_VERSION_HEX >= 0x070800
++        jt = myNameMap.find(std::hash<TopoDS_Shape>{}(shape));
++#else
+         jt = myNameMap.find(shape.HashCode(INT_MAX));
++#endif
+         if (jt != myNameMap.end()) {
+             part->Label.setValue(jt->second);
+         }
+@@ -606,7 +622,11 @@ void ImportXCAF::createShape(const TopoD
+         faceColors.resize(faces.Extent(), partColor);
+         xp.Init(shape,TopAbs_FACE);
+         while (xp.More()) {
++#if OCC_VERSION_HEX >= 0x070800
++            jt = myColorMap.find(std::hash<TopoDS_Shape>{}(xp.Current()));
++#else
+             jt = myColorMap.find(xp.Current().HashCode(INT_MAX));
++#endif
+             if (jt != myColorMap.end()) {
+                 int index = faces.FindIndex(xp.Current());
+                 faceColors[index-1] = convertColor(jt->second);
+@@ -641,23 +661,51 @@ void ImportXCAF::loadShapes(const TDF_La
+             // add the shapes
+             TopExp_Explorer xp;
+             for (xp.Init(aShape, TopAbs_SOLID); xp.More(); xp.Next(), ctSolids++)
++#if OCC_VERSION_HEX >= 0x070800
++                this->mySolids[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                 this->mySolids[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+             for (xp.Init(aShape, TopAbs_SHELL, TopAbs_SOLID); xp.More(); xp.Next(), ctShells++)
++#if OCC_VERSION_HEX >= 0x070800
++                this->myShells[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                 this->myShells[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+             // if no solids and no shells were found then go for compounds
+             if (ctSolids == 0 && ctShells == 0) {
+                 for (xp.Init(aShape, TopAbs_COMPOUND); xp.More(); xp.Next(), ctComps++)
++#if OCC_VERSION_HEX >= 0x070800
++                    this->myCompds[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                     this->myCompds[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+             }
+             if (ctComps == 0) {
+                 for (xp.Init(aShape, TopAbs_FACE, TopAbs_SHELL); xp.More(); xp.Next())
++#if OCC_VERSION_HEX >= 0x070800
++                    this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                     this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+                 for (xp.Init(aShape, TopAbs_WIRE, TopAbs_FACE); xp.More(); xp.Next())
++#if OCC_VERSION_HEX >= 0x070800
++                    this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                     this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+                 for (xp.Init(aShape, TopAbs_EDGE, TopAbs_WIRE); xp.More(); xp.Next())
++#if OCC_VERSION_HEX >= 0x070800
++                    this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                     this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+                 for (xp.Init(aShape, TopAbs_VERTEX, TopAbs_EDGE); xp.More(); xp.Next())
++#if OCC_VERSION_HEX >= 0x070800
++                    this->myShapes[std::hash<TopoDS_Shape>{}(xp.Current())] = (xp.Current());
++#else
+                     this->myShapes[xp.Current().HashCode(INT_MAX)] = (xp.Current());
++#endif
+             }
+         }
+ 
+@@ -667,7 +715,11 @@ void ImportXCAF::loadShapes(const TDF_La
+             hColors->GetColor(label, XCAFDoc_ColorSurf, col) ||
+             hColors->GetColor(label, XCAFDoc_ColorCurv, col)) {
+             // add defined color
++#if OCC_VERSION_HEX >= 0x070800
++            myColorMap[std::hash<TopoDS_Shape>{}(aShape)] = col;
++#else
+             myColorMap[aShape.HashCode(INT_MAX)] = col;
++#endif
+         }
+         else {
+             // http://www.opencascade.org/org/forum/thread_17107/
+@@ -677,7 +729,11 @@ void ImportXCAF::loadShapes(const TDF_La
+                     hColors->GetColor(it.Value(), XCAFDoc_ColorSurf, col) ||
+                     hColors->GetColor(it.Value(), XCAFDoc_ColorCurv, col)) {
+                     // add defined color
++#if OCC_VERSION_HEX >= 0x070800
++                    myColorMap[std::hash<TopoDS_Shape>{}(it.Value())] = col;
++#else
+                     myColorMap[it.Value().HashCode(INT_MAX)] = col;
++#endif
+                 }
+             }
+         }
+@@ -690,7 +746,11 @@ void ImportXCAF::loadShapes(const TDF_La
+             extstr.ToUTF8CString(str);
+             std::string labelName(str);
+             if (!labelName.empty())
++#if OCC_VERSION_HEX >= 0x070800
++                myNameMap[std::hash<TopoDS_Shape>{}(aShape)] = labelName;
++#else
+                 myNameMap[aShape.HashCode(INT_MAX)] = labelName;
++#endif
+             delete [] str;
+         }
+ 
+diff --color -rupN a/src/Mod/Import/App/ImportOCAF.h b/src/Mod/Import/App/ImportOCAF.h
+--- a/src/Mod/Import/App/ImportOCAF.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Import/App/ImportOCAF.h	2024-02-27 15:00:48.252207183 +0100
+@@ -29,7 +29,6 @@
+ #include <XCAFDoc_ShapeTool.hxx>
+ #include <Quantity_ColorRGBA.hxx>
+ #include <TopoDS_Shape.hxx>
+-#include <TDF_LabelMapHasher.hxx>
+ #include <climits>
+ #include <string>
+ #include <set>
+diff --color -rupN a/src/Mod/Import/App/ImportOCAF2.h b/src/Mod/Import/App/ImportOCAF2.h
+--- a/src/Mod/Import/App/ImportOCAF2.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Import/App/ImportOCAF2.h	2024-02-27 15:06:12.358890276 +0100
+@@ -27,7 +27,6 @@
+ #include <XCAFDoc_ColorTool.hxx>
+ #include <XCAFDoc_ShapeTool.hxx>
+ #include <TopoDS_Shape.hxx>
+-#include <TDF_LabelMapHasher.hxx>
+ #include <climits>
+ #include <string>
+ #include <set>
+@@ -57,13 +56,21 @@ namespace Import {
+ 
+ struct ShapeHasher {
+     std::size_t operator()(const TopoDS_Shape &s) const {
++#if OCC_VERSION_HEX >= 0x070800
++        return std::hash<TopoDS_Shape>{}(s);
++#else
+         return s.HashCode(INT_MAX);
++#endif
+     }
+ };
+ 
+ struct LabelHasher {
+     std::size_t operator()(const TDF_Label &l) const {
++#if OCC_VERSION_HEX >= 0x070800
++        return std::hash<TDF_Label> {}(l);
++#else
+         return TDF_LabelMapHasher::HashCode(l,INT_MAX);
++#endif
+     }
+ };
+ 
+diff --color -rupN a/src/Mod/MeshPart/App/CurveProjector.h b/src/Mod/MeshPart/App/CurveProjector.h
+--- a/src/Mod/MeshPart/App/CurveProjector.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/MeshPart/App/CurveProjector.h	2024-02-27 15:00:48.252207183 +0100
+@@ -20,6 +20,7 @@
+  *                                                                         *
+  ***************************************************************************/
+ 
++#include <Standard_Version.hxx>
+ 
+ #ifndef _CurveProjector_h_
+ #define _CurveProjector_h_
+@@ -64,8 +65,13 @@ public:
+ 
+   template<class T>
+     struct TopoDSLess {
+-    bool operator()(const T& x, const T& y) const { 
+-      return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
++    bool operator()(const T& x, const T& y) const {
++#if OCC_VERSION_HEX >= 0x070800
++    std::hash<T> hasher;
++    return hasher(x) < hasher(y);
++#else
++    return x.HashCode(INT_MAX-1) < y.HashCode(INT_MAX-1);
++#endif
+     }
+   };
+ 
+diff --color -rupN a/src/Mod/MeshPart/App/PreCompiled.h b/src/Mod/MeshPart/App/PreCompiled.h
+--- a/src/Mod/MeshPart/App/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/MeshPart/App/PreCompiled.h	2024-02-27 15:00:48.252207183 +0100
+@@ -76,7 +76,6 @@
+ #include <Standard_LicenseError.hxx>
+ #include <Standard_LicenseNotFound.hxx>
+ #include <Standard_Macro.hxx>
+-#include <Standard_math.hxx>
+ #include <Standard_MultiplyDefined.hxx>
+ #include <Standard_NegativeValue.hxx>
+ #include <Standard_NoMoreObject.hxx>
+diff --color -rupN a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp
+--- a/src/Mod/MeshPart/Gui/CrossSections.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/MeshPart/Gui/CrossSections.cpp	2024-02-27 15:00:48.252207183 +0100
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <sstream>
+-# include <Standard_math.hxx>
+ # include <BRep_Builder.hxx>
+ # include <BRepBuilderAPI_MakePolygon.hxx>
+ # include <TopoDS.hxx>
+diff --color -rupN a/src/Mod/Part/App/ImportStep.cpp b/src/Mod/Part/App/ImportStep.cpp
+--- a/src/Mod/Part/App/ImportStep.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/App/ImportStep.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -167,7 +167,12 @@ int Part::ImportStepParts(App::Document
+                 // This is a trick to access the GUI via Python and set the color property
+                 // of the associated view provider. If no GUI is up an exception is thrown
+                 // and cleared immediately
++#if OCC_VERSION_HEX >= 0x070800
++                std::hash<TopoDS_Solid> hasher;
++                std::map<int, Quantity_Color>::iterator it = hash_col.find(hasher(aSolid));
++#else
+                 std::map<int, Quantity_Color>::iterator it = hash_col.find(aSolid.HashCode(INT_MAX));
++#endif
+                 if (it != hash_col.end()) {
+                     try {
+                         Py::Object obj(pcFeature->getPyObject(), true);
+diff --color -rupN a/src/Mod/Part/App/OCCError.h b/src/Mod/Part/App/OCCError.h
+--- a/src/Mod/Part/App/OCCError.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/App/OCCError.h	2024-02-27 15:00:48.255540482 +0100
+@@ -50,7 +50,6 @@
+ # include <Standard_Overflow.hxx>
+ # include <Standard_ProgramError.hxx>
+ # include <Standard_RangeError.hxx>
+-# include <Standard_TooManyUsers.hxx>
+ # include <Standard_TypeMismatch.hxx>
+ # include <Standard_Underflow.hxx>
+ 
+diff --color -rupN a/src/Mod/Part/App/OpenCascadeAll.h b/src/Mod/Part/App/OpenCascadeAll.h
+--- a/src/Mod/Part/App/OpenCascadeAll.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/App/OpenCascadeAll.h	2024-02-27 15:00:48.255540482 +0100
+@@ -49,7 +49,6 @@
+ #include <Standard_LicenseError.hxx>
+ #include <Standard_LicenseNotFound.hxx>
+ #include <Standard_Macro.hxx>
+-#include <Standard_math.hxx>
+ #include <Standard_MultiplyDefined.hxx>
+ #include <Standard_NegativeValue.hxx>
+ #include <Standard_NoMoreObject.hxx>
+diff --color -rupN a/src/Mod/Part/App/TopoShapePyImp.cpp b/src/Mod/Part/App/TopoShapePyImp.cpp
+--- a/src/Mod/Part/App/TopoShapePyImp.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/App/TopoShapePyImp.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -1321,7 +1321,11 @@ PyObject*  TopoShapePy::ancestorsOfType(
+         TopTools_ListIteratorOfListOfShape it(ancestors);
+         for (; it.More(); it.Next()) {
+             // make sure to avoid duplicates
++#if OCC_VERSION_HEX >= 0x070800
++            const size_t code = std::hash<TopoDS_Shape>{}(static_cast<TopoDS_Shape>(it.Value()));
++#else
+             Standard_Integer code = it.Value().HashCode(INT_MAX);
++#endif
+             if (hashes.find(code) == hashes.end()) {
+                 list.append(shape2pyshape(it.Value()));
+                 hashes.insert(code);
+@@ -1943,7 +1947,11 @@ PyObject* TopoShapePy::hashCode(PyObject
+     if (!PyArg_ParseTuple(args, "|i",&upper))
+         return nullptr;
+ 
++#if OCC_VERSION_HEX >= 0x070800
++    int hc = std::hash<TopoDS_Shape>{}(getTopoShapePtr()->getShape());
++#else
+     int hc = getTopoShapePtr()->getShape().HashCode(upper);
++#endif
+     return Py_BuildValue("i", hc);
+ }
+ 
+diff --color -rupN a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp
+--- a/src/Mod/Part/Gui/AppPartGui.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/AppPartGui.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -11,9 +11,6 @@
+ 
+ 
+ #include "PreCompiled.h"
+-#ifndef _PreComp_
+-# include <Standard_math.hxx>
+-#endif
+ 
+ #include <Base/Console.h>
+ #include <Base/Interpreter.h>
+diff --color -rupN a/src/Mod/Part/Gui/Command.cpp b/src/Mod/Part/Gui/Command.cpp
+--- a/src/Mod/Part/Gui/Command.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/Command.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -26,7 +26,6 @@
+ # include <QFileInfo>
+ # include <QPointer>
+ # include <QString>
+-# include <Standard_math.hxx>
+ # include <Standard_Version.hxx>
+ # include <TopExp_Explorer.hxx>
+ # include <TopoDS_Shape.hxx>
+diff --color -rupN a/src/Mod/Part/Gui/CommandSimple.cpp b/src/Mod/Part/Gui/CommandSimple.cpp
+--- a/src/Mod/Part/Gui/CommandSimple.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/CommandSimple.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -22,9 +22,6 @@
+ 
+ 
+ #include "PreCompiled.h"
+-#ifndef _PreComp_
+-# include <Standard_math.hxx>
+-#endif
+ 
+ #include <App/Document.h>
+ #include <App/DocumentObject.h>
+diff --color -rupN a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp
+--- a/src/Mod/Part/Gui/CrossSections.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/CrossSections.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -23,7 +23,6 @@
+ 
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ # include <BRep_Builder.hxx>
+ # include <BRepAlgoAPI_Section.hxx>
+ # include <BRepBuilderAPI_MakeWire.hxx>
+diff --color -rupN a/src/Mod/Part/Gui/ViewProvider2DObject.cpp b/src/Mod/Part/Gui/ViewProvider2DObject.cpp
+--- a/src/Mod/Part/Gui/ViewProvider2DObject.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProvider2DObject.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -26,8 +26,6 @@
+ #ifndef _PreComp_
+ # include <cfloat>
+ 
+-# include <Standard_math.hxx>
+-
+ # include <Inventor/nodes/SoAnnotation.h>
+ # include <Inventor/nodes/SoBaseColor.h>
+ # include <Inventor/nodes/SoDepthBuffer.h>
+diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.cpp b/src/Mod/Part/Gui/ViewProviderExt.cpp
+--- a/src/Mod/Part/Gui/ViewProviderExt.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProviderExt.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -978,7 +978,11 @@ void ViewProviderPartExt::updateVisual()
+ 
+             TopExp_Explorer xp;
+             for (xp.Init(faceMap(i),TopAbs_EDGE);xp.More();xp.Next())
++#if OCC_VERSION_HEX >= 0x070800
++                faceEdges.insert(std::hash<TopoDS_Shape>{}(xp.Current()));
++#else
+                 faceEdges.insert(xp.Current().HashCode(INT_MAX));
++#endif
+             numFaces++;
+         }
+ 
+@@ -1006,7 +1010,11 @@ void ViewProviderPartExt::updateVisual()
+             // So, we have to store the hashes of the edges associated to a face.
+             // If the hash of a given edge is not in this list we know it's really
+             // a free edge.
++#if OCC_VERSION_HEX >= 0x070800
++            int hash = std::hash<TopoDS_Shape>{}(aEdge);
++#else
+             int hash = aEdge.HashCode(INT_MAX);
++#endif
+             if (faceEdges.find(hash) == faceEdges.end()) {
+                 Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
+                 if (!aPoly.IsNull()) {
+@@ -1205,7 +1213,11 @@ void ViewProviderPartExt::updateVisual()
+             TopLoc_Location aLoc;
+ 
+             // handling of the free edge that are not associated to a face
++#if OCC_VERSION_HEX >= 0x070800
++            int hash = std::hash<TopoDS_Shape>{}(aEdge);
++#else
+             int hash = aEdge.HashCode(INT_MAX);
++#endif
+             if (faceEdges.find(hash) == faceEdges.end()) {
+                 Handle(Poly_Polygon3D) aPoly = Part::Tools::polygonOfEdge(aEdge, aLoc);
+                 if (!aPoly.IsNull()) {
+diff --color -rupN a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h
+--- a/src/Mod/Part/Gui/ViewProviderExt.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProviderExt.h	2024-02-27 15:00:48.255540482 +0100
+@@ -24,7 +24,6 @@
+ #ifndef PARTGUI_VIEWPROVIDERPARTEXT_H
+ #define PARTGUI_VIEWPROVIDERPARTEXT_H
+ 
+-#include <Standard_math.hxx>
+ #include <Standard_Boolean.hxx>
+ #include <TopoDS_Shape.hxx>
+ #include <TopoDS_Face.hxx>
+diff --color -rupN a/src/Mod/Part/Gui/ViewProviderMirror.cpp b/src/Mod/Part/Gui/ViewProviderMirror.cpp
+--- a/src/Mod/Part/Gui/ViewProviderMirror.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProviderMirror.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -27,7 +27,6 @@
+ # include <QAction>
+ # include <QMenu>
+ # include <QTimer>
+-# include <Standard_math.hxx>
+ # include <TopExp.hxx>
+ # include <TopTools_IndexedMapOfShape.hxx>
+ # include <TopTools_ListOfShape.hxx>
+diff --color -rupN a/src/Mod/Part/Gui/ViewProviderPython.cpp b/src/Mod/Part/Gui/ViewProviderPython.cpp
+--- a/src/Mod/Part/Gui/ViewProviderPython.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProviderPython.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -23,7 +23,6 @@
+ 
+ #include "PreCompiled.h"
+ 
+-#include <Standard_math.hxx>
+ #ifndef _PreComp_
+ # include <Inventor/nodes/SoSeparator.h>
+ #endif
+diff --color -rupN a/src/Mod/Part/Gui/ViewProviderReference.h b/src/Mod/Part/Gui/ViewProviderReference.h
+--- a/src/Mod/Part/Gui/ViewProviderReference.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Part/Gui/ViewProviderReference.h	2024-02-27 15:00:48.255540482 +0100
+@@ -24,7 +24,6 @@
+ #ifndef PARTGUI_ViewProviderPartReference_H
+ #define PARTGUI_ViewProviderPartReference_H
+ 
+-#include <Standard_math.hxx>
+ #include <Standard_Boolean.hxx>
+ #include <TopoDS_Shape.hxx>
+ #include <Gui/ViewProviderGeometryObject.h>
+diff --color -rupN a/src/Mod/PartDesign/Gui/PreCompiled.h b/src/Mod/PartDesign/Gui/PreCompiled.h
+--- a/src/Mod/PartDesign/Gui/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/PartDesign/Gui/PreCompiled.h	2024-02-27 15:00:48.255540482 +0100
+@@ -44,7 +44,6 @@
+ #include <boost/bind/bind.hpp>
+ 
+ // OCC
+-#include <Standard_math.hxx>
+ #include <Standard_Version.hxx>
+ #include <Bnd_Box.hxx>
+ #include <BRepBndLib.hxx>
+diff --color -rupN a/src/Mod/Path/App/Voronoi.cpp b/src/Mod/Path/App/Voronoi.cpp
+--- a/src/Mod/Path/App/Voronoi.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Path/App/Voronoi.cpp	2024-02-27 15:00:48.255540482 +0100
+@@ -23,10 +23,6 @@
+ 
+ #include "PreCompiled.h"
+ 
+-#ifndef _PreComp_
+-# include <Standard_math.hxx>
+-#endif
+-
+ #include <Base/Vector3D.h>
+ 
+ #include "Voronoi.h"
+diff --color -rupN a/src/Mod/Path/Gui/PreCompiled.h b/src/Mod/Path/Gui/PreCompiled.h
+--- a/src/Mod/Path/Gui/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Path/Gui/PreCompiled.h	2024-02-27 15:00:48.258873781 +0100
+@@ -38,8 +38,6 @@
+ # define PathGuiExport
+ #endif
+ 
+-#include <Standard_math.hxx>
+-
+ #ifdef _MSC_VER
+ # pragma warning( disable : 4273 )
+ #endif
+diff --color -rupN a/src/Mod/Robot/Gui/PreCompiled.h b/src/Mod/Robot/Gui/PreCompiled.h
+--- a/src/Mod/Robot/Gui/PreCompiled.h	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Robot/Gui/PreCompiled.h	2024-02-27 15:00:48.258873781 +0100
+@@ -39,8 +39,6 @@
+ # define RobotGuiExport
+ #endif
+ 
+-#include <Standard_math.hxx>
+-
+ #ifdef _MSC_VER
+ #   pragma warning(disable : 4005)
+ #   pragma warning(disable : 4273)
+diff --color -rupN a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp
+--- a/src/Mod/Sandbox/Gui/AppSandboxGui.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sandbox/Gui/AppSandboxGui.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+ #ifndef _PreComp_
+ # include <Python.h>
+-# include <Standard_math.hxx>
+ # include <Inventor/nodes/SoLineSet.h>
+ # include <Inventor/nodes/SoBaseColor.h>
+ # include <Inventor/nodes/SoSeparator.h>
+diff --color -rupN a/src/Mod/Sketcher/App/SketchAnalysis.cpp b/src/Mod/Sketcher/App/SketchAnalysis.cpp
+--- a/src/Mod/Sketcher/App/SketchAnalysis.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/App/SketchAnalysis.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -25,7 +25,6 @@
+ #include "PreCompiled.h"
+ 
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ # include <BRep_Tool.hxx>
+ # include <gp_Pnt.hxx>
+ # include <Precision.hxx>
+diff --color -rupN a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp
+--- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+ 
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ # include <Inventor/nodes/SoTranslation.h>
+ # include <Inventor/nodes/SoText2.h>
+ # include <Inventor/nodes/SoFont.h>
+diff --color -rupN a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp
+--- a/src/Mod/Sketcher/Gui/EditDatumDialog.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/Gui/EditDatumDialog.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -23,7 +23,6 @@
+ #include "PreCompiled.h"
+ 
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ /// Qt Include Files
+ # include <QApplication>
+ # include <QDialog>
+diff --color -rupN a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp
+--- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+ 
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ # include <QDoubleValidator>
+ # include <QLocale>
+ # include <QMessageBox>
+diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp
+--- a/src/Mod/Sketcher/Gui/ViewProviderPython.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/Gui/ViewProviderPython.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -23,7 +23,6 @@
+ 
+ #include "PreCompiled.h"
+ 
+-#include <Standard_math.hxx>
+ #ifndef _PreComp_
+ # include <Inventor/nodes/SoSeparator.h>
+ #endif
+diff --color -rupN a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
+--- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -24,7 +24,6 @@
+ #include "PreCompiled.h"
+ 
+ #ifndef _PreComp_
+-# include <Standard_math.hxx>
+ 
+ # include <Inventor/actions/SoGetBoundingBoxAction.h>
+ # include <Inventor/SbBox3f.h>
+diff --color -rupN a/src/Mod/Surface/Gui/Command.cpp b/src/Mod/Surface/Gui/Command.cpp
+--- a/src/Mod/Surface/Gui/Command.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/Surface/Gui/Command.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -31,7 +31,6 @@
+ #include <QLineEdit>
+ #include <QMessageBox>
+ #include <QPointer>
+-#include <Standard_math.hxx>
+ #include <TopoDS_Shape.hxx>
+ #include <TopoDS_Edge.hxx>
+ #include <Geom_BezierCurve.hxx>
+diff --color -rupN a/src/Mod/TechDraw/Gui/TaskProjection.cpp b/src/Mod/TechDraw/Gui/TaskProjection.cpp
+--- a/src/Mod/TechDraw/Gui/TaskProjection.cpp	2022-12-07 03:35:37.000000000 +0100
++++ b/src/Mod/TechDraw/Gui/TaskProjection.cpp	2024-02-27 15:00:48.258873781 +0100
+@@ -29,9 +29,6 @@
+ # include <QMessageBox>
+ #endif
+ 
+-
+-#include <Standard_math.hxx>
+-
+ #include <Gui/Application.h>
+ #include <Gui/BitmapFactory.h>
+ #include <Gui/Command.h>

backports/freecad/resourceDirectory.patch

@@ -0,0 +1,11 @@
+--- ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake.orig
++++ ./cMake/FreeCAD_Helpers/ConfigureCMakeVariables.cmake
+@@ -23,7 +23,7 @@
+         "Path to the directory containing PyCXX's cxxextensions.c source file")
+ 
+     # used as compiler defines
+-    set(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}")
++    set(RESOURCEDIR "../../share/freecad")
+     set(LIBRARYDIR "${CMAKE_INSTALL_LIBDIR}")
+     set(DOCDIR "${CMAKE_INSTALL_DOCDIR}")
+ 

backports/freecad/tests.patch

@@ -0,0 +1,33 @@
+--- ./src/Mod/Mesh/App/MeshTestsApp.py.orig
++++ ./src/Mod/Mesh/App/MeshTestsApp.py
+@@ -423,30 +423,6 @@
+         self.planarMesh = []
+         FreeCAD.newDocument("MeshTest")
+ 
+-    def testRayPick(self):
+-        if not FreeCAD.GuiUp:
+-            return
+-        self.planarMesh.append( [-16.097176,-29.891157,15.987688] ) 
+-        self.planarMesh.append( [-16.176304,-29.859991,15.947966] )
+-        self.planarMesh.append( [-16.071451,-29.900553,15.912505] )
+-        self.planarMesh.append( [-16.092241,-29.893408,16.020439] )
+-        self.planarMesh.append( [-16.007210,-29.926180,15.967641] )
+-        self.planarMesh.append( [-16.064457,-29.904951,16.090832] )
+-        planarMeshObject = Mesh.Mesh(self.planarMesh)
+-
+-        from pivy import coin; import FreeCADGui
+-        Mesh.show(planarMeshObject)
+-        view=FreeCADGui.ActiveDocument.ActiveView.getViewer()
+-        rp=coin.SoRayPickAction(view.getSoRenderManager().getViewportRegion())
+-        rp.setRay(coin.SbVec3f(-16.05,16.0,16.0),coin.SbVec3f(0,-1,0))
+-        rp.apply(view.getSoRenderManager().getSceneGraph())
+-        pp=rp.getPickedPoint()
+-        self.assertTrue(pp != None)
+-        det=pp.getDetail()
+-        self.assertTrue(det.getTypeId() == coin.SoFaceDetail.getClassTypeId())
+-        det=coin.cast(det, det.getTypeId().getName().getString())
+-        self.assertTrue(det.getFaceIndex() == 1)
+-
+     def testPrimitiveCount(self):
+         if not FreeCAD.GuiUp:
+             return