* [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
* Re: [PR PATCH] [Updated] icu: update to 67.1
2020-05-26 20:24 [PR PATCH] icu: update to 67.1 Johnnynator
@ 2020-05-26 20:27 ` Johnnynator
2020-05-27 11:23 ` Johnnynator
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-26 20:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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 0f899bff9dafd6abe950e73b2ee5ee65f8de4386 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 67.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 505db666ef41b41d76cf123fee09bfa759a6fcfb 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 b6d958df05dd6fb480cec6265a52c23faa2e7bbc 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 3e203dd91e396a4d8a44afbfbcf0bd7d2d108158 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 58f1d7a0a19d3b5d296f323c1cc67e83c66051b6 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 a95aa7373b2ceb17ac75d3ca9d0b6864ebdf5936 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 62bb17dc1d8b1396d806a5fccbc5bc3a9e4a13e3 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 e84c9e6d0ae320cd23ade4149949a0eec13dcbcf 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 bdddebc1ea7dcb637059647eb615ef7852b3961c 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 194d75135ab85bec690dc4ddf277051829b0ce9c 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 11b9bca2e3a7e9b31f374c177e2b059603365894 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 d5190c12c3c0fb15fac24366434da2a5044fe119 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 e84f6f1fd6fc3968ecf8f1b84c68d7c91df9005b 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 4b12496d96db040035a8bb49352c2c0ff9e67a8e 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 acfb960b2b6ea76905ea930e8c3d4e8d4094d636 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 71bc37e9d80321f2cf352a4581d8052213da288f 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 9b051eb3e35907a161676bd272a86113939e9f25 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 1cb43654682dcff410e0a3b0380170de0e686493 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 ab6b005153770cd545cd48238bb0c99bd9aecb1d 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 07c548644ed6e63b47a72fb2443903c910e0b2a2 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 49b4652fb71891d6143f70606a5e2e4cf2508bf7 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 33319f684e07c2c16972fc5c731f2423a23851d0 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 773174f201ec8122abe1d95a781d93df7f29698e 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 f3daf7daf382d22fec171f2a41c08d702a148968 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 fe3088b4f322126f0ede08c54b8d8523ce00bb8a 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 13bd2b8690b58e568cdd6864938add8e4181a565 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 70341fdd0994f20960e812def58548e75e456d4c 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 3d082a5ce035424ae2c0cce6a4c21d3e359f0e81 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 b555ebb36fe7801d165528e0bbbe9d9d75867d38 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 0861d992253443d4bd63708e7146edb346d8935c 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 6cb244542f46dabb88a77287a015655cb2de0845 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 c2b86eed985653525c54f7c351f832a86d34e85e 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 4d9d4b68c2899b8312ef45892a31ceff3e2b1ac3 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 4777f61f1ee14112a60c0152e85fe24f94211c05 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 97d87c65c3519eed7cc16153ffdbdc0c157af754 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 a05f9d5ef629bb9292ba9600256fbe044d68d0f1 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 ff09f6273ec2e082af07cb429cd8a692fa6f94ce 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 2b900f62bfdd726d75d7874652a41b9db60c6648 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 3d369ff004e3612cbfbaad740d9dd4c1e91b97c3 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 5b6d811e99a58fbaf7dee02e526f72ebf828738d 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 57605d85e3534f27d03355bfe2ecbdf81cc6a6c1 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 910cde91827689b3745d3bd4833a9c37747d2b2a 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 3f214a6ddecd21c5e8da85b64fb70103f25f992c 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 d368fd54bb28a1bcf89210ba361ca36163302765 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 3b1bcf2c6d0665b038b0f074064cc17fa576925f 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 19dba0d89ebfed82575a0bdfa9c9978fed5a2ec5 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 08471197033f72b92bf7a2d4da17830ef560520a 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 8ff7541da6b0f8824d70e96f443e91a72fa74e0b 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 d5c05cf7f8fced6d619da1f4401f54ddf51afa3a 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 7c2f9ee0c6520b1d404488ce54cc688ebfcf3b62 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 a42637ecd4c0d4b4f1dd5decd89e40e3c074c730 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 3d91bd9da26e6dba462ddd0ac2086b5508ea3496 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 e3d3d437c55ea85ed0338b4773714f6aa89a3209 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 a838ffcf9a140992d86354700f9f8b7ff28588b2 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 3b5efc070b7c9e0619bfe5a3a1a01d3c286d2b70 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 96e723bdbb2b20f6fa037ffaad1e67cc26d1be87 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 ccb3de453a4d5cb6d34ccb0975099878990d3dcc 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 48d51024e97e73440f01196f8003c23405c248e2 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 032c6a78946e4f2da387f1814026ad089a1ba765 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 ed1f66fa7d43e88265b2a818d91e8494179687e8 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 2b3402883ef9a3ffaacad4524622f199ccdf4fe5 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 01f4c6a9683da102cf584b560ec088694bf914f8 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 43cbacac7d702ae7935a339fde6eaacf4e992039 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 1bb2c4f5a03302180024262d1dbc3523180f3bc8 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 77593686e2592c8a046fa210c341c4cde0a22d5b 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 52ee157cb4f4ce26ec694427206148584075435e 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 2f91910e5dd2b3c3b69509aad6516db3d0519db5 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 3e3c59661a382bee33df5c82c3cf56a2f56312ef 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 e78b121805c8b90e6b039ef63c31052260429af7 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 3840939e9748f419b74623a96e344f11b78d82f0 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 e97e4e65205cc485356247a6a3cec6636217903b 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 2bd5e81c902f715e6c4ec9f76fcbb73aee834fa2 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 4640ef192460063edc173d12f4d16dbdc0c4e801 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 31698364024b78d04e4443755579f13e20f7df8f 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 0554340f0abc389612d4fcbf9aa50331157ee84d 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 f514e9fdddd574eb51cf73fe7bae41e74cc2a21e 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 ebdb85dfdd27ab0a069fe587fa455820bcbab231 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 42331ee7c9af676b083e45a43bfbc295eb10b263 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 ea84d88aef2f135c3aba4e3903d0980f29980e42 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 d6eef68d413abc04004c3a1a4970a1804a16ba8d 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 e506cf0a224856d5e821c5aaf10bb9d62a286460 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 1c3b2e4dbee685dce15f2be49dedde237b5f7f0d 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 195754e32af919226d317c3669efd73db2497259 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 98ea00fc7125f64fee468378b153567e79507c68 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 1fe4a35b63aa5b94fda98c90964e85cf20f6d7e3 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 fc644abb8ac9eec9843b35cc04dc515ef55d15e3 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 8f687ef0e427da14a4a726f9c4340811c8be71b2 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 fb37a355a87e616ddfd5e3bbde0d1d9689c9b23d 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 36e3489c8bbc6f21143ec4fdab2ffca252f35235 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
* Re: [PR PATCH] [Updated] icu: update to 67.1
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
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-27 11:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 100131 bytes --]
From 5cf2e6fb7589c5bb5cea4ed45088c8f0fd9fbe57 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/93] icu: update to 67.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..69f3a833674 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"
@@ -98,6 +97,7 @@ icu-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/icu
+ vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
vmove usr/share/icu
vmove usr/bin/icu-config
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 2d9666b95a8b781cf027a8b71a0bb2bf01bff02a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 02/93] 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 aed08f7af30cf61797fee20f5b47f7b6a3bd63af Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 03/93] 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 dfdf3d8abacc454e06b6d707ae17f98d32df5790 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 04/93] 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 42524722eb9095d96cd33d3cbac96daace9fc2b4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 05/93] 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 3223032b2261e3315820f4531edd36d124fb3ec2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 06/93] 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 a35bc3b2e87a387cb33db65b490159053b8667fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 07/93] 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 926c625c73be271816dfe572c09d4e73bfa4ee68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 08/93] 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 b5d3cb45a39cd3c2ecbf4febd70dc50f01d27445 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 09/93] 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 bdd109402b121ad9c40134901aefd03d181bb825 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 10/93] 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 a15e0c51339fdf8f6d731bd8ae9b99f0465245d4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 11/93] 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 a848d60a3555dde8bb73cf8cbad22f23221d027d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 12/93] 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 ec7973ef7bf3235be990a4321b2d7b5b7d6c035c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 13/93] 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 2db07eaf8d7d09385031754ed3d85c58092ddc41 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 14/93] 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 169efc9b4a9e9727a9d695d6b7e02c89d4dd4b78 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 15/93] 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 e0c7273ceeb4e8eac2bc9b9ee2283040cf7f762e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 16/93] 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 7418b02ac567823e91fc306f65e735cacd76df0a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 17/93] 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 35ae07337af113033c2cca1fcb1941bc3b43a07e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 18/93] 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 a6ad9605a82b896bd4a6139ee90c18943579cf86 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 19/93] 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 9502b04657f556b4ca3172828afb9886869d3bbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 20/93] 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 17d828fd2945e8a91455604bd39bed6e67e48a95 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 21/93] 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 74d85d26a326b2c31f06e2fd16a56618aa2dd60b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 22/93] 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 d73d27387a729c62f95fb7e0d87f056916a1f13b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 23/93] 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 dc0db867eba31ee73394ebffbe9197ab01016cb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 24/93] 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 591642e34d061ae7a49a3893a11ec24bff167048 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 25/93] 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 db14b8777d2138b3ed5bd70a3dddf550bbfa9039 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 26/93] 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 2010f8a5ff2b3b04aca5637a60d6bbaef526bdec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 27/93] 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 a3dc007acaf2c9f9c09326e06242153381e76781 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 28/93] 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 8ca51cb1e9f980c7ff47604f1419c0df60b265c3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 29/93] 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 32ca2ac1100742cfe2031aa0f669aba0b0f95fb2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 30/93] 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 0262d694863ee621bb67a1bd4f7087300a04e0c6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 31/93] 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 f32d3f77f42f22e0c18b7354ca982f11444dcbee Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 32/93] 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 c093463e7258d04ee59bbcc7fb9bfea5630ebbce Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 33/93] 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 45cb44e14ccd8310bc476c488ca0ed35d626eb19 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 34/93] 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 427e40402a5ed5504717cd026aa118cd069bcdba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 35/93] 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 30cd1f77952713c470a208624c517da3b919b47b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 36/93] 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 9e13b931974b18c7a55a74c6d527672f7629fbcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 37/93] 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 4d0c412cd324fb47db2d72ed6af8beac39eafbe7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 38/93] 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 80d48cae01a7b85b13f7b121aee1fb998391feb5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 39/93] 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 81bc990553f1f8c918dd805abf82b0b742006b29 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 40/93] 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 d5400754ec12e7d6cdbc725ee2bfb32c938ca3b6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 41/93] 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 609c9323b636875fc9c4ff7ae6feabf5b9c2c44b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 42/93] 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 b5544f97f27a2058054a030cb7d532426674e9c0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 43/93] 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 a4f05deab3cc01c3e48d517f64f553e13eb8b3ab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 44/93] 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 ba33cf97dc47fd824b48a59fc43db7fb946d2a5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 45/93] 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 d8992e26969fc046696867402963cff8f4df36a8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 46/93] 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 aa7acfdb1017feaa5291ea1d5881fb2d0e52fd80 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 47/93] 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 6a6a16fad46fd069914fc38d667cda48f51832e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 48/93] 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 ec9594ed59061af7353693dcd1833c190f7ea96b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 49/93] 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 fd27df1c7cbb86bbbbfa636bccc388dac67a5728 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 50/93] 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 99a08086e793ead6dd2026ca7cad7d41fb8bcf0b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 51/93] 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 eaf1ecbbc54481ab666d933eb1390205a7fed51f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 52/93] 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 a8c4458164e580e7b246dcc0794a9323bd2bbc53 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 53/93] 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 b082fd9c2e1f348dd8fe945a189d6aade0ec5035 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 54/93] 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 41eb5a318dcfb532d91de45efafb96acbbc916fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 55/93] 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 74ec82a5e78a32d4a91aafcaea48372f2b2e54e3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 56/93] 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 a0b275fff6b920f2e29a8e5bffa006d25740f532 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 57/93] 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 7b5c6999fc91269df256525236459e723e3f0431 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 58/93] 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 cad008dd5e97ee31f3c4259d850c49d28218bf9b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 59/93] 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 0a25931dfd4af3ea51cfb007426b5c56a80ddd2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 60/93] 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 5b7f0e5ecca728275298da3436b536fe6c879b13 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 61/93] 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 e83aa2f2a0586edb923e002935aeed18d212b45e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 62/93] 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 abe4942648e26abf04eb7bcd30f863964d36dce8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 63/93] 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 df195df635865ae54e9edba182699d66a1c94242 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 64/93] 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 d3ba401ee64681fba28cd6bfe976bea75391d2b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 65/93] 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 f617032340e7bb55862cbb8ed9917412fee05e45 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 66/93] 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 31b897fd514e7ed7aa32ff814c944136f63d2c59 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 67/93] 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 31ff9e790915382bdaa7d7d47fc0ccdb7391e9b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 68/93] 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 30358d5fd0b7d26929b03238467e7a1b746a24d0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 69/93] qt5: rebuild against icu-67.1
---
srcpkgs/qt5/INSTALL | 6 ------
srcpkgs/qt5/template | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
delete mode 100644 srcpkgs/qt5/INSTALL
diff --git a/srcpkgs/qt5/INSTALL b/srcpkgs/qt5/INSTALL
deleted file mode 100644
index 87229f3e18f..00000000000
--- a/srcpkgs/qt5/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # qt5 by default via qtchooser.
- ln -sf /etc/xdg/qtchooser/5.conf etc/xdg/qtchooser/default.conf
- ;;
-esac
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 ae38dbf5b6a722a77b5642466069d961f0ed35bc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 70/93] 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 d6e479b3647e7e74a64b1ba2bc803845985813e2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 71/93] 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 d8170e4fce9815abf50b466a89cd0ff85e2efe6b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 72/93] 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 8fb6ad70a8484066345f5279d9377dafea13482f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 73/93] 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 b2dc2802f7e794bcfa6d27d0245001dd2ac08089 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 74/93] 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 d1c94b1f0ee0cda8ccf105888215980d8ffd1a3b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 75/93] 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 265360da467c25f40f37d0f23d39687703b8d6b8 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 76/93] 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 ef3409a2cd0ea0955a28252bdd8b56d6eebf7d26 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 77/93] 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 720c29eb5b9da737bcc87097e38370ecdd1323fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 78/93] 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 66ca1ee5eb60f882ceb0d0ed2c63ee6b50500e00 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 79/93] 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 995926cb77412c7cc2dcbc72c36f69d4b512ad74 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 80/93] 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 03bfb8f41af6f2453afa6b012cfb392b50326f22 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 81/93] 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 021b9db82eca15a19993134760fa7a7739e1e37e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 82/93] 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 dcbffaedd9b55c87cf84e3893a7c8594bd0e5dcf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 83/93] 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 2b6d7f9f5e6e4ff736dd3cbd5b5027e4d7656d1a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 84/93] 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 f44682d173fafa807346c548a2386b657fdb2c8a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 85/93] 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 3f60b4121c27ce665904914f347306a43efa48cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 86/93] 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 37d05154e73b87d07acf319d323e4bc2d41dc6ec Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:33 +0200
Subject: [PATCH 87/93] 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 e6d8598f877ab3864958fe3860260f696cf5d4b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 17 May 2020 12:42:55 +0200
Subject: [PATCH 88/93] 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 d2b0316b73b89a54110cd84edeafd25392376d9f 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/93] 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
From 1793bddf6dc1b42b4c3c075376c5ad4a7f9a77bd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 11:42:16 +0200
Subject: [PATCH 90/93] firefox-esr: update to 68.8.0.
---
srcpkgs/firefox-esr/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index 41265f35072..a119e408456 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -3,8 +3,8 @@
# THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/firefox-esr-i18n".
#
pkgname=firefox-esr
-version=68.7.0
-revision=2
+version=68.8.0
+revision=1
wrksrc="firefox-${version}"
build_helper="rust"
short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
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=ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570
+checksum=fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842
lib32disabled=yes
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
From 513a51dcf0b0b2f282f38865a3e1b232932d76fd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 11:43:56 +0200
Subject: [PATCH 91/93] firefox-esr-i18n: update to 68.8.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 01bb13566bf..31a6e90331f 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=68.7.0
+version=68.8.0
revision=1
build_style=meta
short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
}
}
-checksum="bb73ff90d2533edc065de0bc975e378f3aef4b580e75f664c7bb15bef70d3351
- f197706c26e07740650a58dfc3d64adcf37fb3a33688095ff863b0e640c81370
- e4e09f9d412fb459f0466e7e14824f5452a58a5653583cb37bf64913b838be1c
- 7f4b4ff7c3fea1110caa62a5fbd926ec7a94574ffe9e9d8686a64d7c9e3036dd
- 3470c12735e19b0d6807ff12ce2f571b97ff6882e1f33e9b0df64f52a6048b16
- 9ff276db700483176b593d341f50cb844ca66cb836e7c68cf7926f3c9f0afc2d
- 98d1e53b48a0063728f56450792c9764532e5d36f21b5ab9fe110442a1e2417f
- 2a751afa57fd31770888a1d1def6705c40151c1b256e80a5f169e845e2f58219
- b9376d0dde965bf64d04b1549d4069064186311665c4c26ba6af86edc350f541
- e5c177ddcec21374029e79e98d3d96b092fdd5c1218e3f93bf3fafe4a4b375aa
- 302b071fc01e245f8feddb9481402b7b288583d6a09c13245dbec6cfe8e4464c
- 17e73c704aa8944ce16f6088d9d9e178146a0732cd482668fbab8c30d2a41f86
- 185282d2cec6a20824b9041acdd9ca4c5208b4e9e11777e42edfec69cce94446
- 21a8c6379f3510b9d2864065dbad6c89316d8075454d24e6f682f13decbfcc2f
- 6d0b81751e6139d71ec3bb287cc4a97063560e67476ab78e3a624390c84a7969
- dca24a63d40a8fdfcd24f9b4c5e578a5e45ae0fb2e31ec80f4f93ad1c900a755
- 432d618c198ac0f6d338365cbf8f5e09c966c37fe33fa92215dbd4d046b61e86
- 70d48d4248a46e356ee21157c2b6d895c9df788d340565d19d5a1185b61e7f58
- 2570ad9849925944979e694ad17f1b1ee1d8cecfa8f80b596fd1a11f71223120
- 833941b7013414e6712095a31c334895ade06c811195a6f09c69469f623adf8d
- 1c5feb098b0a4f2808e2205d1e3e0011fa71996e8f7bfbf4bd50a92b2ea65e97
- eb6bd4e9198d2fb636b5ea5f6372a2cb383c87dba5194c291d03571dfdd6ca22
- 736333fb781e416efc59d26b221863bd7a758d874208fef2ab9d5daccbc5bea2
- 78b2d930ea3e1dedd5205fd0a99964ccdf972e4f18fb33f2f230cbab8d13b499
- e6530ec6959cb86e65f272b1871389e96677dacc3c7a35cfb097e674cdfd4218
- 0ab7ac54ca732d93b97019d3b24db7f7e9b58078b9223c46cc2da94000651760
- 319a7ad42ff07ca4200654f634eccbe854f6b96c94a6696c9934c5865f16e88c
- a9a5fe6bdbbeba31900dde82b32b9ecf192130b7fe89ab66159165489dd68c06
- d841e13ff20270a553c15b08e6345eda50cba8a22cba3d50dddd3b36b7777fbe
- 8c3219a172099ed99f946b2a1ba9a919a5f675086e01c1aa1adc4492b68bef71
- 9224a289b9e3f1ee50636849f0346b362bd9943734c9133898b1b6ab946a48d5
- e9b92c8e9b83fe8309a1081b9703e9d13605bc5dfab9fdc0fb7711412945b155
- e8313f1341a47637e6864919e42a3d5c261a9bf8e1846d3b2f118ee777837d76
- d99344f0b4ac48daad7f6b769dc9ada71c040e2fd846c681a7947a37a32446e6
- 7413059471af9fb3eeeee884a6afc6c08b79b1ea48dd22cb37529a2396183a2e
- 544fafd56ba742dab931349d950b86d6685c851e8ebc8ffa26a0cfcc8c1fcdd8
- dee005753634060206b2c41cd39da33738bfca96868547452fe420294379b83e
- a2e75f09d963334be285b5bd3c2cf5cccd28f51cba5b6338369d46dff5b64a80
- 2ac88866cc8e31055e39aeb031cc7aee5bcfbd4c429ad75867025ecab1b20ff7
- 6755440d60805d37f2223b392d46716629758b21be2753b7b81159744cf5ce8d
- cd2a2354cac19f8a41a0e49206d25725fc2a956c5ee73ca659aa23e153b35179
- 93f8fc2e6667fc95a26b9046ef0c3d4aa2186bffdb8dd42ec0fe2fb03f6e0fdd
- 3f6f53a777af16c831f14562d3973c2bbf367efdb822d62e537679a6c7a1711e
- 41bcbf6e71b7272bdc27110f81a3c0135107f999e50534862bf38c8ca04631d2
- 62ca173bf368eb4aaf924b4d42af575523eb1b99d03754e3b52cd71cf987b413
- 7d8c014a9f43b33150716f8b4876972b59d781d106363ede42a4e0173febd770
- 1fa3cbaf71efd8cc11255b71c2d2be94a2836dfa04fcac2d5660d0caab98e1ce
- bf744e2781e1ac2bac2b6dbe6805f3469077a18c6c31b719ed5d66542b855c84
- 223ce5a15a4d8e58e9f4bb90eb89e6e4efecf2a9d26869506db8bb5a9361f836
- 5fd2d3dc92dd93d65e65442b6c3dc87f7bfd65415b83aaf6e922254d1844ff4d
- 2a1098b28a906f8fa2077f4e1d003e7ff3f91f049e3ab62bb35122d2220dcf57
- a2a8867a9b5c7deb99a3ff48a22ffbd5bd202ceeb33810025f98de87de38992e
- 950ac02a8f0df985bba9b36cad4b4ab21d506a56d6eb230c24b320168b99cfed
- 1664f320d58fda289a24f387c3165865b596d8108b25d182bf056d5ed468a11b
- f8a386862a59f7a3231b19797e62c8e8478fb5e5b494a8f393e7645f5f9b2129
- 1fafb58b0b4c81a6911eab7545bff461dc24cb526f29f0a49219c804ae908c17
- daa82aa4d92977fc0bf5b008e43c07fb4e499ebc276589b554a0ce9d3d02b6ed
- a54589c2cb8661a5b54aa1c3c7068088cf9d0c23f7cfd603943c657f95854b4e
- 637aadaad717dbbc843b9a4350dd4a38b859f2b7dff49b8c3a599931e1881a92
- cb27821eb416f73b275d9866499c759afcdb484b638ebecc6772d09b34f18adc
- 5363d0ce493316b6dbd5c93ede9626f435332ca6554e281d84d6bd7665a2d755
- 7a81ad225fae3470e6e1b50866e8157ac630948c2b5b76bff7e7fb15a837e831
- b08be8df8fcf03028aef26a86d941fe149ebc69c773d5ec50df57f1973749c10
- 48e8fcd46526dca5a4aa4c6f67ac4e2ac9c664cd5252d0382ef1d55a0ad354d6
- 57bb8c3d71ad86a1554049d70f500e1bdfdf9dffa75ee7061f303edc557a4045
- f21a357f2df6c6bf2daa8ae56fe89f2c78e4a9d863ab0db49d461085b4553b72
- 879e73f649098768f1593e62e32c970ee7325c54cd7ae00cf81158f54aeffadc
- 4a008f3bf729f0859470f3efa9d7daa5ff47a20e8fc302dabb2dcce10659a431
- 369aa63eb13732f7cf7801e1b97a59bdee9e979802ec2ab4fd2199a18463dff2
- d54150652015aa5a27d17bf3693cde0940a58bf395a1fb1b6a2d26045587747b
- 21be87fb01055a4023938646a9507037e233c7fc4cde3a2c753318e01902ea4c
- 9d7c5b7ce3e0eb767d33e096439f4debcf5c9fd8b1f8f8efce15b71c6c989ed3
- f290f9f45bb65ef63ae2c25932d701eda70748cfea850cf3f9264c70df2ca665
- e639d09f620ae51e9415625dc3e744ca373b18077a56bc42dd42b079312aa098
- 0c553c3dd0677f7edb08e14ecc5f3b965093cfa55018d16e78d9351cc01f0a62
- f97bb958e1ac654a6f706f92ff07808f242729d1748be555c1755f785bc0251c
- 82cfaceb2519cdea46f71c134a43fe195893c109b53110f76ff6092ed93f45a6
- 92e26ff5922cee89a9fdc37d600ddc651e9d9f3be6ed467d73b1217b185b2d11
- fd4e3ac3f44bbe58e4181525fb8a71cc2a51b3da6f7d6f871e8c9517cc5a662f
- 4bf32f544ffbf563cfd827bda9e1af7bcc8bd7be3185c528e8177cdaa707f171
- bd8f13e1016920228f6d54e6396a50f0c3125b83ad25e85dd2a420805fb6190e
- b471ddab4f89809469634ad76ecdd4f92954da6eb849ccc68b6f99e1093a626c
- 27227e36990dadc2fa6c80d355b418636d2081cc91ce318c0dfa651531638ca2
- 22f1008821e93dbe2c443f4a032a1d8ac987c6c3953e0fa2bd4dc8f6dfca6b11
- 5c8cbfd7ceb886bb669a27dace939d1df023ff2e1d48db45554024a234a21189
- 9448793852ab7f79dabbafe679e1203f551a0b646b7db4e5f0e2cebea7ebf343
- 048706fecca4e99b357d3345b2aaff40506d892db0f81585b7ce99fd9af9e13f
- 7bba3357e660b22c8eb05a93533f66c14b78a4bcbb701a5221bd5b168d905e98
- 8ecba80fa65d1e908c5da145f82c46d1340ba4fc774d92f2a7d01e62b7f7b697
- dec2cf7cb29b6f472d085cca59275c60573c86105a43e27948dcab59e4afcfe8
- 2cc489f22db72cc8e6d261d33cc4abd606bd95d777c7c40a16b501121f3c3cf5
- fde933cf25468f0eea32b23460b51de79c7961bffdc44a0dbbd1fb20d6f222f2
- 7ad6361eeab6eb2fe380af92f969ff0e70790bcb0115236f539a2fa7ebc22197"
+checksum="a19b7b4c1f0a941be9de0488561d813e12794d4b40c9b0dc027fb97fdeafb84e
+ aaea06744ec1621a104f7a74236f827c4ee6f1ff078ad69808f82099ec7b3861
+ 1712f6a5e1143feb77bd29905fed847e33fc6fd6649e84704524854033ba026f
+ 35e899d168543c26d92332a92bc1fd567a8a9dbd6cef2399125c869c7999dc17
+ 73c44c4f6271a36f1208223eae823f38420f7b1c8682a150545ee4a9b2ae7401
+ d964ddcf3903f16eab7767f22b21d0ad799990013094415847201807485ac030
+ ec1860a4b28687410638dd9ecbe97676f2534b91aef77f3ea922910548085100
+ 6cf5322224c86f77356c4708db3ce31cad480ce8afba10ebffe77e977d3bd464
+ bf9be38949507c3d74c1ae57210db36e02cee648126601deb7e02b39f7a1f810
+ b51cd7a58cbcb746ed4fe0b925fdc9124f8e1ddaad52696c0700319c7ded621e
+ 838ea02e7fe7216b7de554a7a6ec82029216b4532e46018ea8173c8814fc407e
+ a3d98703b2aa9e7160906afd49e47459199497957c6d70ecd053e1971de2c4fd
+ 5c66bfb3fe660f037198e7948bf1dd3562748e351eddfeb46a2e5901f059d528
+ 6306b29f71ad3a89033147633238f7ba9f9f39dd6731c5a269768be66fc3fe5f
+ 094f8ff908739c3c39f793e9f4a416e86286fd92b5fe320693d5050235db5fba
+ 58fec13e30b34ab08e79d9ab99e758e8161fbd4349189d548373c109d7cf234b
+ 7ea251c927d1317df8e0cadc4333d100942d61d089551066cb78b7f4a5bc8206
+ c335348af1842ef466382b9d9804375e08b26bb9b9a7efad5aef956c22af5a6e
+ 4e97429d4f43904534d035fe449b7b588b9fde17fc11054dff15c348076d1f46
+ 6366f05fa06c2672f45882af10f4ac29761532d5c9181ea70e28f7985d708c03
+ a10149ca309de5c076de3121518f374db2b3040d5cd8918afe6581f5b5cd6efc
+ d7f2814b9419aa07ac0cb56a33945b90d5ff23bacc82228661dff8b51d351afe
+ 70722a71452c5d28d535f917a36be751a5c53f18a6810a52c5aa6829c983eda3
+ bb9632995358e94ed4b2655beaf61fda8f40f0060c6f10110d6d6c2d33112f93
+ 08c9f823d4ad9be3e5b73df0a065248220a02e5956c88b3414b24a7bcc0038fe
+ 684bafae07dc58ca85020612cd54f7553f59307b9ce4e3612f8a356fa83a20dd
+ 45e5005f6cdcb9a788e595686c8178d6e1e4bc5dae6b8edfdd1e51c7270e6037
+ 3cf5d0c821a6d469b6363848068120f80cbee65177dafd4700ecf0091d733a73
+ 4dd44d99b7714fd7a25761e2abb776bf24fbe024bd3d508709a40c6407e267b7
+ a2ffce13f64a0962f4cdfc255e71f848c1dbaa9ceb673722f30053626a53bfa5
+ 59a49c8671ffea0e7a4a716c49443862d14f3292c316a8ccd6dd283275c02255
+ 3bc7372db97eaf2ce4274651c68d34c2cddffc6f6f9f930bea0562fb186e2787
+ 81486c71ac2bd7aff29f80a050426d164ff2035684e248d458494f13dd5bc69b
+ 9d7361f52ec5908ede33564a1854ec7c00f3e42d828f73dac70c93fc937ef77c
+ 7d6da19668fbb677a9e6f0f54fb57253e802f3cae9e199c8de4a43a5a8272410
+ 6794ff2eca3a0f8952c1040991f3aa910c9629586bc3f1b56601424942dd3245
+ 1d03dd67264a2bf5d46105a6a8d7ca2f3ee73db253a3cd77ea0e0051159bce56
+ c61b4816e03c4382c83261fe1e142b54c9632f8930846729577186b0178ebb73
+ 45e957f3074ab3d832939f87b9f8dbadca4681d603fec6991cfa34bff1ff2047
+ 72a5bdfc0e0451fd17c88511b0143b87e8f3b576b68a21d0852740af7cd9feb1
+ 77cc64ccdfd0c8c9c0cc717ea08919ba3bc29d3eb8381a8b9cab399ea1d225be
+ d181e7f4d053f23928416458ac24161bc731d93ceee7d043fd4a0f27d52e4e21
+ 76d7acd86ae53ec83c55e0ed13659d614f14f95a8b4936503914861853239fc4
+ 6123417f6e9eba5c30a8d95a992454da11a8f14615466be7081dd48f3c8c48e5
+ 4fbf90fc0bb2a5fd1e10fe6dec49cc8a004edd8d0cc1e9679f8155632749410e
+ 7725770d1d2492218f3fc805f302a6d8f11c556774b70e3a120625a693fe120a
+ d04758cd809a9f3104a39697efb714a5a447fea9e5432c210099735ddb683419
+ 3fb78eaeea3a70bbd3459efd7cb6a9ee17f4c449273d6ddde425aec6fe43fc72
+ 73024580fcf4a83240fd379101385c1861ea0e4a864516acdca16ad90679e830
+ 77f6fc7980caa48b1f435cab4651ba5a0588f550231253988c5c8606d36fcd99
+ 332b32924a09ee0d5c315a0ae43f8f3d227a6a6550df245e602014cd78f213f5
+ 31a0b368810476682df67ec5743ae204f20c246e58153264d26fc1a7f2aa424e
+ c87a1e62b220eeac75b36d29a8ad82775f8aae7f106d4586e1836c2b78de5f83
+ 8f9f2f67849e023170502b376c09cf62a34f7dfeba1b10cd3d954e8e181512a8
+ 20329ba0051890845d994fb1de0e331da7734d777bd49bf1cdf3cc5870e5200e
+ 430fd1f8dff3d71a0cfd40b068eb07e2e4df9fddb9579e54fd4c99d14d3380af
+ b01d8a67779a65c280824a46486283d1aa95bf302b5d8b1ae70150b70cadc100
+ bc25214cc26d623745d9d95053c7b1b59537495f241c0b486a00689e2ac4f5e0
+ 88d55d064018324db430a1f0af96e05082bb3312d8d79edda838cba4b7774117
+ ef56a534cf288f408537bb1d926930a532019aaad6e7c8f645f8ec469f48a431
+ 49a5dfe8f473d828b178309a3fe1182c49fea07d545dd0adfcd2dbbfd7b20adf
+ 642715d7cc6c422c8bd17ef44fbffa3f8c13b68be3db64ec0c4bdd7dea55d687
+ 49a9e79fcee2869a08903c0053ed53276d5e6a28446bbb38984855bd17646c35
+ d86a96d4506fb58867526e5beb788b8eab4ba38c8ae40e5eae48d1db092698b1
+ 0565c7d804ab5c9f60c80d846edf41930030916b895591bf4b736813f174a936
+ f5dbb8541cf0b8a2264ab22c6aec131ea9e1b9dd82c2a087d641ecf92aaf4e01
+ 568e2588b9a14c4e32fd2ac3400ea0b9d777f49396d15e2d90b1f3813963e67a
+ a16e0fb248e829572643d45ac3319ab2e2f6729f5aa15fa205223443ec9da1a2
+ b81323f37eab40788000120fd9be14c930e37a84789196d92874d34a4c43f4a1
+ 9eca5a4f04787c58dbf90db03e8e7d6cc8bc5ac26327382e2e69e19f5606c0d1
+ bea13907ac37c5bf5433a34409f35a5afba984186afd78935470830ebb3d9b3a
+ 6e342283729ea010e8f6dc49810daedd58fef0cdddbc4a13d3ce1b2e9f600f6d
+ 95c022401e3e9ba3be3b731e68ddf2ca2a74338f2a5eb16c157aaa87656d972e
+ 4fcc7c972e2da63980495a02ea4cd2b74267e5951b2a9aa8d1dba06a93325d8e
+ 7cad8018337f543ee30b71477235b8b8fcc40a94e0cd52a2400dce7769ce6035
+ e75b731aa30b1006facb6f545b604cd3e74849d31428dd01c95f4cc33b96e5b8
+ 7b7ff837861815b538c9e23fe8a74acbc5871e3bc507cbb1be078524f321db6e
+ b07a541b5f4cf8367c8c386931bb0498e40e2bb0543a618642f6da9977e1e66f
+ bbdcbc438c07896d803876b44e5a22f3d16ff4b295570efda8a449d935a7c790
+ 02ef9d7b4742c4314cc3f9f76c54d7fa211a8e5ba8dd175c669b1528bc1045a2
+ d22baf6b72f15874ae4e8f501a0e9757f48802109274f6aafeadcedc4c41d998
+ 63ec46446e63d4e65e00b6bd0d91d843f3d0c312bd2a273f5bf9ed72ccf68b57
+ 87f6e48f3426bc459397d98723c4d15b1b3a7e3d4017601cad8480f5f80b8e45
+ f5fdb4caba3191556a10d08b2577e4f388a041c34e1b309aac3d05c19b48b4ed
+ 31f136c4f10e5ddeb39e05fc0ed0cb76ab57e99b6c2e6faa2a69cb56ba16e256
+ 0d5110c8389696f76370f646cd61226390dfb7c639c443f2d60517e9c0c1dba6
+ 359d546fdb3ebb6dc21d3b7942243a02b8311d52369effd7ee1b425a00f8339f
+ e35c6646c5139527b9376dc0798755bf4b7dbf106f7082ad3ed67d2eb487ec19
+ e1e1440f529f5bb35f7b0346645508a576fbe8dbd5889bd58368426b8bd85a90
+ 3e24afd750b134c6cce17c373901cfefdc153b6907fa9574b920c9e7c595dcc1
+ 0f5eb83daf0fe899db5d37cbef5cfa9f5c43d7c137c01798bce6565925df003c
+ 530ede5da364726425d60daeeceb3467490e79ddff8c5cdbbd96ad416384d6da
+ d61184a5920a0ae598dcb791d3e0bced17db0fe874863f56dcec07651bc0f470"
From ec46b959582c5491ecfaa8b9c8644915f22a7bc1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 12:23:49 +0200
Subject: [PATCH 92/93] qtchooser: set qt5 as default qt version
---
srcpkgs/qtchooser/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qtchooser/template b/srcpkgs/qtchooser/template
index 6cd0ceca322..4396135f14c 100644
--- a/srcpkgs/qtchooser/template
+++ b/srcpkgs/qtchooser/template
@@ -2,7 +2,7 @@
pkgname=qtchooser
reverts=20150315_2
version=66
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="INSTALL_ROOT=\${DESTDIR}"
short_desc="Qt4/Qt5 version chooser"
@@ -25,4 +25,5 @@ post_install() {
vmkdir etc/xdg/qtchooser
vinstall ${FILESDIR}/4.conf 644 etc/xdg/qtchooser
vinstall ${FILESDIR}/5.conf 644 etc/xdg/qtchooser
+ ln -sf 5.conf ${DESTDIR}/etc/xdg/qtchooser/default.conf
}
From 12c533dab3ba89f39cd6a0851ac226a33ee17b02 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 12:24:03 +0200
Subject: [PATCH 93/93] qt: remove INSTALL script
[ci skip]
---
srcpkgs/qt/INSTALL | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 srcpkgs/qt/INSTALL
diff --git a/srcpkgs/qt/INSTALL b/srcpkgs/qt/INSTALL
deleted file mode 100644
index 8fef24ada00..00000000000
--- a/srcpkgs/qt/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # qt4 by default via qtchooser.
- ln -sf /etc/xdg/qtchooser/4.conf etc/xdg/qtchooser/default.conf
- ;;
-esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] icu: update to 67.1
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
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-27 15:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 313 bytes --]
There is an updated 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: 147964 bytes --]
From 5ea431a07cebf8d35b8cbe8428427ba9530f15d2 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/94] icu: update to 67.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 54a00e3150d..3f0f0052b6f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -553,12 +553,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..69f3a833674 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"
@@ -98,6 +97,7 @@ icu-devel_package() {
pkg_install() {
vmove usr/include
vmove usr/lib/icu
+ vmove "usr/lib/*.a"
vmove usr/lib/pkgconfig
vmove usr/share/icu
vmove usr/bin/icu-config
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 279099ca3b5d5431e4918f690f4ac3b5ea89be6c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 02/94] 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 42c8d3669d276cbeaacf7c982022450ae384e8c9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 03/94] 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 048aef4560048667e0b36030429ac3619c006fa3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 04/94] 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 e08181aacdba524e63d18836a4998b9121f21109 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:21 +0200
Subject: [PATCH 05/94] 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 09bd807ddb08d337895692ce06474a9f1de43a58 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 06/94] 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 09fb0eec6cc5e25cf558eeb540fc88323519f494 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 07/94] 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 5b97112bb88a2429c279d481e87627191e8bbc0c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 08/94] 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 1f7e26c4fb363273b1a2da281b04f2e62ca9577c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 09/94] 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 ec67d1ba1ad86211bce6c1c440f3d2a59b3c29e4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 10/94] 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 4c6f58da5f94913e404ce218040c3c3667e1e007 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 11/94] 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 56767dd05e45519adcd0bacfdbb4d68aed04da9f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 12/94] 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 df3dd7fee587c106fba78b849fcc6c6f1dd2bdbc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:22 +0200
Subject: [PATCH 13/94] 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 80dffc93448f65173896d116737fe16594e04ab1 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 14/94] 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 db8b5bbcf47ef0606457eebc0dce454518292346 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 15/94] 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 36619e21ac18d763bf78ef6a272b502f9342cfab Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 16/94] 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 9511de269da4dd61f63a03cd9d2046a76450a9d2 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 17/94] 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 4bc8a2fe96ab98b125a6f90dc580dd53c951084f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 18/94] 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 c51279de04427d08cf51f73de9aa41cef7087750 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 19/94] 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 76ab10591351d5486e64f662710e993aebecdf3e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 20/94] 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 bad5776be25b180e055cd831f8363bb3d5d3ddfe Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 21/94] 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 24e275c51b0cd60c1de4ad7d08d5d3e4a0e9bb60 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 22/94] 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 415f3918f88ef05cb6a18e003129a059a10eb78f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 23/94] 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 062721680954a88b462e262d15f3599b99b991c5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 24/94] 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 b2d0359e78f74c974129c54a93658458bcdf5a5b Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 25/94] 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 304e8d807c4c7f1c8e7ad913b0298d670c1fbba7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:24 +0200
Subject: [PATCH 26/94] 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 66b19c32acbaf60b24cd1ec66f3b010f7eb88969 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 27/94] 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 155645be4182ca144f25e7bf4d11a3bba3f67f2a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 28/94] 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 26c3d01f48d1acd36a273d8e21c68eabcba6794c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 29/94] 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 80dff0b9d096718d8ac19ea3046c7037ff05384a Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 30/94] 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 c5950982957ad600facf3caf14965d690cf9d1cf Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 31/94] 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 b592d05e62ddac9d5677477c436e811901f7c006 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 32/94] 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 d43a5e60ef71d92de1b8211203de13e89994d3ba Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:25 +0200
Subject: [PATCH 33/94] 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 82fa4f97083a1a2f2ea32adbf2c65c808b1654a0 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 34/94] 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 e3b4f779c71a7367a5b759e6f9777a8e8a1b5fbd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 35/94] 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 f3edf610a73d58b8f71bc2777fd7854a4b11a349 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 36/94] 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 68903a3ff063cdd9d1da6777b1ba9959b1249432 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 37/94] 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 590c17b147e86c6f9a3146b7cdf2bfd84b9ed169 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 38/94] 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 a6dd5d94702d458c7ae8cafd666ef0cd601d4702 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 39/94] 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 312bf8c8fb0628816b5c3d626a63ba0758573ffc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 40/94] 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 2bd8b1b4e27784ff23cb6c48105730d6cba1ccb3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:26 +0200
Subject: [PATCH 41/94] 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 ecac5a0fcb8d6ae879361e8a06dd01a0b81a8835 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 42/94] 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 7a7959e3eb397b66cda4d3baaa7a4a581663b420 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 43/94] 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 14343b116dbe80e42d1220d9fcec4afa8d8c4ea7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 44/94] 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 1b3dc051f4adc616e9fbc7a3b67d0b4716875b09 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 45/94] 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 3a37ad540954d50758795ce724e41b3c172b9110 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 46/94] 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 c698eb764316c42ec1ecfe85456f405bc08d3fbb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 47/94] 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 7350d4f148e023c9e3eb30cd5299f8285b2fbf4e Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:27 +0200
Subject: [PATCH 48/94] 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 f00f42e2859fd265cb954d25403798bb1ddc2a07 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 49/94] 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 7345d71c6416a736fff96ed74178a325087d89db Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 50/94] 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 7b7518a1f044cce2ab3b0a7f9266272646690764 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 51/94] 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 1bd4bf7a932b11d459355ecd9c1a549f39590324 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 52/94] 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 c3754121de36fb784a7acbc8a40f141bf7713cf7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 53/94] 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 6cbe98c6cbbc89c6fbe181da748eaeafbff28e52 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 54/94] 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 dd310ed423ffa51c3a40f511208267cd383687a3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:28 +0200
Subject: [PATCH 55/94] 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 999b4c8e4086371c052abc40dc23f9f3dca4450d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 56/94] 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 70e7b791d225c6be2d6761e59e4cc8ce06f2c9c7 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 57/94] 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 76bd8e89c5b8100efb66bdea1e65ed307c28493f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 58/94] 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 db8ea397a4df94e231bbef47051855a4eb105805 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 59/94] 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 02cb35eda694780d180858053cd6b3fd7e8669d6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 60/94] 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 4f978303cd18ae4a6d99efbea5557f8ef3c2bde6 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 61/94] 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 4f44fb6def12677607838d101f4f4da0dfb7bd5c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 62/94] 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 739a197265d87fda84d2f6bdfb1c930155e06e84 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:29 +0200
Subject: [PATCH 63/94] 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 1ff459dcd60e4ddfcae998d3eda2f869a9fc0b2d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 64/94] 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 8f299c019c1bf27813dd1cabd0d96578b596ddd4 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 65/94] 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 05386909c13e58abd0324e0a3d6143475c405cc5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 66/94] 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 9f4bb76861f9052ded40270d5c180a920f407621 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 67/94] qt5: rebuild against icu-67.1
---
srcpkgs/qt5/INSTALL | 6 ------
srcpkgs/qt5/template | 2 +-
2 files changed, 1 insertion(+), 7 deletions(-)
delete mode 100644 srcpkgs/qt5/INSTALL
diff --git a/srcpkgs/qt5/INSTALL b/srcpkgs/qt5/INSTALL
deleted file mode 100644
index 87229f3e18f..00000000000
--- a/srcpkgs/qt5/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # qt5 by default via qtchooser.
- ln -sf /etc/xdg/qtchooser/5.conf etc/xdg/qtchooser/default.conf
- ;;
-esac
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 09976f4fde892a61fe9b42116f105b6503e023b5 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 68/94] 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 043e2d9e3c2428b4cb5fb56e9800ab428b376b87 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:30 +0200
Subject: [PATCH 69/94] 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 eb7632090106c5ae3ace018c918bed2284639239 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 70/94] 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 2362ba666b93ae677a2d4c4ac5396bf99ae5ee96 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 71/94] 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 af503e35ca5a177e260222c3d28879dd8a462e39 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 72/94] 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 e69b1f83a4536af4d1dae4ae5ce34c23e5a7ee81 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 73/94] 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 3af76e0b77d395b617bfa3495fb174771e3def4c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 74/94] 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 005706f605d6b733207bfd132bfa38250d9a8493 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 75/94] 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 08be263fb95d47e9e8b9524feac99732f078e129 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:31 +0200
Subject: [PATCH 76/94] 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 8ffb47dfe2dc68c8caa87365548aa2d269ecb898 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 77/94] 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 acc19bb9928342af1a930dd027834779cba734a9 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 78/94] 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 68b6fa91c4944195373d1274f309091cca065f2c Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 79/94] 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 da46fa586749e8d0a49a0a17aaed21c02d169cfd Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 80/94] 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 e4d2852fdd0a16716e30a8092f8b31a977193b31 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 81/94] 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 a00add6b11fc43f4c99ab5c67b5ad35352cd032d Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 82/94] 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 0db3ddf4bbcb78baccb21832e150bcaa5aa4f354 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 83/94] 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 a98f302f78e922a8883eae7baf446b9976fc7d08 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:32 +0200
Subject: [PATCH 84/94] 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 db7d11f59bbbceadb281dc829f6a08019344d541 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:33 +0200
Subject: [PATCH 85/94] 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 6d169b113cd9240718a9e57097d6946bf52165eb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Sun, 17 May 2020 12:42:55 +0200
Subject: [PATCH 86/94] 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 0431c2ad784c6a82b60314a07e49764e01a61f14 Mon Sep 17 00:00:00 2001
From: Randy McCaskill <randy@mccaskill.us>
Date: Tue, 12 May 2020 08:13:21 -0400
Subject: [PATCH 87/94] 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
From ffd77182186f9b05b2d5514b35cb0ebd344f8915 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 88/94] firefox-esr: update to 68.8.0.
---
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 990c0f7da79..a119e408456 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=68.7.0
+version=68.8.0
revision=1
wrksrc="firefox-${version}"
build_helper="rust"
@@ -12,7 +12,7 @@ maintainer="Eivind Uggedal <eivind@uggedal.com>"
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=ad3ea069c3d23aab360ad04ff4d0f5e556d3538f7dd4eae0690c4e9241537570
+checksum=fa5b2266d225878d4b35694678f79fd7e7a6d3c62759a40326129bd90f63e842
lib32disabled=yes
hostmakedepends="autoconf213 unzip zip pkg-config perl python yasm
From ac4de891d36291777d4620d01a7ed8c0029bfa61 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 11:43:56 +0200
Subject: [PATCH 89/94] firefox-esr-i18n: update to 68.8.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 01bb13566bf..31a6e90331f 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=68.7.0
+version=68.8.0
revision=1
build_style=meta
short_desc="Firefox ESR language packs"
@@ -135,96 +135,96 @@ _pkgtmpl() {
}
}
-checksum="bb73ff90d2533edc065de0bc975e378f3aef4b580e75f664c7bb15bef70d3351
- f197706c26e07740650a58dfc3d64adcf37fb3a33688095ff863b0e640c81370
- e4e09f9d412fb459f0466e7e14824f5452a58a5653583cb37bf64913b838be1c
- 7f4b4ff7c3fea1110caa62a5fbd926ec7a94574ffe9e9d8686a64d7c9e3036dd
- 3470c12735e19b0d6807ff12ce2f571b97ff6882e1f33e9b0df64f52a6048b16
- 9ff276db700483176b593d341f50cb844ca66cb836e7c68cf7926f3c9f0afc2d
- 98d1e53b48a0063728f56450792c9764532e5d36f21b5ab9fe110442a1e2417f
- 2a751afa57fd31770888a1d1def6705c40151c1b256e80a5f169e845e2f58219
- b9376d0dde965bf64d04b1549d4069064186311665c4c26ba6af86edc350f541
- e5c177ddcec21374029e79e98d3d96b092fdd5c1218e3f93bf3fafe4a4b375aa
- 302b071fc01e245f8feddb9481402b7b288583d6a09c13245dbec6cfe8e4464c
- 17e73c704aa8944ce16f6088d9d9e178146a0732cd482668fbab8c30d2a41f86
- 185282d2cec6a20824b9041acdd9ca4c5208b4e9e11777e42edfec69cce94446
- 21a8c6379f3510b9d2864065dbad6c89316d8075454d24e6f682f13decbfcc2f
- 6d0b81751e6139d71ec3bb287cc4a97063560e67476ab78e3a624390c84a7969
- dca24a63d40a8fdfcd24f9b4c5e578a5e45ae0fb2e31ec80f4f93ad1c900a755
- 432d618c198ac0f6d338365cbf8f5e09c966c37fe33fa92215dbd4d046b61e86
- 70d48d4248a46e356ee21157c2b6d895c9df788d340565d19d5a1185b61e7f58
- 2570ad9849925944979e694ad17f1b1ee1d8cecfa8f80b596fd1a11f71223120
- 833941b7013414e6712095a31c334895ade06c811195a6f09c69469f623adf8d
- 1c5feb098b0a4f2808e2205d1e3e0011fa71996e8f7bfbf4bd50a92b2ea65e97
- eb6bd4e9198d2fb636b5ea5f6372a2cb383c87dba5194c291d03571dfdd6ca22
- 736333fb781e416efc59d26b221863bd7a758d874208fef2ab9d5daccbc5bea2
- 78b2d930ea3e1dedd5205fd0a99964ccdf972e4f18fb33f2f230cbab8d13b499
- e6530ec6959cb86e65f272b1871389e96677dacc3c7a35cfb097e674cdfd4218
- 0ab7ac54ca732d93b97019d3b24db7f7e9b58078b9223c46cc2da94000651760
- 319a7ad42ff07ca4200654f634eccbe854f6b96c94a6696c9934c5865f16e88c
- a9a5fe6bdbbeba31900dde82b32b9ecf192130b7fe89ab66159165489dd68c06
- d841e13ff20270a553c15b08e6345eda50cba8a22cba3d50dddd3b36b7777fbe
- 8c3219a172099ed99f946b2a1ba9a919a5f675086e01c1aa1adc4492b68bef71
- 9224a289b9e3f1ee50636849f0346b362bd9943734c9133898b1b6ab946a48d5
- e9b92c8e9b83fe8309a1081b9703e9d13605bc5dfab9fdc0fb7711412945b155
- e8313f1341a47637e6864919e42a3d5c261a9bf8e1846d3b2f118ee777837d76
- d99344f0b4ac48daad7f6b769dc9ada71c040e2fd846c681a7947a37a32446e6
- 7413059471af9fb3eeeee884a6afc6c08b79b1ea48dd22cb37529a2396183a2e
- 544fafd56ba742dab931349d950b86d6685c851e8ebc8ffa26a0cfcc8c1fcdd8
- dee005753634060206b2c41cd39da33738bfca96868547452fe420294379b83e
- a2e75f09d963334be285b5bd3c2cf5cccd28f51cba5b6338369d46dff5b64a80
- 2ac88866cc8e31055e39aeb031cc7aee5bcfbd4c429ad75867025ecab1b20ff7
- 6755440d60805d37f2223b392d46716629758b21be2753b7b81159744cf5ce8d
- cd2a2354cac19f8a41a0e49206d25725fc2a956c5ee73ca659aa23e153b35179
- 93f8fc2e6667fc95a26b9046ef0c3d4aa2186bffdb8dd42ec0fe2fb03f6e0fdd
- 3f6f53a777af16c831f14562d3973c2bbf367efdb822d62e537679a6c7a1711e
- 41bcbf6e71b7272bdc27110f81a3c0135107f999e50534862bf38c8ca04631d2
- 62ca173bf368eb4aaf924b4d42af575523eb1b99d03754e3b52cd71cf987b413
- 7d8c014a9f43b33150716f8b4876972b59d781d106363ede42a4e0173febd770
- 1fa3cbaf71efd8cc11255b71c2d2be94a2836dfa04fcac2d5660d0caab98e1ce
- bf744e2781e1ac2bac2b6dbe6805f3469077a18c6c31b719ed5d66542b855c84
- 223ce5a15a4d8e58e9f4bb90eb89e6e4efecf2a9d26869506db8bb5a9361f836
- 5fd2d3dc92dd93d65e65442b6c3dc87f7bfd65415b83aaf6e922254d1844ff4d
- 2a1098b28a906f8fa2077f4e1d003e7ff3f91f049e3ab62bb35122d2220dcf57
- a2a8867a9b5c7deb99a3ff48a22ffbd5bd202ceeb33810025f98de87de38992e
- 950ac02a8f0df985bba9b36cad4b4ab21d506a56d6eb230c24b320168b99cfed
- 1664f320d58fda289a24f387c3165865b596d8108b25d182bf056d5ed468a11b
- f8a386862a59f7a3231b19797e62c8e8478fb5e5b494a8f393e7645f5f9b2129
- 1fafb58b0b4c81a6911eab7545bff461dc24cb526f29f0a49219c804ae908c17
- daa82aa4d92977fc0bf5b008e43c07fb4e499ebc276589b554a0ce9d3d02b6ed
- a54589c2cb8661a5b54aa1c3c7068088cf9d0c23f7cfd603943c657f95854b4e
- 637aadaad717dbbc843b9a4350dd4a38b859f2b7dff49b8c3a599931e1881a92
- cb27821eb416f73b275d9866499c759afcdb484b638ebecc6772d09b34f18adc
- 5363d0ce493316b6dbd5c93ede9626f435332ca6554e281d84d6bd7665a2d755
- 7a81ad225fae3470e6e1b50866e8157ac630948c2b5b76bff7e7fb15a837e831
- b08be8df8fcf03028aef26a86d941fe149ebc69c773d5ec50df57f1973749c10
- 48e8fcd46526dca5a4aa4c6f67ac4e2ac9c664cd5252d0382ef1d55a0ad354d6
- 57bb8c3d71ad86a1554049d70f500e1bdfdf9dffa75ee7061f303edc557a4045
- f21a357f2df6c6bf2daa8ae56fe89f2c78e4a9d863ab0db49d461085b4553b72
- 879e73f649098768f1593e62e32c970ee7325c54cd7ae00cf81158f54aeffadc
- 4a008f3bf729f0859470f3efa9d7daa5ff47a20e8fc302dabb2dcce10659a431
- 369aa63eb13732f7cf7801e1b97a59bdee9e979802ec2ab4fd2199a18463dff2
- d54150652015aa5a27d17bf3693cde0940a58bf395a1fb1b6a2d26045587747b
- 21be87fb01055a4023938646a9507037e233c7fc4cde3a2c753318e01902ea4c
- 9d7c5b7ce3e0eb767d33e096439f4debcf5c9fd8b1f8f8efce15b71c6c989ed3
- f290f9f45bb65ef63ae2c25932d701eda70748cfea850cf3f9264c70df2ca665
- e639d09f620ae51e9415625dc3e744ca373b18077a56bc42dd42b079312aa098
- 0c553c3dd0677f7edb08e14ecc5f3b965093cfa55018d16e78d9351cc01f0a62
- f97bb958e1ac654a6f706f92ff07808f242729d1748be555c1755f785bc0251c
- 82cfaceb2519cdea46f71c134a43fe195893c109b53110f76ff6092ed93f45a6
- 92e26ff5922cee89a9fdc37d600ddc651e9d9f3be6ed467d73b1217b185b2d11
- fd4e3ac3f44bbe58e4181525fb8a71cc2a51b3da6f7d6f871e8c9517cc5a662f
- 4bf32f544ffbf563cfd827bda9e1af7bcc8bd7be3185c528e8177cdaa707f171
- bd8f13e1016920228f6d54e6396a50f0c3125b83ad25e85dd2a420805fb6190e
- b471ddab4f89809469634ad76ecdd4f92954da6eb849ccc68b6f99e1093a626c
- 27227e36990dadc2fa6c80d355b418636d2081cc91ce318c0dfa651531638ca2
- 22f1008821e93dbe2c443f4a032a1d8ac987c6c3953e0fa2bd4dc8f6dfca6b11
- 5c8cbfd7ceb886bb669a27dace939d1df023ff2e1d48db45554024a234a21189
- 9448793852ab7f79dabbafe679e1203f551a0b646b7db4e5f0e2cebea7ebf343
- 048706fecca4e99b357d3345b2aaff40506d892db0f81585b7ce99fd9af9e13f
- 7bba3357e660b22c8eb05a93533f66c14b78a4bcbb701a5221bd5b168d905e98
- 8ecba80fa65d1e908c5da145f82c46d1340ba4fc774d92f2a7d01e62b7f7b697
- dec2cf7cb29b6f472d085cca59275c60573c86105a43e27948dcab59e4afcfe8
- 2cc489f22db72cc8e6d261d33cc4abd606bd95d777c7c40a16b501121f3c3cf5
- fde933cf25468f0eea32b23460b51de79c7961bffdc44a0dbbd1fb20d6f222f2
- 7ad6361eeab6eb2fe380af92f969ff0e70790bcb0115236f539a2fa7ebc22197"
+checksum="a19b7b4c1f0a941be9de0488561d813e12794d4b40c9b0dc027fb97fdeafb84e
+ aaea06744ec1621a104f7a74236f827c4ee6f1ff078ad69808f82099ec7b3861
+ 1712f6a5e1143feb77bd29905fed847e33fc6fd6649e84704524854033ba026f
+ 35e899d168543c26d92332a92bc1fd567a8a9dbd6cef2399125c869c7999dc17
+ 73c44c4f6271a36f1208223eae823f38420f7b1c8682a150545ee4a9b2ae7401
+ d964ddcf3903f16eab7767f22b21d0ad799990013094415847201807485ac030
+ ec1860a4b28687410638dd9ecbe97676f2534b91aef77f3ea922910548085100
+ 6cf5322224c86f77356c4708db3ce31cad480ce8afba10ebffe77e977d3bd464
+ bf9be38949507c3d74c1ae57210db36e02cee648126601deb7e02b39f7a1f810
+ b51cd7a58cbcb746ed4fe0b925fdc9124f8e1ddaad52696c0700319c7ded621e
+ 838ea02e7fe7216b7de554a7a6ec82029216b4532e46018ea8173c8814fc407e
+ a3d98703b2aa9e7160906afd49e47459199497957c6d70ecd053e1971de2c4fd
+ 5c66bfb3fe660f037198e7948bf1dd3562748e351eddfeb46a2e5901f059d528
+ 6306b29f71ad3a89033147633238f7ba9f9f39dd6731c5a269768be66fc3fe5f
+ 094f8ff908739c3c39f793e9f4a416e86286fd92b5fe320693d5050235db5fba
+ 58fec13e30b34ab08e79d9ab99e758e8161fbd4349189d548373c109d7cf234b
+ 7ea251c927d1317df8e0cadc4333d100942d61d089551066cb78b7f4a5bc8206
+ c335348af1842ef466382b9d9804375e08b26bb9b9a7efad5aef956c22af5a6e
+ 4e97429d4f43904534d035fe449b7b588b9fde17fc11054dff15c348076d1f46
+ 6366f05fa06c2672f45882af10f4ac29761532d5c9181ea70e28f7985d708c03
+ a10149ca309de5c076de3121518f374db2b3040d5cd8918afe6581f5b5cd6efc
+ d7f2814b9419aa07ac0cb56a33945b90d5ff23bacc82228661dff8b51d351afe
+ 70722a71452c5d28d535f917a36be751a5c53f18a6810a52c5aa6829c983eda3
+ bb9632995358e94ed4b2655beaf61fda8f40f0060c6f10110d6d6c2d33112f93
+ 08c9f823d4ad9be3e5b73df0a065248220a02e5956c88b3414b24a7bcc0038fe
+ 684bafae07dc58ca85020612cd54f7553f59307b9ce4e3612f8a356fa83a20dd
+ 45e5005f6cdcb9a788e595686c8178d6e1e4bc5dae6b8edfdd1e51c7270e6037
+ 3cf5d0c821a6d469b6363848068120f80cbee65177dafd4700ecf0091d733a73
+ 4dd44d99b7714fd7a25761e2abb776bf24fbe024bd3d508709a40c6407e267b7
+ a2ffce13f64a0962f4cdfc255e71f848c1dbaa9ceb673722f30053626a53bfa5
+ 59a49c8671ffea0e7a4a716c49443862d14f3292c316a8ccd6dd283275c02255
+ 3bc7372db97eaf2ce4274651c68d34c2cddffc6f6f9f930bea0562fb186e2787
+ 81486c71ac2bd7aff29f80a050426d164ff2035684e248d458494f13dd5bc69b
+ 9d7361f52ec5908ede33564a1854ec7c00f3e42d828f73dac70c93fc937ef77c
+ 7d6da19668fbb677a9e6f0f54fb57253e802f3cae9e199c8de4a43a5a8272410
+ 6794ff2eca3a0f8952c1040991f3aa910c9629586bc3f1b56601424942dd3245
+ 1d03dd67264a2bf5d46105a6a8d7ca2f3ee73db253a3cd77ea0e0051159bce56
+ c61b4816e03c4382c83261fe1e142b54c9632f8930846729577186b0178ebb73
+ 45e957f3074ab3d832939f87b9f8dbadca4681d603fec6991cfa34bff1ff2047
+ 72a5bdfc0e0451fd17c88511b0143b87e8f3b576b68a21d0852740af7cd9feb1
+ 77cc64ccdfd0c8c9c0cc717ea08919ba3bc29d3eb8381a8b9cab399ea1d225be
+ d181e7f4d053f23928416458ac24161bc731d93ceee7d043fd4a0f27d52e4e21
+ 76d7acd86ae53ec83c55e0ed13659d614f14f95a8b4936503914861853239fc4
+ 6123417f6e9eba5c30a8d95a992454da11a8f14615466be7081dd48f3c8c48e5
+ 4fbf90fc0bb2a5fd1e10fe6dec49cc8a004edd8d0cc1e9679f8155632749410e
+ 7725770d1d2492218f3fc805f302a6d8f11c556774b70e3a120625a693fe120a
+ d04758cd809a9f3104a39697efb714a5a447fea9e5432c210099735ddb683419
+ 3fb78eaeea3a70bbd3459efd7cb6a9ee17f4c449273d6ddde425aec6fe43fc72
+ 73024580fcf4a83240fd379101385c1861ea0e4a864516acdca16ad90679e830
+ 77f6fc7980caa48b1f435cab4651ba5a0588f550231253988c5c8606d36fcd99
+ 332b32924a09ee0d5c315a0ae43f8f3d227a6a6550df245e602014cd78f213f5
+ 31a0b368810476682df67ec5743ae204f20c246e58153264d26fc1a7f2aa424e
+ c87a1e62b220eeac75b36d29a8ad82775f8aae7f106d4586e1836c2b78de5f83
+ 8f9f2f67849e023170502b376c09cf62a34f7dfeba1b10cd3d954e8e181512a8
+ 20329ba0051890845d994fb1de0e331da7734d777bd49bf1cdf3cc5870e5200e
+ 430fd1f8dff3d71a0cfd40b068eb07e2e4df9fddb9579e54fd4c99d14d3380af
+ b01d8a67779a65c280824a46486283d1aa95bf302b5d8b1ae70150b70cadc100
+ bc25214cc26d623745d9d95053c7b1b59537495f241c0b486a00689e2ac4f5e0
+ 88d55d064018324db430a1f0af96e05082bb3312d8d79edda838cba4b7774117
+ ef56a534cf288f408537bb1d926930a532019aaad6e7c8f645f8ec469f48a431
+ 49a5dfe8f473d828b178309a3fe1182c49fea07d545dd0adfcd2dbbfd7b20adf
+ 642715d7cc6c422c8bd17ef44fbffa3f8c13b68be3db64ec0c4bdd7dea55d687
+ 49a9e79fcee2869a08903c0053ed53276d5e6a28446bbb38984855bd17646c35
+ d86a96d4506fb58867526e5beb788b8eab4ba38c8ae40e5eae48d1db092698b1
+ 0565c7d804ab5c9f60c80d846edf41930030916b895591bf4b736813f174a936
+ f5dbb8541cf0b8a2264ab22c6aec131ea9e1b9dd82c2a087d641ecf92aaf4e01
+ 568e2588b9a14c4e32fd2ac3400ea0b9d777f49396d15e2d90b1f3813963e67a
+ a16e0fb248e829572643d45ac3319ab2e2f6729f5aa15fa205223443ec9da1a2
+ b81323f37eab40788000120fd9be14c930e37a84789196d92874d34a4c43f4a1
+ 9eca5a4f04787c58dbf90db03e8e7d6cc8bc5ac26327382e2e69e19f5606c0d1
+ bea13907ac37c5bf5433a34409f35a5afba984186afd78935470830ebb3d9b3a
+ 6e342283729ea010e8f6dc49810daedd58fef0cdddbc4a13d3ce1b2e9f600f6d
+ 95c022401e3e9ba3be3b731e68ddf2ca2a74338f2a5eb16c157aaa87656d972e
+ 4fcc7c972e2da63980495a02ea4cd2b74267e5951b2a9aa8d1dba06a93325d8e
+ 7cad8018337f543ee30b71477235b8b8fcc40a94e0cd52a2400dce7769ce6035
+ e75b731aa30b1006facb6f545b604cd3e74849d31428dd01c95f4cc33b96e5b8
+ 7b7ff837861815b538c9e23fe8a74acbc5871e3bc507cbb1be078524f321db6e
+ b07a541b5f4cf8367c8c386931bb0498e40e2bb0543a618642f6da9977e1e66f
+ bbdcbc438c07896d803876b44e5a22f3d16ff4b295570efda8a449d935a7c790
+ 02ef9d7b4742c4314cc3f9f76c54d7fa211a8e5ba8dd175c669b1528bc1045a2
+ d22baf6b72f15874ae4e8f501a0e9757f48802109274f6aafeadcedc4c41d998
+ 63ec46446e63d4e65e00b6bd0d91d843f3d0c312bd2a273f5bf9ed72ccf68b57
+ 87f6e48f3426bc459397d98723c4d15b1b3a7e3d4017601cad8480f5f80b8e45
+ f5fdb4caba3191556a10d08b2577e4f388a041c34e1b309aac3d05c19b48b4ed
+ 31f136c4f10e5ddeb39e05fc0ed0cb76ab57e99b6c2e6faa2a69cb56ba16e256
+ 0d5110c8389696f76370f646cd61226390dfb7c639c443f2d60517e9c0c1dba6
+ 359d546fdb3ebb6dc21d3b7942243a02b8311d52369effd7ee1b425a00f8339f
+ e35c6646c5139527b9376dc0798755bf4b7dbf106f7082ad3ed67d2eb487ec19
+ e1e1440f529f5bb35f7b0346645508a576fbe8dbd5889bd58368426b8bd85a90
+ 3e24afd750b134c6cce17c373901cfefdc153b6907fa9574b920c9e7c595dcc1
+ 0f5eb83daf0fe899db5d37cbef5cfa9f5c43d7c137c01798bce6565925df003c
+ 530ede5da364726425d60daeeceb3467490e79ddff8c5cdbbd96ad416384d6da
+ d61184a5920a0ae598dcb791d3e0bced17db0fe874863f56dcec07651bc0f470"
From 12d2daa07ea0e6a98e2bdd27dc59abd778da4382 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 12:23:49 +0200
Subject: [PATCH 90/94] qtchooser: set qt5 as default qt version
---
srcpkgs/qtchooser/template | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/srcpkgs/qtchooser/template b/srcpkgs/qtchooser/template
index 6cd0ceca322..4396135f14c 100644
--- a/srcpkgs/qtchooser/template
+++ b/srcpkgs/qtchooser/template
@@ -2,7 +2,7 @@
pkgname=qtchooser
reverts=20150315_2
version=66
-revision=1
+revision=2
build_style=gnu-makefile
make_install_args="INSTALL_ROOT=\${DESTDIR}"
short_desc="Qt4/Qt5 version chooser"
@@ -25,4 +25,5 @@ post_install() {
vmkdir etc/xdg/qtchooser
vinstall ${FILESDIR}/4.conf 644 etc/xdg/qtchooser
vinstall ${FILESDIR}/5.conf 644 etc/xdg/qtchooser
+ ln -sf 5.conf ${DESTDIR}/etc/xdg/qtchooser/default.conf
}
From b8db778a0dc46af524c878e9175bb97cee91ec68 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 12:24:03 +0200
Subject: [PATCH 91/94] qt: remove INSTALL script
[ci skip]
---
srcpkgs/qt/INSTALL | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 srcpkgs/qt/INSTALL
diff --git a/srcpkgs/qt/INSTALL b/srcpkgs/qt/INSTALL
deleted file mode 100644
index 8fef24ada00..00000000000
--- a/srcpkgs/qt/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-case "$ACTION" in
-post)
- # qt4 by default via qtchooser.
- ln -sf /etc/xdg/qtchooser/4.conf etc/xdg/qtchooser/default.conf
- ;;
-esac
From 9e9ecc644f2ea9cd4c103ef916b5d956b59aba28 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 13:39:08 +0200
Subject: [PATCH 92/94] Orphan Uggedal's packages
[ci skip]
---
srcpkgs/advancecomp/template | 2 +-
srcpkgs/dunst/template | 2 +-
srcpkgs/fcgiwrap/template | 2 +-
srcpkgs/firefox-esr/template | 2 +-
srcpkgs/git-cal/template | 2 +-
srcpkgs/git-extras/template | 2 +-
srcpkgs/h2o/template | 2 +-
srcpkgs/haproxy/template | 2 +-
srcpkgs/i3blocks/template | 2 +-
srcpkgs/jemalloc/template | 2 +-
srcpkgs/jp2a/template | 2 +-
srcpkgs/libksba/template | 2 +-
srcpkgs/libtorrent-rasterbar/template | 2 +-
srcpkgs/mdp/template | 2 +-
srcpkgs/miniflux/template | 2 +-
srcpkgs/obnam/template | 2 +-
srcpkgs/odo/template | 2 +-
srcpkgs/openconnect/template | 2 +-
srcpkgs/pass/template | 2 +-
srcpkgs/physlock/template | 2 +-
srcpkgs/pockyt/template | 2 +-
srcpkgs/privoxy/template | 2 +-
srcpkgs/python-Django/template | 2 +-
srcpkgs/python-Flask-Assets/template | 2 +-
srcpkgs/python-Flask-OAuthlib/template | 2 +-
srcpkgs/python-Flask-Script/template | 2 +-
srcpkgs/python-Flask-WTF/template | 2 +-
srcpkgs/python-WTForms/template | 2 +-
srcpkgs/python-cliapp/template | 2 +-
srcpkgs/python-fuse/template | 2 +-
srcpkgs/python-futures/template | 2 +-
srcpkgs/python-hiredis/template | 2 +-
srcpkgs/python-hoedown/template | 2 +-
srcpkgs/python-larch/template | 2 +-
srcpkgs/python-parse/template | 2 +-
srcpkgs/python-pyPEG2/template | 2 +-
srcpkgs/python-redis/template | 2 +-
srcpkgs/python-tracing/template | 2 +-
srcpkgs/python-ttystatus/template | 2 +-
srcpkgs/python-txgithub/template | 2 +-
srcpkgs/python-urlnorm/template | 2 +-
srcpkgs/python-webassets/template | 2 +-
srcpkgs/python3-Django/template | 2 +-
srcpkgs/qutebrowser/template | 2 +-
srcpkgs/screenFetch/template | 2 +-
srcpkgs/spawn-fcgi/template | 2 +-
srcpkgs/tudu/template | 2 +-
srcpkgs/urlwatch/template | 2 +-
srcpkgs/uwsgi/template | 2 +-
srcpkgs/vimb/template | 2 +-
srcpkgs/void-updates/template | 2 +-
srcpkgs/vpnc-scripts/template | 2 +-
srcpkgs/zsh-syntax-highlighting/template | 2 +-
53 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/srcpkgs/advancecomp/template b/srcpkgs/advancecomp/template
index 93f00e2bd83..bca9d61ef55 100644
--- a/srcpkgs/advancecomp/template
+++ b/srcpkgs/advancecomp/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
makedepends="zlib-devel"
short_desc="A collection of recompression utilities for ZIP/PNG/GZ"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3"
homepage="http://www.advancemame.it/comp-readme.html"
distfiles="https://github.com/amadvance/${pkgname}/releases/download/v${version}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/dunst/template b/srcpkgs/dunst/template
index 89adc62e616..b6691955a89 100644
--- a/srcpkgs/dunst/template
+++ b/srcpkgs/dunst/template
@@ -9,7 +9,7 @@ hostmakedepends="perl pkg-config"
makedepends="gtk+-devel libXScrnSaver-devel libXinerama-devel libXrandr-devel
libxdg-basedir-devel libnotify-devel"
short_desc="Lightweight and customizable notification daemon"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
#changelog="https://raw.githubusercontent.com/dunst-project/dunst/master/CHANGELOG.md"
homepage="https://dunst-project.org"
diff --git a/srcpkgs/fcgiwrap/template b/srcpkgs/fcgiwrap/template
index 924f163769e..de3f7b0b170 100644
--- a/srcpkgs/fcgiwrap/template
+++ b/srcpkgs/fcgiwrap/template
@@ -8,7 +8,7 @@ configure_args="--prefix=/ --sbindir=/usr/bin"
hostmakedepends="automake libtool pkg-config"
makedepends="fcgi-devel"
short_desc="Simple server for running CGI applications over FastCGI"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/gnosek/fcgiwrap"
distfiles="https://github.com/gnosek/${pkgname}/archive/${version}.tar.gz"
diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index a119e408456..e164f737b4d 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -8,7 +8,7 @@ revision=1
wrksrc="firefox-${version}"
build_helper="rust"
short_desc="Mozilla Firefox web browser - Extended Support Release (ESR)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+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"
diff --git a/srcpkgs/git-cal/template b/srcpkgs/git-cal/template
index 1e4c4299b59..e05b6da5964 100644
--- a/srcpkgs/git-cal/template
+++ b/srcpkgs/git-cal/template
@@ -8,7 +8,7 @@ hostmakedepends="perl"
makedepends="$hostmakedepends"
depends="perl"
short_desc="GitHub like contributions calendar on terminal"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/k4rthik/${pkgname}"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/git-extras/template b/srcpkgs/git-extras/template
index 178b4215fdc..657cbae2ff4 100644
--- a/srcpkgs/git-extras/template
+++ b/srcpkgs/git-extras/template
@@ -7,7 +7,7 @@ build_style=gnu-makefile
hostmakedepends="util-linux"
depends="bash git"
short_desc="Little git extras"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/tj/git-extras"
distfiles="https://github.com/tj/git-extras/archive/${version}.tar.gz"
diff --git a/srcpkgs/h2o/template b/srcpkgs/h2o/template
index 93b3281be50..67ccf98b5cf 100644
--- a/srcpkgs/h2o/template
+++ b/srcpkgs/h2o/template
@@ -8,7 +8,7 @@ hostmakedepends="pkg-config"
makedepends="libressl-devel libuv-devel zlib-devel"
depends="perl"
short_desc="Optimized HTTP server with support for HTTP/1.x and HTTP/2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://h2o.examp1e.net/"
distfiles="https://github.com/h2o/h2o/archive/v${version}.tar.gz"
diff --git a/srcpkgs/haproxy/template b/srcpkgs/haproxy/template
index 5abb01f7d77..28dd7412c79 100644
--- a/srcpkgs/haproxy/template
+++ b/srcpkgs/haproxy/template
@@ -8,7 +8,7 @@ make_build_args="TARGET=linux-glibc USE_PCRE=1 USE_PCRE_JIT=1 USE_ZLIB=1
make_install_args="SBINDIR=${DESTDIR}/usr/bin DOCDIR=${DESTDIR}/usr/share/doc/${pkgname}"
makedepends="libatomic-devel libressl-devel lua-devel pcre-devel"
short_desc="Reliable, high performance TCP/HTTP load balancer"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://www.haproxy.org"
distfiles="${homepage}/download/${version%.*}/src/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/i3blocks/template b/srcpkgs/i3blocks/template
index a2156cbb67b..bbd5ac987ca 100644
--- a/srcpkgs/i3blocks/template
+++ b/srcpkgs/i3blocks/template
@@ -7,7 +7,7 @@ make_build_args="SYSCONFDIR=/etc"
hostmakedepends="autoconf automake pkg-config"
makedepends="bash-completion"
short_desc="Flexible scheduler for i3bar"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/vivien/i3blocks"
distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/jemalloc/template b/srcpkgs/jemalloc/template
index aba5e005696..eb7efd5dfd7 100644
--- a/srcpkgs/jemalloc/template
+++ b/srcpkgs/jemalloc/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-configure
configure_args="je_cv_static_page_shift=12"
short_desc="General-purpose scalable concurrent malloc(3) implementation"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-2-Clause"
homepage="http://jemalloc.net/"
#changelog="https://raw.githubusercontent.com/jemalloc/jemalloc/master/ChangeLog"
diff --git a/srcpkgs/jp2a/template b/srcpkgs/jp2a/template
index 78264190754..dc7d1b2ebb8 100644
--- a/srcpkgs/jp2a/template
+++ b/srcpkgs/jp2a/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
hostmakedepends="automake"
makedepends="libjpeg-turbo-devel libcurl-devel"
short_desc="JPEG image to ASCII art converter"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only"
homepage="https://github.com/cslarsen/jp2a"
distfiles="https://github.com/cslarsen/jp2a/archive/v${version}.tar.gz"
diff --git a/srcpkgs/libksba/template b/srcpkgs/libksba/template
index 87b915c8eb3..28ce63418e7 100644
--- a/srcpkgs/libksba/template
+++ b/srcpkgs/libksba/template
@@ -5,7 +5,7 @@ revision=2
build_style=gnu-configure
makedepends="libgpg-error-devel"
short_desc="A CMS and X.509 access library"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-3"
homepage="https://www.gnupg.org/related_software/libksba/index.html"
distfiles="https://gnupg.org/ftp/gcrypt/${pkgname}/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/libtorrent-rasterbar/template b/srcpkgs/libtorrent-rasterbar/template
index 88c56d84aa4..2adb67e322c 100644
--- a/srcpkgs/libtorrent-rasterbar/template
+++ b/srcpkgs/libtorrent-rasterbar/template
@@ -9,7 +9,7 @@ configure_args="--enable-examples --enable-python-binding
hostmakedepends="automake pkg-config intltool libtool python3-devel"
makedepends="libressl-devel boost-devel geoip-devel python3-devel"
short_desc="C++ bittorrent library by Rasterbar Software"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://libtorrent.org/"
distfiles="https://github.com/arvidn/libtorrent/releases/download/libtorrent-${version//./_}/libtorrent-rasterbar-${version}.tar.gz"
diff --git a/srcpkgs/mdp/template b/srcpkgs/mdp/template
index 6154413256b..3720bfae02f 100644
--- a/srcpkgs/mdp/template
+++ b/srcpkgs/mdp/template
@@ -5,7 +5,7 @@ revision=1
build_style=gnu-makefile
makedepends="ncurses-devel"
short_desc="A command-line based markdown presentation tool"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/visit1985/mdp"
distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/miniflux/template b/srcpkgs/miniflux/template
index 7f724039681..852f7c07441 100644
--- a/srcpkgs/miniflux/template
+++ b/srcpkgs/miniflux/template
@@ -8,7 +8,7 @@ go_package="miniflux.app"
hostmakedepends="git"
depends="postgresql"
short_desc="Minimalist and opinionated feed reader written in Go"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="Apache-2.0"
homepage="https://miniflux.app"
changelog="https://raw.githubusercontent.com/miniflux/miniflux/${version}/ChangeLog"
diff --git a/srcpkgs/obnam/template b/srcpkgs/obnam/template
index 5ff8bb65e9b..c65f9569ee8 100644
--- a/srcpkgs/obnam/template
+++ b/srcpkgs/obnam/template
@@ -8,7 +8,7 @@ makedepends="python-devel python-cliapp python-larch python-paramiko
python-tracing"
depends="python python-larch python-paramiko python-fuse python-yaml"
short_desc="Backup program that supports encryption and deduplication"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://obnam.org"
distfiles="http://code.liw.fi/debian/pool/main/o/${pkgname}/${pkgname}_${version}.orig.tar.xz"
diff --git a/srcpkgs/odo/template b/srcpkgs/odo/template
index 75a2b90e752..6945f9ae028 100644
--- a/srcpkgs/odo/template
+++ b/srcpkgs/odo/template
@@ -3,7 +3,7 @@ pkgname=odo
version=0.2.2
revision=3
short_desc="An atomic odometer for the command line"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://github.com/atomicobject/odo"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/openconnect/template b/srcpkgs/openconnect/template
index 35f274ed9f8..9f2a8288a76 100644
--- a/srcpkgs/openconnect/template
+++ b/srcpkgs/openconnect/template
@@ -9,7 +9,7 @@ makedepends="gnutls-devel libxml2-devel zlib-devel liblz4-devel
libproxy-devel mit-krb5-devel pcsclite-devel"
depends="vpnc-scripts"
short_desc="Free client for Cisco AnyConnect SSL VPN software"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-only"
homepage="http://www.infradead.org/openconnect/"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/pass/template b/srcpkgs/pass/template
index f1443d01fa1..a454f932b02 100644
--- a/srcpkgs/pass/template
+++ b/srcpkgs/pass/template
@@ -10,7 +10,7 @@ make_check_target=test
depends="bash gnupg2 tree"
checkdepends="${depends} git"
short_desc="Stores, retrieves, generates, and synchronizes passwords securely"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://www.passwordstore.org"
distfiles="https://git.zx2c4.com/password-store/snapshot/password-store-${version}.tar.xz"
diff --git a/srcpkgs/physlock/template b/srcpkgs/physlock/template
index 03f9a82a9db..0f091d24444 100644
--- a/srcpkgs/physlock/template
+++ b/srcpkgs/physlock/template
@@ -6,7 +6,7 @@ build_style=gnu-makefile
make_use_env=yes
makedepends="pam-devel"
short_desc="Lightweight linux console locking tool"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="https://github.com/muennich/physlock"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/pockyt/template b/srcpkgs/pockyt/template
index ff12361d443..eee3691d959 100644
--- a/srcpkgs/pockyt/template
+++ b/srcpkgs/pockyt/template
@@ -8,7 +8,7 @@ hostmakedepends="python3-setuptools"
depends="python3-setuptools python3-parse"
pycompile_module="$pkgname"
short_desc="Automate and manage your pocket collection"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/arvindch/pockyt"
distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/privoxy/template b/srcpkgs/privoxy/template
index 22aba79c339..7422d441250 100644
--- a/srcpkgs/privoxy/template
+++ b/srcpkgs/privoxy/template
@@ -17,7 +17,7 @@ conf_files="
hostmakedepends="autoconf"
makedepends="pcre-devel zlib-devel"
short_desc="Non-caching web proxy with advanced filtering capabilities"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.privoxy.org/"
distfiles="${SOURCEFORGE_SITE}/ijbswa/${pkgname}-${version}-stable-src.tar.gz"
diff --git a/srcpkgs/python-Django/template b/srcpkgs/python-Django/template
index c9560b379ac..6549f5c0fae 100644
--- a/srcpkgs/python-Django/template
+++ b/srcpkgs/python-Django/template
@@ -8,7 +8,7 @@ build_style=python2-module
hostmakedepends="python-setuptools"
depends="python-pytz python-setuptools"
short_desc="High-level Python2 Web framework"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.djangoproject.com/"
distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
diff --git a/srcpkgs/python-Flask-Assets/template b/srcpkgs/python-Flask-Assets/template
index eb81201396b..3ca0de18077 100644
--- a/srcpkgs/python-Flask-Assets/template
+++ b/srcpkgs/python-Flask-Assets/template
@@ -9,7 +9,7 @@ pycompile_module="flask_assets.py"
hostmakedepends="python-setuptools python3-setuptools"
depends="python-Flask python-webassets"
short_desc="Asset management for Flask (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="2-clause-BSD"
homepage="https://github.com/miracle2k/flask-assets"
distfiles="${PYPI_SITE}/F/Flask-Assets/Flask-Assets-${version}.tar.gz"
diff --git a/srcpkgs/python-Flask-OAuthlib/template b/srcpkgs/python-Flask-OAuthlib/template
index 958f05a836c..edf5c13560e 100644
--- a/srcpkgs/python-Flask-OAuthlib/template
+++ b/srcpkgs/python-Flask-OAuthlib/template
@@ -9,7 +9,7 @@ pycompile_module="flask_oauthlib"
hostmakedepends="python-setuptools python3-setuptools"
depends="python-Flask python-requests-oauthlib"
short_desc="OAuthlib for Flask (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/lepture/flask-oauthlib"
distfiles="${PYPI_SITE}/F/Flask-OAuthlib/Flask-OAuthlib-${version}.tar.gz"
diff --git a/srcpkgs/python-Flask-Script/template b/srcpkgs/python-Flask-Script/template
index 41312eae57f..ebac828a5b1 100644
--- a/srcpkgs/python-Flask-Script/template
+++ b/srcpkgs/python-Flask-Script/template
@@ -9,7 +9,7 @@ pycompile_module="flask_script"
hostmakedepends="python-setuptools python3-setuptools"
depends="python-Flask"
short_desc="Scripting support for Flask (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD"
homepage="https://github.com/smurfix/flask-script"
distfiles="${PYPI_SITE}/F/Flask-Script/Flask-Script-${version}.tar.gz"
diff --git a/srcpkgs/python-Flask-WTF/template b/srcpkgs/python-Flask-WTF/template
index 01dfa20e6cf..f72307f79be 100644
--- a/srcpkgs/python-Flask-WTF/template
+++ b/srcpkgs/python-Flask-WTF/template
@@ -8,7 +8,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python-Flask python-WTForms"
short_desc="Simple integration of Flask and WTForms (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/lepture/flask-wtf"
distfiles="${PYPI_SITE}/F/Flask-WTF/Flask-WTF-${version}.tar.gz"
diff --git a/srcpkgs/python-WTForms/template b/srcpkgs/python-WTForms/template
index 98dff7d092f..33f16940cb8 100644
--- a/srcpkgs/python-WTForms/template
+++ b/srcpkgs/python-WTForms/template
@@ -9,7 +9,7 @@ pycompile_module="wtforms"
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
short_desc="Forms validation and rendering library for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="http://wtforms.simplecodes.com/"
#changelog="https://raw.githubusercontent.com/wtforms/wtforms/master/CHANGES.rst"
diff --git a/srcpkgs/python-cliapp/template b/srcpkgs/python-cliapp/template
index 0a4472b8734..fd2c8cc4d13 100644
--- a/srcpkgs/python-cliapp/template
+++ b/srcpkgs/python-cliapp/template
@@ -8,7 +8,7 @@ pycompile_module="cliapp"
hostmakedepends="python-setuptools python-yaml"
depends="python-yaml"
short_desc="Framework for Unix-like command line programs for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://liw.fi/cliapp/"
license="GPL-2"
distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz"
diff --git a/srcpkgs/python-fuse/template b/srcpkgs/python-fuse/template
index 2e99e9866d3..c273933fa7e 100644
--- a/srcpkgs/python-fuse/template
+++ b/srcpkgs/python-fuse/template
@@ -7,7 +7,7 @@ pycompile_module="fuseparts fuse.py"
hostmakedepends="pkg-config python-setuptools python3-setuptools"
makedepends="fuse-devel python-devel python3-devel"
short_desc="FUSE bindings for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://github.com/libfuse/python-fuse"
distfiles="https://github.com/libfuse/python-fuse/archive/v${version}.tar.gz"
diff --git a/srcpkgs/python-futures/template b/srcpkgs/python-futures/template
index cef5393ea1e..12d1f4ae71f 100644
--- a/srcpkgs/python-futures/template
+++ b/srcpkgs/python-futures/template
@@ -9,7 +9,7 @@ pycompile_module="concurrent"
hostmakedepends="python-setuptools"
depends="python"
short_desc="Backport of the concurrent.futures package from Python 3.2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="PSF"
homepage="https://github.com/agronholm/pythonfutures"
distfiles="${PYPI_SITE}/f/futures/futures-${version}.tar.gz"
diff --git a/srcpkgs/python-hiredis/template b/srcpkgs/python-hiredis/template
index 82a97d5eaf3..41fa3cfdace 100644
--- a/srcpkgs/python-hiredis/template
+++ b/srcpkgs/python-hiredis/template
@@ -8,7 +8,7 @@ hostmakedepends="python-devel python3-devel"
makedepends="python-devel python3-devel hiredis-devel"
pycompile_module="hiredis"
short_desc="Python2 wrapper for hiredis"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD"
homepage="https://github.com/redis/hiredis-py"
distfiles="${PYPI_SITE}/h/hiredis/hiredis-${version}.tar.gz"
diff --git a/srcpkgs/python-hoedown/template b/srcpkgs/python-hoedown/template
index 4b82aba9afc..a7635f6bf1b 100644
--- a/srcpkgs/python-hoedown/template
+++ b/srcpkgs/python-hoedown/template
@@ -7,7 +7,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
makedepends="python-devel python3-devel"
short_desc="Python2 binding for hoedown, a markdown parsing library"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
homepage="https://github.com/hhatto/python-hoedown"
license="MIT"
distfiles="${PYPI_SITE}/h/hoedown/hoedown-${version}.tar.gz"
diff --git a/srcpkgs/python-larch/template b/srcpkgs/python-larch/template
index 462c5e86b75..7b9fb4a1e5e 100644
--- a/srcpkgs/python-larch/template
+++ b/srcpkgs/python-larch/template
@@ -9,7 +9,7 @@ makedepends="python-devel python-tracing"
depends="python-tracing python-cliapp python-ttystatus"
pycompile_module="larch"
short_desc="Copy-on-write B-tree data structure for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://liw.fi/larch/"
license="GPL-3"
distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz"
diff --git a/srcpkgs/python-parse/template b/srcpkgs/python-parse/template
index ded581b4420..9ccdc26d51e 100644
--- a/srcpkgs/python-parse/template
+++ b/srcpkgs/python-parse/template
@@ -9,7 +9,7 @@ pycompile_module="parse.py"
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
short_desc="Parse strings using the format() syntax (Python2)"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/r1chardj0n3s/parse"
distfiles="${PYPI_SITE}/p/parse/parse-${version}.tar.gz"
diff --git a/srcpkgs/python-pyPEG2/template b/srcpkgs/python-pyPEG2/template
index 6ba175687f1..e9a10e88c15 100644
--- a/srcpkgs/python-pyPEG2/template
+++ b/srcpkgs/python-pyPEG2/template
@@ -10,7 +10,7 @@ makedepends="python-devel python3-devel"
depends="python-lxml"
pycompile_module="pypeg2"
short_desc="An intrinsic PEG Parser-Interpreter for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2"
homepage="http://fdik.org/pyPEG/"
distfiles="${PYPI_SITE}/p/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
diff --git a/srcpkgs/python-redis/template b/srcpkgs/python-redis/template
index 8285aa577ee..194d682dc32 100644
--- a/srcpkgs/python-redis/template
+++ b/srcpkgs/python-redis/template
@@ -8,7 +8,7 @@ build_style=python-module
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
short_desc="Python2 client for Redis key-value store"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/andymccurdy/redis-py"
distfiles="${PYPI_SITE}/r/redis/redis-${version}.tar.gz"
diff --git a/srcpkgs/python-tracing/template b/srcpkgs/python-tracing/template
index 308d4bb33b3..4408f31be9f 100644
--- a/srcpkgs/python-tracing/template
+++ b/srcpkgs/python-tracing/template
@@ -10,7 +10,7 @@ hostmakedepends="python-setuptools"
makedepends="python-devel"
depends="python"
short_desc="Debug log/trace messages for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://liw.fi/tracing/"
distfiles="http://git.liw.fi/python-tracing/snapshot/python-tracing-tracing-${version}.tar.gz"
diff --git a/srcpkgs/python-ttystatus/template b/srcpkgs/python-ttystatus/template
index 43e87ddcdf0..2df1a81c9be 100644
--- a/srcpkgs/python-ttystatus/template
+++ b/srcpkgs/python-ttystatus/template
@@ -8,7 +8,7 @@ pycompile_module="ttystatus"
hostmakedepends="python-setuptools python3-setuptools"
depends="python"
short_desc="Terminal progress bar and status output for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
homepage="http://liw.fi/ttystatus/"
license="GPL-3"
distfiles="http://code.liw.fi/debian/pool/main/p/${pkgname}/${pkgname}_${version}.orig.tar.xz"
diff --git a/srcpkgs/python-txgithub/template b/srcpkgs/python-txgithub/template
index 4cc9c73bbdd..e33466d59e3 100644
--- a/srcpkgs/python-txgithub/template
+++ b/srcpkgs/python-txgithub/template
@@ -9,7 +9,7 @@ pycompile_module="txgithub"
hostmakedepends="python-setuptools"
depends="python-Twisted python-openssl"
short_desc="GitHub API client implemented using Twisted"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/tomprince/txgithub"
distfiles="${PYPI_SITE}/t/${pkgname#*-}/${pkgname#*-}-${version}.tar.gz"
diff --git a/srcpkgs/python-urlnorm/template b/srcpkgs/python-urlnorm/template
index e56ecda627f..ae488dc3179 100644
--- a/srcpkgs/python-urlnorm/template
+++ b/srcpkgs/python-urlnorm/template
@@ -9,7 +9,7 @@ pycompile_module="urlnorm"
hostmakedepends="python-setuptools"
depends="python"
short_desc="Python2 module for normalizing URLs"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/jehiah/urlnorm"
distfiles="${PYPI_SITE}/u/urlnorm/urlnorm-${version}.tar.gz"
diff --git a/srcpkgs/python-webassets/template b/srcpkgs/python-webassets/template
index 789be9684f7..7ed3cfd1b4c 100644
--- a/srcpkgs/python-webassets/template
+++ b/srcpkgs/python-webassets/template
@@ -9,7 +9,7 @@ pycompile_module="webassets"
hostmakedepends="python-setuptools python3-setuptools"
depends="python-setuptools"
short_desc="Media asset management for Python2"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="2-clause-BSD"
homepage="https://github.com/miracle2k/webassets/"
distfiles="${PYPI_SITE}/w/webassets/webassets-${version}.tar.gz"
diff --git a/srcpkgs/python3-Django/template b/srcpkgs/python3-Django/template
index 0aa04c0821d..afb20774523 100644
--- a/srcpkgs/python3-Django/template
+++ b/srcpkgs/python3-Django/template
@@ -8,7 +8,7 @@ build_style=python3-module
hostmakedepends="python3-setuptools"
depends="python3-pytz python3-setuptools"
short_desc="High-level Python3 Web framework"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.djangoproject.com/"
distfiles="${PYPI_SITE}/D/Django/Django-${version}.tar.gz"
diff --git a/srcpkgs/qutebrowser/template b/srcpkgs/qutebrowser/template
index 6fb45c23882..0980c280e74 100644
--- a/srcpkgs/qutebrowser/template
+++ b/srcpkgs/qutebrowser/template
@@ -9,7 +9,7 @@ depends="python3-PyQt5-quick python3-Jinja2 python3-Pygments python3-pyPEG2
python3-yaml python3-attrs python3-PyQt5-opengl python3-PyQt5-sql
qt5-plugin-sqlite"
short_desc="Keyboard-focused browser with a minimal GUI"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://qutebrowser.org/"
changelog="https://raw.githubusercontent.com/qutebrowser/qutebrowser/master/doc/changelog.asciidoc"
diff --git a/srcpkgs/screenFetch/template b/srcpkgs/screenFetch/template
index 06a84f9301f..4a3d5a9dcaa 100644
--- a/srcpkgs/screenFetch/template
+++ b/srcpkgs/screenFetch/template
@@ -5,7 +5,7 @@ revision=1
archs=noarch
depends="bash bc xdpyinfo"
short_desc="Bash screenshot information tool"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/KittyKatt/screenFetch"
distfiles="${homepage}/archive/v${version}.tar.gz"
diff --git a/srcpkgs/spawn-fcgi/template b/srcpkgs/spawn-fcgi/template
index b218182f9b8..2702256ef50 100644
--- a/srcpkgs/spawn-fcgi/template
+++ b/srcpkgs/spawn-fcgi/template
@@ -4,7 +4,7 @@ version=1.6.4
revision=3
build_style=gnu-configure
short_desc="Spawn FastCGI applications"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD"
homepage="http://redmine.lighttpd.net/projects/spawn-fcgi/"
distfiles="http://www.lighttpd.net/download/${pkgname}-${version}.tar.bz2"
diff --git a/srcpkgs/tudu/template b/srcpkgs/tudu/template
index 0786cb1d095..2d9b744a4f3 100644
--- a/srcpkgs/tudu/template
+++ b/srcpkgs/tudu/template
@@ -6,7 +6,7 @@ build_style=gnu-configure
conf_files="/etc/tudurc"
makedepends="ncurses-devel"
short_desc="Ncurses-based tool to manage hierarchical todos"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://code.meskio.net/tudu/"
distfiles="http://code.meskio.net/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/urlwatch/template b/srcpkgs/urlwatch/template
index 1166fe101a7..ee56c05689f 100644
--- a/srcpkgs/urlwatch/template
+++ b/srcpkgs/urlwatch/template
@@ -10,7 +10,7 @@ depends="python3-appdirs python3-keyring python3-minidb python3-requests
python3-yaml python3-lxml python3-cssselect"
checkdepends="python3-nose ${depends} python3-pycodestyle"
short_desc="Tool for monitoring webpages for updates"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://thp.io/2008/urlwatch/"
distfiles="${PYPI_SITE}/u/urlwatch/urlwatch-${version}.tar.gz"
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index e283d6bc357..2ad7432dae7 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -5,7 +5,7 @@ revision=2
hostmakedepends="python python3"
makedepends="python-devel python3-devel"
short_desc="Fast, self-healing application container server"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://projects.unbit.it/uwsgi"
distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
diff --git a/srcpkgs/vimb/template b/srcpkgs/vimb/template
index c5a03e858b5..e2fa0127301 100644
--- a/srcpkgs/vimb/template
+++ b/srcpkgs/vimb/template
@@ -8,7 +8,7 @@ make_use_env=yes
hostmakedepends="pkg-config"
makedepends="webkit2gtk-devel libglib-devel"
short_desc="Fast and lightweight web browser based on WebKit/GTK+"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://fanglingsu.github.io/vimb/"
changelog="https://raw.githubusercontent.com/fanglingsu/vimb/master/CHANGELOG.md"
diff --git a/srcpkgs/void-updates/template b/srcpkgs/void-updates/template
index de060e72a8d..97236f068c8 100644
--- a/srcpkgs/void-updates/template
+++ b/srcpkgs/void-updates/template
@@ -6,7 +6,7 @@ archs=noarch
build_style=gnu-makefile
depends="git curl"
short_desc="Void Linux package updates"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://github.com/void-linux/void-updates"
distfiles="${homepage}/archive/${version}.tar.gz"
diff --git a/srcpkgs/vpnc-scripts/template b/srcpkgs/vpnc-scripts/template
index c912bdec848..811bd9a3d95 100644
--- a/srcpkgs/vpnc-scripts/template
+++ b/srcpkgs/vpnc-scripts/template
@@ -4,7 +4,7 @@ version=20190611
revision=1
archs=noarch
short_desc="Network configuration scripts for VPNC and OpenConnect"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-or-later"
homepage="http://www.infradead.org/openconnect/vpnc-script.html"
distfiles="ftp://ftp.infradead.org/pub/${pkgname}/${pkgname}-${version}.tar.gz"
diff --git a/srcpkgs/zsh-syntax-highlighting/template b/srcpkgs/zsh-syntax-highlighting/template
index 3304e78720d..66b89fedfc8 100644
--- a/srcpkgs/zsh-syntax-highlighting/template
+++ b/srcpkgs/zsh-syntax-highlighting/template
@@ -5,7 +5,7 @@ revision=1
archs=noarch
depends="zsh"
short_desc="Fish shell like syntax highlighting for Zsh"
-maintainer="Eivind Uggedal <eivind@uggedal.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://github.com/zsh-users/zsh-syntax-highlighting"
changelog="https://raw.githubusercontent.com/zsh-users/zsh-syntax-highlighting/master/changelog.md"
From 3b813540812e611cf87e68217ab2b880640a3f4f Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Tue, 26 May 2020 21:45:23 +0200
Subject: [PATCH 93/94] firefox: update to 76.0.1.
---
srcpkgs/firefox/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 3f052fac9fe..d000f9e3c2c 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=76.0
-revision=2
+version=76.0.1
+revision=1
build_helper="rust"
short_desc="Mozilla Firefox web browser"
maintainer="Johannes <johannes.brechtmann@gmail.com>"
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=3b7b97b0b0625fc6ec23ee28d425988c679d3a56f362d62fd3b225a5d50afdc8
+checksum=f61761e32774a6bdfedd5937c4992fbe5e24c3df057c2b9a559fcd0d038777c3
lib32disabled=yes
From 50a59f15349b2672329e1976978e8c315524f628 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 27 May 2020 15:32:04 +0200
Subject: [PATCH 94/94] firefox-i18n: update to 76.0.1.
---
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 11be604eaf5..6c982eabe36 100644
--- a/srcpkgs/firefox-i18n/template
+++ b/srcpkgs/firefox-i18n/template
@@ -1,6 +1,6 @@
# Template file for 'firefox-i18n'
pkgname=firefox-i18n
-version=76.0
+version=76.0.1
revision=1
build_style=meta
short_desc="Firefox language packs"
@@ -138,99 +138,99 @@ _pkgtmpl() {
}
}
-checksum="30383d8176796196a86524152afc722ad991c79920051b2e6f8f9ece7816c12b
- a0301a9fe77f662ce73d22a829f0275531a083e1402f3fe6a0c7de63e863f8c9
- 0f30a5340bb1d4c96074dd096b9528342a526f98cc2bfe9aacb400f892b5a7c5
- 27717698189dec4de7e9cccbb8419f454e8c95af9a6c122c39f7b4534fb5c137
- f06652419752c172da3336ccdc5711d375c8ea897b8ff47e7e33c23e9e6ce5ee
- 27f2d6eba33e499bea906a13f56dba6607e80393736ee44002ed46b207037b1b
- cd498048e6d664cb2eb91288911d9c7c5ac4ba39e30934bf7bff280cb47eb58d
- 6dbe2e39ffadb2c0b30027cb87202999ed85844277857ca16bf7351bfbc05216
- 858d031986a70306528abe43441ac8099bed7c51b3e2d7f368114c21399648d8
- bc7ff15f556e3f27d7b9f4b0c74dc21726d2732d0fd3d8b4edd3556b49e88a51
- 4cf3d29fd66313418d85768e3595cd9ed11cd656e0e2377bb133d42e8914b12a
- d002fc212109ed35e5c25711ff5b7f0cfea276d39ff0171fdf1e588a9cb6b636
- 53ed8fcdbdd592e628612f2919d61beacb6bbccaa2617887f311109ae8a21268
- 6f5f395171147a98e6682d9103718823ac94bed56b0ecd0a8b361bb489c1957f
- 850b843cfc902b49fab32e738b5fd2c77fa3470e65fe2eece4e08cb8e7b43e53
- f5ad302b3a6715af60ababbbdaeef0c6d5d90f0c5965dc7beabc759d0e4bd16c
- 59842522b90ea71392f5e14dcefebded552c8d56cd438c1de88b7657d5b6321e
- e2ea96f3f7f5aaf1fc79fccc72e33052825a14ca08b6714c7179ff1328c3fe01
- 323ad45e73b1c2b35d741bb89a9b55b2b628d93bc5b4a19d753f4b84230b5df0
- a74df500a6dfddc153e47871c83a493fd257c0e4e9aa7bc2591dbfd47ea552fc
- 3f789b59656d8fa1b6c3c4cfeda405c0d0a4cf0674c456c35dbffeba5eb2965f
- 7b6e9c55d463b268c27b544969313243574f5573e68dda8cbf18c40d817dbcae
- 5969d906d76f661993bc34f3403b56b2684c9966fb22990940e8e1f3d27123d8
- b233979b18aa00bce8a3f0720f1719f1a8fd018b77139fb7d611e274a844b715
- bfae78c215cdf6f2222882ff19fac5f937e2b38b26bb988f2e7492e07799bbd1
- ce5d225b68915358a41ea571c282a0359e4067468fe4346b62d52461c203051f
- 14360a189431a2f3f0f940d94efe8c3ca6854464a6ccd131a58db79be8ededb0
- 08f0ae790d385518a87ea4e0686561b34e1335ac782ca6c4eccfc336dbe8c274
- 99fb1388aef301a2bafa85f5c34f198e584fac65b75786c3f581fac0c4a7b8e2
- 8705116472a878c16bcdb6334a506e4b2c3c7c2d56b98ceea1694fd8a7d66976
- ecf927de1cb1f1b97a7294fc06a715074cba9722662aa6f278ab2000e44eb5c8
- 692797fbd50772000093ca6d23c56b52f94dd87cd2bbc862bf5f8f35abffd213
- 5c0f4b0c72805e2d5ab376428808d028adf9ce0cda4c5ffd487a9945870f18a4
- 9af843a4db68745f2249d32b506ca6de9f0920eb8cec87b80f2f76b9727de0d2
- 60d33390119220f932b04ef5c844cec42096310c839a004d21370561471230bd
- bcd200afcdadc0d477023287feb448718c5a2e5feb0a316ed65b7dd0e611e600
- ad65c239e085b96e2788e68fd68840300743aa3d0f79d0707df825b3246bc057
- d69841cb18ef217040e65aabbaef3df85f8b944c851f2ae3eb876ca99773e3c0
- f8580b23b1d964de12338796f24bd68573bba8c1438ae6a4460437c6fac7c6a5
- 9c07139c32d0b372a3ff2dde34ddc6b9a96a25eac4482aac4f6f2f39dba738c0
- d9b08ec2c79c242a59349d88b1bde5dd61efd15f81074fe8361205779112227e
- d7f3a69dc4e869b436b1ce914765cd4f280bcb932dea0ead54e60477fddc9d8d
- 72a505da3a461451c19bbbd8f347ab263f8be30a8f39808b409a60e7a4552bf3
- b6c53e7c418b0e9a62751283e6b3a974d3adc298b821ed7358cbe447017b11d8
- 41b5663a47b73f4235e3ecd18f769d7b8003304570e9e3f52bfff255200fa074
- e8b04851430d0507601ea269098288b550331229902e52d49a19180ded459781
- 079037fa4af80177dff0a0f6be78abfd3112f8d8d9ac58756e33dea8db787d12
- e77208f1de2d328524a12a2958774eb870355591345102fa87eacb208e4fdbb2
- f62b5decec8cd3df8175f6b467eae4fc656ebd41bc828c446df538f771a32d4c
- 8c650d192180bfa6e475fe4bdeeb49583e0243097d23f541561249df991cbbe4
- 66097e1f10d6a440b107e99351594b2504bfd7a480765c3e1af68d028374d176
- dff42494081a726468944484fce10328c8dc9e4335c81c4bc8c94acc73867577
- 970b05bb662112c371d408d55af4e90ad53f6f832b416978784d2455931f3787
- f6eec89f4e979383c7b0633fed3775f716395a906d253f18ed9b1d404d54b4f1
- 4a1b3e6f0bf07cefc2959769ffbdddc4956044e310e0c7741a7517e347117bb1
- b9d568d510b5c672aa5b989a2d0406049c61b42958bcf3acebcd68f965a7b7d7
- 518cdac69929a7e635d37d2fca16308c8d6352c34ad2134464ee91f37612369b
- 1e9360d70a067ecdd5ea03d5117fdffade6e9bc989602e2dc5b5fd311a74351e
- af6efa809ec098507c13e4cd7c299194243a364e0f04f4eab6ddd6e7e0017bdc
- 1455d5c873cfb269de2e54c852d4f95b4126c68c63d7e31fd5bba2db0d321374
- 178a1d74a7271f3aa658992ab418906bd85a2fd0deaaa1d25d1630f160f086b8
- b8f32da32d5984767da0a5ce47644f9d1e2a7ea00230acd0f23c7439fd6497bd
- 39ceadc8d4ab39547a3bb2e9724f4be421f6364f50a54225332321e1d21df08c
- a254cd24b6281ea572fda915e53d0a3eead3c0e2fdb88986d7eb18f3bdf1f43b
- e8619de06ae50605c37b7bd00a37c1cdabe4c8a1e14b6af28e121d11eeaa6328
- 640ee4bec4942d2620f8b692736d6163c9dd668e962db6d957c3e02be38bf7b6
- 38c983360deab94469b7a6c916e833d792329ed2f142c1f961b9ca8461edd3d6
- 78a0f011f49e03ce7936be3681ccb38b649f14a1c2877fc9aff476089506f4b8
- cedf67007ac7df003c95df38af220e410f0e1c7e85c6657ca8ca82124f9d3033
- 94cc0e31e2a51b5039dbdc73c89e1237d4ed0011133af47f5a6807e399f4bafd
- 681a8dd9bb1d26738de7fa3b7ffd8f95cbddcf62d70b9928b7339e39bb3a9522
- 3ab95ac2379585e4b4806381115073b56bc628926e2df93bed8f534ba081b974
- 39b5a8fc7ec07e146d999289462fd852e484c1536a625796f0507c06e1d7e0ae
- 109439463515c2d560606efb3703a025c5f9f4f5fcda2682bc3afe00c71c1a4a
- 00a3a12ccef1b6fd98e3ae291237646d2ee41bd5647c026ecc61ef875eaaa984
- bffd35a90b6b1741f0819e319b2c5a56b926bc61130f909e1bd2811f7f34ca3e
- b9a39156d03b44f144e4c5eb9014cedfaad640666f22a36cf4b25d7cf945c6d2
- c6c24fce2093088b654040cc10057463a51a11f48dae36121922d504e6b528a3
- 0cbe376d998908f140917ab306c9ee5ac296d860dc97d8c940ac1c1cda35d9d3
- cbbddcb2b4b96116ec43ff7614559726d9208f2ec7a3a4ff00949611fe88aa69
- bd277fefec544450d01b2cd0e0ba6fa5359e9ab2a7cc2210ce24b6e363ad9354
- 0a00feb6f54a81d27a0efe3e8214012010f65b51bf1daba8ca264dc96a7f6b94
- 3f8b9c5a3f37086c0ee958c7deffc1bb5dcca78ff5af1d02e555e13b514dd641
- b138e9d6b1f24776b82246448a2b9a1094d73a36b7e3fbea0630112b480edd60
- 891bd83d1c911bac7b6cd68b3bb0ca02177978b7789adf38358788f88a8a7eb8
- be35062c0e2dbdcd29e0fb2d5aad022435f7825828883e3c00ca6288d03afc25
- 44354f49aaece478ac9c73edca330a32103f9fbb611dabaf8175e6835480aeaf
- fe69f36fdba113a1f84c67a11ead0f87d8b2fa08c60369adfe087d4576109758
- 1436b3b645e622448ce57cbc3c6d2188907d3b9c50cf5ce9bea2322a6d8d6a4a
- e24a396e4299518ddef608c26841a5d367bd69820e4cce7facfbcd56bac50918
- 9b80b586ba97529116c692ca072e87a18b8d3209bbfe0f4114918257ab743995
- 825bb640ed385cb57ec5025828854ca7aee2edeb5dd00dfe8994f90b6036c163
- af2278fdcd6767d709170400ebb8c3a4ecb88532f9fab25faa8cf2c6e34283d3
- fbbc190fa77a55dbe696efa4d6080ea166e33b4bc26cf9f32243c72c910ec03f
- 4f27b2b1ccbb892575304e4574e0b0a814878703b8a3a512aa3e2b0b0af5d454
- dbcbd4e531f1507dcb744dd11741a57aa5798c6f0fba62ff4cf7ae6fb3f7cf79"
+checksum="c9f42ca8a99e2897526727e5774a73b3e914cedbe066ec3be5eb01afa23b950b
+ baefa5fc788d60543396ecb95a3b75d638996bf3acafab933013487a82268a8c
+ bdb14508ca85de7fecfbbb1084c678f6044353a6666ba4dd120f4397d74c89f1
+ 19d7c3abdf6c5a946376f9b40eeea1e63fcc289f8069cafaf52a7d8adc4bd292
+ 678ba030218a41666d9ddb4bad02f5f3655ca789d74fd20d2409088eb1cf5367
+ 81007c737ef60ba116b39e0f843f7df4c124c3621ed86d28aa45754642ab8b05
+ 23464fe52fa7bf8322b504041736e95d68b6b78f1c71faa1baaa2a81cdccc1c9
+ b2b85de72729f1e58279e4c297e9c9b1fe086cb01de4de93f3efbfe1963ad3c3
+ 25dd71e6e9329ddcfaf69fce2b2d664cbb984f89348f5d1d92abc50cce482f60
+ d497088e671a203f4a81fe1c60a37061b91f0f4f9c3684969ae241a742dffaca
+ e4abecb4766a98160ebd62b71b5a5dba739d58587d6ef8307202c95eccefb134
+ dd334b5d7943ab09bb9352bf25060aeb6a967282650e9f7cd23122e3a009a9c1
+ 19ffe10b466f8070724b342f1f716e480ec6bbdca46232449ca881b128b71335
+ a736c03dedc29a78567e08bd1d38a46b23b1a18c668f0ec1c955f1ade85c55b6
+ 9381c2c9c041457d31e371f3fddcbb5528d66401e3a17024bfcd010a97cd8d61
+ 9006178c9f85776342857019c6349ffea3595414d7b5ace15106aa54bb41533e
+ 0b2c93c6f51101ecc08bf5473a790cb62d2693f8cb264fd70a5f5da62a8a5262
+ 21f2576762470a1a6ee9f94c2327f6f1b76db8de67016d0e72bc773320667cff
+ a73f6c88eef361000d4f5faccec551b25b3bfaac411f4d9faca213877516f1e8
+ 69cafcc0dee4128633a6019c0655aa58b25dc1efe0c4b3cef945787a354aaa55
+ aede19275efee69565cf33d697a3efdf89e22845bf3d247af9e10769e4aec859
+ 2ff9be3b4efdaf2d7890f38e213cc1d6e5ae7ca353a83a928e0e5b218cd5d126
+ 7ee07952702cb1d5148d3a9d8b2ec2c66a91004f0be1c6d192c7b333dfcb8eb8
+ 72669ef981e7a7ec456d89b700992a2f6c4315a98bc1f3cf91852e73aa5e58f4
+ 28b7bf228e73aa88a2fc6e4eadeeeeb5bcb8bcec32827781185a8087d2a9e0c2
+ d323070764a79365d4dde64af70772ed69bac53571d6956bd4e4950a6fa95838
+ 2c01eb13bf8d99bc9d7ec0a36572c53b0d0866bebc333219262cea09669b7bca
+ d6bcfe15875a1d804c4af7e4f78d91697d08910b976dd8922702ada6fabb9755
+ e13972b41db73f4afd119b951ede88ab1a9ed5a8b2733b87a2fb173c0924c06d
+ 7635d9d1ba412f581efc2a6716ec3f3d40bc0a5da176423f8988cfffd35f7d7d
+ 2ec214502d5b284686eb8f2cf64edf781e1e58a32e74888bf444da03cadf6cc4
+ 8764ac086230360bfad5e8d44b89de8e76cb49beedfa2adfb76d2f1899d0c04a
+ 74afd25a5994c9b887ab2178d18f3dbd2b57e33de574d068c701edbbd4a44856
+ df91b4b867d8969ddb42a4ceb8af8c20a77d1718e140ce0dd98c547dfff89857
+ 2acb8c4daf5dbb726ca80194baa3bae08f24b987e7ef670cb4acec5813132629
+ 891e4b57dc0739f782de718ad8bb3c846eef59c403927457d4cc9551d27cbcaa
+ ccceea4d438a067964b1690c0dad3a90dd67b5d96f229145a528fed6b8971dce
+ 9002093ea6cc87bbb6c5442726a3c5224944f3ddec969c67c14d46bff1f06452
+ cf2bba14c3254f789ae43ac955890821b20cf7dd60e9d58afd9a5b87c41ef159
+ d6126774249de1f6d0e8311523b41a4048ed63d4d994176e4b5d8f0d318690c3
+ a6264627cf14495bd8eb80ad8986fe1c3830eba481177750c6a14404f8311331
+ 354d53826f5c40be9c0eb07a51483b3edc616539581089f0c6b162bfd5459dc4
+ 153a83f82d2f1da9184fcefdc71f81aa24fb9e758af08acd7d9f28efcd9d371f
+ 6ca761c7a729310a4e26af3b0b0c7af0e4cd4c48b2f2010ddf6ad6a1ce5e60cd
+ b2562ec80ab6b72c813fe2183ad4bcaf37dd20ea61e6e12db8327780ef197d5a
+ b6778c84cfa5b595aa1b03b465f11f3c6c59954a4f3e1ffe9b230dc9a2567185
+ 9c075bfb0cf9ae3e2f1dd478b65697c573f0e796e9b3ee7863910abc795a2631
+ 70c802e12e480f16a4c87c7c731ee544a564165929e21cfec071d591aaf8d02c
+ 5ecd8ff4cedc571a3c16230b4137794e0b120aeeff978456fc385bdf43f67e56
+ 36472ac1ddfb970375998a22d343bcf8e71092cddab71fab5212e7cd6d40d2fb
+ 8252b8748a503464e473068708c4fb0c4fece29209c710edb92cf624e87a283a
+ 108f5fb76fd5bb44322af6eeebbc18d732baad50ec3f6134fb0eff85b8a635c5
+ 82961d02118e6ee43ea09dcbee54eb5f3fd45f42e9029f82ccc527f0b409b208
+ a4999ad9f9778a9e2710fe0f3ef82956408ed32a83f1668ad83d4f992bb16c57
+ 2fbed4d62a23a4335bd28f5c69b986a7397c23130486d0d5f786c57e9df7b872
+ 3ebeca7fb2a282a226757d7183867797f943102c51a39e89a3d77f41337404ca
+ 2cce3120a804ad83885f81e13f9017d9235556e96cb796d5d51d9f233cb431ab
+ 4ef61a0e2cb7e930b2946b47c2109b17255641864d40a7c07d57b65fac96e84b
+ bbae8d7d47839cb1f24e0d54831a32d472a2e4951d95a1b33406005f3c9afa37
+ 2fd89891960ae82943e7fe161f8a838d4b444fcae6e0f5ff9ab80b67def4394f
+ af495694dc0cbd2e5834a350e5ad88da7a2d8d2bb505d1c05b8174923c4bb718
+ e16d824e01e5c7979ec1d5f46b0e757551149ec2cff76940f32d1010a99feebc
+ 2a2c71ed0f3e8b5da413f38eadba4f94d4dc22aad9f935bcfa81084b772131b0
+ 26de50cfe720a3f1cc39e79fe26a5bb7941036738e09c1cf30f109213f5eda58
+ 03f0f4d2acf2c625bb7fce8c9ab5971352292428d7422bd68688a0063a111d7a
+ d96f806f05bfc72151b85424cc37d92fbdacf94ac8cadfddbdbdb63efd05cef0
+ 8bcb406e1df9c9245b7fd0ca10fd2a6493a2e111a053accac143c7eb459de9f0
+ 2a85376e9b045d120746a8d2da932277fb6a1459bb1228959ae73b6fe8b1d785
+ d6c7cfd0a84e42b058b7203f5f245fdf665034e51dd0633ecbf2df6baa50a557
+ b93a242e46175688e3af8ce80b37056f4c32f290a669775dbc8d08830f1debab
+ 672e233a8fc3bbea33466d31d397e8a6632eaa198a52be38a7f34b283167bd98
+ bd9365d61efa2a9e28025da0d1673bb2036c54f934e8e5ae6c9898cc002c08c4
+ a6a42ee442a744a55db0d46e4bd6080e4914a13eefacc93dc5a41116ab4658b6
+ 36e38022f26f6fb87525fd047836e28a210f854ee175ee82e6edb6807997fb79
+ 84314c6c34261942387c284c64e6b5959c78235c97b29148f48f20d6a1bae893
+ 2c502da0e262e146be1d02a3ab4ad46eb33286cf4c22f153e6f1622ede8d307f
+ ee982a62413f02ff9a1f997c877dac8d4b6029d28c7b81570ebf1ccbd33b3269
+ def6dd326fb14b7cb922078aaee4109e6ed843ba2fd79a2ea75d05bbd2bd21a4
+ e678ba54b8c4b145d6d8b7f067d57c92432411a483bdfd76cadfd9aaf18422a1
+ f8055a2577e0b5cfd686b24becbdddb5516470c30751df0f3f0a97b1daee3a42
+ dfed60527aee792b22d63b0758d12c5deae49175b8eb1b276f5d44e8ebcf5354
+ 7c2ede7e0952803aeed892618c903b02562500cee3c0f186bb6299a38ff34d78
+ 631ad0cb3481a198536335939f73fb69c86de580ef4c1efe9c0caad9c26ff179
+ 77e1b3872cd3c5868a5941165c578e441c7d9a8cee93941f8c00e90bebdc86d7
+ 48c36954be5dd8b6942a1f3663b80ee8a7936d2a0f0fdff7c66de4dd7c7a4bd6
+ 1666fd97eaf6fa9e78986d178c1d843b0e5be77f7e85b433e40b880d46e83183
+ 187ae4516d8cf4a55bbde89afc4071a4342c98093cd99106605a568be96338bd
+ f13f8141f3e0e4fafbca43e20972ec0ad247a20c4d02329cb7472db6fcdd3930
+ ca6a2438ec334510336ce5cde86a5b2bb29b9fc01948cd4c4b9bc9e0fa670462
+ 350e5901a72929be09dde6695d4b82c001b6df0ab996901052a55087bdcc067c
+ ea80eb4f512138dc6872c9c66edf5e3060489fbaf07f865a5441b458615c5dc6
+ e900003b189869840ee8a05b2ae966a1a0f6d6b3b0139fb620caee1d6efc3924
+ 38fec1a15b8845cec6653d73184990368d2ac972127312b22e2792aa3febb1fd
+ d1118bff22555ec8023dd37726354ee4dfe1c4902a3709a32dc2e723bf441df0
+ 08c1bd59b42bd51a0242f5b521459cdbcdbd729098fe38886bd55a051b1c9f76
+ 39fd39eb8bb7d03b87c42bf2efa91685d2ad3e423aa1b80e24e899a2f3baf954"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: icu: update to 67.1
2020-05-26 20:24 [PR PATCH] icu: update to 67.1 Johnnynator
` (2 preceding siblings ...)
2020-05-27 15:07 ` Johnnynator
@ 2020-05-29 11:21 ` Johnnynator
2020-05-29 11:21 ` [PR PATCH] [Closed]: " Johnnynator
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-29 11:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 195 bytes --]
New comment by Johnnynator on void-packages repository
https://github.com/void-linux/void-packages/pull/22334#issuecomment-635919457
Comment:
Merged in 786205f5f37c0a474d76dc5a7ce95c8262a3ac36
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: icu: update to 67.1
2020-05-26 20:24 [PR PATCH] icu: update to 67.1 Johnnynator
` (3 preceding siblings ...)
2020-05-29 11:21 ` Johnnynator
@ 2020-05-29 11:21 ` Johnnynator
4 siblings, 0 replies; 6+ messages in thread
From: Johnnynator @ 2020-05-29 11:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 153 bytes --]
There's a closed pull request on the void-packages repository
icu: update to 67.1
https://github.com/void-linux/void-packages/pull/22334
Description:
^ 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).