[arch-commits] Commit in postgresql-old-upgrade/trunk (PKGBUILD icu68.patch)

[Evangelos Foutras]

    Date: Saturday, December 19, 2020 @ 10:42:23
  Author: foutrelis
Revision: 404607

Fix build with ICU 68 (patch from FreeBSD)

Added:
  postgresql-old-upgrade/trunk/icu68.patch
Modified:
  postgresql-old-upgrade/trunk/PKGBUILD

-------------+
 PKGBUILD    |   17 +++++++++++++----
 icu68.patch |   17 +++++++++++++++++
 2 files changed, 30 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-19 10:18:25 UTC (rev 404606)
+++ PKGBUILD	2020-12-19 10:42:23 UTC (rev 404607)
@@ -16,11 +16,20 @@
             'python: for PL/Python 3 support'
             'perl: for PL/Perl support'
             'tcl: for PL/Tcl support')
-source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2)
-sha256sums=('bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95')
-sha512sums=('9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e')
-b2sums=('7f7458346a0823d155f5caea0061aa14048d6f3cac27b1ea23dba03b02a39f39314ad1d44e589520d5e287004ffd32e042fea99ebfeda24b2cc23867b402d336')
+source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2
+        icu68.patch)
+sha256sums=('bd0d25341d9578b5473c9506300022de26370879581f5fddd243a886ce79ff95'
+            'ef6e69a308254e8ee5fcf1e23a600e7165377987a76b1131f55cf41353ce6230')
+sha512sums=('9895bcb1bb26206500666ab4441e663ef83702d428b85a6ff177a4eaf44b0ae06b35d5c4da2672ccb4ec18296649af95bf2f0aed526afaa6a216a8c2d2c5627e'
+            '60ea1330ab38a0f6960aaa3ca590f1e03db65f9ea42aa9d08cbe77ed8305b2e14528834de5406c78df52579af1e03fac7980a6d026f2f6a07cf4796b44b189f0')
+b2sums=('7f7458346a0823d155f5caea0061aa14048d6f3cac27b1ea23dba03b02a39f39314ad1d44e589520d5e287004ffd32e042fea99ebfeda24b2cc23867b402d336'
+        '8392acfb26105578efaec8f0a9d6ab0499025fa9540e6b45ebf3b6873506eaf2548ca551a5a5c9a9053495239d1d831397b51b17db5d0e12917f7f558807ba72')
 
+prepare() {
+  cd postgresql-${pkgver}
+  patch -Np0 -i ../icu68.patch
+}
+
 build() {
   cd postgresql-${pkgver}
   local options=(

Added: icu68.patch
===================================================================
--- icu68.patch	                        (rev 0)
+++ icu68.patch	2020-12-19 10:42:23 UTC (rev 404607)
@@ -0,0 +1,17 @@
+Regressed by https://github.com/unicode-org/icu/commit/c3fe7e09d844
+
+collationcmds.c:467:51: error: use of undeclared identifier 'TRUE'
+        uloc_toLanguageTag(localename, buf, sizeof(buf), TRUE, &status);
+                                                         ^
+
+--- src/backend/commands/collationcmds.c.orig	2020-08-10 21:15:53 UTC
++++ src/backend/commands/collationcmds.c
+@@ -463,7 +463,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",