Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] icu: update to 67.1
@ 2020-05-26 20:24 Johnnynator
  2020-05-26 20:27 ` [PR PATCH] [Updated] " Johnnynator
                   ` (4 more replies)
  0 siblings, 5 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-26 20:24 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages icu
https://github.com/void-linux/void-packages/pull/22334

icu: update to 67.1


A patch file from https://github.com/void-linux/void-packages/pull/22334.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-icu-22334.patch --]
[-- Type: text/x-diff, Size: 83723 bytes --]

From c994fd504378ef7ae77e305415ea39e642ef1330 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Wed, 29 Apr 2020 23:10:19 -0400
Subject: [PATCH 01/89] icu: update to 66.1; Claim maintainer

[ci skip]
---
 common/shlibs                        | 12 ++++++------
 srcpkgs/icu/patches/big-endian.patch | 15 ---------------
 srcpkgs/icu/template                 | 16 ++++++++--------
 srcpkgs/icu/update                   |  4 ++--
 4 files changed, 16 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/icu/patches/big-endian.patch

diff --git a/common/shlibs b/common/shlibs
index 09fd2f33a73..76fccb633b1 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -552,12 +552,12 @@ libkColorPicker.so.0.1.1 kColorPicker-0.1.1_1
 libkImageAnnotator.so.0.2.1 kImageAnnotator-0.2.1_1
 libbabl-0.1.so.0 babl-0.1.16_1
 libbamf3.so.2 bamf-0.5.1_1
-libicuio.so.64 icu-libs-64.1_1
-libicui18n.so.64 icu-libs-64.1_1
-libicudata.so.64 icu-libs-64.1_1
-libicutu.so.64 icu-libs-64.1_1
-libicuuc.so.64 icu-libs-64.1_1
-libicutest.so.64 icu-libs-64.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
 libaspell.so.15 aspell-0.60_1
 libpspell.so.15 aspell-0.60_1
 libenchant.so.1 enchant-1.4.2_1
diff --git a/srcpkgs/icu/patches/big-endian.patch b/srcpkgs/icu/patches/big-endian.patch
deleted file mode 100644
index 46e0ae45c5c..00000000000
--- a/srcpkgs/icu/patches/big-endian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Source: https://unicode-org.atlassian.net/browse/ICU-20533
-Upstream: pending(?)
-Reason: fix build on big-endian architecture
-
---- source/data/Makefile.in	2019-04-17 21:42:15.000000000 +0200
-+++ source/data/Makefile.in	2019-07-30 17:14:44.272986038 +0200
-@@ -149,6 +149,7 @@
- ifneq ($(ICUDATA_ARCHIVE),)
- ICUDATA_SOURCE_ARCHIVE = $(OUTDIR)/$(ICUDATA_PLATFORM_NAME).dat
--$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE) $(OUTDIR)
-+$(ICUDATA_SOURCE_ARCHIVE): $(ICUDATA_ARCHIVE)
-+	$(MKINSTALLDIRS) $(OUTDIR)
- 	$(INVOKE) $(TOOLBINDIR)/icupkg -t$(ICUDATA_CHAR) $(ICUDATA_ARCHIVE) $(ICUDATA_SOURCE_ARCHIVE)
- endif
- else
diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template
index cc72b96d921..eb58ef72269 100644
--- a/srcpkgs/icu/template
+++ b/srcpkgs/icu/template
@@ -2,21 +2,20 @@
 # NOTE: Please convert this package to support progressive updates with the
 #       next soname bump.
 pkgname=icu
-version=64.2
-revision=2
+version=67.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"
+configure_args="--with-data-packaging=archive --enable-static"
 hostmakedepends="pkg-config"
 short_desc="Robust and fully-featured Unicode libraries"
-maintainer="Orphaned <orphan@voidlinux.org>"
+maintainer="Randy McCaskill <randy@mccaskill.us>"
 license="ICU"
-homepage="http://www.icu-project.org/"
-#distfiles="http://download.icu-project.org/files/icu4c/${version}/icu4c-${version//./_}-src.tgz"
-distfiles="https://osdn.net/frs/g_redir.php?m=kent&f=icu%2FICU4C%2F64.2%2Ficu4c-${version//./_}-src.tgz>icu4c-${version//./_}-src.tgz"
-checksum=627d5d8478e6d96fc8c90fed4851239079a561a6a8b9e48b0892f24e82d31d6c
+homepage="https://home.unicode.org/"
+distfiles="https://github.com/unicode-org/icu/releases/download/release-${version//./-}/icu4c-${version//./_}-src.tgz"
+checksum=94a80cd6f251a53bd2a997f6f1b5ac6653fe791dfab66e1eb0227740fb86d5dc
 
 if [ "$CROSS_BUILD" ]; then
 	configure_args+=" --with-cross-build=${XBPS_BUILDDIR}/${wrksrc}/host-icu"
@@ -109,6 +108,7 @@ icu-libs_package() {
 	short_desc+=" - shared libs"
 	pkg_install() {
 		vmove "usr/lib/*.so.*"
+		vmove "usr/lib/*.a"
 
 		# install data manually
 		vmkdir "usr/share/icu/${version}"
diff --git a/srcpkgs/icu/update b/srcpkgs/icu/update
index cbba24ead95..e33ef297284 100644
--- a/srcpkgs/icu/update
+++ b/srcpkgs/icu/update
@@ -1,2 +1,2 @@
-site='http://site.icu-project.org/download'
-pattern='ICU4C-Download">\K[\d.]+'
+site=https://github.com/unicode-org/icu/releases
+pattern="release-\K[\d\-]*(?=\.tar\.gz)"

From 1201a4e51e7f7569887e18ac8a87b1f26ac4aa28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 02/89] 0ad: rebuild against icu-67.1

---
 srcpkgs/0ad/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/0ad/template b/srcpkgs/0ad/template
index d4a42a4894d..88314906c9a 100644
--- a/srcpkgs/0ad/template
+++ b/srcpkgs/0ad/template
@@ -1,7 +1,7 @@
 # Template file for '0ad'
 pkgname=0ad
 version=0.0.23b
-revision=4
+revision=5
 archs="x86_64* i686* aarch64* armv7l* ppc64le*"
 wrksrc="${pkgname}-${version}-alpha"
 hostmakedepends="pkg-config perl cmake python tar"

From ba23aef927441be66dee8edd2c45769cf3791109 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 03/89] Aegisub: rebuild against icu-67.1

---
 srcpkgs/Aegisub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 838de134f93..7410825542b 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,7 +1,7 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
 version=3.2.2
-revision=9
+revision=10
 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 f9f6da0eca7c99a0a850d1ebcb88695be77c8c2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 04/89] OpenRCT2: rebuild against icu-67.1

---
 srcpkgs/OpenRCT2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/OpenRCT2/template b/srcpkgs/OpenRCT2/template
index 988dbb69d70..40f73b0ab4e 100644
--- a/srcpkgs/OpenRCT2/template
+++ b/srcpkgs/OpenRCT2/template
@@ -5,7 +5,7 @@ pkgname=OpenRCT2
 _objects_version=1.0.13
 _titles_version=0.1.2
 version=0.2.5
-revision=1
+revision=2
 build_style=cmake
 configure_args="$(vopt_if multiplayer "" "-DDISABLE_HTTP_TWITCH=1 -DDISABLE_NETWORK=1")"
 hostmakedepends="pkg-config unzip"

From af7c18b5497350a67dd5fc4aed14d0db0df9f220 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 05/89] R: rebuild against icu-67.1

---
 srcpkgs/R/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/R/template b/srcpkgs/R/template
index 2845f08def9..424154fad12 100644
--- a/srcpkgs/R/template
+++ b/srcpkgs/R/template
@@ -1,7 +1,7 @@
 # Template file for 'R'
 pkgname=R
 version=3.6.3
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--docdir=/usr/share/doc/R rdocdir=/usr/share/doc/R
  --with-lapack --with-blas --enable-R-shlib --with-tcltk

From dc6f1be7301b9729fb16c1f32644767d07cab8f7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 06/89] R-cran-stringi: rebuild against icu-67.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 c8e7530e123..fc2bddc2e02 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=1
+revision=2
 build_style=R-cran
 makedepends="pkg-config icu-devel"
 short_desc="Character String Processing Facilities"

From 9aed6718206bf9aff5b4c4e64b656819ad6738b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 07/89] an: rebuild against icu-67.1

---
 srcpkgs/an/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/an/template b/srcpkgs/an/template
index 7618117a137..85e94f7bc72 100644
--- a/srcpkgs/an/template
+++ b/srcpkgs/an/template
@@ -1,7 +1,7 @@
 # Template file for 'an'
 pkgname=an
 version=1.2
-revision=5
+revision=6
 build_style=gnu-makefile
 makedepends="icu-devel"
 depends="words-en"

From 574cb530f94b2c0af8fc90fe158fbd9d3c1bf04b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 08/89] boost: rebuild against icu-67.1

---
 srcpkgs/boost/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/boost/template b/srcpkgs/boost/template
index 068d1390eaa..4506ab0caed 100644
--- a/srcpkgs/boost/template
+++ b/srcpkgs/boost/template
@@ -1,7 +1,7 @@
 # Template file for 'boost'
 pkgname=boost
 version=1.72.0
-revision=1
+revision=2
 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 86c6b1e0af8ee77be429be8dfe1ed7e6ac948230 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 09/89] brltty: rebuild against icu-67.1

---
 srcpkgs/brltty/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/brltty/template b/srcpkgs/brltty/template
index a85530e651f..484b98efaf7 100644
--- a/srcpkgs/brltty/template
+++ b/srcpkgs/brltty/template
@@ -1,7 +1,7 @@
 # Template file for 'brltty'
 pkgname=brltty
 version=6.0
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--enable-gpm --with-screen-driver=lx,sc
  --with-tables-directory=/usr/share/brltty PYTHON=/usr/bin/python3"

From f5e71c17ef17868c0ae0079266c8ae8a0943c887 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 10/89] calibre: rebuild against icu-67.1

---
 srcpkgs/calibre/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template
index 358e073afab..ebb46691560 100644
--- a/srcpkgs/calibre/template
+++ b/srcpkgs/calibre/template
@@ -1,7 +1,7 @@
 # Template file for 'calibre'
 pkgname=calibre
 version=4.15.0
-revision=1
+revision=2
 build_style=python2-module
 pycompile_dirs="/usr/lib/calibre/"
 hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg

From 583347fbb76bbcd7a4684a21bc1fdd2451391571 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 11/89] clamav: rebuild against icu-67.1

---
 srcpkgs/clamav/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/clamav/template b/srcpkgs/clamav/template
index 86f4e602aa4..5afb3841882 100644
--- a/srcpkgs/clamav/template
+++ b/srcpkgs/clamav/template
@@ -1,7 +1,7 @@
 # Template file for 'clamav'
 pkgname=clamav
 version=0.102.3
-revision=2
+revision=3
 build_style=gnu-configure
 # XXX: system llvm is too new (< 3.7 required)
 # Shipped llvm does not build with gcc6

From 53ed42bbd36b8198bf34e5a33ec9e8f0ba3372dd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 12/89] deepin-music: rebuild against icu-67.1

---
 srcpkgs/deepin-music/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/deepin-music/template b/srcpkgs/deepin-music/template
index 8e1c9e88112..42d2bd2fe9c 100644
--- a/srcpkgs/deepin-music/template
+++ b/srcpkgs/deepin-music/template
@@ -1,7 +1,7 @@
 # Template file for 'deepin-music'
 pkgname=deepin-music
 version=5.0.1
-revision=1
+revision=2
 build_style=qmake
 hostmakedepends="qt5-qmake pkg-config"
 makedepends="dtkwidget-devel ffmpeg-devel libcue-devel pulseaudio-devel

From 4630ff8c1f31c2cb3dd3cda95b439a110f475787 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 13/89] dino: rebuild against icu-67.1

---
 srcpkgs/dino/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dino/template b/srcpkgs/dino/template
index 2b51a06331a..77a5b823dc3 100644
--- a/srcpkgs/dino/template
+++ b/srcpkgs/dino/template
@@ -1,7 +1,7 @@
 # Template file for 'dino'
 pkgname=dino
 version=0.1.0
-revision=2
+revision=3
 build_style=cmake
 configure_args="-GNinja -DDINO_PLUGIN_ENABLED_notification-sound=ON"
 make_cmd=ninja

From 45d0d95fa3d96a241e637658bb816cbb3eb52e80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 14/89] dwdiff: rebuild against icu-67.1

---
 srcpkgs/dwdiff/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/dwdiff/template b/srcpkgs/dwdiff/template
index c0e778429cb..d6377c92534 100644
--- a/srcpkgs/dwdiff/template
+++ b/srcpkgs/dwdiff/template
@@ -1,7 +1,7 @@
 # Template file for 'dwdiff'
 pkgname=dwdiff
 version=2.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="gettext pkg-config"
 makedepends="icu-devel"

From ac0ae382acbc1a6813779c3b7d953695248ab20d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 15/89] evolution-data-server: rebuild against icu-67.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 885a115f49b..4ae820be068 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.36.1
-revision=1
+revision=2
 build_style=cmake
 build_helper=gir
 configure_args="-DENABLE_UOA=OFF

From 8849d3475f79b36d3cdd901bdb8ef2fafeb11e28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 16/89] firefox: rebuild against icu-67.1

---
 srcpkgs/firefox/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3f052fac9fe..cb84a21638b 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
 #
 pkgname=firefox
 version=76.0
-revision=2
+revision=3
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Johannes <johannes.brechtmann@gmail.com>"

From 72b09d8429ded143339950b435e1ee3d451e4703 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 17/89] firefox-esr: rebuild against icu-67.1

---
 srcpkgs/firefox-esr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 990c0f7da79..41265f35072 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -4,7 +4,7 @@
 #
 pkgname=firefox-esr
 version=68.7.0
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"

From 014af6703c4061153bc3ddb9e2c943184d900655 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 18/89] freshplayerplugin: rebuild against icu-67.1

---
 srcpkgs/freshplayerplugin/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/freshplayerplugin/template b/srcpkgs/freshplayerplugin/template
index 5747b95c910..b4f06c7f614 100644
--- a/srcpkgs/freshplayerplugin/template
+++ b/srcpkgs/freshplayerplugin/template
@@ -1,7 +1,7 @@
 # Template file for 'freshplayerplugin'
 pkgname=freshplayerplugin
 version=0.3.9
-revision=4
+revision=5
 build_style=cmake
 hostmakedepends="pkg-config ragel"
 makedepends="libevent-devel libXcursor-devel alsa-lib-devel libXrandr-devel gtk+-devel

From 705c3c903683f530b48ec829f31bb6d373db9231 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 19/89] gnucash: rebuild against icu-67.1

---
 srcpkgs/gnucash/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gnucash/template b/srcpkgs/gnucash/template
index 5145a701ac6..743e4b1b6c2 100644
--- a/srcpkgs/gnucash/template
+++ b/srcpkgs/gnucash/template
@@ -1,7 +1,7 @@
 # Template file for 'gnucash'
 pkgname=gnucash
 version=3.10
-revision=1
+revision=2
 wrksrc="${pkgname}-${version%b}"
 build_style=cmake
 configure_args="-DWITH_SQL=0 -DWITH_PYTHON=1"

From f87654aa77727695abde9871cbba4a7e2318da38 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 20/89] gnustep-base: rebuild against icu-67.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 03d2893d747..1c7069d55eb 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.27.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 5cc64ba17c871d488889543e558eb2e0e84b60ce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 21/89] gnustep-gui: rebuild against icu-67.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 56f1ec46778..c6253ca745d 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.28.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 d7083d103c6dde67aa79eae0060f12f79e7535b1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 22/89] goffice: rebuild against icu-67.1

---
 srcpkgs/goffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/goffice/template b/srcpkgs/goffice/template
index 59cfd73cbdf..4271886de06 100644
--- a/srcpkgs/goffice/template
+++ b/srcpkgs/goffice/template
@@ -1,7 +1,7 @@
 # Template file for 'goffice'
 pkgname=goffice
 version=0.10.46
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake pkg-config pcre gettext-devel intltool libtool
  glib-devel gtk-doc"

From 4f992f7dd296c755578417446cb806b47519641e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 23/89] hardinfo: rebuild against icu-67.1

---
 srcpkgs/hardinfo/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/hardinfo/template b/srcpkgs/hardinfo/template
index 183416717b9..4e37ba72696 100644
--- a/srcpkgs/hardinfo/template
+++ b/srcpkgs/hardinfo/template
@@ -1,7 +1,7 @@
 # Template file for 'hardinfo'
 pkgname=hardinfo
 version=0.5.1
-revision=8
+revision=9
 build_style=gnu-configure
 hostmakedepends="pkg-config which"
 makedepends="gtk+-devel libsoup-devel desktop-file-utils"

From d295ab561b8c708252df27db0d88fe2f9c80539f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 24/89] harfbuzz: rebuild against icu-67.1

---
 srcpkgs/harfbuzz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/harfbuzz/template b/srcpkgs/harfbuzz/template
index afbbed8627e..302465c7ddd 100644
--- a/srcpkgs/harfbuzz/template
+++ b/srcpkgs/harfbuzz/template
@@ -1,7 +1,7 @@
 # Template file for 'harfbuzz'
 pkgname=harfbuzz
 version=2.6.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-glib --with-freetype --with-cairo --with-icu --with-graphite2"
 hostmakedepends="automake glib-devel libtool pkg-config"

From 65c110c5090b3335ec923846a967f32f9c866e32 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 25/89] icecat: rebuild against icu-67.1

---
 srcpkgs/icecat/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icecat/template b/srcpkgs/icecat/template
index b8c77e77fd2..a8ae7d6e5de 100644
--- a/srcpkgs/icecat/template
+++ b/srcpkgs/icecat/template
@@ -1,7 +1,7 @@
 # Template file for 'icecat'
 pkgname=icecat
 version=68.8.0
-revision=1
+revision=2
 build_helper="rust"
 hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
  python3 cargo llvm clang rust cbindgen nasm nodejs-lts-10 tar which"

From f2d1b56b5a9361242f060db572a24a6f14493909 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 26/89] icu4lua: rebuild against icu-67.1

---
 srcpkgs/icu4lua/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/icu4lua/template b/srcpkgs/icu4lua/template
index e4af275eb8f..58a1800279d 100644
--- a/srcpkgs/icu4lua/template
+++ b/srcpkgs/icu4lua/template
@@ -1,7 +1,7 @@
 # Template file for 'icu4lua'
 pkgname=icu4lua
 version=0.2B
-revision=8
+revision=9
 create_wrksrc=yes
 build_style=gnu-makefile
 hostmakedepends="pkg-config unzip"

From 1586c16b3fb3464fe901e33aa6055e443d49b7a4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 27/89] imv: rebuild against icu-67.1

---
 srcpkgs/imv/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/imv/template b/srcpkgs/imv/template
index 641ac768ce6..ab5c45cd3a2 100644
--- a/srcpkgs/imv/template
+++ b/srcpkgs/imv/template
@@ -1,7 +1,7 @@
 # Template file for 'imv'
 pkgname=imv
 version=4.1.0
-revision=1
+revision=2
 build_style=gnu-makefile
 hostmakedepends="asciidoc pkg-config"
 makedepends="cmocka-devel freeimage-devel glu-devel librsvg-devel libxkbcommon-devel

From 84a91ea1db8a370ecf1c5e2a78d5f77a3338b537 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 28/89] kdb: rebuild against icu-67.1

---
 srcpkgs/kdb/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/kdb/template b/srcpkgs/kdb/template
index 06a62d5babb..3cfae246693 100644
--- a/srcpkgs/kdb/template
+++ b/srcpkgs/kdb/template
@@ -1,7 +1,7 @@
 # Template file for 'kdb'
 pkgname=kdb
 version=3.2.0
-revision=2
+revision=3
 build_style=cmake
 hostmakedepends="extra-cmake-modules doxygen pkg-config kcoreaddons"
 makedepends="kcoreaddons-devel postgresql-libs-devel libmariadbclient-devel

From 194a0d6599b68270bb04ca34026e54bb916122ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 29/89] kiwix-lib: rebuild against icu-67.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 e6e812efde9..ef9cbc1652d 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.2
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config"
 makedepends="icu-devel libzim-devel pugixml-devel xapian-core-devel

From 456b25cc82b8233388cff15878a4b3824e7b5556 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 30/89] libbitcoin-blockchain: rebuild against icu-67.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 a354237b475..8d71f476cf0 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=2
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 2859b8498b856ec8f9cf6bde4c10eb03062f5d75 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 31/89] libbitcoin-client: rebuild against icu-67.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 63b4b6339b2..946682406d4 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=2
+revision=3
 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 ad3dec2e6f2655d66dd6e83cca8b44506fccc466 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 32/89] libbitcoin-database: rebuild against icu-67.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 eed919dc230..3ac8c3773e1 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=2
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 17f997423a53a95d51289d75f1b55bd229a3bf71 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 33/89] libbitcoin-explorer: rebuild against icu-67.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 49a4ff5fe48..8e4b20ab7c3 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=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions
  --with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib

From 163d0a43c7db5b35ffeb38b46a2d5114021e7c3a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 34/89] libbitcoin-network: rebuild against icu-67.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 db8e6e2c91e..8b4d1ce5196 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=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From faea3237f8cccc0a1ac424c0125355604e61412b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 35/89] libbitcoin-node: rebuild against icu-67.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 5aef078cb3b..b5db32a0eed 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=2
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From 04f72880265a2757e9b46eb435fe138a4c558c92 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 36/89] libbitcoin-protocol: rebuild against icu-67.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 e86df2997e7..e6aa4fc2985 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=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-boost-libdir=${XBPS_CROSS_BASE}/usr/lib
  --with-boost=${XBPS_CROSS_BASE}/usr --with-gnu-ld"

From 5939e1403990a9f6c2d6c5cc4f38c5542501ee39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 37/89] libbitcoin-server: rebuild against icu-67.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 78d8374280e..8c66566117e 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=2
+revision=3
 archs="aarch64* ppc64* x86_64*"
 build_style=gnu-configure
 configure_args="--with-bash-completiondir=/usr/share/bash-completion/completions

From c96e2c230c1267440806dea34e5158d3a630008d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 38/89] libbitcoin-system: rebuild against icu-67.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 53ad23e6616..3addeb4e544 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=2
+revision=3
 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 b35d2d4411978fb22ee6649bcd7eea00c469b04c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 39/89] libcdr: rebuild against icu-67.1

---
 srcpkgs/libcdr/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libcdr/template b/srcpkgs/libcdr/template
index d85b666b356..7def7ac6c99 100644
--- a/srcpkgs/libcdr/template
+++ b/srcpkgs/libcdr/template
@@ -1,7 +1,7 @@
 # Template file for 'libcdr'
 pkgname=libcdr
 version=0.1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--disable-debug"
 hostmakedepends="pkg-config"

From 68494be25a6af6a14dd04928c4f2d618bb592d90 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 40/89] libe-book: rebuild against icu-67.1

---
 srcpkgs/libe-book/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libe-book/template b/srcpkgs/libe-book/template
index d1307a454cd..89bf62399e3 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=6
+revision=7
 build_style=gnu-configure
 configure_args="--disable-werror"
 hostmakedepends="automake libtool gperf doxygen pkg-config"

From e44047c32ef3668a133478e6221a7af1d580b50d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 41/89] libgdal: rebuild against icu-67.1

---
 srcpkgs/libgdal/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libgdal/template b/srcpkgs/libgdal/template
index cd8b06c0684..18c8c6a22b1 100644
--- a/srcpkgs/libgdal/template
+++ b/srcpkgs/libgdal/template
@@ -1,7 +1,7 @@
 # Template file for 'libgdal'
 pkgname=libgdal
 version=3.0.4
-revision=3
+revision=4
 wrksrc="gdal-${version}"
 build_style=gnu-configure
 configure_args="--with-liblzma --with-webp --with-zstd --with-podofo --with-opencl=yes"

From 69ec166ed98d25bdf23abdbfdede68a8234d14ee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 42/89] libical: rebuild against icu-67.1

---
 srcpkgs/libical/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libical/template b/srcpkgs/libical/template
index 80ef8a6cc4a..c90914003b0 100644
--- a/srcpkgs/libical/template
+++ b/srcpkgs/libical/template
@@ -1,7 +1,7 @@
 # Template file for 'libical'
 pkgname=libical
 version=3.0.8
-revision=1
+revision=2
 build_style=cmake
 build_helper="gir"
 configure_args="-DICAL_BUILD_DOCS=false

From f4ef91f3f265af0300a9c3196455792e9d10cb69 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 43/89] liblcf: rebuild against icu-67.1

---
 srcpkgs/liblcf/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/liblcf/template b/srcpkgs/liblcf/template
index b9830657342..77f48c01b40 100644
--- a/srcpkgs/liblcf/template
+++ b/srcpkgs/liblcf/template
@@ -1,7 +1,7 @@
 # Template file for 'liblcf'
 pkgname=liblcf
 version=0.6.1
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config autoconf automake libtool"
 makedepends="expat-devel icu-devel"

From 98cddada7f958a4037437857a0da39759daccfe8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 44/89] libmspub: rebuild against icu-67.1

---
 srcpkgs/libmspub/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libmspub/template b/srcpkgs/libmspub/template
index 46aab2ce171..5c96ba40706 100644
--- a/srcpkgs/libmspub/template
+++ b/srcpkgs/libmspub/template
@@ -1,7 +1,7 @@
 # Template file for 'libmspub'
 pkgname=libmspub
 version=0.1.4
-revision=5
+revision=6
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="icu-devel boost-devel librevenge-devel zlib-devel"

From 4b7cb437a26c85605ae27f78b524c6d11de2bd29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 45/89] libqxp: rebuild against icu-67.1

---
 srcpkgs/libqxp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libqxp/template b/srcpkgs/libqxp/template
index 760edd0a7a5..ebe4dc44f91 100644
--- a/srcpkgs/libqxp/template
+++ b/srcpkgs/libqxp/template
@@ -1,7 +1,7 @@
 # Template file for 'libqxp'
 pkgname=libqxp
 version=0.0.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="boost-devel librevenge-devel icu-devel"

From 900f44bf27d4adf5c16fda275b33b7e29734696a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 46/89] libreoffice: rebuild against icu-67.1

---
 srcpkgs/libreoffice/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 13b58e7e95a..a4efa2625ae 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
 version=6.4.1.2
-revision=1
+revision=2
 build_style=meta
 make_build_args="build-nocheck"
 nocross="Several dependencies are nocross=yes"

From 14f07e8db23185a0a80e19bdb17dedfeb99aaac1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 47/89] libvisio: rebuild against icu-67.1

---
 srcpkgs/libvisio/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libvisio/template b/srcpkgs/libvisio/template
index e567a8ff825..3151a72d41d 100644
--- a/srcpkgs/libvisio/template
+++ b/srcpkgs/libvisio/template
@@ -1,7 +1,7 @@
 # Template file for 'libvisio'
 pkgname=libvisio
 version=0.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="gperf pkg-config perl"
 makedepends="boost-devel librevenge-devel libxml2-devel icu-devel"

From 907402ad7a9512fe5cb1e729207beb3482b74939 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 48/89] libxml2: rebuild against icu-67.1

---
 srcpkgs/libxml2/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libxml2/template b/srcpkgs/libxml2/template
index 7e60cdc6c40..c334f505ed0 100644
--- a/srcpkgs/libxml2/template
+++ b/srcpkgs/libxml2/template
@@ -4,7 +4,7 @@
 #
 pkgname=libxml2
 version=2.9.10
-revision=3
+revision=4
 build_style=gnu-configure
 configure_args="--with-threads --with-history --with-icu --without-python"
 hostmakedepends="automake libtool gettext-devel pkg-config"

From fe2a007c71c9d8530090fd11da59ed032071e24f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 49/89] libzim: rebuild against icu-67.1

---
 srcpkgs/libzim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/libzim/template b/srcpkgs/libzim/template
index 95ca1b2d312..bce35e71bbc 100644
--- a/srcpkgs/libzim/template
+++ b/srcpkgs/libzim/template
@@ -1,7 +1,7 @@
 # Template file for 'libzim'
 pkgname=libzim
 version=6.1.3
-revision=1
+revision=2
 build_style=meson
 hostmakedepends="pkg-config git"
 makedepends="liblzma-devel $(vopt_if zlib zlib-devel)

From 69a291aa08338a871d19f8f71a6ff8ad7d4fa6df Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 50/89] maim: rebuild against icu-67.1

---
 srcpkgs/maim/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/maim/template b/srcpkgs/maim/template
index 0b6d2fa51dc..1e538227c11 100644
--- a/srcpkgs/maim/template
+++ b/srcpkgs/maim/template
@@ -1,7 +1,7 @@
 # Template file for 'maim'
 pkgname=maim
 version=5.6.3
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="MesaLib-devel glm icu-devel libXcomposite-devel libXrandr-devel

From b79d958390f1163d4089f050ae53d88683c0c55f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 51/89] modsecurity: rebuild against icu-67.1

---
 srcpkgs/modsecurity/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/modsecurity/template b/srcpkgs/modsecurity/template
index 4185f346c4b..91a9466865e 100644
--- a/srcpkgs/modsecurity/template
+++ b/srcpkgs/modsecurity/template
@@ -1,7 +1,7 @@
 # Template file for 'modsecurity'
 pkgname=modsecurity
 version=3.0.4
-revision=1
+revision=2
 wrksrc="modsecurity-v${version}"
 build_style=gnu-configure
 configure_args="--enable-standalone-module --enable-htaccess-config"

From c8be5ab43895a695011f745c4bf189db5ca7b912 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 52/89] mozjs52: rebuild against icu-67.1

---
 srcpkgs/mozjs52/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs52/template b/srcpkgs/mozjs52/template
index d9b8c04f3e2..383767ea777 100644
--- a/srcpkgs/mozjs52/template
+++ b/srcpkgs/mozjs52/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs52'
 pkgname=mozjs52
 version=52.9.0
-revision=6
+revision=7
 wrksrc="firefox-${version}esr"
 build_wrksrc="js/src"
 build_style=gnu-configure

From adc16748666625922048988aced07a7bfea633fe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 53/89] mozjs60: rebuild against icu-67.1

---
 srcpkgs/mozjs60/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs60/template b/srcpkgs/mozjs60/template
index 49757ad38e5..d2366ac11d6 100644
--- a/srcpkgs/mozjs60/template
+++ b/srcpkgs/mozjs60/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs60'
 pkgname=mozjs60
 version=60.8.0
-revision=4
+revision=5
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From db6b656a0b969a64cd692ff04527ba4e4953921e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 54/89] mozjs68: rebuild against icu-67.1

---
 srcpkgs/mozjs68/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mozjs68/template b/srcpkgs/mozjs68/template
index 0b54c56f763..040bac871f0 100644
--- a/srcpkgs/mozjs68/template
+++ b/srcpkgs/mozjs68/template
@@ -1,7 +1,7 @@
 # Template file for 'mozjs68'
 pkgname=mozjs68
 version=68.8.0
-revision=1
+revision=2
 wrksrc="firefox-${version}"
 build_wrksrc=js/src
 build_style=gnu-configure

From 5f81aab886db78d033501a16d2a6ee2652d25f14 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 55/89] mpd: rebuild against icu-67.1

---
 srcpkgs/mpd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index 684af4f1c1b..11c396f986b 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.21.23
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled

From 8521b5a01d62aa8aa3b1d17beebb84e7e55bdb4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 56/89] ncmpcpp: rebuild against icu-67.1

---
 srcpkgs/ncmpcpp/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ncmpcpp/template b/srcpkgs/ncmpcpp/template
index 7aae1c87cb8..42583230e54 100644
--- a/srcpkgs/ncmpcpp/template
+++ b/srcpkgs/ncmpcpp/template
@@ -1,7 +1,7 @@
 # Template file for 'ncmpcpp'
 pkgname=ncmpcpp
 version=0.8.2
-revision=9
+revision=10
 build_style=gnu-configure
 configure_args=" BOOST_LIB_SUFFIX= --enable-clock --enable-outputs
  --enable-unicode --enable-visualizer --with-curl --with-taglib --with-fftw"

From b4a267696907eee7191b82080c432af87f36ff8d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 57/89] nodejs: rebuild against icu-67.1

---
 srcpkgs/nodejs/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index cff7777c7f1..9a56cd992b0 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs'
 pkgname=nodejs
 version=13.2.0
-revision=2
+revision=3
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)

From 245df0aeb64339d6aee61b27d0a9e91191f32433 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 58/89] nodejs-lts: rebuild against icu-67.1

---
 srcpkgs/nodejs-lts/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs-lts/template b/srcpkgs/nodejs-lts/template
index b85550b6627..b8371430d13 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.16.3
-revision=1
+revision=2
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
 hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)

From 0cff56e2e4df461d2f45575b595bfab929537360 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 59/89] nodejs-lts-10: rebuild against icu-67.1

---
 srcpkgs/nodejs-lts-10/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nodejs-lts-10/template b/srcpkgs/nodejs-lts-10/template
index 57df37fc450..eaf31185e0e 100644
--- a/srcpkgs/nodejs-lts-10/template
+++ b/srcpkgs/nodejs-lts-10/template
@@ -1,7 +1,7 @@
 # Template file for 'nodejs-lts-10'
 pkgname=nodejs-lts-10
 version=10.19.0
-revision=1
+revision=2
 wrksrc="node-v${version}"
 hostmakedepends="pkg-config python zlib-devel which $(vopt_if icu icu-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)

From 0422f4e9175e45c0c4c3b59611b2d6a3781da412 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 60/89] nuspell: rebuild against icu-67.1

---
 srcpkgs/nuspell/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/nuspell/template b/srcpkgs/nuspell/template
index 27c94df94d6..a0de699954f 100644
--- a/srcpkgs/nuspell/template
+++ b/srcpkgs/nuspell/template
@@ -1,7 +1,7 @@
 # Template file for 'nuspell'
 pkgname=nuspell
 version=3.1.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DBUILD_SHARED_LIBS=ON"
 hostmakedepends="ruby-ronn"

From fe391acabea7549b765f867c4725879040302eaa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 61/89] openttd: rebuild against icu-67.1

---
 srcpkgs/openttd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/openttd/template b/srcpkgs/openttd/template
index 7979d90f680..af19b52257e 100644
--- a/srcpkgs/openttd/template
+++ b/srcpkgs/openttd/template
@@ -1,7 +1,7 @@
 # Template file for 'openttd'
 pkgname=openttd
 version=1.10.1
-revision=1
+revision=2
 _gfxver=0.6.0
 _sfxver=0.2.3
 build_style=gnu-configure

From c12a5874c4eae11f18664c48ce3ae4b11b39e45a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 62/89] peaclock: rebuild against icu-67.1

---
 srcpkgs/peaclock/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/peaclock/template b/srcpkgs/peaclock/template
index 49bf18466f7..0c0a502f676 100644
--- a/srcpkgs/peaclock/template
+++ b/srcpkgs/peaclock/template
@@ -1,7 +1,7 @@
 # Template file for 'peaclock'
 pkgname=peaclock
 version=0.4.0
-revision=1
+revision=2
 build_style=cmake
 makedepends="icu-devel"
 short_desc="Colourful binary clock for the terminal"

From bc9713d8923ffee7c9a6805fb8b47844ddd3b84b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 63/89] perl-XML-LibXML: rebuild against icu-67.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 8f93ae53732..ef43f6bc33a 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=3
+revision=4
 wrksrc="${pkgname/perl-/}-${version}"
 build_style=perl-module
 hostmakedepends="perl"

From ad2e093b0f64043457c2e31413ab811baad88017 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 64/89] php: rebuild against icu-67.1

---
 srcpkgs/php/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/php/template b/srcpkgs/php/template
index 40cd5593b5b..560e87aab71 100644
--- a/srcpkgs/php/template
+++ b/srcpkgs/php/template
@@ -1,7 +1,7 @@
 # Template file for 'php'
 pkgname=php
 version=7.4.6
-revision=2
+revision=3
 hostmakedepends="bison pkg-config apache-devel"
 makedepends="apache-devel enchant-devel freetds-devel freetype-devel gdbm-devel
  gmp-devel libcurl-devel libjpeg-turbo-devel libmysqlclient-devel

From ff8e28c5a5362e01836c3287619bcdf08037d8a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 65/89] poedit: rebuild against icu-67.1

---
 srcpkgs/poedit/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/poedit/template b/srcpkgs/poedit/template
index 16da63e3748..1c541df431a 100644
--- a/srcpkgs/poedit/template
+++ b/srcpkgs/poedit/template
@@ -1,7 +1,7 @@
 # Template file for 'poedit'
 pkgname=poedit
 version=2.3.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-wx-config=wx-config-gtk3"
 hostmakedepends="pkg-config"

From 94e69712a09b09d5058f4751713dbf47a9e6729a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 66/89] postfix: rebuild against icu-67.1

---
 srcpkgs/postfix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/postfix/template b/srcpkgs/postfix/template
index 1efb061be29..6e02ff0219f 100644
--- a/srcpkgs/postfix/template
+++ b/srcpkgs/postfix/template
@@ -1,7 +1,7 @@
 # Template file for 'postfix'
 pkgname=postfix
 version=3.5.2
-revision=1
+revision=2
 hostmakedepends="perl m4"
 makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
  postgresql-libs-devel sqlite-devel"

From 6d005e92f0fa58614efe738c8111411f26d42c2f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 67/89] python-PyICU: rebuild against icu-67.1

---
 srcpkgs/python-PyICU/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/python-PyICU/template b/srcpkgs/python-PyICU/template
index b8cfff36850..aa0ba6f6346 100644
--- a/srcpkgs/python-PyICU/template
+++ b/srcpkgs/python-PyICU/template
@@ -1,7 +1,7 @@
 # Template file for 'python-PyICU'
 pkgname=python-PyICU
 version=2.4.3
-revision=1
+revision=2
 wrksrc="PyICU-${version}"
 build_style=python-module
 hostmakedepends="python-setuptools python3-setuptools"

From 47019f53eb2b55d083bbdc7fa899090f9f0de88c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 68/89] qalculate: rebuild against icu-67.1

---
 srcpkgs/qalculate/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qalculate/template b/srcpkgs/qalculate/template
index da413547c92..6dac76e062c 100644
--- a/srcpkgs/qalculate/template
+++ b/srcpkgs/qalculate/template
@@ -1,7 +1,7 @@
 # Template file for 'qalculate'
 pkgname=qalculate
 version=3.8.0
-revision=1
+revision=2
 wrksrc="lib${pkgname}-${version}"
 build_style=gnu-configure
 hostmakedepends="intltool pkg-config doxygen"

From e1dcdb40708f22c1731388e9182b00d17cf08e42 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 69/89] qt5: rebuild against icu-67.1

---
 srcpkgs/qt5/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index 9b6bbf6bd9c..c8708d7a6bb 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.14.2
-revision=3
+revision=4
 wrksrc="qt-everywhere-src-${version}"
 build_style=meta
 hostmakedepends="cmake clang flex perl glib-devel pkg-config

From bb66c552866693369403e4e3b9927f8a4994b782 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 70/89] qt5-webengine: rebuild against icu-67.1

---
 srcpkgs/qt5-webengine/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/qt5-webengine/template b/srcpkgs/qt5-webengine/template
index 15ea8159cb8..6ef5fe68c10 100644
--- a/srcpkgs/qt5-webengine/template
+++ b/srcpkgs/qt5-webengine/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5-webengine'
 pkgname=qt5-webengine
 version=5.14.2
-revision=3
+revision=4
 archs="x86_64* i686* armv[67]* ppc64* aarch64*"
 wrksrc="qtwebengine-everywhere-src-${version}"
 build_style=qmake

From 8c41020e61c60c2e45ff7076e8126d2ab96d15aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 71/89] recoll: rebuild against icu-67.1

---
 srcpkgs/recoll/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/recoll/template b/srcpkgs/recoll/template
index 61bd80f884a..963f4da4820 100644
--- a/srcpkgs/recoll/template
+++ b/srcpkgs/recoll/template
@@ -1,7 +1,7 @@
 # Template file for 'recoll'
 pkgname=recoll
 version=1.26.1
-revision=1
+revision=2
 build_style=gnu-configure
 build_helper=qmake
 configure_args="--disable-python-module --disable-python-chm

From 834aee149b5f2ecb6471ac2e19639425d6c35a46 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 72/89] rspamd: rebuild against icu-67.1

---
 srcpkgs/rspamd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/rspamd/template b/srcpkgs/rspamd/template
index 206e769f828..f3805a18a9f 100644
--- a/srcpkgs/rspamd/template
+++ b/srcpkgs/rspamd/template
@@ -1,7 +1,7 @@
 # Template file for 'rspamd'
 pkgname=rspamd
 version=1.9.4
-revision=2
+revision=3
 archs="x86_64* i686* aarch64* armv[67]* ppc64*"
 build_style=cmake
 configure_args="-DRSPAMD_USER=rspamd -DCONFDIR=/etc/rspamd

From f75f3eaea0eb68f0b4db45ffae41e970cdb6f677 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 73/89] sile: rebuild against icu-67.1

---
 srcpkgs/sile/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sile/template b/srcpkgs/sile/template
index 670d4b7b3b3..a97bf159b43 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=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel lua51-devel lua51-lpeg luaexpat

From 205d9ce8d4b1afc5b5d3d1561d5bb0f4d0f00486 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 74/89] slop: rebuild against icu-67.1

---
 srcpkgs/slop/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/slop/template b/srcpkgs/slop/template
index 1da5ed4c643..bd6e7a32292 100644
--- a/srcpkgs/slop/template
+++ b/srcpkgs/slop/template
@@ -1,7 +1,7 @@
 # Template file for 'slop'
 pkgname=slop
 version=7.5
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config"
 makedepends="glew-devel glm icu-devel libXrender-devel"

From fc01b3e9ad5a360f1abd7f7bc9e96f5cd118a6af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 75/89] sword: rebuild against icu-67.1

---
 srcpkgs/sword/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/sword/template b/srcpkgs/sword/template
index 57f71acd44c..bb2999aa0ed 100644
--- a/srcpkgs/sword/template
+++ b/srcpkgs/sword/template
@@ -1,7 +1,7 @@
 # Template file for 'sword'
 pkgname=sword
 version=1.8.1
-revision=4
+revision=5
 build_style=gnu-configure
 configure_args="--prefix=/usr --libdir=/usr/lib --without-conf
  --disable-shared --with-icuregex"

From 379573c4ab4a7434cee7f5fc53a108daab9b5667 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 76/89] tectonic: rebuild against icu-67.1

---
 srcpkgs/tectonic/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tectonic/template b/srcpkgs/tectonic/template
index 86f70d5fcf7..a89d167d051 100644
--- a/srcpkgs/tectonic/template
+++ b/srcpkgs/tectonic/template
@@ -1,7 +1,7 @@
 # Template file for 'tectonic'
 pkgname=tectonic
 version=0.1.12
-revision=1
+revision=2
 build_style=cargo
 hostmakedepends="pkg-config"
 makedepends="harfbuzz-devel libressl-devel"

From de6628f3b084058ff07c640ae0ba42f1af062ba9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 77/89] tesseract-ocr: rebuild against icu-67.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 e2ce7513458..f0313da0ce6 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=2
+revision=3
 _tessdataver=4.0.0
 wrksrc="tesseract-${version}"
 build_style=gnu-configure

From aaefe026d2cde40e64634f4a65f84d95e9ddb18f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 78/89] thunderbird: rebuild against icu-67.1

---
 srcpkgs/thunderbird/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template
index bfe004cb609..38244b122b7 100644
--- a/srcpkgs/thunderbird/template
+++ b/srcpkgs/thunderbird/template
@@ -4,7 +4,7 @@
 #
 pkgname=thunderbird
 version=68.8.0
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Standalone Mail/News reader"
 maintainer="Enno Boland <gottox@voidlinux.org>"

From b3b4381cb1e54047017b7f482c85a9f4629a7a8c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 79/89] tracker: rebuild against icu-67.1

---
 srcpkgs/tracker/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tracker/template b/srcpkgs/tracker/template
index 8702bcf5f33..37074cb348d 100644
--- a/srcpkgs/tracker/template
+++ b/srcpkgs/tracker/template
@@ -1,7 +1,7 @@
 # Template file for 'tracker'
 pkgname=tracker
 version=2.3.1
-revision=1
+revision=2
 build_style=meson
 build_helper="gir"
 configure_args="-Ddocs=false -Dfts=true -Dfunctional_tests=false

From fd3ba9d99232208ee994bf14f9e57d045f704722 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 80/89] tracker-miners: rebuild against icu-67.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 686f8de6fb5..04e261e5a4e 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.1
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dtracker_core=system -Ddocs=false -Dextract=true
  -Dfunctional_tests=false -Dcue=enabled -Dexif=enabled -Dflac=enabled

From 549b0bd6ab74730f3d065e1e1b4b3819d74b7190 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 81/89] unar: rebuild against icu-67.1

---
 srcpkgs/unar/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/unar/template b/srcpkgs/unar/template
index ad930c3c200..cb2f79241ac 100644
--- a/srcpkgs/unar/template
+++ b/srcpkgs/unar/template
@@ -1,7 +1,7 @@
 # Template file for 'unar'
 pkgname=unar
 version=1.10.7
-revision=4
+revision=5
 archs="~*-musl" # regexec incompatible
 build_wrksrc="XADMaster"
 build_style=gnu-makefile

From e133d36160e78e5c4aeaf9eb126ba762f32c4dc8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 82/89] vte3: rebuild against icu-67.1

---
 srcpkgs/vte3/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template
index 85f4d2db9cd..32b117a30ee 100644
--- a/srcpkgs/vte3/template
+++ b/srcpkgs/vte3/template
@@ -1,7 +1,7 @@
 # Template file for 'vte3'
 pkgname=vte3
 version=0.60.2
-revision=1
+revision=2
 wrksrc="vte-${version}"
 build_style=meson
 build_helper="gir"

From 7525f174f3e7b081ff1c0999a33674f35f36b1f6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 83/89] webkit2gtk: rebuild against icu-67.1

---
 srcpkgs/webkit2gtk/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/webkit2gtk/template b/srcpkgs/webkit2gtk/template
index 05c9b9d6f50..edf5963a120 100644
--- a/srcpkgs/webkit2gtk/template
+++ b/srcpkgs/webkit2gtk/template
@@ -1,7 +1,7 @@
 # Template file for 'webkit2gtk'
 pkgname=webkit2gtk
 version=2.28.2
-revision=1
+revision=2
 wrksrc="webkitgtk-${version}"
 build_style=cmake
 build_helper="gir"

From 576b7ca9b761d0b871daf201e8e04c561e6046aa Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 84/89] widelands: rebuild against icu-67.1

---
 srcpkgs/widelands/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/widelands/template b/srcpkgs/widelands/template
index d8c8e996047..798a45847c3 100644
--- a/srcpkgs/widelands/template
+++ b/srcpkgs/widelands/template
@@ -1,7 +1,7 @@
 # Template file for 'widelands'
 pkgname=widelands
 version=20
-revision=3
+revision=4
 wrksrc="${pkgname}-build${version}"
 build_style=cmake
 configure_args="

From 0addfc4d40bdee0783986e22729400d1623b4d68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 85/89] xerces-c: rebuild against icu-67.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 16d8ed1b72e..100094350f7 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=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake libtool pkg-config"
 makedepends="libcurl-devel icu-devel"

From 6ee8ef39c7143767e7f3847b0cb9e2a715f589ca Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 86/89] yaz: rebuild against icu-67.1

---
 srcpkgs/yaz/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/yaz/template b/srcpkgs/yaz/template
index b3612c79e96..85f207fa4b6 100644
--- a/srcpkgs/yaz/template
+++ b/srcpkgs/yaz/template
@@ -1,7 +1,7 @@
 # Template file for 'yaz'
 pkgname=yaz
 version=5.29.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-shared --with-memcached --with-xml2 --with-xslt
  --with-icu --with-gnutls"

From b8410c74ed7a68d58187dbfb3b00904a2e0daec0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:33 +0200
Subject: [PATCH 87/89] znc: rebuild against icu-67.1

---
 srcpkgs/znc/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/znc/template b/srcpkgs/znc/template
index 34e46d46b2f..7b70798e498 100644
--- a/srcpkgs/znc/template
+++ b/srcpkgs/znc/template
@@ -1,7 +1,7 @@
 # Template file for 'znc'
 pkgname=znc
 version=1.8.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="
  --enable-python

From 3b16602c621de1954fbd0732e24e1d4fbf1ce59d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 17 May 2020 12:42:55 +0200
Subject: [PATCH 88/89] nodejs: add icu patch and use python3

---
 .../patches/0092-getAllFieldPositions.patch   | 169 ++++++++++++++++++
 srcpkgs/nodejs/template                       |   6 +-
 2 files changed, 172 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch

diff --git a/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch
new file mode 100644
index 00000000000..f9d3718949b
--- /dev/null
+++ b/srcpkgs/nodejs/patches/0092-getAllFieldPositions.patch
@@ -0,0 +1,169 @@
+From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001
+From: Ujjwal Sharma <ryzokuken@disroot.org>
+Date: Wed, 22 Apr 2020 12:20:17 +0530
+Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba
+
+Original commit message:
+
+    [intl] Remove soon-to-be removed getAllFieldPositions
+
+    Needed to land ICU67.1 soon.
+
+    Bug: v8:10393
+    Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618
+    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489
+    Reviewed-by: Jakob Kummerow <jkummerow@chromium.org>
+    Commit-Queue: Frank Tang <ftang@chromium.org>
+    Cr-Commit-Position: refs/heads/master@{#67027}
+
+Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463
+---
+ common.gypi                             |  2 +-
+ deps/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------
+ 2 files changed, 38 insertions(+), 36 deletions(-)
+
+diff --git a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc
+index 92d3e2fb82e..ced408aa173 100644
+--- deps/v8/src/objects/js-number-format.cc
++++ deps/v8/src/objects/js-number-format.cc
+@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate,
+ }
+ 
+ namespace {
+-Maybe<icu::UnicodeString> IcuFormatNumber(
++Maybe<bool> IcuFormatNumber(
+     Isolate* isolate,
+     const icu::number::LocalizedNumberFormatter& number_format,
+-    Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) {
++    Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) {
+   // If it is BigInt, handle it differently.
+   UErrorCode status = U_ZERO_ERROR;
+-  icu::number::FormattedNumber formatted;
+   if (numeric_obj->IsBigInt()) {
+     Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj);
+     Handle<String> big_int_string;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string,
+                                      BigInt::ToString(isolate, big_int),
+-                                     Nothing<icu::UnicodeString>());
+-    formatted = number_format.formatDecimal(
++                                     Nothing<bool>());
++    *formatted = number_format.formatDecimal(
+         {big_int_string->ToCString().get(), big_int_string->length()}, status);
+   } else {
+     double number = numeric_obj->Number();
+-    formatted = number_format.formatDouble(number, status);
++    *formatted = number_format.formatDouble(number, status);
+   }
+   if (U_FAILURE(status)) {
+     // This happen because of icu data trimming trim out "unit".
+     // See https://bugs.chromium.org/p/v8/issues/detail?id=8641
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
+-  }
+-  if (fp_iter) {
+-    formatted.getAllFieldPositions(*fp_iter, status);
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>());
+   }
+-  icu::UnicodeString result = formatted.toString(status);
+-  if (U_FAILURE(status)) {
+-    THROW_NEW_ERROR_RETURN_VALUE(isolate,
+-                                 NewTypeError(MessageTemplate::kIcuError),
+-                                 Nothing<icu::UnicodeString>());
+-  }
+-  return Just(result);
++  return Just(true);
+ }
+ 
+ }  // namespace
+@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric(
+     Handle<Object> numeric_obj) {
+   DCHECK(numeric_obj->IsNumeric());
+ 
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, number_format, numeric_obj, nullptr);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, number_format, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<String>());
+-  return Intl::ToString(isolate, maybe_format.FromJust());
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString result = formatted.toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String);
++  }
++  return Intl::ToString(isolate, result);
+ }
+ 
+ namespace {
+@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts(
+ }
+ 
+ namespace {
+-Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+-                          icu::FieldPositionIterator* fp_iter,
++Maybe<int> ConstructParts(Isolate* isolate,
++                          icu::number::FormattedNumber* formatted,
+                           Handle<JSArray> result, int start_index,
+                           Handle<Object> numeric_obj, bool style_is_unit) {
++  UErrorCode status = U_ZERO_ERROR;
++  icu::UnicodeString formatted_text = formatted->toString(status);
++  if (U_FAILURE(status)) {
++    THROW_NEW_ERROR_RETURN_VALUE(
++        isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>());
++  }
+   DCHECK(numeric_obj->IsNumeric());
+-  int32_t length = formatted.length();
++  int32_t length = formatted_text.length();
+   int index = start_index;
+   if (length == 0) return Just(index);
+ 
+@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+   // other region covers some part of the formatted string. It's possible
+   // there's another field with exactly the same begin and end as this backdrop,
+   // in which case the backdrop's field_id of -1 will give it lower priority.
+-  regions.push_back(NumberFormatSpan(-1, 0, formatted.length()));
++  regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length()));
+ 
+   {
+-    icu::FieldPosition fp;
+-    while (fp_iter->next(fp)) {
+-      regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(),
+-                                         fp.getEndIndex()));
++    icu::ConstrainedFieldPosition cfp;
++    cfp.constrainCategory(UFIELD_CATEGORY_NUMBER);
++    while (formatted->nextPosition(cfp, status)) {
++      regions.push_back(
++          NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit()));
+     }
+   }
+ 
+@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted,
+     Handle<String> substring;
+     ASSIGN_RETURN_ON_EXCEPTION_VALUE(
+         isolate, substring,
+-        Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos),
++        Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos),
+         Nothing<int>());
+     Intl::AddElement(isolate, result, index, field_type_string, substring);
+     ++index;
+@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts(
+       number_format->icu_number_formatter().raw();
+   CHECK_NOT_NULL(fmt);
+ 
+-  icu::FieldPositionIterator fp_iter;
+-  Maybe<icu::UnicodeString> maybe_format =
+-      IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter);
++  icu::number::FormattedNumber formatted;
++  Maybe<bool> maybe_format =
++      IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted);
+   MAYBE_RETURN(maybe_format, Handle<JSArray>());
+ 
+   Handle<JSArray> result = factory->NewJSArray(0);
+   Maybe<int> maybe_format_to_parts = ConstructParts(
+-      isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj,
++      isolate, &formatted, result, 0, numeric_obj,
+       number_format->style() == JSNumberFormat::Style::UNIT);
+   MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
+ 
diff --git a/srcpkgs/nodejs/template b/srcpkgs/nodejs/template
index 9a56cd992b0..c7dc1281b8a 100644
--- a/srcpkgs/nodejs/template
+++ b/srcpkgs/nodejs/template
@@ -4,11 +4,11 @@ version=13.2.0
 revision=3
 wrksrc="node-v${version}"
 # Need these for host v8 for torque, see https://github.com/nodejs/node/pull/21079
-hostmakedepends="pkg-config python zlib-devel $(vopt_if icu icu-devel)
+hostmakedepends="which pkg-config python3 zlib-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
-makedepends="zlib-devel python-devel $(vopt_if icu icu-devel)
+makedepends="zlib-devel python3-devel $(vopt_if icu icu-devel)
  $(vopt_if ssl libressl-devel) $(vopt_if libuv libuv-devel)
  $(vopt_if http_parser http-parser-devel) $(vopt_if nghttp2 nghttp2-devel)
  $(vopt_if cares c-ares-devel) $(vopt_if http_parser llhttp-devel)"
@@ -18,7 +18,7 @@ license="MIT"
 homepage="https://nodejs.org/"
 distfiles="${homepage}/dist/v${version}/node-v${version}.tar.gz"
 checksum=379dcecb721984a99dc9e16c2a096d6eb7a760d50b188582d9ce33e0478a1a5e
-python_version=2 #unverified
+python_version=3
 
 build_options="ssl libuv http_parser icu nghttp2 cares"
 desc_option_ssl="Enable shared libressl"

From 6a7688f72435b4014e7134ac77dac1e34795a460 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Tue, 12 May 2020 08:13:21 -0400
Subject: [PATCH 89/89] qt5-webkit: new snapshot; ARMv6 patch

[ci skip]
---
 srcpkgs/qt5-webkit/patches/armv6.patch       | 72 +++++++++++++++
 srcpkgs/qt5-webkit/patches/armv6l-asm.patch  | 23 -----
 srcpkgs/qt5-webkit/patches/qt5.14.patch      | 93 --------------------
 srcpkgs/qt5-webkit/patches/qt5.14.patch.args |  1 -
 srcpkgs/qt5-webkit/template                  | 10 +--
 srcpkgs/qt5-webkit/update                    |  2 +-
 6 files changed, 78 insertions(+), 123 deletions(-)
 create mode 100644 srcpkgs/qt5-webkit/patches/armv6.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/armv6l-asm.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/qt5.14.patch
 delete mode 100644 srcpkgs/qt5-webkit/patches/qt5.14.patch.args

diff --git a/srcpkgs/qt5-webkit/patches/armv6.patch b/srcpkgs/qt5-webkit/patches/armv6.patch
new file mode 100644
index 00000000000..e60ac2a1c9a
--- /dev/null
+++ b/srcpkgs/qt5-webkit/patches/armv6.patch
@@ -0,0 +1,72 @@
+From 7cc86ebe881f36bfef18d8eeee666d2a55eae892 Mon Sep 17 00:00:00 2001
+From: Guilherme Iscaro <iscaro@profusion.mobi>
+Date: Fri, 31 Mar 2017 10:31:49 -0300
+Subject: [PATCH] Fix build on ARMv6.
+
+The ARMv6 and older architures does not support the movw and movl
+instructions, thus causing a build break.
+This patch fix the problem by creating a new offlineasm instruction,
+which will use the ldr instruction to load a immediate into a register.
+
+https://bugs.webkit.org/show_bug.cgi?id=141288
+
+Reviewed by NOBODY (OOPS!).
+
+* llint/LowLevelInterpreter.asm:
+* offlineasm/arm.rb:
+* offlineasm/instructions.rb:
+---
+ Source/JavaScriptCore/llint/LowLevelInterpreter.asm | 8 +++++++-
+ Source/JavaScriptCore/offlineasm/arm.rb             | 2 ++
+ Source/JavaScriptCore/offlineasm/instructions.rb    | 3 ++-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+diff --git Source/JavaScriptCore/llint/LowLevelInterpreter.asm Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+index ab3c0c8e771..6c32eef8852 100644
+--- Source/JavaScriptCore/llint/LowLevelInterpreter.asm
++++ Source/JavaScriptCore/llint/LowLevelInterpreter.asm
+@@ -1167,7 +1167,13 @@ macro setEntryAddress(index, label)
+         move index, t4
+         storep t1, [a0, t4, 8]
+     elsif ARM or ARMv7 or ARMv7_TRADITIONAL
+-        mvlbl (label - _relativePCBase), t4
++        if ARM
++           ldrlbl t4, label
++           ldrlbl t3, _relativePCBase
++           subp t4, t3, t4
++        else
++           mvlbl (label - _relativePCBase), t4
++        end
+         addp t4, t1, t4
+         move index, t3
+         storep t4, [a0, t3, 4]
+diff --git Source/JavaScriptCore/offlineasm/arm.rb Source/JavaScriptCore/offlineasm/arm.rb
+index c8064a59196..a9c40c8995c 100644
+--- Source/JavaScriptCore/offlineasm/arm.rb
++++ Source/JavaScriptCore/offlineasm/arm.rb
+@@ -504,6 +504,8 @@ class Instruction
+         when "mvlbl"
+                 $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
+                 $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
++        when "ldrlbl"
++            $asm.puts "ldr #{operands[0].armOperand}, =#{operands[1].value}"
+         when "nop"
+             $asm.puts "nop"
+         when "bieq", "bpeq", "bbeq"
+diff --git Source/JavaScriptCore/offlineasm/instructions.rb Source/JavaScriptCore/offlineasm/instructions.rb
+index bbfce7193b3..8cc1cb961ce 100644
+--- Source/JavaScriptCore/offlineasm/instructions.rb
++++ Source/JavaScriptCore/offlineasm/instructions.rb
+@@ -261,7 +261,8 @@ X86_INSTRUCTIONS =
+ ARM_INSTRUCTIONS =
+     [
+      "clrbp",
+-     "mvlbl"
++     "mvlbl",
++     "ldrlbl"
+     ]
+ 
+ ARM64_INSTRUCTIONS =
+-- 
+2.12.1
+
diff --git a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch b/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
deleted file mode 100644
index 284929f035d..00000000000
--- a/srcpkgs/qt5-webkit/patches/armv6l-asm.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Fix code emitted for armv6l to not use movw/movt but ldr.
-See https://bugs.webkit.org/show_bug.cgi?id=131612
-and https://bugs.webkit.org/show_bug.cgi?id=141288
-
---- Source/JavaScriptCore/offlineasm/arm.rb	2015-07-22 14:37:57.000000000 +0200
-+++ Source/JavaScriptCore/offlineasm/arm.rb	2015-08-08 00:31:21.011824644 +0200
-@@ -473,8 +473,16 @@
-                 $asm.puts "mov #{armFlippedOperands(operands)}"
-             end
-         when "mvlbl"
-+            if isARMv7 or isARMv7Traditional
-                 $asm.puts "movw #{operands[1].armOperand}, \#:lower16:#{operands[0].value}"
-                 $asm.puts "movt #{operands[1].armOperand}, \#:upper16:#{operands[0].value}"
-+            else
-+                $mvlbl_counter ||= 0
-+                $mvlbl_counter += 1
-+                const_label = "_mvlbl_const_label#{$mvlbl_counter}"
-+                $asm.puts ".equ #{const_label}, (#{operands[0].value})"
-+                $asm.puts "ldr  #{operands[1].armOperand}, =#{const_label}"
-+            end
-         when "nop"
-             $asm.puts "nop"
-         when "bieq", "bpeq", "bbeq"
diff --git a/srcpkgs/qt5-webkit/patches/qt5.14.patch b/srcpkgs/qt5-webkit/patches/qt5.14.patch
deleted file mode 100644
index 799d53f1f55..00000000000
--- a/srcpkgs/qt5-webkit/patches/qt5.14.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From c344187a099f8fd749dc84ffcc125c0925103819 Mon Sep 17 00:00:00 2001
-From: Konstantin Tokarev <annulen@yandex.ru>
-Date: Tue, 10 Sep 2019 03:51:42 +0300
-Subject: Fix compilation of HTTP2 settings with Qt >= 5.14
-
-Public API QHttp2Configuration was added, so we use it now instead of
-ugly hack required for previous versions. Workaround for QTBUG-77308 is
-no loger needed in 5.14, so we only enable server push.
-
-Change-Id: I3e6817d8fa274c3a849f09b23ca58f93318be6c4
----
- .../network/qt/QNetworkReplyHandler.cpp       |  6 +++---
- .../platform/network/qt/ResourceRequestQt.cpp | 20 ++++++++++++++++++-
- 2 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-index 0da45fbc79a5..7924595582ac 100644
---- a/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-+++ b/Source/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
-@@ -41,7 +41,7 @@
- 
- #include <QCoreApplication>
- 
--#if USE(HTTP2)
-+#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- 
- #include <private/http2protocol_p.h>
- #include <cstdlib>
-@@ -62,7 +62,7 @@ ProtocolParameters::ProtocolParameters()
- 
- QT_END_NAMESPACE
- 
--#endif // USE(HTTP2)
-+#endif // USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
- 
- static const int gMaxRedirections = 10;
- 
-@@ -797,7 +797,7 @@ QNetworkReply* QNetworkReplyHandler::sendNetworkRequest(QNetworkAccessManager* m
-     if (!manager)
-         return 0;
- 
--#if USE(HTTP2)
-+#if USE(HTTP2) && QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
-     static const bool alpnIsSupported = ResourceRequest::alpnIsSupported();
-     if (alpnIsSupported && !manager->property(Http2::http2ParametersPropertyName).isValid()) {
-         Http2::ProtocolParameters params;
-diff --git a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp
-index 2cf2e7750dde..310738449b75 100644
---- a/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp
-+++ b/Source/WebCore/platform/network/qt/ResourceRequestQt.cpp
-@@ -29,7 +29,10 @@
- 
- #if USE(HTTP2)
- #include <QSslSocket>
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+#include <QHttp2Configuration>
- #endif
-+#endif // USE(HTTP2)
- 
- namespace WebCore {
- 
-@@ -65,6 +68,16 @@ bool ResourceRequest::alpnIsSupported()
-     return QSslSocket::sslLibraryVersionNumber() > 0x10002000L &&
-         QSslSocket::sslLibraryVersionString().startsWith(QLatin1String("OpenSSL"));
- }
-+
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+static QHttp2Configuration createHttp2Configuration()
-+{
-+    QHttp2Configuration params;
-+    params.setServerPushEnabled(true);
-+    return params;
-+}
-+#endif
-+
- #endif
- 
- QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) const
-@@ -76,8 +89,13 @@ QNetworkRequest ResourceRequest::toNetworkRequest(NetworkingContext *context) co
- 
- #if USE(HTTP2)
-     static const bool NegotiateHttp2ForHttps = alpnIsSupported();
--    if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps)
-+    if (originalUrl.protocolIs("https") && NegotiateHttp2ForHttps) {
-+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
-+        static const auto params = createHttp2Configuration();
-+        request.setHttp2Configuration(params);
-+#endif
-         request.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, true);
-+    }
- #endif // USE(HTTP2)
- 
-     const HTTPHeaderMap &headers = httpHeaderFields();
diff --git a/srcpkgs/qt5-webkit/patches/qt5.14.patch.args b/srcpkgs/qt5-webkit/patches/qt5.14.patch.args
deleted file mode 100644
index 2eba1cb3c5c..00000000000
--- a/srcpkgs/qt5-webkit/patches/qt5.14.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--Np1
diff --git a/srcpkgs/qt5-webkit/template b/srcpkgs/qt5-webkit/template
index 4a4d0282dad..882fc76c69b 100644
--- a/srcpkgs/qt5-webkit/template
+++ b/srcpkgs/qt5-webkit/template
@@ -1,10 +1,10 @@
 # Template file for 'qt5-webkit'
 pkgname=qt5-webkit
 version=5.212.0
-revision=7
-_snap=1565895469
+revision=8
+_snap=1586819898
 _v=${version%.*}
-wrksrc="qtwebkit-everywhere-src-${_v}"
+wrksrc="qtwebkit-opensource-src-${_v}"
 build_style=cmake
 # some nasty stuff to prevent cmake from inducing buggy -O3 and default -g
 configure_args="-DPORT=Qt -DUSE_LD_GOLD=OFF
@@ -23,8 +23,8 @@ short_desc="Cross-platform application and UI framework (Qt5) - WebKit2 componen
 maintainer="q66 <daniel@octaforge.org>"
 license="LGPL-2.1-or-later"
 homepage="https://www.qt.io/"
-distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-everywhere-src-${_v}.tar.xz"
-checksum=607f0a13e05bbf831d86904d12ae464e7d46a15f0ceed2465487b53512948824
+distfiles="https://download.qt.io/snapshots/ci/qtwebkit/${_v}/${_snap}/src/submodules/qtwebkit-opensource-src-${_v}.tar.xz"
+checksum=9a6ed083154c7ec850081102b299afa928ca7e48bbdf2b5f3ae152425e46eb17
 
 CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include"
 CXXFLAGS="-fpermissive -Wno-class-memaccess"
diff --git a/srcpkgs/qt5-webkit/update b/srcpkgs/qt5-webkit/update
index f9f046d29f3..0d74c2cff12 100644
--- a/srcpkgs/qt5-webkit/update
+++ b/srcpkgs/qt5-webkit/update
@@ -1 +1 @@
-pkgname=qtwebkit-everywhere-src
+pkgname=qtwebkit-opensource-src

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-05-29 11:21 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-26 20:24 [PR PATCH] icu: update to 67.1 Johnnynator
2020-05-26 20:27 ` [PR PATCH] [Updated] " Johnnynator
2020-05-27 11:23 ` Johnnynator
2020-05-27 15:07 ` Johnnynator
2020-05-29 11:21 ` Johnnynator
2020-05-29 11:21 ` [PR PATCH] [Closed]: " Johnnynator

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).