diff options
| author | Ariel Popper | 2021-02-11 10:13:38 -0500 |
|---|---|---|
| committer | Ariel Popper | 2021-02-11 10:13:38 -0500 |
| commit | c7985bb9aa2f26c4fc2caa1762c7add7a88b61fb (patch) | |
| tree | e78f38816da91407d6424e8f1487be165ecf4312 | |
| parent | f345d498891a3a3f2d9543a0bb293e19d5e2e60f (diff) | |
| download | aur-c7985bb9aa2f26c4fc2caa1762c7add7a88b61fb.tar.gz | |
Revert "Fix a build issue introduced with ICU 68."
This reverts commit b8d995d97427db481a685aa2b40cc3d50eaa4c30.
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 5 | ||||
| -rw-r--r-- | postgresql-icu-true.patch | 13 |
3 files changed, 4 insertions, 22 deletions
@@ -1,7 +1,7 @@ pkgbase = postgresql-lts pkgdesc = Sophisticated object-relational DBMS pkgver = 11.10 - pkgrel = 2 + pkgrel = 1 url = https://www.postgresql.org/ arch = x86_64 license = custom:PostgreSQL @@ -22,23 +22,21 @@ pkgbase = postgresql-lts source = https://ftp.postgresql.org/pub/source/v11.10/postgresql-11.10.tar.bz2 source = postgresql-run-socket.patch source = postgresql-perl-rpath.patch - source = postgresql-icu-true.patch source = postgresql-lts.pam source = postgresql-lts.logrotate source = postgresql-lts.service source = postgresql-check-db-dir source = postgresql-lts.sysusers source = postgresql-lts.tmpfiles - sha256sums = 13e6d2f80662fe463bc7718cdf0de6a9ec67fc78afcc7a3ae66b9ea19bb97899 + sha256sums = 35618aa72e0372091f923c42389c6febd07513157b4fbb9408371706afbb6635 sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9 sha256sums = fa7cc63936bce336fedf8ce8d11c8a0e051d6424a10570b991164386e96058cb - sha256sums = 523efab479f77a3d20d4fe3b2957044dc00d83946f8607ea1f6588fcefa7ff71 sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5 sha256sums = 6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e sha256sums = 25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57 sha256sums = 2bbd8c4e51b70223d274fef3a167af096f44af3d3c41ae505ad11c606674e7c5 sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12 - sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57 + sha256sums = 13e6d2f80662fe463bc7718cdf0de6a9ec67fc78afcc7a3ae66b9ea19bb97899 pkgname = postgresql-lts-libs pkgdesc = Libraries for use with PostgreSQL @@ -6,7 +6,7 @@ pkgbase=postgresql-lts pkgname=('postgresql-lts-libs' 'postgresql-lts-docs' 'postgresql-lts') pkgver=11.10 _majorver=${pkgver%.*} -pkgrel=2 +pkgrel=1 pkgdesc='Sophisticated object-relational DBMS' url='https://www.postgresql.org/' arch=('x86_64') @@ -16,7 +16,6 @@ makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1 source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 postgresql-run-socket.patch postgresql-perl-rpath.patch - postgresql-icu-true.patch postgresql-lts.pam postgresql-lts.logrotate postgresql-lts.service @@ -26,7 +25,6 @@ source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.ta sha256sums=('13e6d2f80662fe463bc7718cdf0de6a9ec67fc78afcc7a3ae66b9ea19bb97899' '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9' 'fa7cc63936bce336fedf8ce8d11c8a0e051d6424a10570b991164386e96058cb' - '523efab479f77a3d20d4fe3b2957044dc00d83946f8607ea1f6588fcefa7ff71' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' '6abb842764bbed74ea4a269d24f1e73d1c0b1d8ecd6e2e6fb5fb10590298605e' '25fb140b90345828dc01a4f286345757e700a47178bab03d217a7a5a79105b57' @@ -38,7 +36,6 @@ prepare() { cd postgresql-${pkgver} patch -p1 < ../postgresql-run-socket.patch patch -p1 < ../postgresql-perl-rpath.patch - patch -p1 < ../postgresql-icu-true.patch } build() { diff --git a/postgresql-icu-true.patch b/postgresql-icu-true.patch deleted file mode 100644 index 19a8a16d98e1..000000000000 --- a/postgresql-icu-true.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c -index 8fb51e8c3d..7fd7f0fdf8 100644 ---- a/src/backend/commands/collationcmds.c -+++ b/src/backend/commands/collationcmds.c -@@ -444,7 +444,7 @@ get_icu_language_tag(const char *localename) - UErrorCode status; - - status = U_ZERO_ERROR; -- uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status); -+ uloc_toLanguageTag(localename, buf, sizeof(buf), true, &status); - if (U_FAILURE(status)) - ereport(ERROR, - (errmsg("could not convert locale name \"%s\" to language tag: %s", |