* [PR PATCH] rust-sccache: update to 0.5.0.
@ 2023-05-24 19:16 icp1994
2023-06-02 17:21 ` [PR PATCH] [Updated] " icp1994
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: icp1994 @ 2023-05-24 19:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
There is a new pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages rust-sccache
https://github.com/void-linux/void-packages/pull/44064
rust-sccache: update to 0.5.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/44064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-sccache-44064.patch --]
[-- Type: text/x-diff, Size: 1118 bytes --]
From 760996a1ad0f6d6f9ef31cf7bf43302315574959 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH] rust-sccache: update to 0.5.0.
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..1bb94e60fa18 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
-version=0.4.2
+version=0.5.0
revision=1
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://crates.io/crates/sccache"
changelog="https://github.com/mozilla/sccache/releases"
distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=3db6d5761c32de3be83b04f6c83c6fb00eed26cac8ce48bc456586127a18ad32
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] rust-sccache: update to 0.5.0.
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
@ 2023-06-02 17:21 ` icp1994
2023-06-05 19:30 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.1 icp1994
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: icp1994 @ 2023-06-02 17:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages rust-sccache
https://github.com/void-linux/void-packages/pull/44064
rust-sccache: update to 0.5.0.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/44064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-sccache-44064.patch --]
[-- Type: text/x-diff, Size: 1118 bytes --]
From fa429457eca4cbfd36b6de3d75b2fbff9179d8a9 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH] rust-sccache: update to 0.5.1.
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..4985d4540a8b 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
-version=0.4.2
+version=0.5.1
revision=1
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://crates.io/crates/sccache"
changelog="https://github.com/mozilla/sccache/releases"
distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=9e7acd78725ed6d926abfb0f322de39ec9e50d5f1bfa316291f748ebc05c2050
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] rust-sccache: update to 0.5.1.
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
2023-06-02 17:21 ` [PR PATCH] [Updated] " icp1994
@ 2023-06-05 19:30 ` icp1994
2023-06-07 16:44 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.3 Duncaen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: icp1994 @ 2023-06-05 19:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages rust-sccache
https://github.com/void-linux/void-packages/pull/44064
rust-sccache: update to 0.5.1.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/44064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-sccache-44064.patch --]
[-- Type: text/x-diff, Size: 1118 bytes --]
From b8293d7e780f877d4495122bf267810d4523ec84 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH] rust-sccache: update to 0.5.3.
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..f16c5ebf6041 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
-version=0.4.2
+version=0.5.3
revision=1
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://crates.io/crates/sccache"
changelog="https://github.com/mozilla/sccache/releases"
distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] rust-sccache: update to 0.5.3.
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
2023-06-02 17:21 ` [PR PATCH] [Updated] " icp1994
2023-06-05 19:30 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.1 icp1994
@ 2023-06-07 16:44 ` Duncaen
2023-06-07 18:51 ` icp1994
2023-06-09 2:18 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2023-06-07 16:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/icp1994/void-packages rust-sccache
https://github.com/void-linux/void-packages/pull/44064
rust-sccache: update to 0.5.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/44064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-sccache-44064.patch --]
[-- Type: text/x-diff, Size: 91016 bytes --]
From 246a09a4b711d2e6d6aefbab321791e8dd44f540 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 16 Feb 2023 19:39:39 +0530
Subject: [PATCH 01/39] python3-colorama: update to 0.4.6.
---
srcpkgs/python3-colorama/template | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/srcpkgs/python3-colorama/template b/srcpkgs/python3-colorama/template
index 36a3dda2081c..ec542c2b3b4a 100644
--- a/srcpkgs/python3-colorama/template
+++ b/srcpkgs/python3-colorama/template
@@ -1,18 +1,20 @@
# Template file for 'python3-colorama'
pkgname=python3-colorama
-version=0.4.5
-revision=2
-build_style=python3-module
-hostmakedepends="unzip python3-setuptools"
+version=0.4.6
+revision=1
+build_style=python3-pep517
+hostmakedepends="hatchling"
depends="python3"
+checkdepends="python3-pytest"
short_desc="Cross-platform colored terminal text (Python3)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/tartley/colorama"
changelog="https://github.com/tartley/colorama/raw/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/colorama/colorama-${version}.tar.gz"
-checksum=e6c6b4334fc50988a639d9b98aa429a0b57da6e17b9a44f0451f930b6967b7a4
+checksum=08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44
post_install() {
vlicense LICENSE.txt
+ rm -r ${DESTDIR}/${py3_sitelib}/colorama/tests
}
From 71185be9d188a815c066bacdd062e8f8ff29779c Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Fri, 26 May 2023 00:43:08 +0530
Subject: [PATCH 02/39] common/build-style/python3-pep517.sh: extract wheels in
hidden dirs
This prevents pytest from collecting tests multiple times when
they are bundled in the wheel itself alongside the source tree.
Closes: #43946 [via git-merge-pr]
---
common/build-style/python3-pep517.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-style/python3-pep517.sh b/common/build-style/python3-pep517.sh
index ffe52fccf3db..2d5ff7caf34e 100644
--- a/common/build-style/python3-pep517.sh
+++ b/common/build-style/python3-pep517.sh
@@ -19,7 +19,7 @@ do_check() {
testjobs="-n $XBPS_MAKEJOBS"
fi
- local testdir="${wrksrc}/tmp/$(date +%s)"
+ local testdir="${wrksrc}/.xbps-testdir/$(date +%s)"
python3 -m installer --destdir "${testdir}" \
${make_install_args} ${make_install_target:-dist/*.whl}
From f0869da2b098ee2f847afa464aba8059ac72d6dc Mon Sep 17 00:00:00 2001
From: Martin Dimov <martin@dmarto.com>
Date: Mon, 5 Jun 2023 16:38:07 +0300
Subject: [PATCH 03/39] spotify: update to 1.2.11.
---
srcpkgs/spotify/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/spotify/template b/srcpkgs/spotify/template
index 8eaa25125af7..4dc3395617cd 100644
--- a/srcpkgs/spotify/template
+++ b/srcpkgs/spotify/template
@@ -1,6 +1,6 @@
# Template file for 'spotify'
pkgname=spotify
-version=1.2.9
+version=1.2.11
revision=1
archs="x86_64"
create_wrksrc=yes
@@ -10,8 +10,8 @@ short_desc="Proprietary music streaming client"
maintainer="Stefan Mühlinghaus <jazzman@alphabreed.com>"
license="custom:Proprietary"
homepage="https://www.spotify.com"
-distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.743.g85d9593d_amd64.deb"
-checksum=44eebb4c1a80fae48b532f6dd915ec2990489d0b6b77bf4ee800abf9ee772c81
+distfiles="http://repository.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}.916.geb595a67_amd64.deb"
+checksum=472bf841451c219320f1ca038915f52bd4afdf7a1c979571d6ed541ca5e26d51
repository=nonfree
restricted=yes
nostrip=yes
From dc7db3cccb867e1f8877647b77e3193440dd1e20 Mon Sep 17 00:00:00 2001
From: Jose G Perez Taveras <josegpt27@gmail.com>
Date: Mon, 5 Jun 2023 08:12:45 -0400
Subject: [PATCH 04/39] font-iosevka: update to 24.1.1.
---
srcpkgs/font-iosevka/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/font-iosevka/template b/srcpkgs/font-iosevka/template
index 55aba82b0fe2..c464f5a8d207 100644
--- a/srcpkgs/font-iosevka/template
+++ b/srcpkgs/font-iosevka/template
@@ -1,6 +1,6 @@
# Template file for 'font-iosevka'
pkgname=font-iosevka
-version=24.1.0
+version=24.1.1
revision=1
create_wrksrc=yes
depends="font-util"
@@ -11,8 +11,8 @@ homepage="https://typeof.net/Iosevka/"
changelog="https://raw.githubusercontent.com/be5invis/Iosevka/master/CHANGELOG.md"
distfiles="https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-${version}.zip
https://github.com/be5invis/Iosevka/releases/download/v${version}/super-ttc-iosevka-slab-${version}.zip"
-checksum="52207eccbf8dc8cad208f55efb6ba692361ef6de12faa0716b36a2a123db5522
- 01cdb5c52ada9275e8a30878ef1b709283694a23b877e2f2519fe1940c6b2136"
+checksum="f452e564737131c4425c6784024d9b9fb83d24a4775ca7fb1f03e21a466137f5
+ e33e7785e34892506e60def6d6e2b38b2bb87edd9fdeaedc53913e6d0fb66ea0"
font_dirs="/usr/share/fonts/TTF"
From 0596f04273f773eac5e07cd44510fc4f1d614cee Mon Sep 17 00:00:00 2001
From: Alex Lohr <alex.lohr@logmein.com>
Date: Mon, 5 Jun 2023 11:56:36 +0200
Subject: [PATCH 05/39] linux6.3: update to 6.3.6
---
srcpkgs/linux6.3/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/linux6.3/template b/srcpkgs/linux6.3/template
index 35b5178363f6..135f88fab13f 100644
--- a/srcpkgs/linux6.3/template
+++ b/srcpkgs/linux6.3/template
@@ -1,6 +1,6 @@
# Template file for 'linux6.3'
pkgname=linux6.3
-version=6.3.5
+version=6.3.6
revision=1
short_desc="Linux kernel and modules (${version%.*} series)"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
@@ -14,7 +14,7 @@ if [ "${version##*.}" != 0 ]; then
fi
checksum="ba3491f5ed6bd270a370c440434e3d69085fcdd528922fa01e73d7657db73b1e
- bf66d350e6a4727b8ddbd3a14ddc9033c4b80ffb6d4688269917e1a1a5e4578a"
+ 0bceca759d8c1531197b369668a8aa800b3733fcbe87cc0ecf8f014389c16fd8"
python_version=3
# XXX Restrict archs until a proper <arch>-dotconfig is available in FILESDIR.
From 608b286b98e8ade97b7da454daefaa60fbc882d0 Mon Sep 17 00:00:00 2001
From: Daniel Lewan <vision360.daniel@gmail.com>
Date: Mon, 5 Jun 2023 21:50:52 +0200
Subject: [PATCH 06/39] lazygit: update to 0.38.2.
---
srcpkgs/lazygit/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/lazygit/template b/srcpkgs/lazygit/template
index 77ca7aaf2703..aee7817a109b 100644
--- a/srcpkgs/lazygit/template
+++ b/srcpkgs/lazygit/template
@@ -1,6 +1,6 @@
# Template file for 'lazygit'
pkgname=lazygit
-version=0.38.1
+version=0.38.2
revision=1
build_style=go
go_import_path=github.com/jesseduffield/lazygit
@@ -12,7 +12,7 @@ license="MIT"
homepage="https://github.com/jesseduffield/lazygit"
changelog="https://github.com/jesseduffield/lazygit/releases"
distfiles="https://github.com/jesseduffield/lazygit/archive/refs/tags/v${version}.tar.gz"
-checksum=144f55267df7d51be9ae1dc3313707a7f6bcdf0c42eb330667c1fd661dec01b8
+checksum=2e727db952022c0518443d18c9b8a97a882970b93c5ab198ff33bb8ed2166c2f
post_install() {
vlicense LICENSE
From 0570b56f21f1405dc4a4c6d55a2cf2a30c351528 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Thu, 1 Jun 2023 13:55:30 +0530
Subject: [PATCH 07/39] tree: update to 2.1.1.
Adopt.
---
srcpkgs/tree/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/tree/template b/srcpkgs/tree/template
index b74113a90c14..3f819f254a8c 100644
--- a/srcpkgs/tree/template
+++ b/srcpkgs/tree/template
@@ -1,15 +1,15 @@
# Template file for 'tree'
pkgname=tree
-version=2.1.0
+version=2.1.1
revision=1
build_style=gnu-makefile
short_desc="Recursive directory listing program"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="icp <pangolin@vivaldi.net>"
license="GPL-2.0-or-later"
homepage="https://mama.indstate.edu/users/ice/tree"
changelog="https://mama.indstate.edu/users/ice/tree/changes.html"
distfiles="https://gitlab.com/OldManProgrammer/unix-tree/-/archive/${version}/unix-tree-${version}.tar.gz"
-checksum=e9f829a03996451bcf90fae4fdee4285bece6dc1a89de92a3f8e6cad29e03c71
+checksum=bcd2a0327ad40592a9c43e09a4d2ef834e6f17aa9a59012a5fb1007950b5eced
do_install() {
make MANDIR=${DESTDIR}/usr/share/man DESTDIR=${DESTDIR}/usr/bin install
From 92590682b92375df14eb0631d8849310e9209ac0 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 5 Jun 2023 23:07:55 -0400
Subject: [PATCH 08/39] vivaldi: update to 6.0.2979.25.
---
srcpkgs/vivaldi/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/vivaldi/template b/srcpkgs/vivaldi/template
index 2156fa12d550..12b5400171bf 100644
--- a/srcpkgs/vivaldi/template
+++ b/srcpkgs/vivaldi/template
@@ -2,7 +2,7 @@
# Permission to redistribute is granted.
# see: srcpkgs/vivaldi/files/redistribution-permission.eml
pkgname=vivaldi
-version=6.0.2979.22
+version=6.0.2979.25
revision=1
_release=1
archs="x86_64 aarch64 armv7l"
@@ -17,15 +17,15 @@ skiprdeps="/opt/vivaldi/libqt5_shim.so"
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_amd64.deb"
- checksum=b8dda705696e965c693993f63f3542c0a70d98ef579834b75a214e729d1d3aa8
+ checksum=9b737b76f3ad4676b71582d97643e301f19117828027c5e50e5a469d3a00c156
;;
aarch64)
distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_arm64.deb"
- checksum=c7bc016ddec176eae758615e1c3e6461be6dd3fcc611741a5306c79cd03888c1
+ checksum=b918fd16b71943de7f2775ce9bf8ad4637e35a41a05f1a3aade1d5eb2667c012
;;
armv7l)
distfiles="https://downloads.vivaldi.com/stable/vivaldi-stable_${version}-${_release}_armhf.deb"
- checksum=948fed1e8f50a0f94e91985fb86e99b3557d9e0dfb55afa9dc6e840d8a071ba8
+ checksum=e0dfd628ca39962f3772687548d181a0fe5e3be823f8935368514983060b101a
;;
*)
broken="No distfiles available for this target"
From d7d6851eee5d0c42bfa713b1eb45bce12dc04c4a Mon Sep 17 00:00:00 2001
From: Ivan Maidanski <ivmai@mail.ru>
Date: Sun, 28 May 2023 17:48:18 +0300
Subject: [PATCH 09/39] gc: Update to 8.2.4
---
srcpkgs/gc/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/gc/template b/srcpkgs/gc/template
index a62033103920..61935cc0b664 100644
--- a/srcpkgs/gc/template
+++ b/srcpkgs/gc/template
@@ -1,6 +1,6 @@
# Template file for 'gc'
pkgname=gc
-version=8.2.2
+version=8.2.4
revision=1
build_style=gnu-configure
# libatomic_ops is replaced by C11 atomic
@@ -11,7 +11,7 @@ maintainer="Ivan Maidanski <ivmai@mail.ru>"
license="MIT"
homepage="https://www.hboehm.info/gc/"
distfiles="https://github.com/ivmai/bdwgc/releases/download/v${version}/gc-${version}.tar.gz"
-checksum=f30107bcb062e0920a790ffffa56d9512348546859364c23a14be264b38836a0
+checksum=3d0d3cdbe077403d3106bb40f0cbb563413d6efdbb2a7e1cd6886595dec48fc2
post_install() {
mkdir -p ${DESTDIR}/usr/include/gc/
From 7b1ecaef7b990cb1e10f420d4eb23c5c7df9d842 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 00:55:54 +0200
Subject: [PATCH 10/39] firefox: update to 114.0.
---
...the-vendored-glean_parser-for-all-of.patch | 39 ----------
.../firefox/patches/avoid-redefinition.patch | 15 ----
srcpkgs/firefox/patches/skia-sucks1.patch | 77 -------------------
srcpkgs/firefox/patches/skia-sucks2.patch | 44 -----------
srcpkgs/firefox/patches/skia-sucks3.patch | 32 --------
srcpkgs/firefox/template | 7 +-
6 files changed, 4 insertions(+), 210 deletions(-)
delete mode 100644 srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
delete mode 100644 srcpkgs/firefox/patches/avoid-redefinition.patch
delete mode 100644 srcpkgs/firefox/patches/skia-sucks1.patch
delete mode 100644 srcpkgs/firefox/patches/skia-sucks2.patch
delete mode 100644 srcpkgs/firefox/patches/skia-sucks3.patch
diff --git a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch b/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
deleted file mode 100644
index 3a7118ec69ca..000000000000
--- a/srcpkgs/firefox/patches/0001-Bug-1831691-Use-the-vendored-glean_parser-for-all-of.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: ahochheiden <ahochheiden@mozilla.com>
-Date: Sat, 6 May 2023 21:07:09 +0000
-Subject: [PATCH] Bug 1831691 - Use the vendored 'glean_parser' for all of
- `mach` r=firefox-build-system-reviewers,glandium
-
-Differential Revision: https://phabricator.services.mozilla.com/D177340
----
- python/sites/build.txt | 1 -
- python/sites/mach.txt | 1 +
- python/sites/python-test.txt | 1 -
- 3 files changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/python/sites/build.txt b/python/sites/build.txt
-index b43f7680d200..4e6f6c51d9ad 100644
---- a/python/sites/build.txt
-+++ b/python/sites/build.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pth:third_party/python/vsdownload
-diff --git a/python/sites/mach.txt b/python/sites/mach.txt
-index b9fafd0b9c59..a18691184312 100644
---- a/python/sites/mach.txt
-+++ b/python/sites/mach.txt
-@@ -78,6 +78,7 @@ vendored:third_party/python/esprima
- vendored:third_party/python/fluent.migrate
- vendored:third_party/python/fluent.syntax
- vendored:third_party/python/giturlparse
-+vendored:third_party/python/glean_parser
- vendored:third_party/python/gyp/pylib
- vendored:third_party/python/idna
- vendored:third_party/python/importlib_metadata
-diff --git a/python/sites/python-test.txt b/python/sites/python-test.txt
-index 48cdcd2b8f48..74889365a22b 100644
---- a/python/sites/python-test.txt
-+++ b/python/sites/python-test.txt
-@@ -1,2 +1 @@
--vendored:third_party/python/glean_parser
- pypi:pytest==7.0.1
diff --git a/srcpkgs/firefox/patches/avoid-redefinition.patch b/srcpkgs/firefox/patches/avoid-redefinition.patch
deleted file mode 100644
index 867d37c62a90..000000000000
--- a/srcpkgs/firefox/patches/avoid-redefinition.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Rasmus Thomsen <oss@cogitri.dev>
-Reason: FF is mixing userspace net headers (net/if.h) and kernelspace ones
-(linux/if.h), leading to redefinitions. We need to include net/if.h before
-linux/if.h because linux/if.h has redifinition guards whereas net/if.h doesnt
-Upstream: No
---- a/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:32.359751046 +0200
-+++ b/dom/media/webrtc/transport/third_party/nICEr/src/stun/addrs-netlink.c 2020-07-28 19:24:37.856343751 +0200
-@@ -31,6 +31,7 @@
- */
-
- #if defined(LINUX)
-+#include <net/if.h>
- #include "addrs-netlink.h"
- #include <csi_platform.h>
- #include <assert.h>
diff --git a/srcpkgs/firefox/patches/skia-sucks1.patch b/srcpkgs/firefox/patches/skia-sucks1.patch
deleted file mode 100644
index cd9eecccf610..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks1.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-https://bugzilla.mozilla.org/show_bug.cgi?id=1504834#c5
-https://bugzilla.mozilla.org/attachment.cgi?id=9028600
-
---- a/gfx/skia/skia/third_party/skcms/skcms.cc
-+++ b/gfx/skia/skia/third_party/skcms/skcms.cc
-@@ -30,6 +30,8 @@
- #include <avx512fintrin.h>
- #include <avx512dqintrin.h>
- #endif
-+#elif defined(__BIG_ENDIAN__)
-+ #define SKCMS_PORTABLE
- #endif
-
- // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
-@@ -280,20 +282,28 @@ enum {
- static uint16_t read_big_u16(const uint8_t* ptr) {
- uint16_t be;
- memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
-- return _byteswap_ushort(be);
-+#if defined(__BIG_ENDIAN__)
-+ return be;
- #else
-+ #if defined(_MSC_VER)
-+ return _byteswap_ushort(be);
-+ #else
- return __builtin_bswap16(be);
-+ #endif
- #endif
- }
-
- static uint32_t read_big_u32(const uint8_t* ptr) {
- uint32_t be;
- memcpy(&be, ptr, sizeof(be));
--#if defined(_MSC_VER)
-- return _byteswap_ulong(be);
-+#if defined(__BIG_ENDIAN__)
-+ return be;
- #else
-+ #if defined(_MSC_VER)
-+ return _byteswap_ulong(be);
-+ #else
- return __builtin_bswap32(be);
-+ #endif
- #endif
- }
-
---- a/gfx/2d/DrawTargetSkia.cpp
-+++ b/gfx/2d/DrawTargetSkia.cpp
-@@ -138,8 +138,7 @@ static IntRect CalculateSurfaceBounds(const IntSize& a
- return surfaceBounds.Intersect(bounds);
- }
-
--static const int kARGBAlphaOffset =
-- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
-+static const int kARGBAlphaOffset = 0;
-
- static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
- const int32_t aStride, SurfaceFormat aFormat) {
---- a/gfx/2d/Types.h
-+++ b/gfx/2d/Types.h
-@@ -87,15 +87,8 @@ enum class SurfaceFormat : int8_t {
- // The following values are endian-independent synonyms. The _UINT32 suffix
- // indicates that the name reflects the layout when viewed as a uint32_t
- // value.
--#if MOZ_LITTLE_ENDIAN()
- A8R8G8B8_UINT32 = B8G8R8A8, // 0xAARRGGBB
- X8R8G8B8_UINT32 = B8G8R8X8, // 0x00RRGGBB
--#elif MOZ_BIG_ENDIAN()
-- A8R8G8B8_UINT32 = A8R8G8B8, // 0xAARRGGBB
-- X8R8G8B8_UINT32 = X8R8G8B8, // 0x00RRGGBB
--#else
--# error "bad endianness"
--#endif
-
- // The following values are OS and endian-independent synonyms.
- //
diff --git a/srcpkgs/firefox/patches/skia-sucks2.patch b/srcpkgs/firefox/patches/skia-sucks2.patch
deleted file mode 100644
index 1a498f8711dd..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks2.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-# HG changeset patch
-# Parent aecb4600e5da17443b224c79eee178c1d8e155e3
-For FF68, AntiAliasing of XULTexts seem to be broken on big endian (s390x). Text and icons of the sandwich-menu to the
-right of the address bar, as well as plugin-windows appears transparant, which usually means unreadable (white on white).
-
-diff -r aecb4600e5da gfx/skia/skia/include/private/SkNx.h
---- a/gfx/skia/skia/include/private/SkNx.h Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/include/private/SkNx.h Mon Sep 09 10:04:06 2019 +0200
-@@ -238,7 +238,18 @@
- AI SkNx operator*(const SkNx& y) const { return fVal * y.fVal; }
- AI SkNx operator/(const SkNx& y) const { return fVal / y.fVal; }
-
-+ // On Big endian the commented out variant doesn't work,
-+ // and honestly, I have no idea why it exists in the first place.
-+ // The reason its broken is, I think, that it defaults to the double-variant of ToBits()
-+ // which gets a 64-bit integer, and FromBits returns 32-bit,
-+ // cutting off the wrong half again.
-+ // Overall, I see no reason to have ToBits and FromBits at all (even for floats/doubles).
-+ // Still we are only "fixing" this for big endian and leave little endian alone (never touch a running system)
-+#ifdef SK_CPU_BENDIAN
-+ AI SkNx operator&(const SkNx& y) const { return fVal & y.fVal; }
-+#else
- AI SkNx operator&(const SkNx& y) const { return FromBits(ToBits(fVal) & ToBits(y.fVal)); }
-+#endif
- AI SkNx operator|(const SkNx& y) const { return FromBits(ToBits(fVal) | ToBits(y.fVal)); }
- AI SkNx operator^(const SkNx& y) const { return FromBits(ToBits(fVal) ^ ToBits(y.fVal)); }
-
-diff -r aecb4600e5da gfx/skia/skia/src/opts/SkBlitMask_opts.h
---- a/gfx/skia/skia/src/opts/SkBlitMask_opts.h Tue Aug 20 09:46:55 2019 +0200
-+++ b/gfx/skia/skia/src/opts/SkBlitMask_opts.h Mon Sep 09 10:04:06 2019 +0200
-@@ -203,7 +203,13 @@
- // ~~~>
- // a = 1*aa + d(1-1*aa) = aa + d(1-aa)
- // c = 0*aa + d(1-1*aa) = d(1-aa)
-+
-+ // For big endian we have to swap the alpha-mask from 0,0,0,255 to 255,0,0,0
-+#ifdef SK_CPU_BENDIAN
-+ return Sk4px(Sk16b(aa) & Sk16b(255,0,0,0, 255,0,0,0, 255,0,0,0, 255,0,0,0))
-+#else
- return Sk4px(Sk16b(aa) & Sk16b(0,0,0,255, 0,0,0,255, 0,0,0,255, 0,0,0,255))
-+#endif
- + d.approxMulDiv255(aa.inv());
- };
- while (h --> 0) {
diff --git a/srcpkgs/firefox/patches/skia-sucks3.patch b/srcpkgs/firefox/patches/skia-sucks3.patch
deleted file mode 100644
index 4bf77e684405..000000000000
--- a/srcpkgs/firefox/patches/skia-sucks3.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-CompositableHost.cpp patch added by @q66, based on patch in issue 1602730.
-
-# HG changeset patch
-# Parent 46ea866ca3acb8bb5e1709ceb799b9c94f591dec
-Problem description: Tab-titles that are too long to fit into a tab get faded out.
- On big endian this is broken and instead of fading out, the
- tab gets white and the font transparent, leading to an unreadable
- tab-title
-Solution: This is not a real solution, but a hack. The real solution would have been
- to byte-swap the correct buffer, but I could not find it.
- So the next best thing is to deactivate the fading-effect. Now all tab-titles
- are readable, albeit not as pretty to look at as they could be.
-Side-effects: I have not yet found an unwanted side-effect.
-
-diff -r 46ea866ca3ac -r 6ef20eee3f8f gfx/2d/DrawTargetSkia.cpp
---- a/gfx/2d/DrawTargetSkia.cpp Tue Oct 22 12:27:22 2019 +0200
-+++ b/gfx/2d/DrawTargetSkia.cpp Thu Oct 31 09:11:56 2019 +0100
-@@ -1861,6 +1861,14 @@
- SkCanvas::kPreserveLCDText_SaveLayerFlag |
- (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0));
-
-+#if MOZ_BIG_ENDIAN()
-+ // Pushing a layer where an aMask is defined produces wrong output.
-+ // We _should_ endian swap the data, but I couldn't find a workable way to do so
-+ // Therefore I deactivate those layers in the meantime.
-+ // The result is: Tab-titles that are longer than the available space should be faded out.
-+ // The fading doesn't work, so we deactivate the fading-effect here.
-+ if (!aMask)
-+#endif
- mCanvas->saveLayer(saveRec);
-
- SetPermitSubpixelAA(aOpaque);
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 85a14d933c65..3bf78b037413 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,16 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=113.0
+version=114.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Duncaen <duncaen@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/"
-distfiles="${MOZILLA_SITE}/${pkgname}/releases/${version}/source/${pkgname}-${version}.source.tar.xz"
-checksum=7a266044cb9d0c63079b3453507ea0c80a23389f4cbf6a4f6fd15146c6072627
+# distfiles="${MOZILLA_SITE}/firefox/candidates/${version/beta/b}-candidates/build1/source/firefox-${version/beta/b}.source.tar.xz"
+distfiles="${MOZILLA_SITE}/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"
+checksum=d23a0502742f52110ce496837ba82b47bf38d40585633787508ae5be9a5b4bc6
lib32disabled=yes
From 85a63f402a526c02e94597749e605baac1be1270 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 15:36:35 +0200
Subject: [PATCH 11/39] firefox-i18n: update to 114.0.
---
srcpkgs/firefox-i18n/template | 194 +++++++++++++++++-----------------
1 file changed, 97 insertions(+), 97 deletions(-)
diff --git a/srcpkgs/firefox-i18n/template b/srcpkgs/firefox-i18n/template
index 9c721ea35982..7c94212c279a 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=113.0
+version=114.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="d36df7a481a96ab6ac74ba4cc33e0ee72e91caa2bfe55b97a17d9794d2a3c4e8
- 21d502f5e1d25ee0ea4b3709afc7e9575f629cd15737e21aed19c1f148fd57d1
- ee8d0193cfd2ed426044352d957026e91f31d6c1de680080e6d27ae08cf70ec1
- dca830694cccbecd46e74950d14fa46c3f43614551fb7f75e3b537275a9d50fa
- 2b84cea51df01c5959d1b1012f3ac2e411b9da26b2264b18b59553a814f3ef8e
- 4fe334dce9241ad92b93e09c66124d42841a1e724e359cbb0c50e6000f2f9fc5
- 8b895a7879c8bb652ff56e390e0da4889a4774f30f1976f11b13afe8e7a72994
- 6a6a2cc943c146a98180ed5e862a2c279a08702f89d4074beec01a64f55b98a1
- 06144c4d43188e20d3325c2799a61b87808b587dc0136ac817d890a0cd91bf25
- 0f3d153bde7f1a6afb2a598fe98e95c41f5d14f78191db7b353220557e40e5d5
- a3ff7e5536d4ff85b06ca4f8ffacee45cf1ba73c0662593a14bac544139cc3f9
- 85be7ecde1bfeea1f1f477f2b808de51c74f01d2228966f31e60abe06279049e
- 156747a491aaf8744bd37a085a5b3959d1c00a4edac14ed859690cf980aae709
- bd31e4c6331cc249f114eb9ef7a454d99482fb05c0f0f0e8d4507948d7c113b5
- 0373f78a7bbe79d849c11bec495893c5e99f40c20d3b674acb9704126cd49741
- f6c3f8edc69a07692a8fba5ad37a04e46f246bb9e2f085da5a97caa024d19828
- ca9c9f07abd3feec4dc6cd375f3a2c8841ee19bd69585c6d70ad950c18879adc
- 3626081b50619d66cb88e14eaf71caa97a2b48d79f69cac3a5bb919633f87d04
- b0a4b03cb247c8f0c87c9dee819cc47ff6ced32cb3c89773233a08963975ea36
- 6ae2fdf3c67a676112befb69b0c66709f2acadfeb1d7696315e331cd61dc96bf
- 998bd6ee63d6388c0631524992d7c4d050f8f005d37b0c593e531bfaf6a4a2d1
- 3729bcd73ccc966f0d73f7e32aadb2bfbb9559466c69550602bedad2a78bf500
- 06acc903cfbb6b7f683ae738b733972e451ab6a14b28f7975c2884ae59701ec4
- b1938f51754971be1fa5fcccccdfcba6fa63a845746e47f666efd050042141c1
- 57400cd4597926629ab8f22e5f4722e0234f5727441906708786bbe6843fbf22
- fd42ffc5e14bd3526d8fea876a1e18df379e5f75c1f10368641dee1d6eebbb23
- cc351cb54675a908b20226b13354e189b6a3fc38a5c039116b1f2258af0f479f
- df0794bb5b2e78aec73ecdc779458e9a86f756b5e2f37acec6e227543dc1b3d0
- c750bac67017e0784cf58fb06e92e2bc52688a16a3773825a1a6e0df84ef233a
- a4a11e68fcd10aadd62b0cb10533ffd43a1c98a3e1db535e119cac0df5613f3a
- d489aeb8ca63f97778fa309d43529838349918414188dce598d29b20c59da533
- 438efaaae1867ab1b37fe23283c2bfe666d73288c76f482f339bcdf27a4eb7dd
- d52e1c96fa56d3bd8f152bb4b2e9c9a9e2edc2c4fad81869b1962b06ebb4c283
- 9f442e9e8c819791cb78fe655c53129b9a5d0b8090079ab74b45b7f7d1515a5b
- 8a17ed68d41be60e18ecbe2becff41912305e7fb86384b7d1fc89dd767fa21d5
- 891591bcde2190b87be25d5d57777608b8f8cea06d58c8a60d09d18809b42856
- 9e57d9348c392adfbb14debfc3aa474116007241109ca421a369ef5865cca480
- ea9bf771e9e792a2a1723093c3f3d522681f638c5dc30c0dae6dde0a68648961
- bf9e2e72dfcdb609064a0c0f503001f270257045b3f0b455470bccfbab0476b9
- 0f4f2eea09738aea94c0afec45f0bec34dbae9c4bd922634c82735d3a703f292
- bc228183f6e3c563ade71fd4c64784aa0c0a0e5e108ac04c055e9bcd9836bb86
- 95c0605bffcef0d327830fa14aea895d54b4c18cc38122e49ce115c9a7afb47f
- ee2753898e65d344ad7bc9642ec0a2e05a7880ebee03112c1190cd001c15b4b9
- 9a14eae682acd9044b4227adf33ec1d2e0e4ecad75791fecfd355871d27eb047
- 60db4ea466aa513ca24c4051f0c048bd09e6feb0935b7789cbe4331ad4888cdc
- 9f75ea79337d72287bf6738fb62f6f5abb0bd67e306c331ae1feb412ec160482
- 8a8e4d03059b5bd2ed73870e89f31b20b6ef4d644487d2e048eb422f59a3649b
- 26e0a1db066ec73688d607243f90c98b77806cd67bee504345f6de1e24915f4c
- 7c274bc5c13c6e0b7b2e6674f1e2af791b81eceb0bd722ef5a80e921a97bd903
- a34e84cd85b434885ba7b7b5824b293d8a8a9f23cceb23f79a802236eb6dde1e
- 9aaf343698c7666394b393154ffcf248d87d226fe577e5563afd2de602249c2f
- fef917c385f92ac3dc95aff1d2e9f78eb7afe9d74895c87a7051d770ac887987
- 11729bfef6adcea46e77b1c96dc2b40d3989ffa36ba65f3782f9453f5533b2ae
- 177164301e02565efb226aa525e5b5b2bfd7cd904f5456e15350284f31f3f223
- 45310e7db684e38f404fc4b805e39bbe7a5bae4028beab38311e6aaf2a31fe2b
- 5a25567e3c83bc7a57d16df9f5f669fb1b4e90f5bf1c483280cac6a00e86537c
- ce1295de439ca8476195ac7c4041608669705943c60e883f678a20f0cb7f58e6
- 075b9a3867ddee26ad61441939b4d431329b9605bb86125b29e719e81a0a2c68
- aabf6cef613b20f1fdecd91fcc347275a7c1bc0ef1d18e55e5a245bf6735818e
- 4afde707b110688d130a865969a5ebd78cc7876f74ac151624705fd9f3a8e275
- 3f11b5ea15424f75544378a913eff10f2f9802610541aa24dca72ee2503ef35d
- d0cb5f452064685162686ba49a7b4f5ec6998c726d415c72f178b2db4ef523e3
- 917fe99ea4ce119c418d52d071e6662c8cb9c6190939111142a1daabc4091fd0
- 8eafb1a687d8b8072c6caec83f9ca80d03699f0a182629c2087fe77c2f354fd2
- dcd54b26247e4563d675c612ca7c471fd2588fe9beda9c077695a2f5a673cdde
- 93e71b7dd69dec0d992829ecd7362369a8a2c6070900d93879693d4ea5a1ef32
- 5ba8d4c71ff5b915e20d9d5eab5f57d2daf971cf1b3f0b12dc2fd25755bf6303
- 6b6a82733fec2611d62fafc00dd3de8bc7f7018a8ea9c1f1f7f8d11b599e2a23
- a7cb00209f94b3cb18db773f6d7ab568c416c3604b2d109135b9521f89e2371c
- 0f14e9cee9d13549d418bde6fb20c2827297e673bea582ac1cf085b8d763861e
- 897f391a66e95dc41f52c480a162239f76bac3cf7209152e7e610a19facee29f
- 6a5fdeefc438825d60ad5f8ff14615de43c4a332f01c275e9c2a4a66dd5a4fdb
- e1ea24d2cfa6fc4b490ac81755920b9b8f6f481666d56a66be6fde2539b2080d
- fcf415b511a74d57b1cfa92a22eabd5e3bc30f42642c754e07c429b8caffc714
- 38021f594397a1078fb5be7d584a15dae70f9663681f6f33ef9d14f2a3b91d93
- 32d56004e40dc59240060f0eb84bb761a67f4545d73856775eac41c79c25fdec
- 0bac15f959317aab370995793e585b331b181536b5b40cfcf59100b81a086f38
- 54ec4111d38fd2c4ce4dbfbb86a4517466102d1fd871f6f4f73e4f8cf59a998e
- 353fb938fd4641fd65b10cf54d9f40f703cec74a3d5316126478903eec3f9435
- c43a49feff2ffe483599e286631a2f3bbad61fe90182b8d0acd5468115590971
- f9ebe4290302e434ac774cf21bd5397d438c9e6478b778bd2b2c2bd5f95c3399
- 19a21659c6fb216e5d594ca35f62453de7ceaf88408a52444b40f8dc23d64f17
- 1294a7fdf7e36a3abb2b89222e97d4aaa6dcc2b36bff5319843a64122c692160
- d9f184a76008b8d2be832086b1f53baea3eff988993fd683c5cb2bcd1d240f4f
- c38edc9bfb0ac02bf4972811f50baa3cb237c1e7d626237b8c7c08d520e1246d
- afce22b71757920587de3ff5a5c12fe3dd7b53daf9110ffde6c09c69545edd0e
- fb754a736658035849341f2d01d1f48bb06b09c7f1ee9e6749e0580c7c9cb903
- 30c5079f9c514b7b9e8bc44fd67bd44e4a5b42457c9c76a2ca606a8bf5d62bde
- abf2d8a5d2c8736ffbede3844101a3bd9ea977a0dbca091c2b87871e3bbe96c3
- 7fd38252dd62fe45a732dd322e920ab90533d533f947322db80c48773262a827
- 01db872a78484ee2ed53060810ab46927572d4af92c727b0e03e5337ad2a6fa5
- 944cd12f408e49e0fd4bb79205f9ce9ee007b64d923a3c1d83c1e0cc7f494621
- 6bf5b9d2f30ded74ebdf32933148fe7a478cffff9353379b72f0482ea0991f10
- 1da211f718c88aa8252be97c7a5703d54e9c65599a24121d80853174e9e7dd60
- f2fdd09021e69566d750e34404866235f0f395ead48b36db35738192de557ad0
- da39e10a5598ab69b756872efcaad594fe52dda0e533e7a0d56ad1cdc8859a43"
+checksum="c0f9a6c3d766c08f3676602696d8798b679ec1388cd5392a1b8668ffee145ffa
+ 26e309adb10d6ee133a5e1d47d969b04da06a9aaafb915080ab6d039bd7c9995
+ 5275570c342f09f90a735bb264810c7f4ae1fbc8e18d9a4944a95569682daf62
+ 4f6b16a79b454c72f8fdc0e4800e7a085c392a3204cf2173fb85853568820fe9
+ 34423da9b8cf41b280a3c6dc998da72004bc2ea0245dcb59af6cbe26a6683b68
+ e37ca54dbd3506ca177e812305c5ba870584131a16958b8c46c7f2159172982d
+ 0db3c23472f6b45d158b9de5220040821e89be207767910121040e9cba949f92
+ 38e9cccd6791e769fd9016c2e0a3d5aafb6a2090c1c60326f03907aac0991325
+ f3bec565c0c4c1bd7b659e4c4922d2d33ed5ebc1dd81e9d7b5a23c510da325a0
+ 045ff5e6a99bacdeb1421061fb01a1fc71a76e12c9205cdd1fc58391cd89a613
+ 7aa85724f5b31d31c3108700bf0d2efca74105c5e0df72c6a79b1913f5058152
+ 6a1fd174df2343abe8a74f219c32cbf457f3914c0dd3c96949d947dedafec8b1
+ 559b6c47830caaae13ea507cec2268e4469ee1b90504cdfa1252e5d6295d9a7c
+ ff96e801074a1343ea9a122d3078250a961eb7da29ecac542a0c84186a17f010
+ d0f973e086135861ce2e5e26e1e56bf9b21503d06fb732c8b918f426d55348f6
+ aee67eb0b05c7c06b23aca4af3e473ddc75c9570a3d866675bb30c0fa409f2c0
+ 20e9c7514e8e4a135c36cfd32177fbb000072e2fe3b7a38ea3e08ec2064d9633
+ 6adfd2d6f9667472b0665f0370c2eb582355ca370ea046028741b91c16aa76b2
+ c2a9d90d8a46a3f0070c031c48dcc09fcb33b8d571881578ae541984f0f98ff5
+ 797686f4f8ad9279e8b080ba39cf52f049235ff4ce6e61ca0fe65f9d479a2d45
+ 9ea3dc01ba7d9389d4514626f5cb1597063f7e68401ea13522a74ac777cde4cb
+ 3e02c13156f87af7a25e826f8f72487004c3b64675be73e53eaa55f45a4b0147
+ a2561641f64b428f34ec4d5215b97a6ae945df31b347c282e4f33a1fe82c5bc1
+ 93a4955b0952613b931c2574fa9c6ed251a08df32f46304b3ead002bbe701ec9
+ f1bab7c5b208ebb5ac87a5006a236fe09727be260bdd3b0f7b520a0ed91366d8
+ c7ff4fee557227e6dbf87a1bd12205217710e41028066b0da3ed46adc3df2944
+ 7f6f51cc45674f07f905107d2b6ea1770c39ccf1b8a5782e6bab964fcccc39a2
+ a28453e1d0727297918fb3a83bd68090598c5ddd0386e5cbd21b5ead68cd8d2e
+ 5b88a842efc8b8adccf314734e56ef5570e8823614f03b1023e7f3ba6ae904bf
+ 0f607d174af36790046d1ce2219dd341e557af524f22d8afa504538e047d9081
+ 85a57d3d4746f6e43c3f24ca9d7c2d873ba48166772c0a127485381b4017d9d2
+ ed68f1678df1cedc204c2ebc6363f5ccc82562f684f45455169ffce3a94860ab
+ da0e4e3abc51b101e84450ef84f77b3709ef21d7db3f401f4449fab69966ff62
+ b474686d3b54e00ef1c3606dc432c64a4f3b1f56321cc1b28cd0737e7e313ab8
+ c2c27f1b46fdf4288fd04ff8554443542ce6821cdb7c13e3ddc7bf51c4b62c0a
+ 342230adbb31f5e07b5a89ded0bd860fe76a1cb638953383de5c690fead75050
+ 48d5d27014991eebd2f3cd86ddce13807753fba0c67af32f4665db3685b45ee0
+ e9a5d2be6f3e69570abefcf58390ffecf911efcbb096601f6ea326797d9950e3
+ 0185575560595cd58b8526ba5450c395b0c513e360b523e57be37c3d0af05744
+ e5abcec84157c0085f99b2f4d0cce258d3dd496a8edb7fa208937da8fa7436a3
+ 4d3f1274da892de438c0d0e1003dd06509a7c21b60e7df3f91cbec463021a9db
+ 61356d776b6341a0802ad6974bfd133db0b93b5430eb55d21167049a8626b603
+ 8968f1a77e30680209df33cc6282797ef0e24164ca65141e232d8bc3fbff8123
+ cc4769a1372fe19d1d64afb2660d71eb012f518a731fe2a3b1fc4d38cab285f0
+ b3cfcc9e008fd1800d6688d5180e9fbcbb0336e16e444f81715ffca4d1ddc96f
+ 96592a74d16993e03fd202be691f2e3bc9ac6e2d9fa50a6de0670f46e71b203b
+ 1644d3bfd7e4c2b537a7a52b25b7f9cd808ddbaf86e026be91536c62252cd792
+ 63e53aee3ca63d086778c3b66d2e0530c23e901dc4e2a437e8bdba7bcb6ee720
+ 49e78397cd9d8ec6ce22f6503f89132009ecf028719f5b5ddd1164922184ffa5
+ 12ec633c84011216239334c2f08eaa7ec4e4fa4f9c4d9277d6275a84f6df467f
+ 825410ee4860f3466803725a7a604530b5641779f819f48e3fd47b5831a47659
+ cab3fdae9481f6b8d4f81b91377771022de050a5da63d970b0b35c9a4c8c82f1
+ aa56bd371cf1096c65e2c76073d25d69ecc8018be8487e14cac370bd9f5d45b1
+ 0a18c294ef2a89150acc6521898bed8276806ca607bbb87c6e01c30cc3f6f697
+ fc5e0b80bb4dda023a18d46f3f686981a13bfb364d6d29e4e46cf1f58381daf2
+ 6f15404bca77866c663e8ba1c727ff40007700ca0d36f0e5559e417e654d3b64
+ f0b77a56215baf8546b06a69e7211319af04e3baeb5c06a0fe0519787d949d8c
+ 0a8c4f3c3f541cf4be8ac72c5d8e9cc85852568ece273f4173c71eb637d406e7
+ 23a448de4027b9b2b7d3ad46d3a53411289a2d9b8fdfcbf2b9d9094d0269ff34
+ 3890f6fcc967db23914ee090edd31ca03622e359d7ca7fe5ebb92a203d63f17e
+ f14464fee583c0afe7022db7e6d5dd607782a5f04c9e0caef7dfab6ab135f609
+ 82baa25118153388a0ab7b9c2ec4d89ad52c1acd380141e0bb301bb698371563
+ 39da2bd341d58d4686b2609772d2e40c04183a4046ef4de5bf02821cd550d864
+ ca2e41b6c29c062f40cbf8b5ebb9badfde0457350169b6ae201f607f3dc25813
+ 752168e60f96d2b01275afc1ffcf7b8ad9f3383a05d6f99c76d7f8b2052189e9
+ 37cac85f7af9cb2edc726cb8336dead32ed2f10ab6e72547c799e0dae455148a
+ da58c2ba13252a42551629e66771e8254fdc4e80fff7e7fab40baeec8adc201c
+ 050b33dba495f812910ee3a53affd7eae61ce2456b148a33e1883e06c6beb73e
+ 16d619c02edb3179a30f7af5aea14d0c01266d46f0663b76fbcf71de29b27af8
+ 1eadb108e6271cd74ef0a3328dd277cb92765ff0b8d72d922a979d0ed9710944
+ ac5352956096a0eb869759cbbc0e04acc95a3be677b5ef56f2b237ae74567632
+ cc2035801a929b67b97d5185480757eb51fd8063e360a7bd0d2cecea6edda2e4
+ 62d73008f29ffc7078d1e2bddb36f360044f28a3bab820832b6ea82b07582048
+ 129981bf7628f49fba9522636211405b66fb14159f76c557b93d6d810c672cc2
+ ba6a082b4c41594d1fa671269357f7f814c169f0c62e343164ea86957cb0c748
+ 33de6d30b7a9337b299d083bf5ede792f785c17e4bf3a9c85dcecd7abb0ea4ef
+ b8d14e07fdbd034d4241de6a77c6bfed38b54726ec770ea25442a947fd9a821f
+ 86436adc98e9f449ca2dcdf076042987400d62f8acf9458abf7cd98c327751e8
+ ba69da64c6ab3d416759818e420259023a4d64434b27cb604d6491737e7e4a33
+ ff239bdcb54a03dad3210b9457231e56a38e306220ec981c1f29307d73620fa4
+ 3ebb85c2974c9d69f4e9c816f338da304a58469034997f83f0cd9056c4acb6d3
+ 5315ff187fe3fddfc39000a7164ff3b42938059978eb322ba222a43d2a1145d1
+ 0f768dd1b87e34b347e32d5f06691b68d7747654faf2586a673154d777a2765f
+ 802537e360788ec58d697c17cd0333e8fcfc92ce3161d19cedc2a4841825d0ca
+ 6722b217cd12f3a6502f14865fbf02bae8dceeb98f7a593840a88d57829cbbed
+ a0d85d09f3bda6a1416240a252ec4cfc916cf37b98c72185a6b97e3b7b50251d
+ 0a48ee5ae79e98d8b07adfef4eaacf93b19011ec3a667bfca3fc0098e348ab8c
+ 4b559d090fe138fabc031b27b1cf5a0d67c0a036f646fa4430fe8c4c9f6b0e37
+ 3c9b56539542ace8a6481400800367a07e980ebaad213caba3e5fe2da15bef9b
+ 0b27ce7aa8ff4b09d5f42c1525d89505d2b159c7d9051b3e1dcb60ed67a0be5c
+ b9fcbc9063278b77c652ed738913c1d9506306796af41c42fbe5ff2bae721fe1
+ 625c2e19caa24046e624383501a395bdbbbf39594e742cc40e31d85cdc3eadce
+ 5b397388706d49d413b745ca17f0776f8db6c81b3b6001d0490b3f1163d50ff3
+ 03bb0e45f2038e8dd5d57ad131c163ddcd135cbf1b42371670bef4fa2fdf8da3
+ 8b11f723ba5a973cf3639fa03e860e29f7427c8d8e68d278d5770ec83a6fb903
+ 6ded563d8f5ae096ed6f3c58dd19277333dae81fda96832a50a5040ef79ca35b"
From f76459fbfaaab554108cd4d144558e7b4a01d8a0 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:06:35 -0400
Subject: [PATCH 12/39] New package: python3-lazy_loader-0.2
---
srcpkgs/python3-lazy_loader/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-lazy_loader/template
diff --git a/srcpkgs/python3-lazy_loader/template b/srcpkgs/python3-lazy_loader/template
new file mode 100644
index 000000000000..492c98124834
--- /dev/null
+++ b/srcpkgs/python3-lazy_loader/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-lazy_loader'
+pkgname=python3-lazy_loader
+version=0.2
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core"
+depends="python3"
+checkdepends="python3-pytest-xdist"
+short_desc="Populate Python namespace without incurring immediate import costs"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="BSD-3-Clause"
+homepage="https://github.com/scientific-python/lazy_loader"
+changelog="https://raw.githubusercontent.com/scientific-python/lazy_loader/main/CHANGELOG.md"
+distfiles="${PYPI_SITE}/l/lazy_loader/lazy_loader-${version}.tar.gz"
+checksum=0edc7a5175c400acb108f283749951fefdadedeb00adcec6e88b974a9254f18a
+
+post_install() {
+ vlicense LICENSE.md
+}
From 0ea7125c1a2b8cf8805f016b23d549d31874bf64 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:06:36 -0400
Subject: [PATCH 13/39] New package: python3-pyproject-metadata-0.7.1
---
srcpkgs/python3-pyproject-metadata/template | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
create mode 100644 srcpkgs/python3-pyproject-metadata/template
diff --git a/srcpkgs/python3-pyproject-metadata/template b/srcpkgs/python3-pyproject-metadata/template
new file mode 100644
index 000000000000..fcf5c5d22593
--- /dev/null
+++ b/srcpkgs/python3-pyproject-metadata/template
@@ -0,0 +1,19 @@
+# Template file for 'python3-pyproject-metadata'
+pkgname=python3-pyproject-metadata
+version=0.7.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="python3-flit_core python3-wheel"
+depends="python3-packaging"
+short_desc="PEP 621 metadata parsing"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://pep621.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/FFY00/python-pyproject-metadata/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/p/pyproject-metadata/pyproject-metadata-${version}.tar.gz"
+checksum=0a94f18b108b9b21f3a26a3d541f056c34edcb17dc872a144a15618fed7aef67
+make_check=no # tarball includes no tests
+
+post_install() {
+ vlicense LICENSE
+}
From 9a73ca39502ca952f63a71d7314746af62cbd4ff Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Fri, 2 Jun 2023 12:48:57 -0400
Subject: [PATCH 14/39] New package: python3-meson-python-0.13.1
---
srcpkgs/python3-meson-python/template | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
create mode 100644 srcpkgs/python3-meson-python/template
diff --git a/srcpkgs/python3-meson-python/template b/srcpkgs/python3-meson-python/template
new file mode 100644
index 000000000000..57f3b808c83e
--- /dev/null
+++ b/srcpkgs/python3-meson-python/template
@@ -0,0 +1,20 @@
+# Template file for 'python3-meson-python'
+pkgname=python3-meson-python
+version=0.13.1
+revision=1
+build_style=python3-pep517
+hostmakedepends="meson python3-pyproject-metadata"
+depends="meson python3-pyproject-metadata patchelf"
+short_desc="Meson PEP 517 Python build backend"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="MIT"
+homepage="https://meson-python.readthedocs.io/"
+changelog="https://raw.githubusercontent.com/mesonbuild/meson-python/main/CHANGELOG.rst"
+distfiles="${PYPI_SITE}/m/meson_python/meson_python-${version}.tar.gz"
+checksum=63b3170001425c42fa4cfedadb9051cbd28925ff8eed7c40d36ba0099e3c7618
+# tests require custom-built executables, need reconciliation with xbps-src env
+make_check=no
+
+post_install() {
+ vlicense LICENSE
+}
From 8342faf5f853303045375e0139825690a2e20e7e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 4 Apr 2023 10:09:26 -0400
Subject: [PATCH 15/39] python3-scikit-image: update to 0.21.0.
---
.../patches/meson-cross.patch | 93 +++++++++++++++++++
.../patches/numpy-version.patch | 14 +++
srcpkgs/python3-scikit-image/template | 59 +++++++++---
3 files changed, 151 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/python3-scikit-image/patches/meson-cross.patch
create mode 100644 srcpkgs/python3-scikit-image/patches/numpy-version.patch
diff --git a/srcpkgs/python3-scikit-image/patches/meson-cross.patch b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
new file mode 100644
index 000000000000..8807a612f665
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/meson-cross.patch
@@ -0,0 +1,93 @@
+From 8789a3365282a4f5604e090a10c960e710d240b9 Mon Sep 17 00:00:00 2001
+From: "Andrew J. Hesford" <ajh@sideband.org>
+Date: Tue, 6 Jun 2023 10:05:25 -0400
+Subject: [PATCH] meson: allow proper selection of NumPy, Pythran in cross
+ builds
+
+---
+ skimage/meson.build | 62 +++++++++++++++++++++++++++------------------
+ 1 file changed, 38 insertions(+), 24 deletions(-)
+
+diff --git a/skimage/meson.build b/skimage/meson.build
+index 28c831312..c168389d7 100644
+--- a/skimage/meson.build
++++ b/skimage/meson.build
+@@ -29,37 +29,51 @@ if is_windows
+ endif
+ endif
+
+-# NumPy include directory - needed in all submodules
+-incdir_numpy = run_command(py3,
+- [
+- '-c',
+- 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
+- ],
+- check: true
+-).stdout().strip()
++# Both NumPy and Pythran require header files that may differ between the build
++# system and the host system in a cross-compilation environment. To accommodate
++# these cases, we can query user-defined properties that can be specified in
++# the 'properties' section of a Meson cross file:
++#
++# [properties]
++# numpy-include-dir = '/path/to/numpy/includes'
++# pythran-include-dir = '/path/to/pythran/includes'
++#
++# In the absence of explicitly configured paths, just run the build Python and
++# try to query the Python packages for their paths directly.
++
++# NumPy include directory
++incdir_numpy = meson.get_external_property('numpy-include-dir', 'not-given')
++if incdir_numpy == 'not-given'
++ # If not specified, try to query NumPy from the build python
++ incdir_numpy = run_command(py3,
++ [
++ '-c',
++ 'import os; os.chdir(".."); import numpy; print(numpy.get_include())'
++ ],
++ check: true
++ ).stdout().strip()
++endif
+
+ inc_np = include_directories(incdir_numpy)
+
+ cc = meson.get_compiler('c')
+
+-# Pythran include directory and build flags
+-use_pythran = run_command(py3,
+- [
+- '-c',
+- 'import os; print(os.environ.get("SCIPY_USE_PYTHRAN", 1))'
+- ],
+- check: true
+-).stdout().strip() == '1'
+-
+-incdir_pythran = run_command(py3,
+- [
+- '-c',
+- 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
+- ],
+- check: true
+-).stdout().strip()
++# Pythran include directory
++incdir_pythran = meson.get_external_property('pythran-include-dir', 'not-given')
++if incdir_pythran == 'not-given'
++ # If not specified, try to query Pythran from the build python
++ incdir_pythran = run_command(py3,
++ [
++ '-c',
++ 'import os; os.chdir(".."); import pythran; print(os.path.dirname(pythran.__file__));'
++ ],
++ check: true
++ ).stdout().strip()
++endif
++
+ inc_pythran = include_directories(incdir_pythran)
+
++# Pythran build flags
+ cpp_args_pythran = [
+ '-DENABLE_PYTHON_MODULE',
+ '-D__PYTHRAN__=3',
+--
+2.41.0
+
diff --git a/srcpkgs/python3-scikit-image/patches/numpy-version.patch b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
new file mode 100644
index 000000000000..9d3a96588edd
--- /dev/null
+++ b/srcpkgs/python3-scikit-image/patches/numpy-version.patch
@@ -0,0 +1,14 @@
+There doesn't seem to be a valid reason for this restriction, and it doesn't
+impede building anyway.
+
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -145,7 +145,7 @@
+ "numpy==1.21.1; python_version=='3.8' and platform_python_implementation != 'PyPy'",
+ "numpy==1.21.1; python_version=='3.9' and platform_python_implementation != 'PyPy'",
+ "numpy==1.21.6; python_version=='3.10' and platform_system != 'Windows' and platform_python_implementation != 'PyPy'",
+- "numpy==1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
++ "numpy>=1.23.3; python_version=='3.11' and platform_python_implementation != 'PyPy'",
+ "numpy; python_version>='3.12'",
+ "numpy; python_version>='3.8' and platform_python_implementation=='PyPy'",
+ ]
diff --git a/srcpkgs/python3-scikit-image/template b/srcpkgs/python3-scikit-image/template
index c3b403fdef61..e800ed4f00f6 100644
--- a/srcpkgs/python3-scikit-image/template
+++ b/srcpkgs/python3-scikit-image/template
@@ -1,28 +1,57 @@
# Template file for 'python3-scikit-image'
pkgname=python3-scikit-image
-version=0.19.3
-revision=2
-_pkgname="${pkgname#python3-}"
-build_style=python3-module
-build_helper="numpy"
-hostmakedepends="python3-Cython python3-wheel python3-numpy
- python3-packaging python3-setuptools pythran"
-makedepends="python3-devel"
-depends="python3-scipy python3-numpy python3-imageio python3-matplotlib
- python3-networkx python3-tifffile python3-pywt python3-packaging"
+version=0.21.0
+revision=1
+build_style=meson
+build_helper="python3"
+hostmakedepends="python3-build python3-installer python3-meson-python
+ python3-wheel python3-setuptools python3-packaging python3-Cython pythran
+ python3-lazy_loader python3-numpy pkg-config"
+makedepends="python3-devel python3-numpy pythran"
+depends="python3-numpy python3-scipy python3-networkx python3-Pillow
+ python3-imageio python3-tifffile python3-pywt python3-packaging
+ python3-lazy_loader"
short_desc="Image processing in Python"
maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, MIT"
homepage="https://scikit-image.org/"
-distfiles="https://github.com/${_pkgname}/${_pkgname}/archive/v${version}.tar.gz"
-checksum=4eb877c98d1395769daef5bc2ba8a7efd3f736c87086aecb3775a9174593398b
+distfiles="https://github.com/scikit-image/scikit-image/archive/v${version}.tar.gz"
+checksum=53a82a9dbd3ed608d2ad3876269a271a7e922b12e228388eac996b508aadd652
# Tests require data files and unpackaged dependencies
make_check=no
-pre_build() {
- make_build_args+=" ${makejobs}"
+if [ "${CROSS_BUILD}" ]; then
+ configure_args="--cross-file=python.cross"
+fi
+
+pre_patch() {
+ if [ "${CROSS_BUILD}" ]; then
+ # Meson can't tolerate $CC with arguments as set by build helper
+ CC="${XBPS_CROSS_TRIPLET}-gcc"
+ # CXX needs to know where to find Python headers
+ CXXFLAGS+=" -I${XBPS_CROSS_BASE}/${py3_inc}"
+ fi
+}
+
+post_patch() {
+ if [ "${CROSS_BUILD}" ]; then
+ local _xpy="${XBPS_CROSS_BASE}/${py3_sitelib}"
+ cat > python.cross <<-EOF
+ [properties]
+ numpy-include-dir = '${_xpy}/numpy/core/include'
+ pythran-include-dir = '${_xpy}/pythran'
+ EOF
+ fi
+}
+
+do_build() {
+ # Use the build directory already configured by xbps-src for meson
+ python3 -m build --no-isolation --wheel \
+ -Cbuilddir="./build" -Ccompile-args="${makejobs}" .
}
-post_install() {
+do_install() {
+ python3 -m installer --destdir "${DESTDIR}" \
+ --no-compile-bytecode dist/*.whl
vlicense LICENSE.txt
}
From 8cc8693cd09478241b7ad3989a824919234fd8be Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:12:58 -0400
Subject: [PATCH 16/39] python3-MarkupSafe: update to 2.1.3.
---
srcpkgs/python3-MarkupSafe/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-MarkupSafe/template b/srcpkgs/python3-MarkupSafe/template
index e164956b0e2c..ce9f7dc13108 100644
--- a/srcpkgs/python3-MarkupSafe/template
+++ b/srcpkgs/python3-MarkupSafe/template
@@ -1,6 +1,6 @@
# Template file for 'python3-MarkupSafe'
pkgname=python3-MarkupSafe
-version=2.1.2
+version=2.1.3
revision=1
build_style=python3-module
hostmakedepends="python3-setuptools"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause"
homepage="https://palletsprojects.com/p/markupsafe/"
distfiles="${PYPI_SITE}/M/MarkupSafe/MarkupSafe-${version}.tar.gz"
-checksum=abcabc8c2b26036d62d4c746381a6f7cf60aafcc653198ad678306986b09450d
+checksum=af598ed32d6ae86f1b747b82783958b1a4ab8f617b06fe68795c7f026abbdcad
post_install() {
vlicense LICENSE.rst
From abefd83a58b34dcc5d22ae3223036ef7744e125e Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:14:59 -0400
Subject: [PATCH 17/39] python3-cryptography_vectors: update to 41.0.1.
---
srcpkgs/python3-cryptography_vectors/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography_vectors/template b/srcpkgs/python3-cryptography_vectors/template
index 8a900ad9d118..122780dbe152 100644
--- a/srcpkgs/python3-cryptography_vectors/template
+++ b/srcpkgs/python3-cryptography_vectors/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography_vectors'
pkgname=python3-cryptography_vectors
-version=41.0.0
+version=41.0.1
revision=1
build_style=python3-pep517
hostmakedepends="python3-setuptools python3-wheel"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
distfiles="${PYPI_SITE}/c/cryptography_vectors/cryptography_vectors-${version}.tar.gz"
-checksum=7c77787f6f1e3065aed0af9b0113d3736f2d0a80e0ed1ddbd296cf5ac638df00
+checksum=23b08c39777ec7b2774a11f945d1746301b1e88ecff2e5326d7f50ea0f42d580
post_install() {
vlicense LICENSE
From b61d016fed4dcb4f148c83cad99bf6e7f92e7923 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:16:54 -0400
Subject: [PATCH 18/39] python3-cryptography: update to 41.0.1.
---
srcpkgs/python3-cryptography/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cryptography/template b/srcpkgs/python3-cryptography/template
index f5a45e5277a5..ed5d26a87413 100644
--- a/srcpkgs/python3-cryptography/template
+++ b/srcpkgs/python3-cryptography/template
@@ -1,6 +1,6 @@
# Template file for 'python3-cryptography'
pkgname=python3-cryptography
-version=41.0.0
+version=41.0.1
revision=1
build_style=python3-module
build_helper="rust"
@@ -17,7 +17,7 @@ license="BSD-3-Clause, Apache-2.0"
homepage="https://github.com/pyca/cryptography"
changelog="https://raw.githubusercontent.com/pyca/cryptography/master/CHANGELOG.rst"
distfiles="${PYPI_SITE}/c/cryptography/cryptography-${version}.tar.gz"
-checksum=6b71f64beeea341c9b4f963b48ee3b62d62d57ba93eb120e1196b31dc1025e78
+checksum=d34579085401d3f49762d2f7d6634d6b6c2ae1242202e860f4d26b046e3a1006
if [ "$CROSS_BUILD" ]; then
makedepends+=" rust-std"
From dd4e3a1c010d6192df29b10891aebb19171c6dc3 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:17:42 -0400
Subject: [PATCH 19/39] python3-imageio: update to 2.31.0.
---
srcpkgs/python3-imageio/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-imageio/template b/srcpkgs/python3-imageio/template
index ad3e419c67fd..859954e3973c 100644
--- a/srcpkgs/python3-imageio/template
+++ b/srcpkgs/python3-imageio/template
@@ -1,6 +1,6 @@
# Template file for 'python3-imageio'
pkgname=python3-imageio
-version=2.30.0
+version=2.31.0
revision=1
build_style=python3-module
# tests have unpackaged dependencies, require network or missing data files
@@ -16,7 +16,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="BSD-2-Clause"
homepage="https://github.com/imageio/imageio"
distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=15e8ae8a63575040253a772cb476b7ce4e4d762200fb6086e08802784c7d394b
+checksum=2833a9e648a7d95d3dbbe74d3488283de59722463c67fa4d0481185f7de29ed6
post_install() {
vlicense LICENSE
From ddda38c319a3b540fabb0f1f2843675e8e72bde1 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Tue, 6 Jun 2023 11:30:28 -0400
Subject: [PATCH 20/39] python3-cvxopt: fix dist-info versioning
---
srcpkgs/python3-cvxopt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/python3-cvxopt/template b/srcpkgs/python3-cvxopt/template
index 92e33c022bae..7e85f1c5628b 100644
--- a/srcpkgs/python3-cvxopt/template
+++ b/srcpkgs/python3-cvxopt/template
@@ -1,9 +1,9 @@
# Template file for 'python3-cvxopt'
pkgname=python3-cvxopt
version=1.3.1
-revision=1
+revision=2
build_style=python3-module
-hostmakedepends="python3-setuptools"
+hostmakedepends="python3-setuptools_scm"
makedepends="python3-devel SuiteSparse-devel gsl-devel glpk-devel fftw-devel
$(vopt_if openblas 'openblas-devel' 'lapack-devel')"
depends="python3"
From b36c33b64f59315fef694e96941b8cea95e81472 Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Sun, 4 Jun 2023 14:23:31 +0200
Subject: [PATCH 21/39] xrdb: update to 1.2.2.
---
srcpkgs/xrdb/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/xrdb/template b/srcpkgs/xrdb/template
index e786702c8d80..bc72395160e7 100644
--- a/srcpkgs/xrdb/template
+++ b/srcpkgs/xrdb/template
@@ -1,6 +1,6 @@
# Template file for 'xrdb'
pkgname=xrdb
-version=1.2.1
+version=1.2.2
revision=1
build_style=gnu-configure
configure_args="--with-cpp=/usr/bin/cpp,/usr/bin/clang-cpp,/usr/bin/mcpp"
@@ -11,8 +11,8 @@ short_desc="X server resource database utility"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.bz2"
-checksum=4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4
+distfiles="${XORG_SITE}/app/${pkgname}-${version}.tar.xz"
+checksum=31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4
post_install() {
vlicense COPYING
From 61578607c3dcf74d9b6527cef4d3dba413b4b83c Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Mon, 5 Jun 2023 17:38:11 +0200
Subject: [PATCH 22/39] reptyr: update to 0.10.0.
---
srcpkgs/reptyr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/reptyr/template b/srcpkgs/reptyr/template
index b1cad3c1d477..5190ebf8b816 100644
--- a/srcpkgs/reptyr/template
+++ b/srcpkgs/reptyr/template
@@ -1,6 +1,6 @@
# Template file for 'reptyr'
pkgname=reptyr
-version=0.9.0
+version=0.10.0
revision=1
build_style=gnu-makefile
make_install_args="BASHCOMPDIR=/usr/share/bash-completion/completions"
@@ -9,7 +9,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://github.com/nelhage/reptyr"
distfiles="https://github.com/nelhage/reptyr/archive/${pkgname}-${version}.tar.gz"
-checksum=b442fbb80a1003b1985974c6fc9eeb8124a43a9bf014ae6af8cde0ca5e587731
+checksum=c6ffbc34a511ac00d072219bda30699e51f2f4eb483cbae9e32e981d49e8b380
post_install() {
vlicense COPYING LICENSE
From ad0690adf86f5837d4f8ebc75d927bf707877ffc Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:06:49 +0200
Subject: [PATCH 23/39] xorgproto: update to 2023.1.
---
srcpkgs/xorgproto/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/xorgproto/template b/srcpkgs/xorgproto/template
index 342be095872f..02905d7aabb0 100644
--- a/srcpkgs/xorgproto/template
+++ b/srcpkgs/xorgproto/template
@@ -1,6 +1,6 @@
# Template file for 'xorgproto'
pkgname=xorgproto
-version=2022.2
+version=2023.1
revision=1
build_style=meson
configure_args="-Dlegacy=true"
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="MIT"
homepage="https://xorg.freedesktop.org"
distfiles="${XORG_SITE}/proto/xorgproto-${version}.tar.xz"
-checksum=5d13dbf2be08f95323985de53352c4f352713860457b95ccaf894a647ac06b9e
+checksum=6545e41aceba43c13497ac8084dad5db6deef580a5ea7d0bd7872cfd1be72a13
replaces="bigreqsproto>=0 compositeproto>=0 damageproto>=0 dmxproto>=0 dri2proto>=0
dri3proto>=0 fixesproto>=0 fontsproto>=0 glproto>=0 inputproto>=0 kbproto>=0 presentproto>=0
printproto>=0 randrproto>=0 recordproto>=0 renderproto>=0 resourceproto>=0 scrnsaverproto>=0
From 5ca3dc45a31d4fb9ad0aaff3844f5470345fa8cf Mon Sep 17 00:00:00 2001
From: Leah Neukirchen <leah@vuxu.org>
Date: Tue, 6 Jun 2023 14:07:25 +0200
Subject: [PATCH 24/39] ugrep: update to 3.12.1.
---
srcpkgs/ugrep/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/ugrep/template b/srcpkgs/ugrep/template
index eb60f284250b..df9ae32837ff 100644
--- a/srcpkgs/ugrep/template
+++ b/srcpkgs/ugrep/template
@@ -1,6 +1,6 @@
# Template file for 'ugrep'
pkgname=ugrep
-version=3.12.0
+version=3.12.1
revision=1
build_style=gnu-configure
makedepends="bzip2-devel liblz4-devel liblzma-devel libzstd-devel pcre2-devel
@@ -10,7 +10,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="BSD-3-Clause"
homepage="https://github.com/Genivia/ugrep"
distfiles="https://github.com/Genivia/ugrep/archive/v${version}.tar.gz"
-checksum=f69330b74a2d2e46c878c19da3453e97d92ae960d0e1a92a853481cb889fca3e
+checksum=a442ac9c0961746374d0627e6ec52d5c6250541640aeb9a698eb40382d0ec44c
post_install() {
vlicense LICENSE.txt LICENSE
From 8a2cb232c63b6f58abdb0c40fc4a6fe43f7ff1e8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 22:57:19 +0200
Subject: [PATCH 25/39] syncthing: update to 1.23.5.
---
srcpkgs/syncthing/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/syncthing/template b/srcpkgs/syncthing/template
index 58a95827922d..1c704f3d6eed 100644
--- a/srcpkgs/syncthing/template
+++ b/srcpkgs/syncthing/template
@@ -1,6 +1,6 @@
# Template file for 'syncthing'
pkgname=syncthing
-version=1.23.4
+version=1.23.5
revision=1
build_style=go
go_import_path="github.com/syncthing/syncthing"
@@ -16,7 +16,7 @@ license="MPL-2.0"
homepage="https://syncthing.net/"
changelog="https://github.com/syncthing/syncthing/releases"
distfiles="https://github.com/syncthing/${pkgname}/archive/v${version}.tar.gz"
-checksum=4b68cee85b63fbb197a4e5401b3983a2a2358e1098ff91755f47925a1ee17f58
+checksum=d87f02b3e970c0f08c59166851b40ee5c647efcb2d70b5f0410416987cd42294
pre_build() {
GOARCH= go generate \
From 47fc37e6d7bdf330b4b10da3ccef6bd498c78c10 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:28:53 +0200
Subject: [PATCH 26/39] terragrunt: update to 0.46.2.
---
srcpkgs/terragrunt/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/terragrunt/template b/srcpkgs/terragrunt/template
index fe7569f377f3..fc654aa02f70 100644
--- a/srcpkgs/terragrunt/template
+++ b/srcpkgs/terragrunt/template
@@ -1,6 +1,6 @@
# Template file for 'terragrunt'
pkgname=terragrunt
-version=0.46.1
+version=0.46.2
revision=1
build_style=go
go_import_path="github.com/gruntwork-io/terragrunt"
@@ -10,7 +10,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="MIT"
homepage="https://github.com/gruntwork-io/terragrunt"
distfiles="$homepage/archive/v$version.tar.gz"
-checksum=f3b99f6de74ce6d2af87a01cb0ca6ff8d6357e506fbc69252f821820d3c5c0bf
+checksum=0d8bb4e98276e68c76d770e662bb434fb5c89f8fc06c3c00e14e717417123ec5
post_install() {
vlicense LICENSE.txt
From 4517a2b6141f3e00eda5ba047c480e6ffed056e2 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <abc@pompel.me>
Date: Wed, 7 Jun 2023 11:29:51 +0200
Subject: [PATCH 27/39] hugo: update to 0.113.0.
---
srcpkgs/hugo/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/hugo/template b/srcpkgs/hugo/template
index d80e676fd44d..d5c4cfeca19a 100644
--- a/srcpkgs/hugo/template
+++ b/srcpkgs/hugo/template
@@ -1,6 +1,6 @@
# Template file for 'hugo'
pkgname=hugo
-version=0.112.7
+version=0.113.0
revision=1
build_style=go
build_helper=qemu
@@ -11,7 +11,7 @@ maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="Apache-2.0"
homepage="https://gohugo.io"
distfiles="https://github.com/gohugoio/hugo/archive/v${version}.tar.gz"
-checksum=d706e52c74f0fb00000caf4e95b98e9d62c3536a134d5e26b433b1fa1e2a74aa
+checksum=0bea01f37d7d04e6262844ff3070b76e5fb9f5fe2330a1367bd1c35c77098161
post_install() {
vdoc README.md
From 61b4764baf989681ab3f53ba82791f722bbf280e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:02 +0200
Subject: [PATCH 28/39] drumkv1: update to 0.9.31.
---
srcpkgs/drumkv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/drumkv1/template b/srcpkgs/drumkv1/template
index dee163016be3..90373aa8ef95 100644
--- a/srcpkgs/drumkv1/template
+++ b/srcpkgs/drumkv1/template
@@ -1,6 +1,6 @@
# Template file for 'drumkv1'
pkgname=drumkv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://drumkv1.sourceforge.io/"
changelog="https://github.com/rncbc/drumkv1/raw/master/ChangeLog"
distfiles="https://download.sourceforge.net/drumkv1/drumkv1-${version}.tar.gz"
-checksum=75b0c50705fe2a81d578e739700bbbabcdb359d153f76b9475016c8572d64ec1
+checksum=d42b09322a4135964afdd5246a8d6863d8aa20886b47ba8b58f345d23aa68033
From fb97383f5d7dfbee4f721d28086a7fc7d1288d03 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:05 +0200
Subject: [PATCH 29/39] padthv1: update to 0.9.31.
---
srcpkgs/padthv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/padthv1/template b/srcpkgs/padthv1/template
index 33a217131082..2c4b5a50bff7 100644
--- a/srcpkgs/padthv1/template
+++ b/srcpkgs/padthv1/template
@@ -1,6 +1,6 @@
# Template file for 'padthv1'
pkgname=padthv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://padthv1.sourceforge.io/"
changelog="https://github.com/rncbc/padthv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/padthv1/padthv1-${version}.tar.gz"
-checksum=704b94d41d5daca3dbd9eaca93b8228e8f6e447a8c86f1f695fd92f16e7e6add
+checksum=305f45be4c923bcfa671463b01ef212d8fde4ae37ea687581a8046187b9315c7
From bda7ee21da6e33d1512455477ddbc6e934c11f19 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 30/39] samplv1: update to 0.9.31.
---
srcpkgs/samplv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/samplv1/template b/srcpkgs/samplv1/template
index d4d17baa57c3..0d299884926b 100644
--- a/srcpkgs/samplv1/template
+++ b/srcpkgs/samplv1/template
@@ -1,6 +1,6 @@
# Template file for 'samplv1'
pkgname=samplv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -12,4 +12,4 @@ license="GPL-2.0-or-later"
homepage="https://samplv1.sourceforge.io/"
changelog="https://github.com/rncbc/samplv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/samplv1/samplv1-${version}.tar.gz"
-checksum=f32fcccfa0395757b66351816e841e2b5c0459ce9161aba36d23ff9db58955a5
+checksum=9d4eb430709e5ed53d28c8dd9c01f07fc042be569b72a248bd766d2256a50bcb
From 3d904851619eb4f22ab5ef46e96952b8fa4ab582 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:35:06 +0200
Subject: [PATCH 31/39] synthv1: update to 0.9.31.
---
srcpkgs/synthv1/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/synthv1/template b/srcpkgs/synthv1/template
index 7d20b505baea..126cd0600682 100644
--- a/srcpkgs/synthv1/template
+++ b/srcpkgs/synthv1/template
@@ -1,6 +1,6 @@
# Template file for 'synthv1'
pkgname=synthv1
-version=0.9.30
+version=0.9.31
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@@ -11,4 +11,4 @@ license="GPL-2.0-or-later"
homepage="https://synthv1.sourceforge.io/"
changelog="https://github.com/rncbc/synthv1/raw/master/ChangeLog"
distfiles="${SOURCEFORGE_SITE}/synthv1/synthv1-${version}.tar.gz"
-checksum=235cf1035f91a24743d01fcd1efa5274db94f2395734f33519ca672ac64af4d5
+checksum=9304a03adcfc51d4c83e6acdbbd4ef8e4418c996a1e23f8c5f9eabd62d8fce1b
From fccb442fa0e227e007f594f5dfabcee7f6c63464 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:05:38 -0400
Subject: [PATCH 32/39] python3-meson-python: fix update-check
---
srcpkgs/python3-meson-python/update | 1 +
1 file changed, 1 insertion(+)
create mode 100644 srcpkgs/python3-meson-python/update
diff --git a/srcpkgs/python3-meson-python/update b/srcpkgs/python3-meson-python/update
new file mode 100644
index 000000000000..60b9eebd42f4
--- /dev/null
+++ b/srcpkgs/python3-meson-python/update
@@ -0,0 +1 @@
+pattern="meson_python-\K[0-9.]+(?=.tar)"
From 4e232bff5b8c1919f49d1d5a6e67b3979eb3a097 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:09:23 -0400
Subject: [PATCH 33/39] cpp-utilities: update to 5.23.0.
---
.../patches/fix-32bit-sendfile.patch | 26 -------------------
srcpkgs/cpp-utilities/template | 4 +--
2 files changed, 2 insertions(+), 28 deletions(-)
delete mode 100644 srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
diff --git a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch b/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
deleted file mode 100644
index 0c8cc562f866..000000000000
--- a/srcpkgs/cpp-utilities/patches/fix-32bit-sendfile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 92757f253113515e96bb4ddbb4627b314ada6b58 Mon Sep 17 00:00:00 2001
-From: "Andrew J. Hesford" <ajh@sideband.org>
-Date: Thu, 6 Apr 2023 11:33:41 -0400
-Subject: [PATCH] Fix use of `sendfile()` on 32-bit systems
-
----
- io/copy.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/io/copy.h b/io/copy.h
-index 4abbe8d..0635a8e 100644
---- a/io/copy.h
-+++ b/io/copy.h
-@@ -155,7 +155,8 @@ void CopyHelper<bufferSize>::callbackCopy(NativeFileStream &input, NativeFileStr
- output.flush();
- const auto totalBytes = static_cast<std::streamoff>(count);
- while (count) {
-- const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, std::min(count, bufferSize));
-+ const auto bytesToCopy = static_cast<std::size_t>(std::min(count, static_cast<std::uint64_t>(bufferSize)));
-+ const auto bytesCopied = ::sendfile64(output.fileDescriptor(), input.fileDescriptor(), nullptr, bytesToCopy);
- if (bytesCopied < 0) {
- throw std::ios_base::failure(argsToString("sendfile64() failed: ", std::strerror(errno)));
- }
---
-2.40.0
-
diff --git a/srcpkgs/cpp-utilities/template b/srcpkgs/cpp-utilities/template
index d4d2d10eb9a8..4e164a09fac5 100644
--- a/srcpkgs/cpp-utilities/template
+++ b/srcpkgs/cpp-utilities/template
@@ -1,6 +1,6 @@
# Template file for 'cpp-utilities'
pkgname=cpp-utilities
-version=5.22.0
+version=5.23.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -10,7 +10,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/cpp-utilities"
distfiles="https://github.com/Martchus/cpp-utilities/archive/v${version}.tar.gz"
-checksum=ea68a894f9d5879dc247c1a08172319ca34d2a0022bbc0412e9428c011ffaba2
+checksum=2a0564afb3c5c2f9119ef4ea434001d4ee67a88a99484c412253b3f9ae4147bc
cpp-utilities-devel_package() {
short_desc+=" - development files"
From 398acda9db727f18b7aab7e6ee0d91f5fd26db55 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:10:23 -0400
Subject: [PATCH 34/39] qtutilities: update to 6.12.1.
---
srcpkgs/qtutilities/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/qtutilities/template b/srcpkgs/qtutilities/template
index 027d35c37179..06cc1b888bd8 100644
--- a/srcpkgs/qtutilities/template
+++ b/srcpkgs/qtutilities/template
@@ -1,6 +1,6 @@
# Template file for 'qtutilities'
pkgname=qtutilities
-version=6.12.0
+version=6.12.1
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -12,7 +12,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/qtutilities"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=d3b8bc68c82d195cfeb4aa8d599c020774322aea7faebf5243e139088d89a82c
+checksum=83a68a39a2edbd1ba3ec2e50b9b4c84ed5a54c30fb3cb1bc3088e8d0290989c2
pre_check() {
ninja -C build tests
From 3dc29db624a217efd9a5e7adeb310d72cb3aff46 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:15:08 -0400
Subject: [PATCH 35/39] tagparser: update to 12.0.0.
---
common/shlibs | 2 +-
srcpkgs/tagparser/template | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 042a1d23492e..e34e372b84f0 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3925,7 +3925,7 @@ libslirp.so.0 libslirp-4.2.0_1
libqpdf.so.29 libqpdf-11.0.0_1
libstk-4.6.1.so libstk-4.6.1_1
libc++utilities.so.5 cpp-utilities-5.2.0_1
-libtagparser.so.11 tagparser-11.0.0_1
+libtagparser.so.12 tagparser-12.0.0_1
libqtutilities.so.6 qtutilities-6.0.4_1
libkdsoap.so.2 KDSoap-2.0.0_1
libkdsoap-server.so.2 KDSoap-2.0.0_1
diff --git a/srcpkgs/tagparser/template b/srcpkgs/tagparser/template
index c0ce54c985f9..5577aaa67c0a 100644
--- a/srcpkgs/tagparser/template
+++ b/srcpkgs/tagparser/template
@@ -1,6 +1,6 @@
# Template file for 'tagparser'
pkgname=tagparser
-version=11.6.0
+version=12.0.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tagparser"
distfiles="https://github.com/Martchus/${pkgname}/archive/v${version}.tar.gz"
-checksum=298ff927e14860e97e5b75057ff50fe64e0e0521ca7253e8624be6db6ac77261
+checksum=94ded89093beb67d95816c4ba700cb50f64b4f4fdc7748ccfbb61946246b635e
tagparser-devel_package() {
short_desc+=" - development files"
From e7e99df59d907a307a82069be6e2e7801862359f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Wed, 7 Jun 2023 10:16:28 -0400
Subject: [PATCH 36/39] tageditor: update to 3.8.0.
---
srcpkgs/tageditor/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/tageditor/template b/srcpkgs/tageditor/template
index 8b18b4f825bb..26b4421b4396 100644
--- a/srcpkgs/tageditor/template
+++ b/srcpkgs/tageditor/template
@@ -1,6 +1,6 @@
# Template file for 'tageditor'
pkgname=tageditor
-version=3.7.9
+version=3.8.0
revision=1
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS:BOOL=ON"
@@ -11,7 +11,7 @@ maintainer="Andrew J. Hesford <ajh@sideband.org>"
license="GPL-2.0-only"
homepage="https://github.com/Martchus/tageditor"
distfiles="https://github.com/Martchus/tageditor/archive/v${version}.tar.gz"
-checksum=987101e9a259db79b28b872c778e9818f12618ce5a12ab7558b6262c7621b217
+checksum=9ab25924be61b1ddd12510c2fa90a9fd9ebae1b634764e50415f47c1e0be28ab
build_options="qt webengine webkit script"
build_options_default="qt"
From 46dd270c3d7b10313b676cc01b190759088990a2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 7 Jun 2023 13:58:26 +0200
Subject: [PATCH 37/39] knot: update to 3.2.7.
---
srcpkgs/knot/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/knot/template b/srcpkgs/knot/template
index 8a220c62d1d3..bfb53410c2e2 100644
--- a/srcpkgs/knot/template
+++ b/srcpkgs/knot/template
@@ -1,7 +1,7 @@
# Template file for 'knot'
pkgname=knot
-version=3.2.6
-revision=2
+version=3.2.7
+revision=1
build_style=gnu-configure
configure_args="
--disable-silent-rules
@@ -12,7 +12,8 @@ configure_args="
conf_files="/etc/knot/knot.conf"
hostmakedepends="automake pkg-config protobuf-c"
makedepends="gnutls-devel lmdb-devel libedit-devel liburcu-devel
- protobuf-c-devel fstrm-devel libmaxminddb-devel"
+ protobuf-c-devel fstrm-devel libmaxminddb-devel libcap-ng-devel
+ nghttp2-devel"
checkdepends="softhsm"
short_desc="High-performance authoritative-only DNS server"
maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -20,7 +21,7 @@ license="GPL-3.0-or-later"
homepage="https://www.knot-dns.cz/"
changelog="https://github.com/CZ-NIC/knot/raw/${version%*.*}/NEWS"
distfiles="https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"
-checksum=ac124fb17dbc4ac5310a30a396245a6ba304b3c89abed0f8a47d727462c8da4d
+checksum=d3b7872ac8aa80f7f54ddb1bb3b1e2f90ec55f7270a2c4a9338eab42b7d2767b
system_accounts="_knot"
_knot_homedir="/var/lib/knot"
From 79485f6d08c4cce1629bee6fc2529f09475da019 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 6 Jun 2023 13:34:57 +0200
Subject: [PATCH 38/39] chromium: update to 114.0.5735.106.
---
...g-for-std-strlen-in-web_view_impl.cc.patch | 29 -------
...typename-s-that-are-required-in-C-17.patch | 45 +++++++++++
...karound_clang_bug-structured_binding.patch | 32 --------
...karound_clang_bug-structured_binding.patch | 81 +++++++++++++++++++
.../patches/cursed^Uscoped_file.patch | 18 -----
srcpkgs/chromium/template | 20 ++---
6 files changed, 133 insertions(+), 92 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
create mode 100644 srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
create mode 100644 srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
delete mode 100644 srcpkgs/chromium/patches/cursed^Uscoped_file.patch
diff --git a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index 6648fab5719d..000000000000
--- a/srcpkgs/chromium/patches/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Patch-Source: https://github.com/archlinux/svntogit-packages/blob/79b774aedeaecd4d31b2adb84e3e4b901dc980aa/trunk/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
---
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
-
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 000000000000..35b7152cbbdb
--- /dev/null
+++ b/srcpkgs/chromium/patches/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+ RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result) {
++ typename std::remove_reference<T>::type... result) {
+ auto found_callbacks_map = saved_callbacks.find(remote_id);
+ if (found_callbacks_map == saved_callbacks.end())
+ return; // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+ template <class... T>
+ void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+ const RemoteId& remote_id,
+- std::remove_reference<T>::type... result);
++ typename std::remove_reference<T>::type... result);
+
+ // Test support for client ID management.
+ static void SetClientsForTesting(
diff --git a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
deleted file mode 100644
index c3e87c9f589a..000000000000
--- a/srcpkgs/chromium/patches/chromium-113-workaround_clang_bug-structured_binding.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Source: https://src.fedoraproject.org/rpms/chromium/blob/439349f5608f8ecb21aec532e8f9ba6a5b4920f7/f/chromium-113-workaround_clang_bug-structured_binding.patch
-workaround llvm15 compiler bug
-diff -up chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
---- chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.me 2023-05-03 16:30:34.244612573 +0200
-+++ chromium-113.0.5672.63/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-03 16:37:36.732278590 +0200
-@@ -516,8 +516,11 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
- row_auto_repetitions);
-
- bool has_nested_subgrid = false;
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->CreateSizingData();
-+
-+ auto& workaround_clang_bug = sizing_tree->CreateSizingData();
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- if (!must_ignore_children) {
- // Construct grid items that are not subgridded.
-@@ -1540,8 +1543,10 @@ void NGGridLayoutAlgorithm::InitializeTr
- NGGridSizingTree* sizing_tree) const {
- DCHECK(sizing_tree && current_grid_index < sizing_tree->Size());
-
-- auto& [grid_items, layout_data, subtree_size] =
-- sizing_tree->At(current_grid_index);
-+ auto& workaround_clang_bug = sizing_tree->At(current_grid_index);
-+ auto& grid_items = workaround_clang_bug.grid_items;
-+ auto& layout_data = workaround_clang_bug.layout_data;
-+ auto& subtree_size = workaround_clang_bug.subtree_size;
-
- auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
- InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
diff --git a/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
new file mode 100644
index 000000000000..af8e737059c7
--- /dev/null
+++ b/srcpkgs/chromium/patches/chromium-114-workaround_clang_bug-structured_binding.patch
@@ -0,0 +1,81 @@
+diff -up chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc
+--- chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc.workaround_clang_bug-structured_binding 2023-05-11 03:36:27.000000000 +0200
++++ chromium-114.0.5735.26/third_party/blink/renderer/core/layout/ng/grid/ng_grid_layout_algorithm.cc 2023-05-14 11:49:42.558129164 +0200
+@@ -238,7 +238,10 @@ const NGLayoutResult* NGGridLayoutAlgori
+ : BuildGridSizingTree(&oof_children);
+
+ LayoutUnit intrinsic_block_size;
+- auto& [grid_items, layout_data, tree_size] = grid_sizing_tree.TreeRootData();
++ auto& [g_i, l_d, t_s] = grid_sizing_tree.TreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& tree_size = t_s;
+
+ if (IsBreakInside(BreakToken())) {
+ // TODO(layout-dev): When we support variable inline-size fragments we'll
+@@ -520,8 +523,10 @@ wtf_size_t NGGridLayoutAlgorithm::BuildG
+ row_auto_repetitions);
+
+ bool has_nested_subgrid = false;
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& [g_i, l_d, s_s] = sizing_tree->CreateSizingData(opt_subgrid_data);
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ if (!must_ignore_children) {
+ // Construct grid items that are not subgridded.
+@@ -650,8 +655,10 @@ NGGridSizingTree NGGridLayoutAlgorithm::
+ NGGridSizingTree sizing_tree;
+
+ if (const auto* layout_subtree = ConstraintSpace().GridLayoutSubtree()) {
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_tree.CreateSizingData();
++ auto& [g_i, l_d, s_s] = sizing_tree.CreateSizingData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const auto& node = Node();
+ grid_items =
+@@ -1640,8 +1647,10 @@ void NGGridLayoutAlgorithm::InitializeTr
+ const absl::optional<GridTrackSizingDirection>& opt_track_direction) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ auto InitAndCacheTrackSizes = [&](GridTrackSizingDirection track_direction) {
+ InitializeTrackCollection(opt_subgrid_data, track_direction, &layout_data);
+@@ -1825,8 +1834,10 @@ void NGGridLayoutAlgorithm::CompleteTrac
+ bool* opt_needs_additional_pass) const {
+ DCHECK(sizing_subtree);
+
+- auto& [grid_items, layout_data, subtree_size] =
+- sizing_subtree.SubtreeRootData();
++ auto& [g_i, l_d, s_s] = sizing_subtree.SubtreeRootData();
++ auto& grid_items = g_i;
++ auto& layout_data = l_d;
++ auto& subtree_size = s_s;
+
+ const bool is_for_columns = track_direction == kForColumns;
+ const bool has_non_definite_track =
+diff -up chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc
+--- chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc.me 2023-05-14 17:35:00.446844465 +0200
++++ chromium-114.0.5735.26/media/base/cdm_promise_adapter.cc 2023-05-14 17:39:22.991733926 +0200
+@@ -94,7 +94,9 @@ void CdmPromiseAdapter::RejectPromise(ui
+ void CdmPromiseAdapter::Clear(ClearReason reason) {
+ // Reject all outstanding promises.
+ DCHECK(thread_checker_.CalledOnValidThread());
+- for (auto& [promise_id, promise] : promises_) {
++ for (auto& [p_i, p_e] : promises_) {
++ auto& promise_id = p_i;
++ auto& promise = p_e;
+ TRACE_EVENT_NESTABLE_ASYNC_END1(
+ "media", "CdmPromise", TRACE_ID_WITH_SCOPE("CdmPromise", promise_id),
+ "status", "cleared");
diff --git a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch b/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
deleted file mode 100644
index 2e5433f7abce..000000000000
--- a/srcpkgs/chromium/patches/cursed^Uscoped_file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/base/files/scoped_file_linux.cc.orig
-+++ 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"
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index cafc2fe324c6..b4a39dfd3815 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,12 +1,11 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=113.0.5672.92
+version=114.0.5735.106
revision=1
archs="i686* x86_64* aarch64* armv7l*"
hostmakedepends="
$(vopt_if clang "clang lld llvm15")
- $(vopt_if js_optimize openjdk)
bison git gperf hwids ninja nodejs perl pkg-config python3
libatomic-devel libepoxy-devel libevent-devel libglib-devel"
makedepends="
@@ -17,8 +16,8 @@ makedepends="
libexif-devel libflac-devel libgcrypt-devel libjpeg-turbo-devel libmtp-devel
libpng-devel libva-devel libwebp-devel libxml2-devel libxshmfence-devel
libxslt-devel woff2-devel minizip-devel mit-krb5-devel nss-devel opus-devel
- pciutils-devel re2-devel snappy-devel speech-dispatcher-devel speex-devel
- xcb-proto zlib-devel libaom-devel libffi-devel
+ pciutils-devel snappy-devel speech-dispatcher-devel speex-devel
+ xcb-proto zlib-devel libaom-devel libffi-devel libevdev-devel
$(vopt_if pipewire pipewire-devel)
$(vopt_if pulseaudio pulseaudio-devel)
$(vopt_if sndio sndio-devel)"
@@ -28,15 +27,14 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5
+checksum=df18b0b28bf52b1c099acde54e568fbfa2c9225150108bce9d53d8b31f71304a
lib32disabled=yes
-build_options="clang debug js_optimize vaapi pulseaudio sndio pipewire"
+build_options="clang debug vaapi pulseaudio sndio pipewire"
build_options_default="clang vaapi pulseaudio pipewire"
desc_option_clang="Use clang to build"
desc_option_debug="Build with debug symbols"
-desc_option_js_optimize="Optimize the JS used for Chromium's UI"
desc_option_pipewire="Enable support for screen sharing for WebRTC via PipeWire"
if [ "$XBPS_LIBC" = musl ]; then
@@ -52,8 +50,8 @@ if [ "$CROSS_BUILD" ]; then
libjpeg-turbo-devel libXi-devel nss-devel libpng-devel libwebp-devel
libxml2-devel $(vopt_if pulseaudio pulseaudio-devel) libxslt-devel libxkbcommon-devel
$(vopt_if pipewire pipewire-devel) ffmpeg-devel opus-devel pango-devel libva-devel
- libcurl-devel snappy-devel re2-devel libXrandr-devel libXcomposite-devel cups-devel
- mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel
+ libcurl-devel snappy-devel libXrandr-devel libXcomposite-devel cups-devel
+ mit-krb5-devel alsa-lib-devel libXdamage-devel libepoxy-devel libevdev-devel
libavif-devel libaom-devel jsoncpp-devel woff2-devel libdav1d-devel libflac-devel"
fi
@@ -158,7 +156,6 @@ do_configure() {
libxml
libxslt
opus
- re2
snappy
"
@@ -219,9 +216,6 @@ do_configure() {
# deprecated
'use_gnome_keyring=false'
- # https://chromium.googlesource.com/chromium/src/+/master/docs/closure_compilation.md
- "enable_js_type_check=$(vopt_if js_optimize true false)"
-
"use_pulseaudio=$(vopt_if pulseaudio true false)"
"link_pulseaudio=$(vopt_if pulseaudio true false)"
From f79667ca62b713f88c36c9c8cbaca23016b70a55 Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH 39/39] rust-sccache: update to 0.5.3.
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..f16c5ebf6041 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
-version=0.4.2
+version=0.5.3
revision=1
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://crates.io/crates/sccache"
changelog="https://github.com/mozilla/sccache/releases"
distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] rust-sccache: update to 0.5.3.
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
` (2 preceding siblings ...)
2023-06-07 16:44 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.3 Duncaen
@ 2023-06-07 18:51 ` icp1994
2023-06-09 2:18 ` [PR PATCH] [Merged]: " classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: icp1994 @ 2023-06-07 18:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 487 bytes --]
There is an updated pull request by icp1994 against master on the void-packages repository
https://github.com/icp1994/void-packages rust-sccache
https://github.com/void-linux/void-packages/pull/44064
rust-sccache: update to 0.5.3.
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
A patch file from https://github.com/void-linux/void-packages/pull/44064.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rust-sccache-44064.patch --]
[-- Type: text/x-diff, Size: 1118 bytes --]
From 22f987719f6a8248ae0b4c45e452afe24680d80b Mon Sep 17 00:00:00 2001
From: icp <pangolin@vivaldi.net>
Date: Wed, 24 May 2023 15:24:57 +0530
Subject: [PATCH] rust-sccache: update to 0.5.3.
---
srcpkgs/rust-sccache/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/rust-sccache/template b/srcpkgs/rust-sccache/template
index 5a4133d4d283..f16c5ebf6041 100644
--- a/srcpkgs/rust-sccache/template
+++ b/srcpkgs/rust-sccache/template
@@ -1,6 +1,6 @@
# Template file for 'rust-sccache'
pkgname=rust-sccache
-version=0.4.2
+version=0.5.3
revision=1
build_style=cargo
# 1. requires expensive extra feature 2. requires clang 3. requires libc
@@ -14,7 +14,7 @@ license="Apache-2.0"
homepage="https://crates.io/crates/sccache"
changelog="https://github.com/mozilla/sccache/releases"
distfiles="https://static.crates.io/crates/sccache/sccache-${version}.crate"
-checksum=5e4e2e0d3e14abc7a1698e3f873f9c7871c7f12d05bab4241fa38389881cdda9
+checksum=4b9f745761d99969cb885e41e3ec4dacc99598e21a8d07a51d5028a26acb5cc3
case "$XBPS_TARGET_MACHINE" in
x86_64*|i686*|arm*|aarch64*) ;;
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: rust-sccache: update to 0.5.3.
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
` (3 preceding siblings ...)
2023-06-07 18:51 ` icp1994
@ 2023-06-09 2:18 ` classabbyamp
4 siblings, 0 replies; 6+ messages in thread
From: classabbyamp @ 2023-06-09 2:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 326 bytes --]
There's a merged pull request on the void-packages repository
rust-sccache: update to 0.5.3.
https://github.com/void-linux/void-packages/pull/44064
Description:
#### Testing the changes
- I tested the changes in this PR: **YES**
#### Local build testing
- I built this PR locally for my native architecture: **x86_64**
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-06-09 2:18 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-24 19:16 [PR PATCH] rust-sccache: update to 0.5.0 icp1994
2023-06-02 17:21 ` [PR PATCH] [Updated] " icp1994
2023-06-05 19:30 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.1 icp1994
2023-06-07 16:44 ` [PR PATCH] [Updated] rust-sccache: update to 0.5.3 Duncaen
2023-06-07 18:51 ` icp1994
2023-06-09 2:18 ` [PR PATCH] [Merged]: " classabbyamp
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).