From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] icu: update to 67.1
Date: Wed, 27 May 2020 13:23:46 +0200 [thread overview]
Message-ID: <20200527112346.GVacPZ66x2XodVH_yI6YU_BoMCZkW8Yz9BWRPLcp2is@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-22334@inbox.vuxu.org>
[-- 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
next prev parent reply other threads:[~2020-05-27 11:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-26 20:24 [PR PATCH] " Johnnynator
2020-05-26 20:27 ` [PR PATCH] [Updated] " Johnnynator
2020-05-27 11:23 ` Johnnynator [this message]
2020-05-27 15:07 ` Johnnynator
2020-05-29 11:21 ` Johnnynator
2020-05-29 11:21 ` [PR PATCH] [Closed]: " Johnnynator
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200527112346.GVacPZ66x2XodVH_yI6YU_BoMCZkW8Yz9BWRPLcp2is@z \
--to=johnnynator@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).