community/ansible-core/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=ansible-core
 _pkgname=${pkgname/-/_}
 pkgver=2.18.3
-pkgrel=0
+pkgrel=1
 pkgdesc="core components of ansible: A configuration-management, deployment, task-execution, and multinode orchestration framework"
 url="https://ansible.com"
 options="!check" # for now
@@ -23,7 +23,9 @@ makedepends="py3-docutils py3-gpep517 py3-setuptools py3-wheel"
 checkdepends="py3-pytest"
 subpackages="$pkgname-doc $pkgname-pyc"
 # tarball is named "ansible_core" instead of "ansible-core" since 2.16.6
-source="$pkgname-$pkgver.tar.gz::https://pypi.python.org/packages/source/a/ansible-core/ansible_core-$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://pypi.python.org/packages/source/a/ansible-core/ansible_core-$pkgver.tar.gz
+	resolvelib.patch
+	"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 replaces="ansible-base"
@@ -47,4 +49,5 @@ package() {
 }
 sha512sums="
 e4229cd5de46e7ee35922b91e520711b2fd7f17490ea1f08b6e535b0522e54d8b5178212df1010c3a3a4e212fabbb9d6437069ee11eb0588c519d1fb145875ba  ansible-core-2.18.3.tar.gz
+d26b740a3fcfc0553424ef577cd55c22d037cd7c9c10d77a2695422b7cd29e610fc6ae2049578784685a2b35874697be42e7472cdb820141487c72fc7a1a04dc  resolvelib.patch
 "

community/ansible-core/resolvelib.patch

+Patch-Source: https://github.com/ansible/ansible/pull/84218
+From d4085a56e00a6f9059e7df6e4a16eef4f5737501 Mon Sep 17 00:00:00 2001
+From: s-hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Fri, 1 Nov 2024 11:49:04 -0400
+Subject: [PATCH 1/2] Bump ansible-galaxy's resolvelib requirement upperbound
+ to 1.2.0
+
+Test against the newest resolvelib release 1.1.0
+
+Only test the oldest supported resolvelib version, latest minor release,
+and releases that offer additional coverage
+---
+ changelogs/fragments/update-resolvelib-lt-1_2_0.yml   |  2 ++
+ lib/ansible/galaxy/dependency_resolution/providers.py |  2 +-
+ requirements.txt                                      |  2 +-
+ .../targets/ansible-galaxy-collection/vars/main.yml   | 11 +++++------
+ test/lib/ansible_test/_data/requirements/ansible.txt  |  2 +-
+ 5 files changed, 10 insertions(+), 9 deletions(-)
+ create mode 100644 changelogs/fragments/update-resolvelib-lt-1_2_0.yml
+
+diff --git a/changelogs/fragments/update-resolvelib-lt-1_2_0.yml b/changelogs/fragments/update-resolvelib-lt-1_2_0.yml
+new file mode 100644
+index 00000000000000..461f436339b4c5
+--- /dev/null
++++ b/changelogs/fragments/update-resolvelib-lt-1_2_0.yml
+@@ -0,0 +1,2 @@
++minor_changes:
++  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.2.0`` (https://github.com/ansible/ansible/issues/84217).
+diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
+index 7578cae785c100..f0f30c9cc4be58 100644
+--- a/lib/ansible/galaxy/dependency_resolution/providers.py
++++ b/lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -39,7 +39,7 @@ class AbstractProvider:  # type: ignore[no-redef]
+ 
+ # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
+ RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+-RESOLVELIB_UPPERBOUND = SemanticVersion("1.1.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("1.2.0")
+ RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+ 
+ 
+diff --git a/requirements.txt b/requirements.txt
+index 5eaf9f2cbc2911..e0126172e5e39e 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -12,4 +12,4 @@ packaging
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.2.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/integration/targets/ansible-galaxy-collection/vars/main.yml b/test/integration/targets/ansible-galaxy-collection/vars/main.yml
+index 066d2678bca56e..abbc40cbc1eff4 100644
+--- a/test/integration/targets/ansible-galaxy-collection/vars/main.yml
++++ b/test/integration/targets/ansible-galaxy-collection/vars/main.yml
+@@ -4,13 +4,12 @@ gpg_homedir: "{{ galaxy_dir }}/gpg"
+ 
+ offline_server: https://test-hub.demolab.local/api/galaxy/content/api/
+ 
++# Test oldest and most recently supported, and versions with notable changes
+ supported_resolvelib_versions:
+-  - "0.5.3"  # Oldest supported
+-  - "0.6.0"
+-  - "0.7.0"
+-  - "0.8.0"
+-  - "0.9.0"
+-  - "1.0.1"
++  - "0.5.3"  # test CollectionDependencyProvider050
++  - "0.6.0"  # test CollectionDependencyProvider060
++  - "0.7.0"  # test CollectionDependencyProvider070
++  - "1.1.0"  # test CollectionDependencyProvider080
+ 
+ unsupported_resolvelib_versions:
+   - "0.2.0"  # Fails on import
+diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
+index 5eaf9f2cbc2911..e0126172e5e39e 100644
+--- a/test/lib/ansible_test/_data/requirements/ansible.txt
++++ b/test/lib/ansible_test/_data/requirements/ansible.txt
+@@ -12,4 +12,4 @@ packaging
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 1.1.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 1.2.0  # dependency resolver used by ansible-galaxy
+
+From 659042e85509da0192b8afd8429d6ad5c31af20c Mon Sep 17 00:00:00 2001
+From: s-hertel <19572925+s-hertel@users.noreply.github.com>
+Date: Tue, 5 Nov 2024 17:09:36 -0500
+Subject: [PATCH 2/2] Update the upperbound to 2.0.0 since minor SemVer
+ releases should not contain breaking changes
+
+Add a better code comment about the resolvelib versions tested against
+---
+ ...olvelib-lt-1_2_0.yml => update-resolvelib-lt-2_0_0.yml} | 2 +-
+ lib/ansible/galaxy/dependency_resolution/providers.py      | 2 +-
+ requirements.txt                                           | 2 +-
+ .../targets/ansible-galaxy-collection/vars/main.yml        | 7 +++++--
+ test/lib/ansible_test/_data/requirements/ansible.txt       | 2 +-
+ 5 files changed, 9 insertions(+), 6 deletions(-)
+ rename changelogs/fragments/{update-resolvelib-lt-1_2_0.yml => update-resolvelib-lt-2_0_0.yml} (50%)
+
+diff --git a/changelogs/fragments/update-resolvelib-lt-1_2_0.yml b/changelogs/fragments/update-resolvelib-lt-2_0_0.yml
+similarity index 50%
+rename from changelogs/fragments/update-resolvelib-lt-1_2_0.yml
+rename to changelogs/fragments/update-resolvelib-lt-2_0_0.yml
+index 461f436339b4c5..10c4f1a0838b91 100644
+--- a/changelogs/fragments/update-resolvelib-lt-1_2_0.yml
++++ b/changelogs/fragments/update-resolvelib-lt-2_0_0.yml
+@@ -1,2 +1,2 @@
+ minor_changes:
+-  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 1.2.0`` (https://github.com/ansible/ansible/issues/84217).
++  - ansible-galaxy - support ``resolvelib >= 0.5.3, < 2.0.0`` (https://github.com/ansible/ansible/issues/84217).
+diff --git a/lib/ansible/galaxy/dependency_resolution/providers.py b/lib/ansible/galaxy/dependency_resolution/providers.py
+index f0f30c9cc4be58..d336c3441e2e1d 100644
+--- a/lib/ansible/galaxy/dependency_resolution/providers.py
++++ b/lib/ansible/galaxy/dependency_resolution/providers.py
+@@ -39,7 +39,7 @@ class AbstractProvider:  # type: ignore[no-redef]
+ 
+ # TODO: add python requirements to ansible-test's ansible-core distribution info and remove the hardcoded lowerbound/upperbound fallback
+ RESOLVELIB_LOWERBOUND = SemanticVersion("0.5.3")
+-RESOLVELIB_UPPERBOUND = SemanticVersion("1.2.0")
++RESOLVELIB_UPPERBOUND = SemanticVersion("2.0.0")
+ RESOLVELIB_VERSION = SemanticVersion.from_loose_version(LooseVersion(resolvelib_version))
+ 
+ 
+diff --git a/requirements.txt b/requirements.txt
+index e0126172e5e39e..45c9c01b803647 100644
+--- a/requirements.txt
++++ b/requirements.txt
+@@ -12,4 +12,4 @@ packaging
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 1.2.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 2.0.0  # dependency resolver used by ansible-galaxy
+diff --git a/test/integration/targets/ansible-galaxy-collection/vars/main.yml b/test/integration/targets/ansible-galaxy-collection/vars/main.yml
+index abbc40cbc1eff4..c865871c4fe692 100644
+--- a/test/integration/targets/ansible-galaxy-collection/vars/main.yml
++++ b/test/integration/targets/ansible-galaxy-collection/vars/main.yml
+@@ -4,12 +4,15 @@ gpg_homedir: "{{ galaxy_dir }}/gpg"
+ 
+ offline_server: https://test-hub.demolab.local/api/galaxy/content/api/
+ 
+-# Test oldest and most recently supported, and versions with notable changes
++# Test oldest and most recently supported, and versions with notable changes.
++# The last breaking change for a feature ansible-galaxy uses was in 0.8.0.
++# It would be redundant to test every minor version since 0.8.0, so we just test against the latest minor release.
++# NOTE: If ansible-galaxy incorporates new resolvelib features, this matrix should be updated to verify the features work on all supported versions.
+ supported_resolvelib_versions:
+   - "0.5.3"  # test CollectionDependencyProvider050
+   - "0.6.0"  # test CollectionDependencyProvider060
+   - "0.7.0"  # test CollectionDependencyProvider070
+-  - "1.1.0"  # test CollectionDependencyProvider080
++  - "<2.0.0"  # test CollectionDependencyProvider080
+ 
+ unsupported_resolvelib_versions:
+   - "0.2.0"  # Fails on import
+diff --git a/test/lib/ansible_test/_data/requirements/ansible.txt b/test/lib/ansible_test/_data/requirements/ansible.txt
+index e0126172e5e39e..45c9c01b803647 100644
+--- a/test/lib/ansible_test/_data/requirements/ansible.txt
++++ b/test/lib/ansible_test/_data/requirements/ansible.txt
+@@ -12,4 +12,4 @@ packaging
+ # NOTE: Ref: https://github.com/sarugaku/resolvelib/issues/69
+ # NOTE: When updating the upper bound, also update the latest version used
+ # NOTE: in the ansible-galaxy-collection test suite.
+-resolvelib >= 0.5.3, < 1.2.0  # dependency resolver used by ansible-galaxy
++resolvelib >= 0.5.3, < 2.0.0  # dependency resolver used by ansible-galaxy

community/ansible-lint/APKBUILD

@@ -54,9 +54,6 @@ provides="py3-ansible-lint=$pkgver-r$pkgrel" # for backward compatibility
 replaces="py3-ansible-lint"                  # for backward compatibility
 options="net" # tests
 
-# py3-pytest-mypy not available on riscv64
-[ "$CARCH" = "riscv64" ] && options="$options !check"
-
 prepare() {
 	default_prepare
 
@@ -81,14 +78,16 @@ check() {
 		--deselect "test/test_with_skip_tagid.py::test_run_skip_rule"\
 		--deselect "test/rules/test_syntax_check.py::test_syntax_check_role" \
 		--deselect "test/test_file_utils.py::test_normpath_path" \
+		--deselect "test/test_file_utils.py::test_discover_lintables_silent" \
 		--deselect "test/test_include_miss_file_with_role.py::test_cases_warning_message" \
 		--deselect "test/test_include_miss_file_with_role.py::test_cases_that_do_not_report" \
 		--deselect "test/test_rules_collection.py::test_rules_id_format" \
 		--deselect "test/test_runner.py::test_include_wrong_syntax" \
 		--deselect "test/test_skip_inside_yaml.py::test_role_tasks_with_block" \
 		--deselect "test/test_task_includes.py::test_included_tasks" \
-		--deselect "test/test_transformer.py::test_transformer"
-	}
+		--deselect "test/test_transformer.py::test_transformer" \
+		--deselect "test/test_schemas.py::test_spdx"
+}
 
 package() {
 	python3 -m installer -d "$pkgdir" \

community/binaryen/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=binaryen
 pkgver=121
-pkgrel=1
+pkgrel=2
 pkgdesc="Compiler infrastructure and toolchain library for WebAssembly, in C++"
 url="https://github.com/WebAssembly/binaryen"
 arch="all !s390x"

community/blender/APKBUILD

@@ -4,7 +4,7 @@
 pkgname=blender
 pkgver=4.3.2
 _pkgver=${pkgver%.[0-9]}
-pkgrel=0
+pkgrel=1
 pkgdesc="3D Creation/Animation/Publishing System"
 url="https://www.blender.org/"
 arch="x86_64 aarch64" # limited by openvdb
@@ -68,6 +68,7 @@ subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname
 source="https://download.blender.org/source/blender-$pkgver.tar.xz
 	0001-musl-fixes.patch
 	0002-fix-includes.patch
+	4f4c3f73b697436922464e087823f53e8681d7e8.patch
 	"
 
 # secfixes:
@@ -153,4 +154,5 @@ sha512sums="
 44697faf9acc2c1e75783d432a1a0040339c3445834961a995e95974d4088e75ee5cb647a3908125259d1910d180910e5bc50d34d40d35f33e03197893581477  blender-4.3.2.tar.xz
 fd06c0af6855e15edc7ce9a4bdcd07f245d5d8bc84f67b49c2935bbfb6c811e62926ec8932bc9b903d5d314e5be5c079510e73b4ef9968fd88abca585ffecb57  0001-musl-fixes.patch
 8fffd66af4a4ebc23767950c2831c889d2260fc499d094d57da5f6638cb85b67d520eb2d68d88146326ffbac74495fc09f803c03a6ab04555e91b379fd3328f2  0002-fix-includes.patch
+e65e7b90661391b587c23e6a982957fb0eaa128fc711fcd7ecf6938af53efbd1ded45db953e0b5fe9e91af3bc4b33013fd2b6d4fafa19f7bbf4cd6cf2e6b8e50  4f4c3f73b697436922464e087823f53e8681d7e8.patch
 "

community/calligra/APKBUILD

@@ -5,7 +5,7 @@
 # group=kde-other
 pkgname=calligra
 pkgver=4.0.1
-pkgrel=14
+pkgrel=15
 pkgdesc="Office and graphic art suite by KDE"
 # armhf blocked by extra-cmake-modules
 # armv7 and x86 are broken

community/cargo-tarpaulin/APKBUILD

 # Maintainer: kpcyrd <git@rxv.cc>
 pkgname=cargo-tarpaulin
-pkgver=0.31.3
+pkgver=0.32.0
 pkgrel=0
 pkgdesc="Code coverage tool for Rust projects"
 url="https://github.com/xd009642/tarpaulin"
@@ -41,5 +41,5 @@ package() {
 }
 
 sha512sums="
-979c99be947549b3802f2b459b96b4f266d0588f104353e7a294a75e3be762fe482f5852798a5608f595219eeeacf915b586b1489757618c9b122c14134e1ddd  cargo-tarpaulin-0.31.3.tar.gz
+0bcea10a0e1b8930cda03329e513c473db1cfa035e449e339038bf916546df95d7a1497bbf2c5fd49c329bd97358a5cf72580087a5f31fbe7ebbafc1db10e783  cargo-tarpaulin-0.32.0.tar.gz
 "

community/flux/APKBUILD

 maintainer="Hoang Nguyen <folliekazetani@protonmail.com>"
 pkgname=flux
-pkgver=2.4.0
-pkgrel=2
+pkgver=2.5.1
+pkgrel=0
 pkgdesc="Open and extensible continuous delivery solution for Kubernetes"
 url="https://fluxcd.io/"
 # blocked by kubernetes
@@ -66,5 +66,5 @@ package() {
 }
 
 sha512sums="
-bc5020300d3607d50ef6ef9223be98684df1b296c64a25b0cfc35577b73eda79f52514af4b77904337125d85c1a89178e766a8a978d46929fb36a63be0203ee0  flux-2.4.0.tar.gz
+7217338ccafe3673b739ddf978279ef9ab3e355b63d68f77c2158899288f2ef65d0b3791eba9256e3365b87bba340629b8838d278e966aa921043583ca920ca2  flux-2.5.1.tar.gz
 "

community/gdal/APKBUILD

@@ -3,7 +3,7 @@
 maintainer="Holger Jaekel <holger.jaekel@gmx.de>"
 pkgname=gdal
 pkgver=3.10.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A translator library for raster and vector geospatial data formats"
 url="https://gdal.org/"
 arch="all"

community/girara/APKBUILD

@@ -5,9 +5,9 @@
 maintainer="Celeste <cielesti@protonmail.com>"
 pkgname=girara
 pkgver=0.4.5
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK user interface that focuses on simplicity and minimalism"
-url="https://git.pwmt.org/pwmt/girara"
+url="https://pwmt.org/projects/girara/"
 arch="all"
 license="Zlib"
 makedepends="

community/gnome-terminal/APKBUILD

 # Contributor: Rasmus Thomsen <oss@cogitri.dev>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnome-terminal
-pkgver=3.54.3
+pkgver=3.54.4
 pkgrel=0
 pkgdesc="GNOME terminal emulator application"
 url="https://wiki.gnome.org/Apps/Terminal"
@@ -48,6 +48,6 @@ package() {
 }
 
 sha512sums="
-5d60a8a842b9d433c508fe2fcfa69df131640b42184b88c2002f47c9f7041f99fc95796ba4edf0d8e15fdbbc7b6a9eda681b5453799e0cf33c0bf4dfe659481d  gnome-terminal-3.54.3.tar.gz
+ada98b9350e8cf29163bc0e3ff14b4a1d200f1443cc492c07c39f4051eba32bdd9defece4262ce480f1df30426dc941276b9397ef40bcb6d415b08b4b8ccca6b  gnome-terminal-3.54.4.tar.gz
 3bbc0e9dbbbfd4a3263b5d195a78df9cc70d13ae02d3a2981886001e79d92c2bfe4962954efba8fbab69f23e1778d5fbe3436f494b70e196ecedb02bf9d95400  fix-W_EXITCODE.patch
 "

testing/haproxy-dataplaneapi/APKBUILD → community/haproxy-dataplaneapi/APKBUILD

@@ -2,8 +2,8 @@
 # Maintainer: Guy Godfroy <guy.godfroy@gugod.fr>
 pkgname=haproxy-dataplaneapi
 _pkgname=dataplaneapi
-pkgver=3.0.1
-pkgrel=2
+pkgver=3.1.0
+pkgrel=0
 pkgdesc="HAProxy data plane API"
 url="https://github.com/haproxytech/dataplaneapi"
 # loongarch64: incompatible github.com/shirou/gopsutil
@@ -49,7 +49,7 @@ package() {
 }
 
 sha512sums="
-5a6d142d88c352108dcdf106006f98b42ed90a17c114fda3e4f8831f77b4496acf7c5e47ffe7680ae101ff5811020cde9c596bf48283abd457bdcd6591ca0e47  dataplaneapi-3.0.1.tar.gz
+15a2d539bb26271820aff32828d68711561aafc1ddf2897621ac536d002ef033afe2c81ff75154b7440198f990170959ca8acb63f426d296ae7f782d3f74baf6  dataplaneapi-3.1.0.tar.gz
 29f0f6f489f0b163eae7945bd53c663f95c608aeadc2437545933020b33357f019f0bb50840ea88ff80e645b2082210fef9590ff2013d5b49c60e2c3d85e81ad  haproxy-dataplaneapi.initd
 76c173820d513de762e6834ad3dcaf53695d2a8f6bb2340c0a50be769fdb9abd1a63a254d5ea4a51bcf8d7a8edd1d9b531aa73974cffbed5d95be05e111b2211  haproxy-dataplaneapi.confd
 95b843518ecc90c0bf052982c12a4de5f2b3d2d98fc831a85ad22508ba25b01739e1d3cd8318c22369771dad765f2e45059cb5094b8456be6bbc084bff3136be  dataplaneapi.yml

community/inkscape/APKBUILD

@@ -3,7 +3,7 @@ pkgname=inkscape
 pkgver=1.4
 _pkgdate=2024-10-09
 _pkgcommit=e7c3feb100
-pkgrel=3
+pkgrel=4
 pkgdesc="Vector-based drawing program - svg compliant"
 url="https://inkscape.org/"
 arch="all"
@@ -63,6 +63,7 @@ source="
 	0002-poppler-gfxcolorspace.patch
 	0003-poppler-includes.patch
 	0004-poppler-getimageparams.patch
+	poppler-25.02.0.patch
 	"
 options="!check" # take extremely long and use absurd amounts of memory
 ldpath="/usr/lib/inkscape"
@@ -150,4 +151,5 @@ e5a21326bc1191a5c037698a89d3022613a840736f0199954a4685027786126cc65f889241cd813d
 c3380bd87b34d0b019ea5a3be1881bb86c49e6054ff70913fd5cd37043e21c7522de6c25646a7231b3d298aaaeddbe07b5208f89c5193b779b3bd4a5c69f6ca3  0002-poppler-gfxcolorspace.patch
 da8a9a5dc8c4b3d589f4935ac5fe15b71f2afaa7fe459d22bc8d51daa8336268ced34dab6aceea20f79ddc0d701c127f40305e4329995a6516a8d843bcfece5f  0003-poppler-includes.patch
 99946d8266f818b26993860a96aba32d23d548970b94fe9fc66aefe3bec088c04fae9bdf2f146600f9588e7b4158ac2660e09697e57d7f5d50669d2d56eb4023  0004-poppler-getimageparams.patch
+41d5a42e86a828063916efae3af44dbe2ded87e41bf5653c3002976c1b00191844026e5d5c181b4095b613a38d9687379600f839d051f2c37fff99a6782dfc6d  poppler-25.02.0.patch
 "

community/inkscape/poppler-25.02.0.patch

+Patch-Source: https://gitlab.com/inkscape/inkscape/-/commit/9754274ea0ee76d9888ec0b306885ecba6926702
+---
+From 9754274ea0ee76d9888ec0b306885ecba6926702 Mon Sep 17 00:00:00 2001
+From: KrIr17 <elendil.krir17@gmail.com>
+Date: Sun, 9 Feb 2025 22:52:53 +0530
+Subject: [PATCH] Fix building with poppler 25.02.0
+
+1. `getCodeToGIDMap`, `getCIDToGID`, `getCIDToGIDMap` are now `std::vector`
+
+2. `pdfDocEncodingToUTF16` returns an `std::string`
+
+(cherry picked from commit 5c4c6d116dae5250d75d34a45f0d9220824d2e20)
+---
+ .../pdfinput/poppler-cairo-font-engine.cpp    | 50 +++++++++++++++----
+ .../pdfinput/poppler-transition-api.h         | 20 +++++---
+ 2 files changed, 55 insertions(+), 15 deletions(-)
+
+diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
+index 02c55fda589..5e1a6426250 100644
+--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp
+@@ -407,14 +407,22 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+             break;
+         case fontCIDType2:
+         case fontCIDType2OT:
++#if POPPLER_CHECK_VERSION(25,2,0)
++            if (!gfxcid->getCIDToGID().empty()) {
++                const auto src = gfxcid->getCIDToGID();
++                codeToGID = std::move(src);
++            }
++#else
+             if (gfxcid->getCIDToGID()) {
+                 n = gfxcid->getCIDToGIDLen();
+                 if (n) {
+-                    const int *src = gfxcid->getCIDToGID();
++                    const auto src = gfxcid->getCIDToGID();
+                     codeToGID.reserve(n);
+                     codeToGID.insert(codeToGID.begin(), src, src + n);
+                 }
+-            } else {
++            }
++#endif
++            else {
+ #if POPPLER_CHECK_VERSION(22, 1, 0)
+                 std::unique_ptr<FoFiTrueType> ff;
+ #else
+@@ -429,13 +437,18 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+                     goto err2;
+                 }
+ #if POPPLER_CHECK_VERSION(22, 1, 0)
+-                int *src = gfxcid->getCodeToGIDMap(ff.get(), &n);
++                auto src = gfxcid->_POPPLER_GET_CODE_TO_GID_MAP(ff.get(), &n);
+ #else
+-                int *src = gfxcid->getCodeToGIDMap(ff, &n);
++                auto src = gfxcid->_POPPLER_GET_CODE_TO_GID_MAP(ff, &n);
+ #endif
++
++#if POPPLER_CHECK_VERSION(25,2,0)
++                codeToGID = std::move(src);
++#else
+                 codeToGID.reserve(n);
+                 codeToGID.insert(codeToGID.begin(), src, src + n);
+                 gfree(src);
++#endif
+             }
+             /* Fall through */
+         case fontTrueType:
+@@ -457,13 +470,17 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+             /* This might be set already for the CIDType2 case */
+             if (fontType == fontTrueType || fontType == fontTrueTypeOT) {
+ #if POPPLER_CHECK_VERSION(22, 1, 0)
+-                int *src = gfx8bit->getCodeToGIDMap(ff.get());
++                auto src = gfx8bit->getCodeToGIDMap(ff.get());
+ #else
+-                int *src = gfx8bit->getCodeToGIDMap(ff);
++                auto src = gfx8bit->getCodeToGIDMap(ff);
+ #endif
++#if POPPLER_CHECK_VERSION(25,2,0)
++                codeToGID = std::move(src);
++#else
+                 codeToGID.reserve(256);
+                 codeToGID.insert(codeToGID.begin(), src, src + 256);
+                 gfree(src);
++#endif
+             }
+             font_face = getFreeTypeFontFace(fontEngine, lib, fileName, std::move(font_data));
+             if (!font_face) {
+@@ -481,10 +498,14 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+                     ff1c = FoFiType1C::load(fileName.c_str());
+                 }
+                 if (ff1c) {
+-                    int *src = ff1c->getCIDToGIDMap(&n);
++                    auto src = ff1c->_POPPLER_GET_CID_TO_GID_MAP(&n);
++#if POPPLER_CHECK_VERSION(25,2,0)
++                    codeToGID = std::move(src);
++#else
+                     codeToGID.reserve(n);
+                     codeToGID.insert(codeToGID.begin(), src, src + n);
+                     gfree(src);
++#endif
+                     delete ff1c;
+                 }
+             }
+@@ -497,14 +518,21 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+             break;
+ 
+         case fontCIDType0COT:
++#if POPPLER_CHECK_VERSION(25,2,0)
++            if (!gfxcid->getCIDToGID().empty()) {
++                const auto src = gfxcid->getCIDToGID();
++                codeToGID = std::move(src);
++            }
++#else
+             if (gfxcid->getCIDToGID()) {
+                 n = gfxcid->getCIDToGIDLen();
+                 if (n) {
+-                    const int *src = gfxcid->getCIDToGID();
++                    const auto src = gfxcid->getCIDToGID();
+                     codeToGID.reserve(n);
+                     codeToGID.insert(codeToGID.begin(), src, src + n);
+                 }
+             }
++#endif
+ 
+             if (codeToGID.empty()) {
+                 if (!useCIDs) {
+@@ -520,10 +548,14 @@ CairoFreeTypeFont *CairoFreeTypeFont::create(GfxFont *gfxFont, XRef *xref, FT_Li
+                     }
+                     if (ff) {
+                         if (ff->isOpenTypeCFF()) {
+-                            int *src = ff->getCIDToGIDMap(&n);
++                            auto src = ff1c->_POPPLER_GET_CID_TO_GID_MAP(&n);
++#if POPPLER_CHECK_VERSION(25,2,0)
++                            codeToGID = std::move(src);
++#else
+                             codeToGID.reserve(n);
+                             codeToGID.insert(codeToGID.begin(), src, src + n);
+                             gfree(src);
++#endif
+                         }
+                     }
+                 }
+diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h
+index b7a54828e74..a67132ba6bd 100644
+--- a/src/extension/internal/pdfinput/poppler-transition-api.h
++++ b/src/extension/internal/pdfinput/poppler-transition-api.h
+@@ -15,6 +15,20 @@
+ #include <glib/poppler-features.h>
+ #include <poppler/UTF.h>
+ 
++#if POPPLER_CHECK_VERSION(25,2,0)
++#define _POPPLER_GET_CODE_TO_GID_MAP(ff, len) getCodeToGIDMap(ff)
++#define _POPPLER_GET_CID_TO_GID_MAP(len) getCIDToGIDMap()
++#else
++#define _POPPLER_GET_CODE_TO_GID_MAP(ff, len) getCodeToGIDMap(ff, len)
++#define _POPPLER_GET_CID_TO_GID_MAP(len) getCIDToGIDMap(len)
++#endif
++
++#if POPPLER_CHECK_VERSION(24,12,0)
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode, hasAlpha)
++#else
++#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode)
++#endif
++
+ #if POPPLER_CHECK_VERSION(24, 10, 0)
+ #define _POPPLER_CONSUME_UNIQPTR_ARG(value) std::move(value)
+ #else
+@@ -39,12 +53,6 @@
+ #define _POPPLER_FUNCTION_TYPE_STITCHING 3
+ #endif
+ 
+-#if POPPLER_CHECK_VERSION(24,12,0)
+-#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode, hasAlpha)
+-#else
+-#define _POPPLER_GET_IMAGE_PARAMS(bits, csMode, hasAlpha) getImageParams(bits, csMode)
+-#endif
+-
+ #if POPPLER_CHECK_VERSION(22, 4, 0)
+ #define _POPPLER_FONTPTR_TO_GFX8(font_ptr) ((Gfx8BitFont *)font_ptr.get())
+ #else
+-- 
+GitLab
+

community/jruby/APKBUILD

@@ -7,7 +7,7 @@ pkgdesc="An implementation of Ruby on the JVM"
 url="https://www.jruby.org/"
 # s390x: JVM crash
 # others blocked by openjdk11
-arch="noarch !x86 !armhf !armv7 !riscv64 !s390x !loongarch64"
+arch="noarch !x86 !armhf !armv7 !riscv64 !s390x"
 license="EPL-2.0 OR GPL-2.0-or-later OR LGPL-2.1-or-later AND Ruby"
 # libc6-compat: https://github.com/jnr/jnr-posix/issues/73
 depends="$pkgname-libs=$pkgver-r$pkgrel
@@ -37,7 +37,7 @@ _stdlibdir="$_rubydir/stdlib"
 
 prepare() {
 	cd "$builddir"/bin
-	rm *.bat *.dll *.exe
+	rm ./*.bat ./*.dll ./*.exe
 	rm jirb_swing jruby jruby.*
 
 	cd "$builddir"/lib/ruby/stdlib
@@ -140,8 +140,8 @@ _mvgem() {
 	cd "$pkgdir"
 	for file in ./$_stdlibdir/$name.rb \
 			./$_stdlibdir/$name \
-			./$_gemdir/gems/$name-* \
-			./$_gemdir/specifications/default/$name-*; do
+			"./$_gemdir/gems/$name-"* \
+			"./$_gemdir/specifications/default/$name-"*; do
 		[ -e "$pkgdir"/$file ] || continue
 		_mv "$file"
 	done