summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-06-11 11:02:26 +0200
committerDenis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>2020-06-11 16:43:01 +0200
commit8caa1ac001b4bb4f6137239c9516119e3b9206f6 (patch)
treebeb671cc68e37530fbc694d3988ff9d7cf0fa499 /libre
parent08de71b1e72e9cd59b43b2cfc607adda36298c5f (diff)
downloadabslibre-8caa1ac001b4bb4f6137239c9516119e3b9206f6.tar.gz
abslibre-8caa1ac001b4bb4f6137239c9516119e3b9206f6.tar.bz2
abslibre-8caa1ac001b4bb4f6137239c9516119e3b9206f6.zip
libre: icu: enable to provide compatibility for multiple versions
This should enable to have more than one compatibility library at the same time. Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre')
-rw-r--r--libre/icu-65-compat/PKGBUILD (renamed from libre/icu-parabola/PKGBUILD)4
-rw-r--r--libre/icu-65-compat/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch (renamed from libre/icu-parabola/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch)0
-rw-r--r--libre/icu-65-compat/icu-65.1-prevent-SEGV_MAPERR-in-append.patch (renamed from libre/icu-parabola/icu-65.1-prevent-SEGV_MAPERR-in-append.patch)0
-rw-r--r--libre/openttd/PKGBUILD2
4 files changed, 4 insertions, 2 deletions
diff --git a/libre/icu-parabola/PKGBUILD b/libre/icu-65-compat/PKGBUILD
index 86ae232d4..edd52b8ef 100644
--- a/libre/icu-parabola/PKGBUILD
+++ b/libre/icu-65-compat/PKGBUILD
@@ -73,7 +73,7 @@
# own, ldconfig will create untracked symlinks which were supposed to be
# installed by the icu package.
-pkgname=icu-parabola
+pkgname=icu-65-compat
_pkgname=icu
pkgver=65.1
pkgrel=3
@@ -90,6 +90,8 @@ depends+=("icu>$pkgver")
conflicts=("icu<=$pkgver")
makedepends=('python')
provides=(libicu{data,i18n,io,test,tu,uc}.so)
+replaces=('icu-parabola')
+conflicts=('icu-parabola')
source=(https://github.com/unicode-org/icu/releases/download/release-${pkgver//./-}/${_pkgname}4c-${pkgver//./_}-src.tgz{,.asc}
icu-65.1-initialized-buffer-uloc_getKeywordValue.patch::https://github.com/unicode-org/icu/commit/fab4c3c719.patch
icu-65.1-prevent-SEGV_MAPERR-in-append.patch::https://github.com/unicode-org/icu/commit/b7d08bc04a.patch)
diff --git a/libre/icu-parabola/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch b/libre/icu-65-compat/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch
index 475921d23..475921d23 100644
--- a/libre/icu-parabola/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch
+++ b/libre/icu-65-compat/icu-65.1-initialized-buffer-uloc_getKeywordValue.patch
diff --git a/libre/icu-parabola/icu-65.1-prevent-SEGV_MAPERR-in-append.patch b/libre/icu-65-compat/icu-65.1-prevent-SEGV_MAPERR-in-append.patch
index 07b3db677..07b3db677 100644
--- a/libre/icu-parabola/icu-65.1-prevent-SEGV_MAPERR-in-append.patch
+++ b/libre/icu-65-compat/icu-65.1-prevent-SEGV_MAPERR-in-append.patch
diff --git a/libre/openttd/PKGBUILD b/libre/openttd/PKGBUILD
index 7a0fa3055..81bd933f7 100644
--- a/libre/openttd/PKGBUILD
+++ b/libre/openttd/PKGBUILD
@@ -7,7 +7,7 @@
# - depends on individual icu libraries to prevent upgrade breakages and
# enable Parabola to provide older icu libraries in a separate package to
# make transition easier for Parabola contributors. See the comments in
-# the icu-parabola PKGBUILD for more details.
+# the icu-*-compat PKGBUILDs for more details.
pkgname=openttd
pkgver=1.9.3