Date: Saturday, December 19, 2020 @ 06:57:28 Author: foutrelis Revision: 404546
Fix build with ICU 68 (patch from FreeBSD) Added: postgresql/trunk/icu68.patch Modified: postgresql/trunk/PKGBUILD -------------+ PKGBUILD | 4 ++++ icu68.patch | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-12-19 06:49:41 UTC (rev 404545) +++ PKGBUILD 2020-12-19 06:57:28 UTC (rev 404546) @@ -13,6 +13,7 @@ makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0' 'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang' 'libxslt') source=(https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2 + icu68.patch postgresql-run-socket.patch postgresql-perl-rpath.patch postgresql.pam @@ -22,6 +23,7 @@ postgresql.sysusers postgresql.tmpfiles) sha256sums=('12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f' + 'fa784fe8b94833539cdb52f3986561bba3673e3b1d80e18d9e097826c5658454' '02ffb53b0a5049233f665c873b96264db77daab30e5a2194d038202d815a8e6a' 'af6186d40128e043f333da4591455bf62b7c96e80214835f5c8c60b635ea9afb' '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5' @@ -31,6 +33,7 @@ '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12' '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57') b2sums=('609ac10f87da800754223c7f7d6b02efa3ed1308a5d27cc793c937be983f4041576e20de3b2efe514e3f61dc863e6212ec01d73adb93f6bcc373a596b2946675' + '0f829658a4fdc39b83f62b47bc3f5ca61c8bfc1cea166286ce797939f008542147fb10773267f46ef98e7e330975223e784f5117eefa1e8b75d850f7e0c7c59e' '71dc1b4e41294fd235db05317c991d42de082c49d38a2f97d1394572a93a4aa77f42ec29b4e6cf0a17adb3a4471afcb1e2464870f2b9e847906bf49541763a53' '5135c5f9dafe427de8d3740d4a67c6dba2869be47dc52b4190b8aa1148e702992fde1821371b68e93b224f5805f697d490ea28ec80d7ce55e5a224551b0a6247' '3eab84d332d96678fe6e435ee243c8f1a82b838f601d61d3604d11e918aed7a62202edca5e476c4b9031ed284570e6fcd6c659cfdbd9624aa0019d3233755f81' @@ -42,6 +45,7 @@ prepare() { cd postgresql-${pkgver} + patch -p0 < ../icu68.patch patch -p1 < ../postgresql-run-socket.patch patch -p1 < ../postgresql-perl-rpath.patch } Added: icu68.patch =================================================================== --- icu68.patch (rev 0) +++ icu68.patch 2020-12-19 06:57:28 UTC (rev 404546) @@ -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-09-21 20:47:36 UTC ++++ src/backend/commands/collationcmds.c +@@ -464,7 +464,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",