From: Duncaen <Duncaen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] icu-69.1, firefox-91.0, firefox-esr-78.13.0, qt5-webengine-5.15.5
Date: Tue, 10 Aug 2021 21:06:37 +0200 [thread overview]
Message-ID: <20210810190637.3sNbT8cMxVx159cocPqvr7L0exQt6znGPTpGz6uioFM@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32441@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 365 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages icu-69.1
https://github.com/void-linux/void-packages/pull/32441
icu-69.1, firefox-91.0, firefox-esr-78.13.0, qt5-webengine-5.15.5
[ci skip]
A patch file from https://github.com/void-linux/void-packages/pull/32441.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-icu-69.1-32441.patch --]
[-- Type: text/x-diff, Size: 138297 bytes --]
From b538087f6e698c1382c5757d16e48faba25a813c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:10:40 +0200
Subject: [PATCH 01/95] icu: update to 69.1.
---
common/shlibs | 12 ++++++------
srcpkgs/icu/template | 7 ++++---
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 278d2456072f..8d1e95f063ec 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -515,12 +515,12 @@ libkImageAnnotator.so.0 kImageAnnotator-0.4.1_1
libkColorPicker.so.0 kColorPicker-0.1.5_1
libbabl-0.1.so.0 babl-0.1.16_1
libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.67 icu-libs-67.1_1
-libicui18n.so.67 icu-libs-67.1_1
-libicudata.so.67 icu-libs-67.1_1
-libicutu.so.67 icu-libs-67.1_1
-libicuuc.so.67 icu-libs-67.1_1
-libicutest.so.67 icu-libs-67.1_1
+libicuio.so.69 icu-libs-69.1_1
+libicui18n.so.69 icu-libs-69.1_1
+libicudata.so.69 icu-libs-69.1_1
+libicutu.so.69 icu-libs-69.1_1
+libicuuc.so.69 icu-libs-69.1_1
+libicutest.so.69 icu-libs-69.1_1
libaspell.so.15 libaspell-0.60.8_2
libpspell.so.15 libaspell-0.60.8_2
libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index 261c8ea7fdb9..a05d0a7d35a8 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,20 +2,21 @@
# NOTE: Please convert this package to support progressive updates with the
# next soname bump.
pkgname=icu
-version=67.1
-revision=2
+version=69.1
+revision=1
wrksrc=icu
build_wrksrc=source
build_style=gnu-configure
# use archive data instead of .so data for correct cross-compiling
configure_args="--with-data-packaging=archive --enable-static"
hostmakedepends="pkg-config"
+checkdepends="diffutils python3"
short_desc="Robust and fully-featured Unicode libraries"
maintainer="Randy McCaskill <randy@mccaskill.us>"
license="ICU"
homepage="https://home.unicode.org/"
distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
-checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
+checksum=4cba7b7acd1d3c42c44bb0c14be6637098c7faf2b330ce876bc5f3b915d09745
if [ "$CROSS_BUILD" ]; then
configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
From 73cb7f2ac001669b35e27977c4206a8a58b01df3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 02/95] 0ad: rebuild for icu-69.1
---
srcpkgs/0ad/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d6bbdb483101..f6e6b41899de 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
# Template file for '0ad'
pkgname=0ad
version=0.0.24b
-revision=2
+revision=3
archs="x86_64* i686* aarch64* armv7l* ppc64le*"
wrksrc="${pkgname}-${version}-alpha"
hostmakedepends="pkg-config perl cmake python3 rust cargo yasm tar clang"
From 6a8661cfb6c7c79691b2c84402ae80118585fc8c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 03/95] Aegisub: rebuild for icu-69.1
---
srcpkgs/Aegisub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..a00a75fe709d 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.2.2
-revision=12
+revision=13
build_style=gnu-configure
configure_args="--disable-update-checker --with-alsa --with-ffms2
--with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
From 090f75a8e367ba305f1f7c5e4163b484cc43e513 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:19 +0200
Subject: [PATCH 04/95] OpenRCT2: rebuild for icu-69.1
---
srcpkgs/OpenRCT2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 761da7f1e580..8eeb3f75b528 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -6,7 +6,7 @@ _objects_version=1.0.21
_titles_version=0.1.2c
_replays_version=0.0.43
version=0.3.4.1
-revision=1
+revision=2
build_style=cmake
configure_args="
-DOPENRCT2_VERSION_TAG=${version}
From 1abc4115eda7e638b1dde71354bf46d932a62fc3 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 05/95] R: rebuild for icu-69.1
---
srcpkgs/R/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 0eda3df81f3f..2a3cb67d3fec 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
# Template file for 'R'
pkgname=R
version=4.1.0
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
--with-blas$(vopt_if openblas '=openblas') --with-lapack
From 9feee054eeb6810a08c2243e02dca6f4059241ac Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 06/95] R-cran-stringi: rebuild for icu-69.1
---
srcpkgs/R-cran-stringi/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/R-cran-stringi/template b/srcpkgs/R-cran-stringi/template
index b7420242f6a4..c15849c98799 100644
--- a/srcpkgs/R-cran-stringi/template
+++ b/srcpkgs/R-cran-stringi/template
@@ -1,7 +1,7 @@
# Template file for 'R-cran-stringi'
pkgname=R-cran-stringi
version=1.4.6
-revision=3
+revision=4
build_style=R-cran
makedepends="pkg-config icu-devel"
short_desc="Character String Processing Facilities"
From d41c925477a73b4ef0516049d0a8c3a82f26061a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 07/95] an: rebuild for icu-69.1
---
srcpkgs/an/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 28a6600f6492..e05c3c129e64 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
# Template file for 'an'
pkgname=an
version=1.2
-revision=7
+revision=8
build_style=gnu-makefile
makedepends="icu-devel"
depends="words-en"
From c2971b93c095581ee1e0bc6452781b6ec3594544 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 08/95] boost: rebuild for icu-69.1
---
srcpkgs/boost/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index d1dd74577e7a..61749aaeba72 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
# Template file for 'boost'
pkgname=boost
version=1.72.0
-revision=4
+revision=5
wrksrc="${pkgname}_${version//\./_}"
hostmakedepends="which bzip2-devel icu-devel python-devel python3-devel"
makedepends="zlib-devel bzip2-devel icu-devel python-devel python3-devel"
From 7459e770ed5e492274ec9f6d6dba80e936a1738b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 09/95] brltty: rebuild for icu-69.1
---
srcpkgs/brltty/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index 53e15ed6ff03..76d56520dac2 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
# Template file for 'brltty'
pkgname=brltty
version=6.1
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-gpm --with-screen-driver=lx,sc
--with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"
From d77cd577471bfb885ee66bd3e1fed7207929848e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:20 +0200
Subject: [PATCH 10/95] calibre: rebuild for icu-69.1
---
srcpkgs/calibre/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 0d69e612e46f..adcd8781dc90 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
# Template file for 'calibre'
pkgname=calibre
version=5.21.0
-revision=1
+revision=2
build_style=python3-module
pycompile_dirs="/usr/lib/calibre/"
hostmakedepends="pkg-config python3-BeautifulSoup4 python3-Pillow python3-PyQt5-svg
From f64363ac3f426c5581059ebf29c4b6a05edb8a93 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 11/95] clamav: rebuild for icu-69.1
---
srcpkgs/clamav/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index f77692c4b4c2..e0b48d33537b 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
# Template file for 'clamav'
pkgname=clamav
version=0.103.3
-revision=1
+revision=2
build_style=gnu-configure
# XXX: system llvm is too new (< 3.7 required)
# Shipped llvm does not build with gcc>=6
From 799bb54f845c1cdc5c255352bed6b600d38f4217 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 12/95] darktable: rebuild for icu-69.1
---
srcpkgs/darktable/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/darktable/template b/srcpkgs/darktable/template
index 8be87e888872..f18f5f123b7e 100644
--- a/srcpkgs/darktable/template
+++ b/srcpkgs/darktable/template
@@ -1,7 +1,7 @@
# Template file for 'darktable'
pkgname=darktable
version=3.6.0
-revision=1
+revision=2
# upstream only supports these archs:
archs="x86_64* aarch64* ppc64le*"
build_style=cmake
From cfe3cbd9bfceb062b067b950fc3f88fc59321295 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 13/95] dino: rebuild for icu-69.1
---
srcpkgs/dino/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 94c058ab7d70..fda6cc8c94eb 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
# Template file for 'dino'
pkgname=dino
version=0.2.1
-revision=1
+revision=2
build_style=cmake
configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
make_cmd=ninja
From d56a3d36ceb7b763174222c24c537776d3ee3d74 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 14/95] dwdiff: rebuild for icu-69.1
---
srcpkgs/dwdiff/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index 4264945987a8..2467ce056132 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
# Template file for 'dwdiff'
pkgname=dwdiff
version=2.1.4
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gettext pkg-config"
makedepends="icu-devel"
From 95f475d21215eba62253e564839ad0e6a0dd657f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:21 +0200
Subject: [PATCH 15/95] enchant2: rebuild for icu-69.1
---
srcpkgs/enchant2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/enchant2/template b/srcpkgs/enchant2/template
index 5bb08e5c5636..59413b958747 100644
--- a/srcpkgs/enchant2/template
+++ b/srcpkgs/enchant2/template
@@ -1,7 +1,7 @@
# Template file for 'enchant2'
pkgname=enchant2
version=2.2.15
-revision=2
+revision=3
wrksrc="enchant-${version}"
build_style=gnu-configure
# so package doesn't conflict with enchant's /usr/share/enchant/enchant.ordering;
From 570206335459fa6f21d8fdeb35f11c5438a0dc52 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 16/95] evolution-data-server: rebuild for icu-69.1
---
srcpkgs/evolution-data-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 136c47804c04..43a5f1cf8434 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
# Template file for 'evolution-data-server'
pkgname=evolution-data-server
version=3.40.2
-revision=1
+revision=2
build_style=cmake
build_helper="gir qemu"
configure_args="-DENABLE_UOA=OFF
From 1cdeccd0a462b5873155345eff73dd74d17fac38 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 17/95] firefox: update to 91.0, rebuild for icu-69.1
---
srcpkgs/firefox/patches/lto-thin.patch | 19 +++++++++++++++++++
srcpkgs/firefox/template | 6 +++---
2 files changed, 22 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/firefox/patches/lto-thin.patch
diff --git a/srcpkgs/firefox/patches/lto-thin.patch b/srcpkgs/firefox/patches/lto-thin.patch
new file mode 100644
index 000000000000..e85cbce36583
--- /dev/null
+++ b/srcpkgs/firefox/patches/lto-thin.patch
@@ -0,0 +1,19 @@
+$OpenBSD: patch-config_makefiles_rust_mk,v 1.6 2021/01/26 15:52:58 landry Exp $
+
+use lto=thin to reduce memory pressure when building gkrust
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644409
+https://bugzilla.mozilla.org/show_bug.cgi?id=1640982
+
+Index: config/makefiles/rust.mk
+--- a/config/makefiles/rust.mk.orig
++++ a/config/makefiles/rust.mk
+@@ -70,7 +70,8 @@ ifndef MOZ_DEBUG_RUST
+ # gkrust_gtest. And not when doing cross-language LTO.
+ ifndef MOZ_LTO_RUST_CROSS
+ ifeq (,$(findstring gkrust_gtest,$(RUST_LIBRARY_FILE)))
+-cargo_rustc_flags += -Clto
++cargo_rustc_flags += -Clto=thin
++export CARGO_PROFILE_RELEASE_LTO=thin
+ endif
+ # We need -Cembed-bitcode=yes for all crates when using -Clto.
+ RUSTFLAGS += -Cembed-bitcode=yes
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 08c8efadf2d9..f9693404b846 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -3,15 +3,15 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-i18n".
#
pkgname=firefox
-version=90.0.1
+version=91.0
revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
-maintainer="Orphaned <orphan@voidlinux.org>"
+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=85796ca5857e2196c8722719423d3f164396efdefb2988d3efd6d5c399dc0a87
+checksum=2a4d1f788ab77f68380d4e6ab0b36bd1efd1a4ac9e9c6d10e39377894c077901
lib32disabled=yes
From 46755544f640b98429a3f5741584269a9d6d984a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 18/95] firefox-esr: update to 78.13.0, rebuild for icu-69.1
---
srcpkgs/firefox-esr/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index e4ea57638c2c..79f1e4a21e58 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,7 +3,7 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
#
pkgname=firefox-esr
-version=78.10.0
+version=78.13.0
revision=1
wrksrc="firefox-${version}"
build_helper="rust qemu"
@@ -22,7 +22,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.mozilla.org/firefox/organizations/"
distfiles="${MOZILLA_SITE}/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"
-checksum=979141a6d94bbe303815e9cd1ab1d23b5ce2f9c77d9d5486871eaecf0ea2df40
+checksum=19f9a9e2c2473cb37d57a49a1b2661a8236c4930df9b251d5e9ae274292b4f6c
lib32disabled=yes
conflicts="firefox>=0"
From 9c29e5a076b69dcb529820575d62ace03989908c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 19/95] freshplayerplugin: rebuild for icu-69.1
---
srcpkgs/freshplayerplugin/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index a6205c0ba98d..e7dbb2758861 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
# Template file for 'freshplayerplugin'
pkgname=freshplayerplugin
version=0.3.9
-revision=7
+revision=8
build_style=cmake
hostmakedepends="pkg-config ragel"
makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel
From 2612fca46004c1350a3df2c26ce2ae86293f4462 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 20/95] geary: rebuild for icu-69.1
---
srcpkgs/geary/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/geary/template b/srcpkgs/geary/template
index 3891e7190112..c863e4ebc5ea 100644
--- a/srcpkgs/geary/template
+++ b/srcpkgs/geary/template
@@ -1,7 +1,7 @@
# Template file for 'geary'
pkgname=geary
version=40.0
-revision=1
+revision=2
build_helper="gir"
build_style=meson
configure_args="-Dprofile=release -Dcontractor=enabled"
From 826a702bf004775d7878226f93a13549c3b9ef70 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:22 +0200
Subject: [PATCH 21/95] gnucash: rebuild for icu-69.1
---
srcpkgs/gnucash/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 64469ecfa77f..4309553e29cc 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
# Template file for 'gnucash'
pkgname=gnucash
version=4.6
-revision=1
+revision=2
wrksrc="${pkgname}-${version%b}"
build_style=cmake
make_check_target=check
From 15225fa8762b3861d733d9ae9d270753931360b8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 22/95] gnustep-base: rebuild for icu-69.1
---
srcpkgs/gnustep-base/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnustep-base/template b/srcpkgs/gnustep-base/template
index 483dd8011bee..bafd7370419d 100644
--- a/srcpkgs/gnustep-base/template
+++ b/srcpkgs/gnustep-base/template
@@ -1,7 +1,7 @@
# Template file for 'gnustep-base'
pkgname=gnustep-base
version=1.28.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make gcc-objc pkg-config which"
makedepends="libobjc-devel libffi-devel libxml2-devel gnutls-devel
From 3ba87eb120e2de8bb3c52942323627c665a6d44a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 23/95] gnustep-gui: rebuild for icu-69.1
---
srcpkgs/gnustep-gui/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gnustep-gui/template b/srcpkgs/gnustep-gui/template
index 9335681ada37..9371cb40d30d 100644
--- a/srcpkgs/gnustep-gui/template
+++ b/srcpkgs/gnustep-gui/template
@@ -1,7 +1,7 @@
# Template file for 'gnustep-gui'
pkgname=gnustep-gui
version=0.29.0
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="gnustep-make pkg-config tar"
makedepends="gnustep-base-devel libjpeg-turbo-devel tiff-devel libpng-devel
From 048682a47cf2d5ba3cc080b8bac213be53440699 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 24/95] harfbuzz: rebuild for icu-69.1
---
srcpkgs/harfbuzz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index 106a44ff3139..6964948610fa 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
# Template file for 'harfbuzz'
pkgname=harfbuzz
version=2.8.2
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="-Dglib=enabled -Dfreetype=enabled -Dcairo=enabled -Dicu=enabled
From 2c3757cef701fff522c44ba8a05d4d3c21bac13b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 25/95] icu4lua: rebuild for icu-69.1
---
srcpkgs/icu4lua/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index 9adf55946651..665433492423 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
# Template file for 'icu4lua'
pkgname=icu4lua
version=0.2B
-revision=9
+revision=10
create_wrksrc=yes
build_style=gnu-makefile
hostmakedepends="pkg-config unzip"
From 730e82b3af0f88268070387e24028d92eba4c3c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 26/95] imv: rebuild for icu-69.1
---
srcpkgs/imv/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 608cc8790641..9dc7717fbedc 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
# Template file for 'imv'
pkgname=imv
version=4.3.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="asciidoc pkg-config cmake"
makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libheif-devel libxkbcommon-devel
From 2d80e67b43b161725ccf0db8edacbad467f89423 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:23 +0200
Subject: [PATCH 27/95] kdb: rebuild for icu-69.1
---
srcpkgs/kdb/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 0bc353bd7085..509915e3e6fa 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
# Template file for 'kdb'
pkgname=kdb
version=3.2.0
-revision=5
+revision=6
build_style=cmake
hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel
From 2806455e8060b241768c3463ec09aa7e584e921e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 28/95] kiwix-lib: rebuild for icu-69.1
---
srcpkgs/kiwix-lib/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kiwix-lib/template b/srcpkgs/kiwix-lib/template
index fed972c83bc2..52c1c6a48013 100644
--- a/srcpkgs/kiwix-lib/template
+++ b/srcpkgs/kiwix-lib/template
@@ -1,7 +1,7 @@
# Template file for 'kiwix-lib'
pkgname=kiwix-lib
version=9.4.1
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config"
makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel
From e7112202dcbeff727efc6edd0e882afbc01aa049 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 29/95] libbitcoin-blockchain: rebuild for icu-69.1
---
srcpkgs/libbitcoin-blockchain/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-blockchain/template b/srcpkgs/libbitcoin-blockchain/template
index 8bdf869f4ff6..9f9b36815f49 100644
--- a/srcpkgs/libbitcoin-blockchain/template
+++ b/srcpkgs/libbitcoin-blockchain/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-blockchain'
pkgname=libbitcoin-blockchain
version=3.6.0
-revision=3
+revision=4
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 949c00a102f414437b696b5d43f87cca2a115d0f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 30/95] libbitcoin-client: rebuild for icu-69.1
---
srcpkgs/libbitcoin-client/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-client/template b/srcpkgs/libbitcoin-client/template
index f85033f35c63..5b63efde5db8 100644
--- a/srcpkgs/libbitcoin-client/template
+++ b/srcpkgs/libbitcoin-client/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-client'
pkgname=libbitcoin-client
version=3.6.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --without-examples"
From 3e3dc363e1bdb5bb29099ee9d3c1e361eab8987f Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 31/95] libbitcoin-database: rebuild for icu-69.1
---
srcpkgs/libbitcoin-database/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-database/template b/srcpkgs/libbitcoin-database/template
index 6acd56e31682..7f30b50739bb 100644
--- a/srcpkgs/libbitcoin-database/template
+++ b/srcpkgs/libbitcoin-database/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-database'
pkgname=libbitcoin-database
version=3.6.0
-revision=3
+revision=4
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 2209fa359435d2f1a177fcb49b83d1cda46ded59 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:24 +0200
Subject: [PATCH 32/95] libbitcoin-explorer: rebuild for icu-69.1
---
srcpkgs/libbitcoin-explorer/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-explorer/template b/srcpkgs/libbitcoin-explorer/template
index 39c2a55f6548..8704c89d558f 100644
--- a/srcpkgs/libbitcoin-explorer/template
+++ b/srcpkgs/libbitcoin-explorer/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-explorer'
pkgname=libbitcoin-explorer
version=3.6.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
From 509a9854068145b9d916aa5f3487c520b679dcc7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 33/95] libbitcoin-network: rebuild for icu-69.1
---
srcpkgs/libbitcoin-network/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-network/template b/srcpkgs/libbitcoin-network/template
index 6a518b876664..0ffc3b9a6ab8 100644
--- a/srcpkgs/libbitcoin-network/template
+++ b/srcpkgs/libbitcoin-network/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-network'
pkgname=libbitcoin-network
version=3.6.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 6e62c12bceb96d9000a2640dba2ad07ddf9742c5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 34/95] libbitcoin-node: rebuild for icu-69.1
---
srcpkgs/libbitcoin-node/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-node/template b/srcpkgs/libbitcoin-node/template
index 7aa1706e85c7..644f31f36a9a 100644
--- a/srcpkgs/libbitcoin-node/template
+++ b/srcpkgs/libbitcoin-node/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-node'
pkgname=libbitcoin-node
version=3.6.0
-revision=3
+revision=4
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From aecfa820c082b588e1cec08fa67db0fc505f6671 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 35/95] libbitcoin-protocol: rebuild for icu-69.1
---
srcpkgs/libbitcoin-protocol/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-protocol/template b/srcpkgs/libbitcoin-protocol/template
index 8d45895873b7..7209be818c72 100644
--- a/srcpkgs/libbitcoin-protocol/template
+++ b/srcpkgs/libbitcoin-protocol/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-protocol'
pkgname=libbitcoin-protocol
version=3.6.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"
From 8dd6357fae8e4f7b38766ea7e254573254fb6938 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 36/95] libbitcoin-server: rebuild for icu-69.1
---
srcpkgs/libbitcoin-server/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-server/template b/srcpkgs/libbitcoin-server/template
index 0a949866e0c2..6e770407dda9 100644
--- a/srcpkgs/libbitcoin-server/template
+++ b/srcpkgs/libbitcoin-server/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-server'
pkgname=libbitcoin-server
version=3.6.0
-revision=3
+revision=4
archs="aarch64* ppc64* x86_64*"
build_style=gnu-configure
configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
From 37eb43ca22bcc0d9f18402ea450a28a4c848ff20 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 37/95] libbitcoin-system: rebuild for icu-69.1
---
srcpkgs/libbitcoin-system/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libbitcoin-system/template b/srcpkgs/libbitcoin-system/template
index 7cf3a50675d1..fa17cbfc55e6 100644
--- a/srcpkgs/libbitcoin-system/template
+++ b/srcpkgs/libbitcoin-system/template
@@ -1,7 +1,7 @@
# Template file for 'libbitcoin-system'
pkgname=libbitcoin-system
version=3.6.0
-revision=3
+revision=4
build_style=gnu-configure
configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
--with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld --with-icu --with-png
From 448115888ac583ab9eb51c7667be7a6b6b134e32 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:25 +0200
Subject: [PATCH 38/95] libcdr: rebuild for icu-69.1
---
srcpkgs/libcdr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index 5753e74baa15..a73f577ba845 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
# Template file for 'libcdr'
pkgname=libcdr
version=0.1.7
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-debug"
hostmakedepends="pkg-config"
From f426746e056b98128766b35bdf6a74d2b5468fbf Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 39/95] libe-book: rebuild for icu-69.1
---
srcpkgs/libe-book/patches/icu-68.patch | 20 ++++++++++++++++++++
srcpkgs/libe-book/template | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libe-book/patches/icu-68.patch
diff --git a/srcpkgs/libe-book/patches/icu-68.patch b/srcpkgs/libe-book/patches/icu-68.patch
new file mode 100644
index 000000000000..1ed6b83b64aa
--- /dev/null
+++ b/srcpkgs/libe-book/patches/icu-68.patch
@@ -0,0 +1,20 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+EBOOKCharsetConverter.cpp:127:7: error: use of undeclared identifier 'TRUE'
+ TRUE, TRUE, &status)
+ ^
+EBOOKCharsetConverter.cpp:127:13: error: use of undeclared identifier 'TRUE'
+ TRUE, TRUE, &status)
+ ^
+
+--- a/src/lib/EBOOKCharsetConverter.cpp.orig 2018-01-01 11:16:28 UTC
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *c
+ m_converterToUTF8.get(), m_converterToUnicode.get(),
+ &outText, outText + out.size(), &inText, inText + length,
+ nullptr, nullptr, nullptr, nullptr,
+- TRUE, TRUE, &status)
++ true, true, &status)
+ ;
+ if (status==U_BUFFER_OVERFLOW_ERROR)
+ {
diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index 2c9fb778531c..c45b15b98d54 100644
--- a/srcpkgs/libe-book/template
+++ b/srcpkgs/libe-book/template
@@ -1,7 +1,7 @@
# Template file for 'libe-book'
pkgname=libe-book
version=0.1.3
-revision=8
+revision=9
build_style=gnu-configure
configure_args="--disable-werror"
hostmakedepends="automake libtool gperf doxygen pkg-config"
From f9fee3db1db8a0b081cb9b25b379038228c0cfc2 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 40/95] libgdal: rebuild for icu-69.1
---
srcpkgs/libgdal/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index 72c96ff67605..c34684b8115b 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
# Template file for 'libgdal'
pkgname=libgdal
version=3.0.4
-revision=9
+revision=10
wrksrc="gdal-${version}"
build_style=gnu-configure
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"
From a342d30de3891fc2cbaeb2c622ee733f6432c786 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 41/95] libical: rebuild for icu-69.1
---
srcpkgs/libical/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 913be53ef07f..0bba9b9b2b07 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
# Template file for 'libical'
pkgname=libical
version=3.0.8
-revision=3
+revision=4
build_style=cmake
build_helper="gir qemu"
configure_args="-DICAL_BUILD_DOCS=false
From 6d90e4b806185f0861dd22b1228c3362cd84e909 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 42/95] liblcf: rebuild for icu-69.1
---
srcpkgs/liblcf/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index 273439c90905..71684bd89e3e 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
# Template file for 'liblcf'
pkgname=liblcf
version=0.6.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config autoconf automake libtool"
makedepends="expat-devel icu-devel"
From 1eefd4cb65e3a871e61c8d00cb379eb1132a8d33 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:26 +0200
Subject: [PATCH 43/95] libmspub: rebuild for icu-69.1
---
srcpkgs/libmspub/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 5c96ba407069..2dea31ee46a1 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
# Template file for 'libmspub'
pkgname=libmspub
version=0.1.4
-revision=6
+revision=7
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="icu-devel boost-devel librevenge-devel zlib-devel"
From c83bea306e47197211e5f4a91a33cd73ded36805 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 44/95] libpsl: rebuild for icu-69.1
---
srcpkgs/libpsl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libpsl/template b/srcpkgs/libpsl/template
index 5a90eaf22801..9f1574767f47 100644
--- a/srcpkgs/libpsl/template
+++ b/srcpkgs/libpsl/template
@@ -1,7 +1,7 @@
# Template file for 'libpsl'
pkgname=libpsl
version=0.21.1
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="pkg-config python3"
makedepends="icu-devel"
From 22f1a1e9ba88e4b13c87159d4e076179cfd6f213 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 45/95] libqxp: rebuild for icu-69.1
---
srcpkgs/libqxp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 8500917732b1..edca219c3606 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
# Template file for 'libqxp'
pkgname=libqxp
version=0.0.2
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="boost-devel librevenge-devel icu-devel"
From 4208631b5318ea6b3afd10dd54c54a009dea2ba1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 46/95] libreoffice: rebuild for icu-69.1
---
srcpkgs/libreoffice/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index f08066f12966..fc69bd9af9c9 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
# Template file for 'libreoffice'
pkgname=libreoffice
version=7.1.3.2
-revision=1
+revision=2
build_style=meta
make_build_target="build-nocheck"
nocross="Several dependencies are nocross=yes"
From 99248729f669716500bff0a529c568b56a9c9de0 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 47/95] libvisio: rebuild for icu-69.1
---
srcpkgs/libvisio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index 3151a72d41dc..4585b7c55f92 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
# Template file for 'libvisio'
pkgname=libvisio
version=0.1.7
-revision=2
+revision=3
build_style=gnu-configure
hostmakedepends="gperf pkg-config perl"
makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"
From 9a28470e88e01016e57a0a906aa58eef8b3d1fae Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 48/95] libxml2: rebuild for icu-69.1
---
srcpkgs/libxml2/patches/icu-68.patch | 25 +++++++++++++++++++++++++
srcpkgs/libxml2/template | 2 +-
2 files changed, 26 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/libxml2/patches/icu-68.patch
diff --git a/srcpkgs/libxml2/patches/icu-68.patch b/srcpkgs/libxml2/patches/icu-68.patch
new file mode 100644
index 000000000000..b11c57daf9e7
--- /dev/null
+++ b/srcpkgs/libxml2/patches/icu-68.patch
@@ -0,0 +1,25 @@
+From b516ed189eb440e909f36baca1557b98e4d9ffd7 Mon Sep 17 00:00:00 2001
+From: Frederik Seiffert <frederik@algoriddim.com>
+Date: Thu, 12 Nov 2020 12:53:43 +0100
+Subject: [PATCH] Fix building with ICU 68.
+
+ICU 68 no longer defines the TRUE macro.
+
+Closes #204.
+---
+ encoding.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/encoding.c b/encoding.c
+index c34aca446..264f60bb4 100644
+--- a/encoding.c
++++ b/encoding.c
+@@ -2004,7 +2004,7 @@ xmlEncOutputChunk(xmlCharEncodingHandler *handler, unsigned char *out,
+ #ifdef LIBXML_ICU_ENABLED
+ else if (handler->uconv_out != NULL) {
+ ret = xmlUconvWrapper(handler->uconv_out, 0, out, outlen, in, inlen,
+- TRUE);
++ 1);
+ }
+ #endif /* LIBXML_ICU_ENABLED */
+ else {
diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index c334f505ed0c..6a68fb6691c3 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
#
pkgname=libxml2
version=2.9.10
-revision=4
+revision=5
build_style=gnu-configure
configure_args="--with-threads --with-history --with-icu --without-python"
hostmakedepends="automake libtool gettext-devel pkg-config"
From 55c3b5deaa3817c61e77a52f54bfc1a6160f865e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:27 +0200
Subject: [PATCH 49/95] libzim: rebuild for icu-69.1
---
srcpkgs/libzim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index fe3c53109803..659abee5ecc9 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
# Template file for 'libzim'
pkgname=libzim
version=6.3.0
-revision=1
+revision=2
build_style=meson
hostmakedepends="pkg-config git"
makedepends="liblzma-devel $(vopt_if zlib zlib-devel)
From 30e213c78e6beb08445ed70bdaf6d7056ad2d2d7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 50/95] maim: rebuild for icu-69.1
---
srcpkgs/maim/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index f689a789e210..ff2758d370fa 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
# Template file for 'maim'
pkgname=maim
version=5.7.4
-revision=1
+revision=2
build_style=cmake
hostmakedepends="pkg-config"
makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel
From 110845e8f08b2e90e7f8fa89a64f04aa41c43194 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 51/95] modsecurity: rebuild for icu-69.1
---
srcpkgs/modsecurity/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 9ab94af0fedd..af66ed3d01a3 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
# Template file for 'modsecurity'
pkgname=modsecurity
version=3.0.4
-revision=2
+revision=3
wrksrc="modsecurity-v${version}"
build_style=gnu-configure
configure_args="--enable-standalone-module --enable-htaccess-config"
From b24937ba20a10474703a80c0f14d427e93a04a95 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 52/95] mozjs78: rebuild for icu-69.1
---
srcpkgs/mozjs78/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mozjs78/template b/srcpkgs/mozjs78/template
index 87e90b422b4e..e3167e3a7588 100644
--- a/srcpkgs/mozjs78/template
+++ b/srcpkgs/mozjs78/template
@@ -1,7 +1,7 @@
# Template file for 'mozjs78'
pkgname=mozjs78
version=78.9.0
-revision=2
+revision=3
wrksrc="firefox-${version}"
build_wrksrc=js/src
build_style=gnu-configure
From f63c0aacdf6575559afdf94107116a1830ef8d37 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 53/95] ncmpcpp: rebuild for icu-69.1
---
srcpkgs/ncmpcpp/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 0e036b303a35..7c7fbade75f2 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
# Template file for 'ncmpcpp'
pkgname=ncmpcpp
version=0.9.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
--enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"
From 1ba6a954925ebd931d668529062d8bc21561e8cb Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 54/95] nodejs: rebuild for icu-69.1
---
srcpkgs/nodejs/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 1c226d51ce1a..575278170b27 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs'
pkgname=nodejs
version=14.17.2
-revision=1
+revision=2
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="which pkg-config python3 libatomic-devel zlib-devel
From 51cba9313f7d83c9df8d6fd44a96b5ea998e9665 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:28 +0200
Subject: [PATCH 55/95] nodejs-lts: update to 12.22.4, rebuild for icu-69.1
---
srcpkgs/nodejs-lts/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index d3912ae2cf05..915d53cf851d 100644
--- a/srcpkgs/nodejs-lts/template
+++ b/srcpkgs/nodejs-lts/template
@@ -1,7 +1,7 @@
# Template file for 'nodejs-lts'
pkgname=nodejs-lts
-version=12.21.0
-revision=2
+version=12.22.4
+revision=1
wrksrc="node-v${version}"
# Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
hostmakedepends="pkg-config python libatomic-devel zlib-devel which
@@ -18,7 +18,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="MIT"
homepage="https://nodejs.org/"
distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
-checksum=36e862555bebc04b13f7afebf4472c4dd7ebf4c891f9d6746ec545a4f099d05e
+checksum=613b5a895d85d72b4aa495bdf0ffa483ad8b33635a173c4beb94d2842db740f5
python_version=3
build_options="ssl libuv http_parser icu nghttp2 cares"
From eda0da4ac3fb7a52d45017fb2cd8ce1e04fb1639 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 56/95] nodejs-lts-10: remove
---
srcpkgs/nodejs-lts-10/patches/atomic8.patch | 14 ---
srcpkgs/nodejs-lts-10/patches/ppc32.patch | 29 -------
srcpkgs/nodejs-lts-10/patches/ppc64.patch | 41 ---------
srcpkgs/nodejs-lts-10/template | 96 ---------------------
srcpkgs/nodejs-lts-10/update | 2 -
5 files changed, 182 deletions(-)
delete mode 100644 srcpkgs/nodejs-lts-10/patches/atomic8.patch
delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc32.patch
delete mode 100644 srcpkgs/nodejs-lts-10/patches/ppc64.patch
delete mode 100644 srcpkgs/nodejs-lts-10/template
delete mode 100644 srcpkgs/nodejs-lts-10/update
diff --git a/srcpkgs/nodejs-lts-10/patches/atomic8.patch b/srcpkgs/nodejs-lts-10/patches/atomic8.patch
deleted file mode 100644
index 21ec83101424..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/atomic8.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/node.gyp
-+++ b/node.gyp
-@@ -479,6 +479,11 @@
- 'msvs_disabled_warnings!': [4244],
-
- 'conditions': [
-+ [ 'target_arch=="mips" or target_arch=="mipsel" or target_arch=="ppc" or target_arch=="arm"', {
-+ 'link_settings': {
-+ 'libraries': [ '-latomic' ],
-+ },
-+ }],
- [ 'node_code_cache_path!=""', {
- 'sources': [ '<(node_code_cache_path)' ]
- }, {
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc32.patch b/srcpkgs/nodejs-lts-10/patches/ppc32.patch
deleted file mode 100644
index dd2440b372b8..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc32.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/configure.py
-+++ b/configure.py
-@@ -848,7 +848,7 @@ def host_arch_cc():
- '__MIPSEL__' : 'mipsel',
- '__mips__' : 'mips',
- '__PPC64__' : 'ppc64',
-- '__PPC__' : 'ppc64',
-+ '__PPC__' : 'ppc',
- '__x86_64__' : 'x64',
- '__s390__' : 's390',
- '__s390x__' : 's390x',
---- a/deps/v8/src/libsampler/sampler.cc
-+++ b/deps/v8/src/libsampler/sampler.cc
-@@ -418,9 +418,15 @@ void SignalHandler::FillRegisterState(void* context, RegisterState* state) {
- reinterpret_cast<void*>(ucontext->uc_mcontext.regs->gpr[PT_R31]);
- #else
- // Some C libraries, notably Musl, define the regs member as a void pointer
-+ #if !V8_TARGET_ARCH_32_BIT
- state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[32]);
- state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[1]);
- state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gp_regs[31]);
-+ #else
-+ state->pc = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[32]);
-+ state->sp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[1]);
-+ state->fp = reinterpret_cast<void*>(ucontext->uc_mcontext.gregs[31]);
-+ #endif
- #endif
- #elif V8_HOST_ARCH_S390
- #if V8_TARGET_ARCH_32_BIT
diff --git a/srcpkgs/nodejs-lts-10/patches/ppc64.patch b/srcpkgs/nodejs-lts-10/patches/ppc64.patch
deleted file mode 100644
index 98e515cf4300..000000000000
--- a/srcpkgs/nodejs-lts-10/patches/ppc64.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Taken from Adélie Linux, fixes node on big endian ELFv2.
---- a/deps/v8/src/ppc/assembler-ppc.h.old 2019-03-05 15:16:29.000000000 +0000
-+++ b/deps/v8/src/ppc/assembler-ppc.h 2019-04-02 07:05:25.977213735 +0000
-@@ -48,7 +48,8 @@
- #include "src/ppc/constants-ppc.h"
-
- #if V8_HOST_ARCH_PPC && \
-- (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && V8_TARGET_BIG_ENDIAN))
-+ (V8_OS_AIX || (V8_TARGET_ARCH_PPC64 && \
-+ (V8_TARGET_BIG_ENDIAN && (!defined(_CALL_ELF) || _CALL_ELF == 1))))
- #define ABI_USES_FUNCTION_DESCRIPTORS 1
- #else
- #define ABI_USES_FUNCTION_DESCRIPTORS 0
-@@ -60,13 +61,15 @@
- #define ABI_PASSES_HANDLES_IN_REGS 0
- #endif
-
--#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || V8_TARGET_LITTLE_ENDIAN
-+#if !V8_HOST_ARCH_PPC || !V8_TARGET_ARCH_PPC64 || \
-+ (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2))
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 1
- #else
- #define ABI_RETURNS_OBJECT_PAIRS_IN_REGS 0
- #endif
-
--#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN)
-+#if !V8_HOST_ARCH_PPC || (V8_TARGET_ARCH_PPC64 && \
-+ (V8_TARGET_LITTLE_ENDIAN || (defined(_CALL_ELF) && _CALL_ELF == 2)))
- #define ABI_CALL_VIA_IP 1
- #else
- #define ABI_CALL_VIA_IP 0
-@@ -220,7 +220,8 @@
- // The following constants describe the stack frame linkage area as
- // defined by the ABI. Note that kNumRequiredStackFrameSlots must
- // satisfy alignment requirements (rounding up if required).
--#if V8_TARGET_ARCH_PPC64 && V8_TARGET_LITTLE_ENDIAN
-+#if V8_TARGET_ARCH_PPC64 && (V8_TARGET_LITTLE_ENDIAN || \
-+ defined(_CALL_ELF) && _CALL_ELF == 2)
- // [0] back chain
- // [1] condition register save area
- // [2] link register save area
diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
deleted file mode 100644
index 300667cb9782..000000000000
--- a/srcpkgs/nodejs-lts-10/template
+++ /dev/null
@@ -1,96 +0,0 @@
-# Template file for 'nodejs-lts-10'
-pkgname=nodejs-lts-10
-version=10.24.0
-revision=2
-wrksrc="node-v${version}"
-# atomic8.patch will pull in -latomic even for some architectures
-# not covered by XBPS_TARGET_NO_ATOMIC8.
-hostmakedepends="pkg-config python which zlib-devel libatomic-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-makedepends="libatomic-devel zlib-devel python-devel
- $(vopt_if icu icu-devel) $(vopt_if ssl openssl-devel) $(vopt_if libuv libuv-devel)
- $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
- $(vopt_if cares c-ares-devel)"
-checkdepends="procps-ng"
-short_desc="Evented I/O for V8 javascript (Dubnium)"
-maintainer="k4leg <d0xi@inbox.ru>"
-license="MIT"
-homepage="https://nodejs.org/"
-distfiles="${homepage}/download/release/v${version}/node-v${version}.tar.xz"
-checksum=158273af66f891b2fca90aec7336c42f7574f467affad02c14e80ca163cb3acc
-python_version=3
-
-build_options="ssl libuv http_parser icu nghttp2 cares"
-desc_option_ssl="Enable shared openssl"
-desc_option_libuv="Enable shared libuv"
-desc_option_http_parser="Enable shared http-parser"
-desc_option_icu="Enable shared icu"
-desc_option_nghttp2="Enable shared nghttp2"
-desc_option_cares="Enable shared c-ares"
-build_options_default="ssl libuv http_parser icu nghttp2 cares"
-
-replaces="iojs>=0"
-conflicts="nodejs nodejs-lts"
-provides="nodejs-runtime-0_1"
-
-if [ "$XBPS_WORDSIZE" -ne "$XBPS_TARGET_WORDSIZE" ]; then
- nocross="host and target must have the same pointer size"
-fi
-
-CFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
-
-do_configure() {
- local _args
-
- export LD="$CXX"
- if [ "$CROSS_BUILD" ]; then
- case "$XBPS_TARGET_MACHINE" in
- arm*) _args="--dest-cpu=arm" ;;
- aarch64*) _args="--dest-cpu=arm64" ;;
- ppc64*) _args="--dest-cpu=ppc64" ;;
- ppc*) _args="--dest-cpu=ppc" ;;
- mipsel*) _args="--dest-cpu=mipsel" ;;
- mips*) _args="--dest-cpu=mips" ;;
- i686*) _args="--dest-cpu=x86" ;;
- x86_64*) _args="--dest-cpu=x86_64" ;;
- *) msg_error "$pkgver: cannot be cross compiled for ${XBPS_TARGET_MACHINE}.\n" ;;
- esac
- _args+=" --without-snapshot"
- fi
- ./configure --prefix=/usr --shared-zlib \
- $(vopt_if icu --with-intl=system-icu) \
- $(vopt_if http_parser --shared-http-parser) \
- $(vopt_if ssl --shared-openssl) \
- $(vopt_if libuv --shared-libuv) \
- $(vopt_if nghttp2 --shared-nghttp2) \
- $(vopt_if cares --shared-cares) ${_args}
-}
-
-do_build() {
- if [ "$CROSS_BUILD" ]; then
- make LD="$CXX" LDFLAGS+=-ldl ${makejobs} PORTABLE=1 V=1
- else
- make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1
- fi
-}
-
-do_check() {
- make LD="$CXX" LDFLAGS+=-ldl ${makejobs} V=1 test-only
-}
-
-do_install() {
- make LD="$CXX" LDFLAGS+=-ldl DESTDIR="$DESTDIR" install
- rm $DESTDIR/usr/include/node/openssl -rf
- vlicense LICENSE
-}
-
-nodejs-lts-10-devel_package() {
- short_desc+=" (development files)"
- conflicts="nodejs-devel nodejs-lts-devel"
- pkg_install() {
- vmove usr/include
- }
-}
diff --git a/srcpkgs/nodejs-lts-10/update b/srcpkgs/nodejs-lts-10/update
deleted file mode 100644
index fd924949cea2..000000000000
--- a/srcpkgs/nodejs-lts-10/update
+++ /dev/null
@@ -1,2 +0,0 @@
-site="https://nodejs.org/download/release/latest-v10.x/"
-pkgname="node"
From b16bdb0ce9bc582a1527da342301c345d7a75447 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 57/95] nuspell: rebuild for icu-69.1
---
srcpkgs/nuspell/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index dd6f06a99117..7d796f02024c 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
# Template file for 'nuspell'
pkgname=nuspell
version=4.2.0
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_SHARED_LIBS=ON"
makedepends="icu-devel"
From ad1c05534199fb2d904246531717acef595a971c Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 58/95] openttd: rebuild for icu-69.1
---
srcpkgs/openttd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index df8575fffaef..d6aedccab9ee 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
# Template file for 'openttd'
pkgname=openttd
version=1.10.3
-revision=2
+revision=3
_gfxver=0.6.0
_sfxver=0.2.3
create_wrksrc=yes
From 6677e599eaa3a2dd0a00e16a74e655652c8e531d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 59/95] peaclock: rebuild for icu-69.1
---
srcpkgs/peaclock/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index e39dce1cabb5..1263dd4df2fe 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
# Template file for 'peaclock'
pkgname=peaclock
version=0.4.3
-revision=1
+revision=2
build_style=cmake
makedepends="icu-devel"
short_desc="Colourful binary clock for the terminal"
From 8fc75454db9b45cfef60ed078a5fd7aeb2226d7e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:29 +0200
Subject: [PATCH 60/95] perl-XML-LibXML: rebuild for icu-69.1
---
srcpkgs/perl-XML-LibXML/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/perl-XML-LibXML/template b/srcpkgs/perl-XML-LibXML/template
index 6d9d813b427b..4c6af2d344c9 100644
--- a/srcpkgs/perl-XML-LibXML/template
+++ b/srcpkgs/perl-XML-LibXML/template
@@ -1,7 +1,7 @@
# Template file for 'perl-XML-LibXML'
pkgname=perl-XML-LibXML
version=2.0134
-revision=6
+revision=7
wrksrc="${pkgname/perl-/}-${version}"
build_style=perl-module
hostmakedepends="perl"
From b8f92b284412f7e4a5d3014f7e9bcbc2f37f1445 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 61/95] php: rebuild for icu-69.1
---
srcpkgs/php/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index bad7523396ac..a1390b7e1ec2 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
# Template file for 'php'
pkgname=php
version=7.4.14
-revision=4
+revision=5
hostmakedepends="bison pkg-config apache-devel"
makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
gmp-devel libcurl-devel libjpeg-turbo-devel libmariadbclient-devel
From b81273a0b5adbcf930046aa2755d2eab2210ffd7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 62/95] poedit: rebuild for icu-69.1
---
srcpkgs/poedit/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index f2f05fd3b30c..5a3c062a57d9 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
# Template file for 'poedit'
pkgname=poedit
version=2.4.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="pkg-config"
From 08e48e5450ad5947220aedf37bddf66b9f737757 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 63/95] postfix: rebuild for icu-69.1
---
srcpkgs/postfix/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 4dc1b9e5dad8..15189e218237 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
# Template file for 'postfix'
pkgname=postfix
version=3.6.2
-revision=1
+revision=2
hostmakedepends="perl m4"
makedepends="icu-devel libldap-devel libmariadbclient-devel pcre-devel
postgresql-libs-devel sqlite-devel"
From 136e703025c038213c9dc783c2a331dfbb2c3757 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 64/95] python3-PyICU: rebuild for icu-69.1
---
srcpkgs/python3-PyICU/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/python3-PyICU/template b/srcpkgs/python3-PyICU/template
index 263b9954756d..4f8cd0f5889a 100644
--- a/srcpkgs/python3-PyICU/template
+++ b/srcpkgs/python3-PyICU/template
@@ -1,7 +1,7 @@
# Template file for 'python3-PyICU'
pkgname=python3-PyICU
version=2.7.4
-revision=1
+revision=2
wrksrc="pyicu-v${version}"
build_style=python3-module
hostmakedepends="python3-setuptools"
From 2ef4d584a7a82090530d229dc11af0b17d4d64a6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 65/95] qalculate: rebuild for icu-69.1
---
srcpkgs/qalculate/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index 4d9e490bf26d..bad1adfcf64e 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -3,7 +3,7 @@
# and "srcpkgs/qalculate-qt"
pkgname=qalculate
version=3.20.1
-revision=1
+revision=2
wrksrc="lib${pkgname}-${version}"
build_style=gnu-configure
hostmakedepends="intltool pkg-config doxygen"
From 0679e7473a0f3dd238310786447e3b8f49c908bd Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:30 +0200
Subject: [PATCH 66/95] qt5: rebuild for icu-69.1
---
srcpkgs/qt5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 1dff88dc6cab..ca47cb6952b4 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -3,7 +3,7 @@ pkgname=qt5
version=5.15.3+20210429
# commit d42afef0e48a102334ecfda6a492286fb9fc5996
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=2
+revision=3
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
From 2abcbd578ef278dfa8289a55fdaba4bb8673a4b9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 67/95] qt5-webkit: rebuild for icu-69.1
---
srcpkgs/qt5-webkit/patches/glib-2.68.patch | 26 ++++
srcpkgs/qt5-webkit/patches/icu-68.patch | 170 +++++++++++++++++++++
srcpkgs/qt5-webkit/template | 2 +-
3 files changed, 197 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/qt5-webkit/patches/glib-2.68.patch
create mode 100644 srcpkgs/qt5-webkit/patches/icu-68.patch
diff --git a/srcpkgs/qt5-webkit/patches/glib-2.68.patch b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
new file mode 100644
index 000000000000..3df60789638c
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/glib-2.68.patch
@@ -0,0 +1,26 @@
+From 5b698ba3faffd4e198a45be9fe74f53307395e4b Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fvogt@suse.de>
+Date: Wed, 7 Apr 2021 13:38:09 +0200
+Subject: [PATCH] Remove invalid g_object declarations to fix build with glib
+ >= 2.68
+
+g_object_ref_sink is defined as a macro meanwhile and so the build fails.
+Just remove the declarations, glib.h is included anyway.
+---
+ Source/WTF/wtf/glib/GRefPtr.h | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/Source/WTF/wtf/glib/GRefPtr.h b/Source/WTF/wtf/glib/GRefPtr.h
+index 06133d82cb35..d9a1d2f145f5 100644
+--- a/Source/WTF/wtf/glib/GRefPtr.h
++++ b/Source/WTF/wtf/glib/GRefPtr.h
+@@ -29,9 +29,6 @@
+ #include <algorithm>
+ #include <glib.h>
+
+-extern "C" void g_object_unref(gpointer);
+-extern "C" gpointer g_object_ref_sink(gpointer);
+-
+ namespace WTF {
+
+ enum GRefPtrAdoptType { GRefPtrAdopt };
diff --git a/srcpkgs/qt5-webkit/patches/icu-68.patch b/srcpkgs/qt5-webkit/patches/icu-68.patch
new file mode 100644
index 000000000000..07a26883e7ac
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/icu-68.patch
@@ -0,0 +1,170 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:31:
+Source/WebCore/platform/text/TextCodecICU.cpp:311:42: error: use of undeclared identifier 'TRUE'
+ ucnv_setFallback(m_converterICU, TRUE);
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:40:
+In file included from Source/WebCore/platform/text/icu/UTextProvider.cpp:27:
+Source/WebCore/platform/text/icu/UTextProvider.h:83:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:88:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:97:28: error: use of undeclared identifier 'TRUE'
+ isAccessible = TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProvider.h:102:28: error: use of undeclared identifier 'FALSE'
+ isAccessible = FALSE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:41:
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:103:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:108:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:114:20: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:119:20: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:147:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:339:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp:359:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+In file included from Source/WebCore/platform/text/TextAllInOne.cpp:42:
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:128:16: error: use of undeclared identifier 'FALSE'
+ return FALSE;
+ ^
+Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp:148:12: error: use of undeclared identifier 'TRUE'
+ return TRUE;
+ ^
+
+--- a/Source/WebCore/platform/text/TextCodecICU.cpp.orig 2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/TextCodecICU.cpp
+@@ -308,7 +308,7 @@ void TextCodecICU::createICUConverter() const
+ m_converterICU = ucnv_open(m_canonicalConverterName, &err);
+ ASSERT(U_SUCCESS(err));
+ if (m_converterICU)
+- ucnv_setFallback(m_converterICU, TRUE);
++ ucnv_setFallback(m_converterICU, true);
+ }
+
+ int TextCodecICU::decodeToBuffer(UChar* target, UChar* targetLimit, const char*& source, const char* sourceLimit, int32_t* offsets, bool flush, UErrorCode& err)
+--- a/Source/WebCore/platform/text/icu/UTextProvider.h.orig 2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProvider.h
+@@ -80,12 +80,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex >= nativeLength && text->chunkNativeLimit == nativeLength) {
+ text->chunkOffset = text->chunkLength;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ } else {
+@@ -94,12 +94,12 @@ inline bool uTextAccessInChunkOrOutOfRange(UText* text
+ // Ensure chunk offset is well formed if computed offset exceeds int32_t range.
+ ASSERT(offset < std::numeric_limits<int32_t>::max());
+ text->chunkOffset = offset < std::numeric_limits<int32_t>::max() ? static_cast<int32_t>(offset) : 0;
+- isAccessible = TRUE;
++ isAccessible = true;
+ return true;
+ }
+ if (nativeIndex <= 0 && !text->chunkNativeStart) {
+ text->chunkOffset = 0;
+- isAccessible = FALSE;
++ isAccessible = false;
+ return true;
+ }
+ }
+--- a/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp.orig 2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderLatin1.cpp
+@@ -100,23 +100,23 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+ if (index < uText->chunkNativeLimit && index >= uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (index >= length && uText->chunkNativeLimit == length) {
+ // Off the end of the buffer, but we can't get it.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return FALSE;
++ return false;
+ }
+ } else {
+ if (index <= uText->chunkNativeLimit && index > uText->chunkNativeStart) {
+ // Already inside the buffer. Set the new offset.
+ uText->chunkOffset = static_cast<int32_t>(index - uText->chunkNativeStart);
+- return TRUE;
++ return true;
+ }
+ if (!index && !uText->chunkNativeStart) {
+ // Already at the beginning; can't go any farther.
+ uText->chunkOffset = 0;
+- return FALSE;
++ return false;
+ }
+ }
+
+@@ -144,7 +144,7 @@ static UBool uTextLatin1Access(UText* uText, int64_t i
+
+ uText->nativeIndexingLimit = uText->chunkLength;
+
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1Extract(UText* uText, int64_t start, int64_t limit, UChar* dest, int32_t destCapacity, UErrorCode* status)
+@@ -336,7 +336,7 @@ static int64_t uTextLatin1ContextAwareNativeLength(UTe
+ static UBool uTextLatin1ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextLatin1ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -356,7 +356,7 @@ static UBool uTextLatin1ContextAwareAccess(UText* text
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textLatin1ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextLatin1ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
+--- a/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp.orig 2020-03-04 17:16:37 UTC
++++ b/Source/WebCore/platform/text/icu/UTextProviderUTF16.cpp
+@@ -125,7 +125,7 @@ static inline int64_t uTextUTF16ContextAwareNativeLeng
+ static UBool uTextUTF16ContextAwareAccess(UText* text, int64_t nativeIndex, UBool forward)
+ {
+ if (!text->context)
+- return FALSE;
++ return false;
+ int64_t nativeLength = uTextUTF16ContextAwareNativeLength(text);
+ UBool isAccessible;
+ if (uTextAccessInChunkOrOutOfRange(text, nativeIndex, nativeLength, forward, isAccessible))
+@@ -145,7 +145,7 @@ static UBool uTextUTF16ContextAwareAccess(UText* text,
+ ASSERT(newContext == UTextProviderContext::PriorContext);
+ textUTF16ContextAwareSwitchToPriorContext(text, nativeIndex, nativeLength, forward);
+ }
+- return TRUE;
++ return true;
+ }
+
+ static int32_t uTextUTF16ContextAwareExtract(UText*, int64_t, int64_t, UChar*, int32_t, UErrorCode* errorCode)
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index b2e7813cc45e..26a32a55fffa 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,7 +1,7 @@
# Template file for 'qt5-webkit'
pkgname=qt5-webkit
version=5.212.0
-revision=11
+revision=12
_snap=1586819898
_v=${version%.*}
wrksrc="qtwebkit-opensource-src-${_v}"
From 2f0f04b39ef9ad992f62de1181f67c226dd97945 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 68/95] qt6-base: rebuild for icu-69.1
---
srcpkgs/qt6-base/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-base/template b/srcpkgs/qt6-base/template
index bb043213a360..d877eeb9b3a3 100644
--- a/srcpkgs/qt6-base/template
+++ b/srcpkgs/qt6-base/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-base'
pkgname=qt6-base
version=6.1.1
-revision=1
+revision=2
wrksrc="qtbase-everywhere-src-${version}"
build_style=cmake
configure_args="-DINSTALL_DATADIR=share/qt6
From 3d52ad0d83123a5c4dc234171feffbcf502e4755 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 69/95] qt6-qt5compat: rebuild for icu-69.1
---
srcpkgs/qt6-qt5compat/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt6-qt5compat/template b/srcpkgs/qt6-qt5compat/template
index d64b37bff575..06837849b3f1 100644
--- a/srcpkgs/qt6-qt5compat/template
+++ b/srcpkgs/qt6-qt5compat/template
@@ -1,7 +1,7 @@
# Template file for 'qt6-qt5compat'
pkgname=qt6-qt5compat
version=6.1.1
-revision=1
+revision=2
wrksrc="qt5compat-everywhere-src-${version}"
build_style=cmake
configure_args="-DQT_HOST_PATH=/usr "
From 5a05a99b9d2911a74ad7e709bb8c4ffffca9c780 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:31 +0200
Subject: [PATCH 70/95] rspamd: rebuild for icu-69.1
---
srcpkgs/rspamd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 7398b753622e..f4b3da5d40a9 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
# Template file for 'rspamd'
pkgname=rspamd
version=1.9.4
-revision=5
+revision=6
archs="x86_64* i686* aarch64* armv[67]* ppc64*"
build_style=cmake
configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd
From e00e3a24b1e2e19bf129730f0ae17d4acf9afc63 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 71/95] scribus: rebuild for icu-69.1
---
srcpkgs/scribus/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/scribus/template b/srcpkgs/scribus/template
index 9aeb910322df..136d6e4a1fbf 100644
--- a/srcpkgs/scribus/template
+++ b/srcpkgs/scribus/template
@@ -1,7 +1,7 @@
# Template file for 'scribus'
pkgname=scribus
version=1.5.7
-revision=4
+revision=5
build_style=cmake
configure_args="-DCMAKE_SKIP_RPATH=TRUE -DQT_PREFIX=${XBPS_CROSS_BASE}/usr
-DWANT_GRAPHICSMAGICK=1"
From c4318a0cae9073d2f7e5053cbfa855a46c284fe8 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 72/95] sile: rebuild for icu-69.1
---
srcpkgs/sile/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 8e9f28786b9e..fae71dee89b1 100644
--- a/srcpkgs/sile/template
+++ b/srcpkgs/sile/template
@@ -1,7 +1,7 @@
# Template file for 'sile'
pkgname=sile
version=0.9.5.1
-revision=4
+revision=5
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="harfbuzz-devel lua51-devel lua51-lpeg lua51-luaexpat
From e7833f107fc5a62281b3d1ae6895d6bf6e3ca776 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 73/95] slop: rebuild for icu-69.1
---
srcpkgs/slop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 79839a6fdca4..4bfe13d08896 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
# Template file for 'slop'
pkgname=slop
version=7.5
-revision=3
+revision=4
build_style=cmake
hostmakedepends="pkg-config"
makedepends="glew-devel glm icu-devel libXrender-devel"
From 59a40c94cd4559edc28a7bb22e726b37e0b1fa57 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 74/95] sword: rebuild for icu-69.1
---
srcpkgs/sword/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 13240a993160..25daf413eb1f 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
# Template file for 'sword'
pkgname=sword
version=1.8.1
-revision=6
+revision=7
build_style=gnu-configure
configure_args="--without-conf --with-icuregex"
hostmakedepends="libtool automake pkg-config"
From 17b3d630fd6cbaaff26213f891347714478b66b6 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 75/95] tectonic: rebuild for icu-69.1
---
srcpkgs/tectonic/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 043842eb63c8..5f9cb1e03956 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
# Template file for 'tectonic'
pkgname=tectonic
version=0.7.1
-revision=1
+revision=2
wrksrc="tectonic-tectonic-${version}"
build_style=cargo
configure_args="--features=external-harfbuzz"
From 2c0c534008c386b4a6bee1bd01a1a7563e21621b Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:32 +0200
Subject: [PATCH 76/95] tepl: rebuild for icu-69.1
---
srcpkgs/tepl/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tepl/template b/srcpkgs/tepl/template
index 2213a79cc0f1..948c624a71fa 100644
--- a/srcpkgs/tepl/template
+++ b/srcpkgs/tepl/template
@@ -1,7 +1,7 @@
# Template file for 'tepl'
pkgname=tepl
version=6.00.0
-revision=1
+revision=2
build_style=meson
build_helper=gir
configure_args="$(vopt_bool gir gir)"
From 6f01aa6aa812b9ed4fd1a902c6e85bf56b3564ff Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 77/95] tesseract-ocr: rebuild for icu-69.1
---
srcpkgs/tesseract-ocr/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tesseract-ocr/template b/srcpkgs/tesseract-ocr/template
index 7ed37c53c848..a654d5d0746f 100644
--- a/srcpkgs/tesseract-ocr/template
+++ b/srcpkgs/tesseract-ocr/template
@@ -1,7 +1,7 @@
# Template file for 'tesseract-ocr'
pkgname=tesseract-ocr
version=4.1.1
-revision=4
+revision=5
_tessdataver=4.0.0
wrksrc="tesseract-${version}"
build_style=gnu-configure
From 1810ec8b6b1b836204fdfc704952213fc1ebfb61 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 78/95] texlive: rebuild for icu-69.1
---
srcpkgs/texlive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template
index 253dd32a4110..06e527a5258d 100644
--- a/srcpkgs/texlive/template
+++ b/srcpkgs/texlive/template
@@ -1,7 +1,7 @@
# Template file for 'texlive'
pkgname=texlive
version=20200406
-revision=9
+revision=10
wrksrc="texlive-${version}-source"
build_wrksrc="build"
build_style=gnu-configure
From e09c4c8ed84a65b5cb787eba85d17c41a000b3de Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 79/95] thunderbird: rebuild for icu-69.1
---
srcpkgs/thunderbird/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index 876d9aeec6d8..8a55b610cb49 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
#
pkgname=thunderbird
version=78.12.0
-revision=1
+revision=2
build_helper="rust"
short_desc="Standalone Mail/News reader"
maintainer="Érico Nogueira <ericonr@disroot.org>"
From d992f151b7679879021a3848d270a0d8144f33b7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 80/95] tracker: rebuild for icu-69.1
---
srcpkgs/tracker/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 810675677fe5..8c4a66773097 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
# Template file for 'tracker'
pkgname=tracker
version=2.3.6
-revision=1
+revision=2
build_style=meson
build_helper="gir"
configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false
From 451345d55ff8fa016f8eecd180c3aa04191160e9 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:33 +0200
Subject: [PATCH 81/95] tracker-miners: rebuild for icu-69.1
---
srcpkgs/tracker-miners/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker-miners/template b/srcpkgs/tracker-miners/template
index 600d144218c5..77802c21ea8f 100644
--- a/srcpkgs/tracker-miners/template
+++ b/srcpkgs/tracker-miners/template
@@ -1,7 +1,7 @@
# Template file for 'tracker-miners'
pkgname=tracker-miners
version=2.3.5
-revision=1
+revision=2
build_style=meson
configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
-Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled
From e1930d5e7463a7fe092b4fdba17de3416c975fc7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 82/95] tracker3: rebuild for icu-69.1
---
srcpkgs/tracker3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker3/template b/srcpkgs/tracker3/template
index b83fe8746262..12ba53374733 100644
--- a/srcpkgs/tracker3/template
+++ b/srcpkgs/tracker3/template
@@ -1,7 +1,7 @@
# Template file for 'tracker3'
pkgname=tracker3
version=3.0.2
-revision=1
+revision=2
wrksrc=tracker-${version}
build_style=meson
build_helper="gir"
From 8f9c0e1fe41f860e79d60fbc186351d1cdf8e603 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 83/95] tracker3-miners: rebuild for icu-69.1
---
srcpkgs/tracker3-miners/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tracker3-miners/template b/srcpkgs/tracker3-miners/template
index 6ea8e49a1a51..9d266c66397f 100644
--- a/srcpkgs/tracker3-miners/template
+++ b/srcpkgs/tracker3-miners/template
@@ -1,7 +1,7 @@
# Template file for 'tracker3-miners'
pkgname=tracker3-miners
version=3.0.5
-revision=1
+revision=2
wrksrc=tracker-miners-${version}
build_style=meson
# missing libgrss for miner_rss
From e70589f8119ec78549d4ed89f97a936caa632e7d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 84/95] unar: rebuild for icu-69.1
---
srcpkgs/unar/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index 8cad3cf76263..e7a689216655 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
# Template file for 'unar'
pkgname=unar
version=1.10.7
-revision=6
+revision=7
archs="~*-musl" # regexec incompatible
build_wrksrc="XADMaster"
build_style=gnu-makefile
From 23b3a81120451753298ba20ea475067226dc35e5 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 85/95] vte3: rebuild for icu-69.1
---
srcpkgs/vte3/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 945678b4a390..434e9f549584 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
# Template file for 'vte3'
pkgname=vte3
version=0.64.2
-revision=1
+revision=2
wrksrc="vte-${version}"
build_style=meson
build_helper="gir"
From 583410f8c09b20c4bbdf3b6700e092d44bcd749e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 86/95] webkit2gtk: rebuild for icu-69.1
---
srcpkgs/webkit2gtk/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 55087a491946..bbe0d8ddca86 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -2,7 +2,7 @@
# ping q66 before touching this
pkgname=webkit2gtk
version=2.32.3
-revision=1
+revision=2
wrksrc="webkitgtk-${version}"
build_style=cmake
build_helper="gir"
From 90fef537a05c545eea1c17cb0d1fdd114e9c0fde Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:34 +0200
Subject: [PATCH 87/95] widelands: rebuild for icu-69.1
---
srcpkgs/widelands/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d0402050262e..97b2c6254b24 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
# Template file for 'widelands'
pkgname=widelands
version=21
-revision=4
+revision=5
wrksrc="${pkgname}-build${version}"
build_style=cmake
configure_args="-DOPENGL_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
From a1eff3d2676cfede5d3e04232b2ed7bd0c6d324a Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 88/95] xerces-c: rebuild for icu-69.1
---
srcpkgs/xerces-c/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 56f12c4aab08..e29e7798d647 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
# Template file for 'xerces-c'
pkgname=xerces-c
version=3.2.3
-revision=3
+revision=4
build_style=gnu-configure
hostmakedepends="automake libtool pkg-config"
makedepends="libcurl-devel icu-devel"
From eb0ac92f57fbedc6f83d2db063d3f84917afa38e Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 89/95] yaz: rebuild for icu-69.1
---
srcpkgs/yaz/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index 50e3929b5862..35492d2f6ec6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
# Template file for 'yaz'
pkgname=yaz
version=5.30.3
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
--with-icu --with-gnutls"
From cc93a0257232277a5b9a73f102e618ebae60e736 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:12:35 +0200
Subject: [PATCH 90/95] znc: rebuild for icu-69.1
---
srcpkgs/znc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index f5b01ed0c425..bff3702aa131 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
# Template file for 'znc'
pkgname=znc
version=1.8.2
-revision=6
+revision=7
build_style=gnu-configure
configure_args="
--enable-python
From d8f0eb7d7f6f14b290a5fe09fad7e8d6f0254da4 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 14:57:08 +0200
Subject: [PATCH 91/95] removed-packages: drop nodejs-lts-10
---
srcpkgs/removed-packages/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 566536002191..51fb04a0fe84 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -1,7 +1,7 @@
# Template file for 'removed-packages'
pkgname=removed-packages
version=0.1
-revision=47
+revision=48
build_style=meta
short_desc="Uninstalls packages removed from repository"
maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -319,6 +319,7 @@ replaces="
zou<=0.2.0_7
zuluplay<=1.1_1
zuluplay-devel<=1.1_1
+ nodejs-lts-10<=10.24.0_2
"
if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
From 941674cf5fc55baff4a52e28baafe53dccccdf3d Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 15:01:15 +0200
Subject: [PATCH 92/95] rstudio: switch nodejs-lts
---
srcpkgs/rstudio/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template
index dcd1f1255317..c3eade261225 100644
--- a/srcpkgs/rstudio/template
+++ b/srcpkgs/rstudio/template
@@ -10,7 +10,7 @@ configure_args="-DRSTUDIO_TARGET=Desktop
-DQT_QMAKE_EXECUTABLE=/usr/lib/qt5/bin/qmake
-DCMAKE_INSTALL_PREFIX=/usr/lib/rstudio"
hostmakedepends="unzip pandoc openjdk apache-ant R qt5-qmake
- qt5-host-tools which nodejs-lts-10"
+ qt5-host-tools which nodejs-lts"
makedepends="zlib-devel libuuid-devel openssl-devel pam-devel R mathjax
boost-devel pango-devel hunspell-devel qt5-devel qt5-webkit-devel
qt5-declarative-devel qt5-location-devel qt5-sensors-devel qt5-svg-devel
From 4a5c5788c347c4a228d1663ea6f9dc194a280e62 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:08:27 +0200
Subject: [PATCH 93/95] firefox-esr-i18n: update to 78.13.0.
---
srcpkgs/firefox-esr-i18n/template | 188 +++++++++++++++---------------
1 file changed, 94 insertions(+), 94 deletions(-)
diff --git a/srcpkgs/firefox-esr-i18n/template b/srcpkgs/firefox-esr-i18n/template
index db026b7334d4..a32c55b9e878 100644
--- a/srcpkgs/firefox-esr-i18n/template
+++ b/srcpkgs/firefox-esr-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-esr-i18n'
pkgname=firefox-esr-i18n
-version=78.10.0
+version=78.13.0
revision=1
build_style=meta
short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
}
}
-checksum="52a18b0f03c8e32ebe65fd35b35580c052f0a6d664b03ff7158d7092ec9b7ecc
- d465e0bc4e4435430a0dc46f4b6da3d89671980f5f15a775acd7fb0cbfc72ca5
- bc4b59a18b6dddf2346dc3035071558385f2531bbfc2ab2ba4c4fce8ff06ee73
- e69896e629f334c423e9e0a4fb88e32140b2e78edd6f8e80d83a55cc3213ce03
- 96656c65318bd915ea2bb50c18641f5817a69dfa2858887afceedbdcfcc88273
- afc068cd1a5ca56f2e5423712b1ffd9dbbd6dca620ebc74cc8d9765fb10c7cf8
- 28b79b454cc4711799850dc1992489317e744a6d393b177b28a6adeb101f9b5c
- 3c6b77c4e45b721bf9366c6e6f58bb744ed02803d4485e645ee33e061900276d
- 46aa1fa5e978ce477d653f0b111b9f633721ec9624ea632f05a17cee25b8fbfb
- 82ea2890a3e71c59c20920f16875cfc30010bb665cc057b4b637ebdc3707684f
- bccac87fda10872668bd0516eefc45ea654cd0ea00bf540e9bc716a3672cffcc
- bffb69a6aa95739dbcc57121f5f7d19e87686d283dc9fa776be6766d47562ec3
- cffc9925ae05662e0c80d97d665dbe0039979ca3e56c971f5ac85fa4d3f02e76
- b61fbc2fb817c51656f66d43e95de4f9348f085e1dc2da1f372ce91ece801882
- a1a3e68500ea4adfccf17438e31dcf895a64b822ca1e5d57b957658cd11dc5f4
- 9042f2976ac86dda964c4660947bf48610d6323a4b8401783d79c0246d5c59fb
- 774a70486ff675fba9c168d94788e123e180ecc49bf09d70a8658589b96a6062
- c9a50baece491a34d3684df5ba7adb36ce290226fdf154cced3ced0600eb2552
- cc7e83f009146fdfef41ff8ff74c26f99521675a593ac762f612d1767b441233
- dfcec6dccf25b3198a6291f59b6e59caf753f1515750c75a9370d8a786481bcf
- a9eda22d8722bf4e5fb3daf2e5f45eed36f217e95b923eb5281f4fe182b12032
- 83f81d426b6d57b216738701759aac0523599d99ca1001da29452f39c7549a3a
- 4e7d77567efcab3713556e3db86132c900ba551d74b08195276ce9c36935259a
- b2909209b20fc86254f3616a5f5093f563c534dec87b402fb779e210a1fe0602
- c25c76ac63b91f6dfa066071c320e550161ed2a61f7db6c1edbf224af0ebdc03
- 4a6cb89ed9433852e3f6be678bf74b28bde1445de6e2666c714e3833bec023fa
- 6a15e0017f80a7ba0a009ad33be65eaec9dc2a325a73b38b5d19df16d7cb8252
- 11a29f31990ac5f444b3df4a17573ae9f48b2256a971cf83fdf512b4d6075a98
- f3aa6226f97018a4255253367252bc052b283cbff8c2bd90968baaf94a9ff3f1
- 1b92d6145a9e2d32437e29cae12632eb2302903a028104c9cb06a45724eef9fc
- 3488d9160b67794a0ab7bc35d54578bd94097304186d0b31ea5667178d02a99c
- 55cf76466291a1496d5f830aa0257292271284d6ee044e9bf95465105e29049c
- 8729900ea584e49ee1a3462f17337a4d4ecc0711e6320d6119dfa9afb7d0f231
- 39269840ec90a26b3a822a6d78db6aa91ada31da7fafa15611cc20d884d715de
- 3c93c3dc040a8b8a9330ef0e86ed4c9b4528fb7b1aebad50fa8ea5e188dec3ab
- d522cec4bfd17cb578749e84737e1bbde5949d39a824f8338708010b67a37677
- 4fe1dc98e52ce963a1e97b5af821fdbe300b3ffee85500d0017315b1dfdd92d4
- 179d75e4e64d10d78c5e02e083b627890341e466c7ed543b17c1d1d23ab8c1bb
- 3cb3453ee615021d7748daff3bd0420e5df6d457be6ef651ea569a9c08baed0f
- 9fc6c427029e963a82b87cc8ae2581b3c1b540f3347c8af758de959143cd4893
- 1692f45b2b989f4d4c9b9ce44748026041cba1f98ee99c99cdd2d5e7b1132a15
- ac4cdf0d291ccb9d80afd527b18bd2c665c70354cb411691d4c7472930ba6471
- 64b0d17fdbbf71250385bbbeae689728d3789d30696a9055bbbd1a2b990538ee
- ca3890ec82b71b03dc4b5f4544bf2172cd0934c3b4ba77bccc555bb367b6b5df
- 04eb3e7efa149b4f56135ba11aba79183511423370fc9637171a3a249591aa8c
- 9d871c5027cc3621ef6ccd5607a3bf79c8c79ef3b5a9362afc822b6b292a5ab6
- 3fa67e4c9b91a0036414c57d072826dbbf6ec50ef0e74ebe57c81d19e8d79d4f
- 4b15970422169f5a03bc4cdd16acf1858d9d3f8ebe743056872abe94a5524973
- 7aefe8cea46ff5b0db6bc417ca08236ec497fcbffb17815bde527ef2d9e07072
- 3cf67fd6a632235193b2afc48c77c76000a1da92d568b9bc7747abe44b674ff1
- c587d086d5dee92a7ebfcba8b53fd9476177816fe18c25686d7620b50087c76f
- c03af098290c82d18c4a76457e64261cf20095a1a589e2ca0bf826a6d1daf6f8
- c661f28dfe22a162cbdb54fa18566611c8b6fe67a69efe947214a142cff5b727
- ae9ebbf068a3f95a3a58cb425fbb5c7027403aa7a9bba1f9a85a7c185f774fae
- 9db037950c2fee22259f48922ec9b48e6fe245793308616c09dfe1faa41f8265
- b0705c96af1624042a3dd7f5177c22ce7a5196e35cebb21a8c47182ed01f1626
- 547da5b3f6d638b00e677379948956f39c4ef4455d8d53e1140c6e5e5cd9c043
- 2fec28c806f7b67cd2dc8b8dedfd3d6fb94ac1d125c2c9c4d9e5b1865a49d2c4
- ac9c1cac64843844d527e17e0a122a1eb4879a0a562d74380bce9d84812bdc8a
- 10de5e643b72ef582acec3abd2301033884b52c6ee085f4740cc6dbe42053ad6
- 29ee5a0c5d9d2635b9729c67a2628e406d6f138a3015f529af908de57c62f9a8
- ac8e4a204cd7675c19be0f714a7c66fc61c9b43854e6a4f5c906dd4395b138b8
- b2949a790c321633d827abff60dec5c8c0b5f4e049daa7f8352b9d2fd79b92e1
- aafb502de49c5dca19f44134d2c2925d1eb271a5aab458158fb45fe2597e2955
- f34211872382eca744aad54a980e1214ef5b2fb8cacb0c5524390565ea5352ce
- d770fe882698b42548f6b11cdfa1f3f7705026c4d8465af2a262658aa3487ebf
- 612d7721320c8f3263ea0f6a958bfc7ec3a9d4a3a3efccf333a61babd1d7e6c3
- 56faa0492325e0ed8fd44d7e02127398caf7fa97798ab4295c52b16ac3be4b08
- b648f6bd110b016786bc4d8bd87cb25fb05e0b1b274c40a1494e399c01c126e6
- 7390155c8c575ea56bf0f92d4ea97d5bf70735a2345f0b5644d6d5de234fd745
- feae5d7ff4165bc9b65a9a95455f13319bbe4bfcdce74b3c3119c02683f6e38d
- 2c6dc858852c9d9ebfeb437a5a6e6eae53e1470bff25b7aea97853df57f74eac
- ee0ee55a9dc6dce88adca93ccde0115af305a24f31c7d5110dcf47886c4fe44c
- 1111a78e81d32fb717ac6d57ab661c77dc4d69c007235a66eeeaf85ee1dce7b3
- c7a17cb9681cd83c577cda30caea294eb95878cbe46323c116523e40d1796a4d
- 81a3a01fe39ebdaa736e46dfc42043183cb2084821bea5be00f0328ab657fba9
- dad65dbdc29efde82689bfea94a56f4c9c1a81f490162e420ab7eaef0ccb3f10
- 4f3a6e62e45b5589c3e72249d8fdda32e741d9d6259b4c184f4068ab14fbe56c
- 956728a3f34efc88b1651426059808e56f5e0a9f91d435ed89e680c4d588031d
- 47e5edf1cd2681649799c468d353577b95587f6689197277a5d7f28570b8255c
- 798fb7cd52ed2d7812e9d6e080088814666ea1f2da5a917ab62430f0c6e07533
- 40e3f0117c511c0e4df85fa69ec7d56bd4ef7f7e2b218b7c60c3a3c5653cf12f
- c9da58427e33a0b3d562e922cbbc925fb7253b25772b1a93cfe3dedbd008c25e
- 2901fde41a204fdc16554e58b0cfe57de70d46225ae89bd7a5a07a2aadc4f0c9
- 3da1eac5979817f642c08c874a78cb92e83f0039d10df58795119bdfae69c7a8
- 0c027dc38f08b18d4b3ebd0c6ca7829f6173b8e013836d01e561a1edae1ad8f4
- b11f676363b18162ad09544e0ad5169d386812764e52af6bf85d0973e41f0ecf
- 79aa1438995b4e4b306c920eb114440e7adf0e4ddeac3e664dc0af2f294fdf5f
- 8ccc5f4db495440a27900b16977515d7327aba825816749b1142be8a9eb1a749
- e61ec2b783a7e5da560a3987f14036bb715ebffd84b2b93ef149e10c1fd52ba5
- d832133312870f5511905811707986c13619ac6b0aac4145f6f405ac07161869
- 36ad24b7a2a7ff99ae9407135cb42865d974ba2dc3caa8ff11d1f525879225d8
- f599a4b43b0f6ba05b832139c89c0a8a544263cdf56d8a07fb8b8e105f3630ee"
+checksum="d6771fd4032455f588b9a5087e6724cbd7dd0de5e2ed52b9d8c9628e353bb485
+ efc1b45b422eaa67b50515fd9f4c7a8873a41c173f34ea81f794862760970c03
+ c813964ba0acb1a4171f4b80cf0b35418632706e230a207bae1fbe148525e2e3
+ 537ca4d87f877169977bf8ba6aee00365a675bff20c5e83ce669cb32f8134935
+ e0074c93c0e5fa6c4c32e3ffd71ae049fc12d68b34807b355e8771d23786dcd2
+ f08a6298bb4020f42c3d391a89ce4fd098169be2b7c7a9ebee9845f201d050b8
+ 58f41c4f8b6a2cee01b31dd291ea775f6a129bb826e60dcb681c16f35cb043e0
+ dee160f79cb2249fe080f8fe04b453a1826a4c94d8487ade1ead1d31c58c165c
+ 5af1c6f4aebd4676fa9398105de1382def19ebb8892a0aa296262b0d0bee6766
+ 2a25dd41a57a8e845f24723fd14dd8783911b5feae1710fae35b5b53731bff90
+ 8ec853bd3b6f775c25283625c035bbd1a2e0d96582e72a74a8785fe2eb0f9f05
+ 113a772edeeb034479bb19e8a56c4a7b53c1bc4739215603b2ae4f2f2b72e003
+ 30ef44adfc325c8ae49235807988a371b857c43f68dd368a17e3525a93e2f8ff
+ 644f93276f6331465c87e1ff4817d04da235c2d9f291556526231082739d775d
+ d0438bc18febe594785bc32aaef68c7b68a9d2deef27ba648fce91bcb7b3efb6
+ 3c17346870391f7f74fd990f5f583fe1d79133293f2bb1dcee499f2a73f54e35
+ 95b3a8971fb5b56bdf75fa2a0d1d75d89bd002e741c049b9ea0b6fe7ff1d4781
+ 9d6b44f05a63a6e0a2fc5c6a05918ee00a9a58170c2f1efe34405024f588f7d5
+ 061c2217363932fdd31d8a0073aa28a2354cb0e46625058bc65ec6e75685fbe7
+ 3d78cdd992317e95cbb24e968b3cd08aeefc7062d5d91c792dc996926664aa6e
+ b374d959e577a78d06bfc8a126de96dce921d6290c06a297e6eac841162b85ca
+ fbd04b0031dba202982a73269763a142b6b5e8068f199b4c7ba0043eac298b37
+ 5635a2d1abce646a3ef8720930d6a3a600606e77e1e83f30f21bee0b2a0074cc
+ 87a286c30c04c7c331944ab0133d5f5e8dc96719afdf1f6599ead38334b69b58
+ 03408d0d8108ae45c0c98985849ab9d0b658cea1276fe66ad019a1d8e0237371
+ 4602a24cf9af22c0e8ef833423b1cd86c0d14c283d8caa18f3a4d35dd2d433c1
+ 79ee035d4be25b501cadb2469fb2c2d2f49862e88462b5ba8dd983f3b42dce55
+ e1fe81a33942eaaeac61576725f930516eae2beded974cbf8156dce8bbe06422
+ 2fdcc6eec03ecb42b572322e72bb3724224b007a84eec5c3b55d3ee41af0134a
+ 1c5e983d78157033b329ebf9d65223aab783acfd4c41ec1f713dc9efc7b3a401
+ c7d80f642ab2a6d4fe25e12248d3c2e60554ca34c119f771be99c285bf32ea0d
+ 00d7f81966e6e029352067387239982c4483bed13b475bee107a829b61d95ed1
+ b526fd78a5adb7713ce80dc053b90c2a96c2805fe2b03c91e48c89d6e24efd85
+ 6a42e3e608d5c9c667bee2231e21c97690518a46801d1d93e5c3a954db2a83dd
+ 6fa55aeb7f1b87cd4288e356e880aab8b5d870b0487c33b972778ded31b8c2b2
+ 274d2bb6b6f19d7bf6c7775a9e683fb20596f965db74667d9fd883d00b74dc9b
+ da09351ec54b5d25a3998fcfbddfdde037848d33a9f896e31cbd0f82156fb565
+ cf26c89b02c8c1fa7e501241a833bb79e64a5e6726931d487d99713712a6d92d
+ 033c75978c6d1bc11a8680c2575be2360efb52a2df1794f7c972b28a251dd5f7
+ ea26bb3fa07b43bdc1ee871fa2a5af7d716cfc3189218453d0935cd17b7a7b05
+ 6971188bfcb3340f639491a632d70ad7652d7fbcd7cd71f0410cde1579a50fb0
+ ba6b27da759a9f49aabf934f9a90475de8425f1a35d95b6e4e5ee679f792ff8e
+ 9c8a13d6d32b837f7e1ce19f4eabe6bf251a425b148ca9a35ee2d0203a301e06
+ 9a1b8a9958e556bb2a1ffc3b5adeb885f6f4e666772bb0f0653475541ec5a6c1
+ 7dd399646f9684e6875d58f174bb619c5d76ab16227e36b0c0e9e2c541deb55c
+ 11a4694ade358311a0142c58b7cae91cb9f06fdb7998cb9e5ca48b2f175ddbe4
+ 351c7dc114476d06dd9d110440c7143da0b89388934abfdf7879c727403262b8
+ 6e55baf505876fadc1a0d544b2015116b4b101817aec35e345bd0b010ef84235
+ c06fbf6b7333f03d69a851e38e3b9dbf470b9009a92aa353ced48f59d989556e
+ 65f82d867f308c8cea1133e5b1358edcea71e32bafac5e297bee89448dacbf48
+ b17ebc71e34baad52de982ca9c2d8804538f930d4a832cd4f63c1f771943d79e
+ e22947d02b32066329c14044be0387ff93643ae0058e3c8e95336425368e9a9d
+ 3885ec0ed6ac6a35102f3352539e4d76226f6cb4c0fa6a38bbcd0f2ddce2773e
+ c1d05d870a8064f542d9a4348cf73c7a503ce795d6ef425b1ed457f8af80b26b
+ 081ed95e41c39b7b93325f9a78fb8a5e9728ba24267b57572b9b9d20ef878d21
+ e225a51d5265955eeb85d4664e66bca5778651cd238c0ca6dd4ebfdec720ec49
+ 93e8b8bb4cc6bd9dc528612ce284375b186ccffe5faf8dc85119e11ebf8357d7
+ 044f2502806d96b42adcd151ba96e97727b26cad776abe1bcfabc65a0a0a0489
+ ee6ebc4dc9f6fb01baea79ae251761661b1e7e10d262afd391ae781e864a25ea
+ 3b1356a215141dab33648118241c8e16325a490be4e13bd699c36392cb576e1a
+ 736187c7a3e475f4d241361cb6466d83ec8d01175bf0d037ef602d41ee5426d4
+ 9e61f44d5064a166b2b662d7ac796470431aaa4679e6fa62e6899b30147abf51
+ 5d6e80d1548de83f923503c8412b1fa00db28327e117cd7ea1b49ee2563ed0f6
+ e63d5b95b32d80d5e126868512d5424ac641daede865b886b32056e0f2b07431
+ 2e466a4eaae6973eb317a28d577ec01cd30b0f129a8258421219c264e674d266
+ 92d27e9d41b2f9f576e8a9200425d817d425a366beb878c692abea457e245a5f
+ aa18501cdbf8c9b218e918da3f1e0fac4abf33fbc6a19d361bf5c2ef183d7fd3
+ 385a8b9cb52ece24ed07e1bdbdb414b8c13459e416e897729a1a58c89c916087
+ 3845b03f37e31bd59e3b10b1c5f2f3bd165f910cf6c339765dd43765bc01e9a0
+ 890516bebf4ceffe0de49e03fdf6e7e0df34a0fa4cf267a6a61916773bea0cbc
+ feb64eb3c3b14123f5d3e1a6601c268a5df82b340ce150294a8dca7dc3dcfb3d
+ f1e77a0bc3a2fa648b76801c3e944d0015331d2b2940bbc80910d705eea76abc
+ 178bc9dcf64d514808944acd0e805cd25f7ef8a97a7ccd888027d0d9ceb86790
+ fb347133864a1c88602320ecde78e7927c3e5c77fd5244138457cc091f4cc3a2
+ df1c9f2ad89f65ef8192e7a7fd1b9ad30eda0e07cb7cac8e47a43c350a99df11
+ 2c10e714b89705cc6afe7927e81fe15607f76ae6f15fe33b376dce292c832aa0
+ c4da570a06542f567d99fbb3e11ee12b34d9f0797656e35575581116702ac3c3
+ c9280dbf64d9a20a63908072a985648eeb4c69913fba9bf23a7177c4e175b606
+ d3ef20d664fd55302b040d0762417b204d318e2782e3463a83fe7f0e4550004f
+ e1c20282b48be38bd0d48544ff14da6b4467baefd3f599c5c3a21e18d1ba21a4
+ a48615f1e6dd69f21a47fd68f178f1bdd689e89f8762924a748a3ff63bef5b51
+ 96fa9aad7467c92dd590a0f707ddf0d1555b252c6ad4c008451d9656f5d85dc2
+ 04e3a16ca126476de4ba19247d3731b1335fa79a8c957f3675a9fa338a9d1af3
+ fef002d0b3fb82a1fc2993286e908d59502c4d816518ad872537ae2f6e20ea30
+ 066a70255297a3344b801d2251fea245f1712eb7415bfaeefbdf3c860d7d6ac7
+ 1f67ac24fd8d1f774aa796d209c87c7b09185ef98cb2d8ee5ece32c3177b38f6
+ 0971b746755d88008e9464e2eb4009096e75efdb27cde98d8a94768bb146eedb
+ 5301a1ea1a9ceba97976dcf0cc5e34bb126ef2d3abaa67fe3a119bd7c2b026f7
+ a38fd540e3710ec248d6f193549431171f68becd65832e58061e3bed9720c683
+ 92e70811f1f6a5bdaf0e888bfc77c5755c70a6889912d24b9f2dadcd417476c0
+ e071113a40dc1780aa9d927a5f2975cb4fab5544c81b274e3aad23ad81d3a027
+ cdcd024670f48966a03a91f9d2e6a083c1b24afd93a22c1ea415d762a573bb65
+ 3eb8744c722800bdd172eb20274b57cf745bba4bcd55dacd62d2acba303f4ad9"
From 425f8be1cbffeb98fd5cac02f152ae7f50d80e3f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 23 Jun 2021 19:10:39 +0200
Subject: [PATCH 94/95] qt5-webengine: update to 5.15.5, rebuild for icu-69.1
---
.../patches/0120-QTBUG-91773.patch | 372 ------------------
.../0200-invalidate-old-v8-cache.patch | 31 --
srcpkgs/qt5-webengine/template | 16 +-
3 files changed, 9 insertions(+), 410 deletions(-)
delete mode 100644 srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
delete mode 100644 srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
diff --git a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch b/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
deleted file mode 100644
index 88e7b893e302..000000000000
--- a/srcpkgs/qt5-webengine/patches/0120-QTBUG-91773.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
-index 5597c69f9..2cd48907b 100644
---- a/src/core/web_contents_adapter.cpp
-+++ b/src/core/web_contents_adapter.cpp
-@@ -716,8 +716,7 @@ void WebContentsAdapter::load(const QWebEngineHttpRequest &request)
- m_adapterClient->loadFinished(false, request.url(), false,
- net::ERR_DISALLOWED_URL_SCHEME,
- QCoreApplication::translate("WebContentsAdapter",
-- "HTTP-POST data can only be sent over HTTP(S) protocol"),
-- false);
-+ "HTTP-POST data can only be sent over HTTP(S) protocol"));
- return;
- }
- params.post_data = network::ResourceRequestBody::CreateFromBytes(
-@@ -773,7 +772,7 @@ void WebContentsAdapter::setContent(const QByteArray &data, const QString &mimeT
-
- GURL dataUrlToLoad(urlString);
- if (dataUrlToLoad.spec().size() > url::kMaxURLChars) {
-- m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString(), false);
-+ m_adapterClient->loadFinished(false, baseUrl, false, net::ERR_ABORTED, QString());
- return;
- }
- content::NavigationController::LoadURLParams params((dataUrlToLoad));
-@@ -1995,6 +1994,7 @@ void WebContentsAdapter::discard()
- if (m_webContents->IsLoading()) {
- m_webContentsDelegate->didFailLoad(m_webContentsDelegate->url(webContents()), net::Error::ERR_ABORTED,
- QStringLiteral("Discarded"));
-+ m_webContentsDelegate->DidStopLoading();
- }
-
- content::WebContents::CreateParams createParams(m_profileAdapter->profile());
-diff --git a/src/core/web_contents_adapter_client.h b/src/core/web_contents_adapter_client.h
-index 267266d81..afc43806a 100644
---- a/src/core/web_contents_adapter_client.h
-+++ b/src/core/web_contents_adapter_client.h
-@@ -466,8 +466,7 @@ public:
- virtual void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) = 0;
- virtual void loadCommitted() = 0;
- virtual void loadVisuallyCommitted() = 0;
-- virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) = 0;
-+ virtual void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) = 0;
- virtual void focusContainer() = 0;
- virtual void unhandledKeyEvent(QKeyEvent *event) = 0;
- virtual QSharedPointer<WebContentsAdapter>
-diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp
-index 1e92a46f8..f0e4130e8 100644
---- a/src/core/web_contents_delegate_qt.cpp
-+++ b/src/core/web_contents_delegate_qt.cpp
-@@ -259,14 +259,12 @@ void WebContentsDelegateQt::CloseContents(content::WebContents *source)
-
- void WebContentsDelegateQt::LoadProgressChanged(double progress)
- {
-- QUrl current_url(m_viewClient->webContentsAdapter()->getNavigationEntryOriginalUrl(m_viewClient->webContentsAdapter()->currentNavigationEntryIndex()));
-- int p = qMin(qRound(progress * 100), 100);
--
-- if (!m_loadingErrorFrameList.isEmpty() || !m_loadProgressMap.contains(current_url) || m_loadProgressMap[current_url] == 100 || p == 100)
-+ if (!m_loadingErrorFrameList.isEmpty() || !m_loadingInfo.isLoading()) // suppress signals that aren't between loadStarted and loadFinished
- return;
-
-- if (p > m_loadProgressMap[current_url]) { // ensure strict monotonic increase
-- m_loadProgressMap[current_url] = p;
-+ int p = qMin(qRound(progress * 100), 100);
-+ if (p > m_loadingInfo.progress) { // ensure strict monotonic increase
-+ m_loadingInfo.progress = p;
- m_viewClient->loadProgressChanged(p);
- }
- }
-@@ -339,35 +337,21 @@ void WebContentsDelegateQt::RenderViewHostChanged(content::RenderViewHost *, con
- }
- }
-
--void WebContentsDelegateQt::EmitLoadStarted(const QUrl &url, bool isErrorPage)
-+void WebContentsDelegateQt::emitLoadStarted(bool isErrorPage)
- {
-- m_isDocumentEmpty = true;
-- m_viewClient->loadStarted(url, isErrorPage);
-- m_viewClient->updateNavigationActions();
--
-- if ((url.hasFragment() || m_lastLoadedUrl.hasFragment())
-- && url.adjusted(QUrl::RemoveFragment) == m_lastLoadedUrl.adjusted(QUrl::RemoveFragment)
-- && !m_isNavigationCommitted) {
-- m_loadProgressMap.insert(url, 100);
-- m_lastLoadedUrl = url;
-- m_viewClient->loadProgressChanged(100);
-+ // only report first ever load start or separate one for error page only
-+ if (!isErrorPage && m_loadingInfo.isLoading()) // already running
- return;
-- }
-
-- if (!m_loadProgressMap.isEmpty()) {
-- QMap<QUrl, int>::iterator it = m_loadProgressMap.begin();
-- while (it != m_loadProgressMap.end()) {
-- if (it.value() == 100) {
-- it = m_loadProgressMap.erase(it);
-- continue;
-- }
-- ++it;
-- }
-+ m_isDocumentEmpty = true; // reset to default which may only be overridden on actual resource load complete
-+ if (!isErrorPage) {
-+ m_loadingInfo.progress = 0;
-+ m_viewClient->loadStarted(m_loadingInfo.url, false);
-+ m_viewClient->updateNavigationActions();
-+ m_viewClient->loadProgressChanged(0);
-+ } else {
-+ m_viewClient->loadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
- }
--
-- m_lastLoadedUrl = url;
-- m_loadProgressMap.insert(url, 0);
-- m_viewClient->loadProgressChanged(0);
- }
-
- void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *navigation_handle)
-@@ -375,34 +359,41 @@ void WebContentsDelegateQt::DidStartNavigation(content::NavigationHandle *naviga
- if (!webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled))
- navigation_handle->SetSilentlyIgnoreErrors();
-
-- if (!navigation_handle->IsInMainFrame())
-+ if (!navigation_handle->IsInMainFrame() || !web_contents()->IsLoadingToDifferentDocument())
- return;
-
-
- m_loadingErrorFrameList.clear();
- m_faviconManager->resetCandidates();
-- EmitLoadStarted(toQt(navigation_handle->GetURL()));
-+
-+ m_loadingInfo.url = toQt(navigation_handle->GetURL());
-+ // IsErrorPage is only set after navigation commit, so check it otherwise: error page shouldn't have navigation entry
-+ bool isErrorPage = m_loadingInfo.triggersErrorPage && !navigation_handle->GetNavigationEntry();
-+ emitLoadStarted(isErrorPage);
- }
-
--void WebContentsDelegateQt::EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription, bool triggersErrorPage)
-+void WebContentsDelegateQt::emitLoadFinished(bool isErrorPage)
- {
-- Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-- Q_ASSERT((triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !triggersErrorPage);
--
-- // When error page enabled we don't need to send the error page load finished signal
-- if (m_loadProgressMap[url] == 100)
-+ if (!m_loadingInfo.isLoading()) // not currently running
- return;
-
-- m_lastLoadedUrl = url;
-- m_loadProgressMap[url] = 100;
-- m_isNavigationCommitted = false;
-- m_viewClient->loadProgressChanged(100);
-+ Q_ASSERT(!isErrorPage || webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled));
-+ Q_ASSERT((m_loadingInfo.triggersErrorPage && webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled)) || !m_loadingInfo.triggersErrorPage);
-+
-+ if (!isErrorPage) {
-+ if (m_loadingInfo.progress < 100) {
-+ m_loadingInfo.progress = 100;
-+ m_viewClient->loadProgressChanged(100);
-+ }
-
-- m_viewClient->loadFinished(success, url, isErrorPage, errorCode, errorDescription, triggersErrorPage);
-- m_viewClient->updateNavigationActions();
-+ m_viewClient->loadFinished(m_loadingInfo.success, m_loadingInfo.url, false, m_loadingInfo.errorCode, m_loadingInfo.errorDescription);
-+ m_viewClient->updateNavigationActions();
-+ } else {
-+ m_viewClient->loadFinished(false, toQt(GURL(content::kUnreachableWebDataURL)), true, 0, QString());
-+ }
- }
-
--void WebContentsDelegateQt::EmitLoadCommitted()
-+void WebContentsDelegateQt::emitLoadCommitted()
- {
- m_findTextHelper->handleLoadCommitted();
- m_viewClient->loadCommitted();
-@@ -422,8 +413,7 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
- profileAdapter->visitedLinksManager()->addUrl(url);
- }
-
-- m_isNavigationCommitted = true;
-- EmitLoadCommitted();
-+ emitLoadCommitted();
- }
-
- // Success is reported by DidFinishLoad, but DidFailLoad is now dead code and needs to be handled below
-@@ -440,11 +430,11 @@ void WebContentsDelegateQt::DidFinishNavigation(content::NavigationHandle *navig
- // Now report we are starting to load an error-page.
- m_loadingErrorFrameList.append(navigation_handle->GetRenderFrameHost()->GetRoutingID());
- m_faviconManager->resetCandidates();
-- EmitLoadStarted(toQt(GURL(content::kUnreachableWebDataURL)), true);
-+ emitLoadStarted(true);
-
- // If it is already committed we will not see another DidFinishNavigation call or a DidFinishLoad call.
- if (navigation_handle->HasCommitted())
-- EmitLoadCommitted();
-+ emitLoadCommitted();
- }
- }
-
-@@ -486,6 +476,9 @@ void WebContentsDelegateQt::DidStopLoading()
-
- if (m_loadingState == LoadingState::Loading)
- setLoadingState(LoadingState::Loaded);
-+
-+ emitLoadFinished();
-+ m_loadingInfo.clear();
- }
-
- void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QString &errorDescription)
-@@ -495,7 +488,11 @@ void WebContentsDelegateQt::didFailLoad(const QUrl &url, int errorCode, const QS
- // Delay notifying failure until the error-page is done loading.
- // Error-pages are not loaded on failures due to abort.
- bool aborted = (errorCode == -3 /* ERR_ABORTED*/ );
-- EmitLoadFinished(false /* success */ , url, false /* isErrorPage */, errorCode, errorDescription, errorPageEnabled && !aborted);
-+ m_loadingInfo.success = false;
-+ m_loadingInfo.url = url;
-+ m_loadingInfo.errorCode = errorCode;
-+ m_loadingInfo.errorDescription = errorDescription;
-+ m_loadingInfo.triggersErrorPage = errorPageEnabled && !aborted;
- }
-
- void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_host, const GURL& validated_url, int error_code)
-@@ -511,8 +508,7 @@ void WebContentsDelegateQt::DidFailLoad(content::RenderFrameHost* render_frame_h
- Q_ASSERT(error_code == -3 /* ERR_ABORTED */);
- m_loadingErrorFrameList.removeOne(render_frame_host->GetRoutingID());
- m_viewClient->iconChanged(QUrl());
--
-- EmitLoadFinished(false /* success */, toQt(validated_url), true /* isErrorPage */);
-+ emitLoadFinished(/* isErrorPage = */true);
- return;
- }
- // Qt6: Consider getting rid of the error_description (Chromium already has)
-@@ -532,7 +528,7 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
- // Trigger LoadFinished signal for main frame's error page only.
- if (!render_frame_host->GetParent()) {
- m_viewClient->iconChanged(QUrl());
-- EmitLoadFinished(true /* success */, toQt(validated_url), true /* isErrorPage */);
-+ emitLoadFinished(/* isErrorPage = */true);
- }
-
- return;
-@@ -550,7 +546,11 @@ void WebContentsDelegateQt::DidFinishLoad(content::RenderFrameHost* render_frame
- int http_statuscode = entry ? entry->GetHttpStatusCode() : 0;
- bool errorPageEnabled = webEngineSettings()->testAttribute(WebEngineSettings::ErrorPageEnabled);
- bool triggersErrorPage = errorPageEnabled && (http_statuscode >= 400) && m_isDocumentEmpty;
-- EmitLoadFinished(http_statuscode < 400, toQt(validated_url), false /* isErrorPage */, http_statuscode, QString(), triggersErrorPage);
-+
-+ m_loadingInfo.success = http_statuscode < 400;
-+ m_loadingInfo.url = toQt(validated_url);
-+ m_loadingInfo.errorCode = http_statuscode;
-+ m_loadingInfo.triggersErrorPage = triggersErrorPage;
- }
-
- void WebContentsDelegateQt::DidUpdateFaviconURL(content::RenderFrameHost *render_frame_host, const std::vector<blink::mojom::FaviconURLPtr> &candidates)
-diff --git a/src/core/web_contents_delegate_qt.h b/src/core/web_contents_delegate_qt.h
-index 5a3dff6e9..7149f6bff 100644
---- a/src/core/web_contents_delegate_qt.h
-+++ b/src/core/web_contents_delegate_qt.h
-@@ -216,9 +216,9 @@ private:
- WindowOpenDisposition disposition, const gfx::Rect &initial_pos,
- const QUrl &url,
- bool user_gesture);
-- void EmitLoadStarted(const QUrl &url, bool isErrorPage = false);
-- void EmitLoadFinished(bool success, const QUrl &url, bool isErrorPage = false, int errorCode = 0, const QString &errorDescription = QString(), bool triggersErrorPage = false);
-- void EmitLoadCommitted();
-+ void emitLoadStarted(bool isErrorPage = false);
-+ void emitLoadFinished(bool isErrorPage = false);
-+ void emitLoadCommitted();
-
- LoadingState determineLoadingState(content::WebContents *contents);
- void setLoadingState(LoadingState state);
-@@ -242,9 +242,17 @@ private:
- int m_desktopStreamCount = 0;
- mutable bool m_pendingUrlUpdate = false;
-
-- QMap<QUrl, int> m_loadProgressMap;
-- QUrl m_lastLoadedUrl;
-- bool m_isNavigationCommitted = false;
-+ struct LoadingInfo {
-+ bool success = false;
-+ int progress = -1;
-+ bool isLoading() const { return progress >= 0; }
-+ QUrl url;
-+ int errorCode = 0;
-+ QString errorDescription;
-+ bool triggersErrorPage = false;
-+ void clear() { *this = LoadingInfo(); }
-+ } m_loadingInfo;
-+
- bool m_isDocumentEmpty = true;
- base::WeakPtrFactory<WebContentsDelegateQt> m_weakPtrFactory { this };
- };
-diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp
-index 6ab1c97cb..1de7f1c7f 100644
---- a/src/webengine/api/qquickwebengineview.cpp
-+++ b/src/webengine/api/qquickwebengineview.cpp
-@@ -496,11 +496,9 @@ Q_STATIC_ASSERT(static_cast<int>(WebEngineError::NoErrorDomain) == static_cast<i
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::CertificateErrorDomain) == static_cast<int>(QQuickWebEngineView::CertificateErrorDomain));
- Q_STATIC_ASSERT(static_cast<int>(WebEngineError::DnsErrorDomain) == static_cast<int>(QQuickWebEngineView::DnsErrorDomain));
-
--void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage)
-+void QQuickWebEngineViewPrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
- Q_Q(QQuickWebEngineView);
-- Q_UNUSED(triggersErrorPage);
-
- if (isErrorPage) {
- #if QT_CONFIG(webengine_testsupport)
-diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h
-index ebe55c345..ec535298b 100644
---- a/src/webengine/api/qquickwebengineview_p_p.h
-+++ b/src/webengine/api/qquickwebengineview_p_p.h
-@@ -116,8 +116,7 @@ public:
- void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
- void loadCommitted() override;
- void loadVisuallyCommitted() override;
-- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) override;
-+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
- void focusContainer() override;
- void unhandledKeyEvent(QKeyEvent *event) override;
- QSharedPointer<QtWebEngineCore::WebContentsAdapter>
-diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
-index e08afed44..b32c15039 100644
---- a/src/webenginewidgets/api/qwebenginepage.cpp
-+++ b/src/webenginewidgets/api/qwebenginepage.cpp
-@@ -282,28 +282,20 @@ void QWebEnginePagePrivate::loadStarted(const QUrl &provisionalUrl, bool isError
- QTimer::singleShot(0, q, &QWebEnginePage::loadStarted);
- }
-
--void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage)
-+void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription)
- {
- Q_Q(QWebEnginePage);
- Q_UNUSED(url);
- Q_UNUSED(errorCode);
- Q_UNUSED(errorDescription);
-
-- if (isErrorPage) {
-- QTimer::singleShot(0, q, [q](){
-- emit q->loadFinished(false);
-- });
-+ if (isErrorPage)
- return;
-- }
-
- isLoading = false;
-- Q_ASSERT((success && !triggersErrorPage) || !success);
-- if (!triggersErrorPage) {
-- QTimer::singleShot(0, q, [q, success](){
-- emit q->loadFinished(success);
-- });
-- }
-+ QTimer::singleShot(0, q, [q, success](){
-+ emit q->loadFinished(success);
-+ });
- }
-
- void QWebEnginePagePrivate::didPrintPageToPdf(const QString &filePath, bool success)
-diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h
-index 82ce99503..ae3ab5d25 100644
---- a/src/webenginewidgets/api/qwebenginepage_p.h
-+++ b/src/webenginewidgets/api/qwebenginepage_p.h
-@@ -107,8 +107,7 @@ public:
- void loadStarted(const QUrl &provisionalUrl, bool isErrorPage = false) override;
- void loadCommitted() override { }
- void loadVisuallyCommitted() override { }
-- void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode,
-- const QString &errorDescription, bool triggersErrorPage) override;
-+ void loadFinished(bool success, const QUrl &url, bool isErrorPage, int errorCode, const QString &errorDescription) override;
- void focusContainer() override;
- void unhandledKeyEvent(QKeyEvent *event) override;
- QSharedPointer<QtWebEngineCore::WebContentsAdapter>
diff --git a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch b/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
deleted file mode 100644
index 0b3820466dc9..000000000000
--- a/srcpkgs/qt5-webengine/patches/0200-invalidate-old-v8-cache.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 12ecfd11e326219ef185e7fdd6d967985fc57599 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@qt.io>
-Date: Thu, 20 May 2021 12:42:18 +0200
-Subject: [PATCH] Bump V8_PATCH_LEVEL
-
-Some backported patches to v8 require us to update the version string,
-otherwise stale cache files might not be cleaned properly.
-
-The V8_PATCH_LEVEL will de facto be decoupled from its upstream
-counterpart, but that should not matter in practice.
-
-Fixes: QTBUG-93744
-Change-Id: I77d0d2a5b011955d22e6ae4c2eb45406f4c52863
-Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
----
- chromium/v8/include/v8-version.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/chromium/v8/include/v8-version.h b/chromium/v8/include/v8-version.h
-index cc87cda0776..298c9f74e02 100644
---- a/src/3rdparty/chromium/v8/include/v8-version.h
-+++ b/src/3rdparty/chromium/v8/include/v8-version.h
-@@ -11,7 +11,7 @@
- #define V8_MAJOR_VERSION 8
- #define V8_MINOR_VERSION 7
- #define V8_BUILD_NUMBER 220
--#define V8_PATCH_LEVEL 31
-+#define V8_PATCH_LEVEL 32
-
- // Use 1 for candidates and 0 otherwise.
- // (Boolean macro values are not supported by all preprocessors.)
diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 0819b3790345..de219ffcc8b3 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,11 +1,12 @@
# Template file for 'qt5-webengine'
pkgname=qt5-webengine
-version=5.15.4
-revision=2
+version=5.15.5
+revision=1
+_version="${version}-lts"
_commit=0d4ca9cfb0d6e538172005e1c4b0b3a021b1c18c
-_chromium_commit=3f594ea1afb8b18c864715a796ef21099d432a13
+_chromium_commit=eaffb82d5ee99ea1db8c0d4d359bbc72e77f065b
archs="x86_64* i686* armv[67]* ppc64* aarch64*"
-wrksrc="qtwebengine-${_commit}"
+wrksrc="qtwebengine-${_version}"
build_style=qmake
configure_args="--
-webengine-icu -webengine-ffmpeg -webengine-opus -webengine-webp
@@ -24,15 +25,16 @@ makedepends="qt5-webchannel-devel qt5-location-devel qt5-tools-devel qt5-devel
libvpx-devel re2-devel libXtst-devel libXcursor-devel libXcomposite-devel
jsoncpp-devel harfbuzz-devel lcms2-devel protobuf-devel pulseaudio-devel
libXrandr-devel MesaLib-devel mit-krb5-devel alsa-lib-devel libxkbcommon-devel
+ libxkbfile-devel
$(vopt_if sndio sndio-devel) $(vopt_if pipewire libpipewire0.2-devel)"
short_desc="Cross-platform application and UI framework (QT5) - WebEngine component"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later, LGPL-3.0-or-later"
homepage="https://qt.io/"
-distfiles="https://github.com/qt/qtwebengine/archive/${_commit}.tar.gz
+distfiles="https://github.com/qt/qtwebengine/archive/v${_version}.tar.gz
https://github.com/qt/qtwebengine-chromium/archive/${_chromium_commit}.tar.gz"
-checksum="cea995e14c599c0c46b53b9938fd16f2360b639bf77e88a28ea26f518bb7b578
- fa0cab27cc32284f5af227a3dabde05ed6755f06641db6a6ca1c66848b10f715"
+checksum="b3d2970823c19b0abb5c9bcc0d72bc6a66b22e76cf660b8f31fd1f7e786786ea
+ 22eb137c1b423a30b55ae554b02729ddf11e0466d409d5e5a792c473c21282ac"
no_generic_pkgconfig_link=yes
build_options="sndio pipewire"
From e75fc6cfbc574eb5baed3180b18306faf049bf27 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Tue, 10 Aug 2021 17:51:45 +0200
Subject: [PATCH 95/95] firefox-i18n: update to 91.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 755b02d248c0..46c247e38536 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=90.0.1
+version=91.0
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -140,99 +140,99 @@ _pkgtmpl() {
}
}
-checksum="be357100c3fbdc0e0568985f0966d7080f6d489668300e9cb912bce70f7b8293
- 71667a2ea1a9f7f1fa8d7c1a61206cb2a84e61e5a3995f8ad039f4431dc9ca30
- a628f511eefdb40474f8b5c27fc8e25e0dcece7395552f68da444dc511d1fa25
- 67426fc4cdfdb18d97c4f0bfc54cd7a54341bc82177d977d798af8a8f33a6883
- ea6d961aec4c22758cab21aa42ce9544a20c333f320d7dce26707ad29df67ee2
- 9abb4464f9a0335a2d78b9f951309ce88f4727b0b15aa127d1bf983f034ccc76
- d2b67203c26292632b27b19c894d1980b1bf6e5540153360351ee70cf4545fd9
- ff0b5045589e866527df3240dd1207c14d4b11aa3764c9d7d8d4a92ef125bb21
- 17068cd81a7a223da2debab9da6fe4ca84463570931952c8269f2607b14e96fa
- ae8b28dfa5d73fed65c21a4c392eaa165fd608610d91ba8ec03c33036c47709f
- 423cbcc21ac9a21985deeea320dbac657696edc097769dc66b87ce5a20cb0b31
- 75eb76024a29b35ef5e7672d71769463b39b533ce018ce20da2097bb9744c8c8
- 0fa00a2a922b630594e0b94c8da46f7c5884bdf138dd6cca6dc8eb828bd1e2d7
- 34bd621a31da5e7ba2f887bea936e6c0ebceb4229badfd1fa1478776b2140d14
- bdd083ef2797c6cfbfb898ec1416f7f4cc5a5874bd4cc59ee857c82fda7df258
- 0e47f9c1891802657f00bb9c1d591fa5856da9af118e1e5b6cffcb59d94d496b
- e92252b9a1a3459f0da78556b24a64b181a3b2817cf3a8f0be8341b73c871ea4
- cc60e2252d84fb8440284a0e856f8a902220dfc63d0e8b126b2f42c55306b21b
- 49891d321639b35e151203bd232fd9e72f0c9683d1bea6f1a7c401d7a3a04a76
- df3545107af7b4bc032ef4c9fc7d3c435fb93054901abdb6fc4939d47aa764c6
- 4d6dada6f645dbc618d8376ee60a8eeecf437bd18ea0785595d1e201a8e8c5be
- 3172dea2525652c8094bde33f4f38983dbbe434ea27310e419c8f6e50a51975a
- cb25c27b81cd6760356a638e10816777cd9695e56ed95300018d35a7f53f0a77
- dbd688b662c519a1a3cc51067b76cd7640951d4b2fa99c8fd6a423ee58f9cf09
- 53e4198abf07adf3ccd626e6a34f532a80b60692182fc01d7bc3e420c119f7d2
- 2bc5e3b5b1ceb1126737ccd5c9c6e26dab77276d748ec4a0761d105515580151
- 9f7c502604bbd252a3ab256e8397e8757931310c57421577b7da511cd27c18af
- c115f32dc9c7b7d24a23defeaf78653ca7265428ef402994250d135905252b1c
- b9efc308fe8cac9a6015cf40b41e20207d9485bc8ba4a62773212594ce797f84
- 53295a0504e883b7b0cf6a7522ad61f58cbd23229ac0e7387366f4e57293f08b
- 83147e937209d97e8f980da4e12a09ba920665767dfe9f272abb2c485f00e904
- b2bd15e6782afa19c681d6083f6d528463d6ef74d55b7ccebe44e6ffbe2730f5
- 89b2f2538528542a89d5eeb845ee97896ece7407ca9038ea4e7e1f0b0f548158
- e0a764400e86782734add3fa848726634212abb71e4e7f33553268a310344b72
- 16ce9e331f413623de20099d2f2874d735744a587a9a5db95ca95f1960600a12
- 04c2b912864dd90aaef379b09017f1273e25d7e1723bce748a7d0fc03d0c0663
- 89c0276d64185f10b442e2e31dadf2ce3bd8d09db95644467f325aad22f49a69
- e0ab2286ef9518ffcf9595c79918ff505d096d057d6372f6cfc9c2740727611c
- 77e2c1b72e73ed8c23390bc67fdd68602cb3bba74e3d91a7f74522eb933acb8c
- befaca21c9c962a62c1f568e7d2d68aefad4d63d8bbf985bd5ca761dcad898c8
- e133796f92b7a634e3353226aa2ea44f311cca6b0affcc89ec9308c71cd018ad
- 60e99cf8302b5e277bbb5866e0fe56d357a006a5cfbd68c5acbbf82ceef24920
- 5ad2ddac27a739798c15542450507b2485806607334c018d58583c2a0fb77f3f
- 2548b8d17504cd11c742d810b74c4ec4d17c3da57250bb8a178488924fb14f95
- ec33239e16abbe551cfa1c9908249cc2c333a16c3c1950ad2041ee9feb75ad77
- d7de6154454ff6d087ccd0a4a6471d2cf1f4b73b3821493db3ece8c1a461c037
- f4ed4ad50029e687a7b97c71fbfa6f16557b97c52a236f750c69dbcf8459ebc8
- 0afa21ba8c5ff99ecee2d6c8f348e4e82a7f1f7d13bf8b3fe0c505cad5513d62
- 97e36627e7bc58b6139b30e31b3e9e50dd8e67bad514fc058d6170559273197c
- db8a0b2d753f2591e9dbc0f1c71516e35ed0ee839a46596e4a7d5b4b8e002672
- a7a442bd6142272b7734479eb946219dd7fbf2be9986d55c045b01ac13988539
- d98ead55c776fee847fa259472b5a80254fb8e49c8e1df695da1ae0e46ec61da
- fbebbd39b2d84c663425c8e5b40bbdf8cb4df13d3a8db5fef07ed19fe6f790b8
- c37af09b2ca5fbdb025b115c7dbb5c68717f57a29b3d5403bcd7daf3e4d51818
- a8fe814f81cda0fe2b819c1185b0d131f5fdab6156b396cdcc4d1b323d0a0660
- a6e78737ca0ed0cde75e9b7bc18d85edb11493433f0de05294efbe1742a75b27
- c55b7f41c14c3ac0a8226351b72bfa5ce05f0648bf0bce96826363875132a121
- b7b76bcc2ffbc5aee2327982544957ee4ce49872587367ec17368fd4f7ff58ec
- 85c146b304153f0587669ce9d31299465e3b109be97f35c7698e77ea04d46ebc
- 0b09874b5d687b71929042ce95184bebc5ed026332e4d347c1ecde3f451f4a5c
- 480681ce041ef2c217091e8ec0e4c7a95e5d2fabb1c2e7a6c6bc47fb98dba980
- 8130ab6e8d3d5a644dba2ac67df0cb2124f29afc08c59fc8eb4222901a42ac50
- 36b1fbe2166c83d58d8c955678204bee18a41a8f4e3ccd5a8f12b3b3b5f6e4e1
- 1d8e864cbe155f1470bd360b4cad611e336036a5044060f673bf04305f40f03b
- 932bbdec41615f61a54495ff1d50b228a5be7702071e24159ce92dc4f237470a
- 09095e1472079ff4c8ba251b0cd247be56bfe3f72dcd86866182ec1797607a9f
- 76be304b42b5fbdefb4301f30884b7b0bae96259bc25d08dd2b4f63ea5d27185
- 6258fb53ab87bce22906957ffe71e4dd69fbc7b7bca23cf1d82098647d82a334
- 379e9ca71f8a40f4cb81d70ddfea3ec433451a8216ebe13d1773f6e7743e7aae
- a1a2e9a6733297e4c000f67b49fc79385525fd99df35c48b0670ae7ef071f0b1
- b90bdc875b93f6d78c1ec113b94a895e142d28836b27a57b44cc86e2f6b6dc88
- 18ea08e9f1f81555e5771e86bdd6652be4465a1c39b6d07895ed54de56eafc9a
- a66bc6dc460cf0e4c891a02192faff10fa772a64f3d260bec2d9e49487f4cde9
- a995381bff3f42b0f67d2e7d6f12871d7ae7e58869ce345f590ae80ccc174709
- cde46c5c7007ab3ba895d5e9b30ac6270837f5b48f393f9f752a24e03532a48b
- dc363a23c014d1a8bf24afa1e6cae0d0cba6bb6e0c3f933816f8debc38c622d2
- 2ee0f2492f81a12840d2c99a00ac1e3666f514d2654042e54f8c8e5bd211797c
- 6113eb31e48de4d7fdb439d9dbe319408e7dcbe3c55fbbf1a7c4c5449394b324
- 92df223930d3e39657f7705b6a75369b0b9ecc5988e5fabc4895b39a9718dbed
- b95a4d34d8c426e04ad6023cb2b9319c519576f4a851b82c03a1992f58f026bc
- 760dd2be7d150ecf5ceabee59f55da9be5cd2a0fc7eaf20f7afa92dfa3189273
- 5ab7c5a16857b53a333198656335672593f8d9b2920693420d90d1df0e7e13b0
- 68499f57731c926e8601cb138b0e03e0d8bdcd88757701b3bea46652d439245e
- 41d4ef32a4833f1ef9f849fafdf32ccd1833adab0696324658a64e38d54625a2
- 2ba6ea3e31364158af51554efdd13c4efdc5c665d868ef140274eac27c2e38c9
- c506b5af14c6ce5a46d5bd9b4e0875dae548202f1f3f1cca967322805e61545a
- f7b8b33efd41b69d9905f3da2277ca66a4f212efe99619f3eeb19d14ae835061
- e5fa0feb89a3418608812debf1445d952ab65d53d94d5ec4e9680224d0ba50d7
- e78dc38e67d3416e8319491399e432c7025b134ce7b195847e3de38d66f63852
- 9c6915607b0181f95ca43fd4266c6c4ede04010549c368f5bac6798b5dd70ea7
- 57ca390e904ad5e292e819b1fa3fdb35652c8b5196d1f52dd65a33b2a254914c
- 9028546203eedd44ec1dd08e33c0ab40be27988100f08c3e47b2a025b6b20cb0
- 8993f2b916a162e2e05be1e0b91d0f1e663a462e4363a3a867992c03ef7bc122
- 57bc6916b472fb843052794574b39a96b7f48698d88104522f9fc6a6b9f9e8bc
- 42d64b7a6a7f5cc5e76e78108066fff648681a574c3e2b6c34fea704e76c2499
- 3c9a52ca9f25a5040314b42f3cf14dd4be83b065ccda29e6998d21e85b0fb9cc"
+checksum="353dd29fece91f4f455314d5c53586214df0ff644618239e8ca97f9d5769c1e6
+ 17c31a493019c0472183df215a197c001e76a085f696a29d644040d4bb4615af
+ 42a76176cff1d262948e86704ce162880acecb0d5cc7b6391424a6049ad90ac6
+ ef975199eba7257696368dfdfbadd8dd5f57fa47ffbf647fca3562283d91590e
+ 7e556855822a6a8b7124c1258f420abe65def9219c9a56504c661462df2e97ac
+ 4cb21bc10cad54bca9c5d384268c601f79c23e5f71addfdf1244b8f9b1e09354
+ 4ecf37a49a71498d56e464198783e22a59bd97a8442ee101fa5b68544167e932
+ 3d407df39ead090f6f074a93bf6b11451a891af2e8b44554392dd5f879fe8e98
+ 9b2947e2f4cdf806a5d80b6d10625817fc079225509065ebc5ae0115f5307eed
+ 15088ced6ef218412fed8b88803b4f06eb64ed2eb14c5f885c0654e8f770f0c1
+ ed870ed230cae2f1549f593b90ae6afcda0ab6cd0ed8ac47e442392f48dba95d
+ ff036496fc99f4d4fb4c904736ae681bd73eb34a9f8eff06bdffbe74209494b4
+ cb34895b84569683cc91b2f1b7f57eb4930d7de506df85fecae60029f41dd14c
+ 185562f67c05a890bd244d57d55e49d809aac3a63a8ca285fcda9f6df7d46624
+ 0e79aca97c2dd8dd16067777ba21aa3d72a6484adb1bdb40bc7e334352d59fbe
+ 5ab0c9a4342ddb431b25ccfaea3173b44ed42dbd1fc08d450c5eda626fbe9a99
+ 26a4c9bca70916fee5a98116026e229817acb5b0c931f87a8a021199afa36757
+ adc6557eed370f88b52d181e044ec92544dce9332e219c5f49031526cdb31165
+ e760a9bbc874094d531ac831a224e19bfac28caa40188e690547bf931904f3d5
+ 0f297974eaf9e1517b9dea0e4408c4f477c3d5b6afa4ee1a27b5829df085b9df
+ d64d04e2205ed1c249a4ab01a0563d06abb4eca1fda53ec6ac3307770e80f9a7
+ 534d8b63f05351892ff37fec15e7bfad02f85def032255d5eebe9b084e53a2f0
+ 22ec607d4283e658d51262d898dcbc73ecaedc4edad0224f79072111ddd27b4a
+ 0c168b6627d8845f6ba706849eeaa62d82cb82d0c69512e4dd3b439e7185087c
+ 88bcc1d57fa04645355c628119448c2d93e3654fe0dcedd5f5c6129c4af7364d
+ 299fcdfcff3dc733538e501b0f2be9a1788060137f9aa70ac6659c0df6ea0c2c
+ 92b78450685b1b5c73a9b93eb1587793896ad3d031bf4af42e73110184c2fb69
+ 89b5943cdd988fd062f6d5957541abf994d3b218fbf87ed266d9f2c9c437503e
+ 127fe410aa02ceb639dfe8011741313df3ae82a5d455d22bc515eec604b81159
+ be46a7b341653a2f59554262bb71d87bfb5d5f7b84f6da305877157777087a90
+ c2c76ea7579db6ba9d2884754deb118298956362182401724d277956e6be11bc
+ d5461153c1be0db6516b9f34baa91b69f22756bac650a271861d0a1c646bc3d8
+ 5cb0c69a5c6c54d80639c7588061f9710e17bbec1ce4fca1b5dc05def67b0e7b
+ 635fd90bd15a765f6cbc38808b1ad130e0bb54693b07cd97adf14e3c1636ad72
+ 76d6b25d9dda629be3194124e52f5a2ae0619538c008a740c4c5037dcc8ad349
+ 9f48953593519fc429ee3d151d734b20e3e0146ca070b245991cd888d6721565
+ 0dfc1334b47fd26b36f6b7680cd08941ff6cefbefe115e6eeab0ae640e554416
+ 8b33655d2957d801c41ccfaeb2267b2b03bf53b3acf8fe7d17fa8aeb9d638fb9
+ f47dde0da2e89009c3720fc4cd613ba972cdb176cf1c4c51a69ac91560a219ff
+ 2ce6fe1a2ab03ebc505457c58194024dd030769ac3911e84d706dcd5c6cc9e91
+ c3d3b0f9203698fe687c48dde5adf265e3fae7d6933090cb931a6b4c91cf386b
+ 0a9b0e6ece0c0269a297ade146254c4234f6da1f35fad5b526c0e21f0182e0a1
+ 02f7d9f2b6903a0086c94c61d7607a7b2ee2f24e5a862eb39da647322ff986d5
+ c22d4a74423ee45e45023c62e7f841036fc90b825978b664a306222f4ed52435
+ 9423604d2e11262e6130f7cb49959147ae5f1bf80d4e5c8ab488a3a2583d159b
+ 363f34190368a76188dbafcfd1bf01357eab8d7be69818a858d721e6551e96dd
+ bf87d8ae012cd4c548c9ac7ef0ea42a6ad34f9a6116417f3bd2c871c00b72b18
+ 4fbf9161315864e1fb429d6bccb6355245e5e88d1ae9ba993a907ed81300e8de
+ b0eac9bd7858dd656fb409c238037e171aae74d1fec5f191d32aa29079633b61
+ 9ae744fb4abf0bb3f61947c7c2295499715e71792bf7d1c4be5f4dcf04f7e534
+ f54aec41d6995206ebde480d76b5132c06cf9d351cc55301af7632d9a84aecef
+ c09ccc3aa33517d40e75d7a3438c136b882f27a95aa9511950fd68549872d16a
+ 51ceb7379bc0866388009af25d5fc4e30802940fdc698a16d1198dc05ef68a7c
+ d67bd91c11aa2e4053905cac429fbb2338818b00fe0a4bf545cf5a863616940a
+ 54428684fb49a28222e828a6fb0f96a0ae6e0a368965461c12208ed153dc530f
+ 73db5c5d864ef415b1edc57fdd1387bd064fafc2e1dba758effa5112077936d4
+ 9d5bbce7b7beb5ee7cc38d7c5e369d91753cd2b1542a23be31a36386660e10d4
+ ca771f88130ca2723eeffcd55166d3bc31cfae9165e57f7a7992a18a33eb4684
+ 5355fee42235573d7d5a54d416ea77d8dfef2f38b2244665724f100d0893965c
+ 6afd61b17cb437b1b919890eb27b3c9d5c70a741b953cdb9be5be212a0057d26
+ 8da37148e3f1e926c1d0a9808d7a86687fc8e3dadf3254e7f9d75b26dd89853b
+ c6a8d6b1a1406dca3d094fdeb41719f7584610443d3420adb9db89ca6a8a4e1a
+ c82fe0ae8db1d439c2df7ebdc01bb9054da1d840f246cf43b006717cb00ed042
+ 92849280c1e7660a4f908e46097d9ab0c4f7365c6ad324032731e4d544ee41e2
+ e4d627bfebe744d80fcc806c3d2a62de2c20a1ed51ee73ba9e10192c750ab95a
+ 197625e12d3593474e620e7d4e649d621cdd100af7f1a5f4e6e2315927344dd9
+ b92aaa5199b5f16b4c0485721afdfd5a2d3fb6a4ac478108e47f37792d841eda
+ 322d9640fda1330eecc269fc93bdbb780de7b4bbd78b6f06c3d1a12bfbf9ae46
+ c4ee0243743f292d7f8509dcf5a56c7c63968dba2e06324a14ff82dbc4b2b355
+ 343fb9afd65bd3315edefc4c7d94cb6532703ed3066075e298e7e923a72f794d
+ 8a0d64ff9e4fda3eb10532dd74b28088dc94e453795489a74f779fa06c46fcb1
+ 9496237b781fe905e74b5b5d2a105a176df0c70dd8b766949cea906e558ce4f7
+ 2fe5195e6f2f2688d74f08131d3ac7d4e07bf15bf259ffb5eb0eee0827dec616
+ 32be71785f829b2ee12bc18e4e5b91cc9d63c6208a54064f4c91519f0bf44d8f
+ 892eaee3d96bfae1bfb80fd168fa52f790a626460673762387c735d517e6969f
+ 5085ced357447c5d9c3b3620607512990848962b2be07cd9ba30b888249a15f4
+ 5e0cfca869c91ced73de14941e17e484cd861ceb8f1915216bb1436c040b4b4b
+ 25f462c1114328f1c27af2d5307698d2067b5961b358a59806ad73890a99d1c3
+ 4edefae806f5f9c0a7756c6163b0f22d5bb55051f16fd11f5986a2496e1c7099
+ b4db8fe0a45b7c4a0a0e214833aa97806da09431d17316ca6d1b50a8ddb41291
+ a152c663d92d56dbca04b98df4f86251d9028c29592594d0b7e96284cb8028b6
+ 494597287c037899fb9cc8e9a4020273b2b4fd4b5a3ec541126d18640116f726
+ b5dc6ce6ad473c5c2e9c707a23e6736261e1af494708d057281f6f30bb3f019e
+ 4182b8865bd5081fe0ff2b2f1a60b1e7e2ec7e835bae3ef850a51476419d1618
+ fda7c820f4c52b08cee89709347f698720d7f0e4ebeffefe6df9b30c80d982aa
+ a02df3beda2c114e8d9056f89bf9e6ffb03a8f963a0b46c158aad41b05f53c00
+ 49467a25795c2f35c37ba250b0be3d483c6fb58cf2160f1891e2e59ad4b42823
+ 70bcb1e054dd30a78517c9628f3b2ce739d5d4161faf67da3bef009fc7cc058b
+ 232836ed62b23fc2c0d28bd7df53b4b050068b8e7d6f0d43d5ee31570fbbd88d
+ 4b620f22c23ca1f6b8017f790c1aa3ec508de91b1a543a8e4de9b884669b8686
+ 548ed5c7d49365322c56f647da717059c26eb7418866569a562123a85006e0e8
+ 1efe7f211b58675fcf2c4fbc4736f817b15230050bd85e81ac523c45de0a717d
+ d93bbed71c151e016a6958fd0b886761cd44c7921e11d123d30a5d8b9730f967
+ 9035f32d76cedd4cb1d6f48c3b58cb1ccf19b47e77574fb4f9d4d97f77926bd3
+ 73ffcaeefcf78057e9eb06da45d9c2b961133e1f8497ac8f092d7e9a7afe67f4
+ 93c61e97e8fdf759c63c5b689d7fd772550968973a2da28f2db019284c964068"
next prev parent reply other threads:[~2021-08-10 19:06 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-10 12:18 [PR PATCH] icu-69.1 Duncaen
2021-08-10 13:12 ` [PR PATCH] [Updated] icu-69.1 Duncaen
2021-08-10 13:14 ` Duncaen
2021-08-10 14:55 ` Duncaen
2021-08-10 17:03 ` Duncaen
2021-08-10 17:35 ` Duncaen
2021-08-10 17:55 ` [PR PATCH] [Updated] icu-69.1, firefox-91.0, firefox-esr-78.13.0, qt5-webengine-5.15.5 Duncaen
2021-08-10 19:06 ` Duncaen [this message]
2021-08-10 23:43 ` Duncaen
2021-08-11 0:46 ` Duncaen
2021-08-11 2:00 ` ericonr
2021-08-11 2:08 ` ericonr
2021-08-11 13:01 ` [PR PATCH] [Updated] " Duncaen
2021-08-11 13:15 ` Duncaen
2021-08-11 14:05 ` Duncaen
2021-08-11 14:22 ` [PR PATCH] [Closed]: " Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210810190637.3sNbT8cMxVx159cocPqvr7L0exQt6znGPTpGz6uioFM@z \
--to=duncaen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).