Fix build with icu68

[gentoo] https://bugs.gentoo.org/766225

3 files changed, 22 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03cda06f792e..c6905c525b7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = postgresql-10
 	pkgdesc = Sophisticated object-relational DBMS
 	pkgver = 10.13
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.postgresql.org/
 	arch = x86_64
 	license = custom:PostgreSQL
@@ -20,6 +20,7 @@ pkgbase = postgresql-10
 	makedepends = llvm
 	makedepends = clang
 	source = https://ftp.postgresql.org/pub/source/v10.13/postgresql-10.13.tar.bz2
+	source = icu68.patch
 	source = postgresql-run-socket.patch
 	source = postgresql-perl-rpath.patch
 	source = postgresql.pam
@@ -29,6 +30,7 @@ pkgbase = postgresql-10
 	source = postgresql.sysusers
 	source = postgresql.tmpfiles
 	sha256sums = 4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1
+	sha256sums = d8e2e89215c049d27cbdbc6eed1b805028aa0169f3f244399b44180251036f12
 	sha256sums = 8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9
 	sha256sums = 5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31
 	sha256sums = 57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5
@@ -38,6 +40,7 @@ pkgbase = postgresql-10
 	sha256sums = 7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12
 	sha256sums = 4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57
 	sha512sums = 7b268aa4476ed9b168814891e8b19d182683ab4994d4a9b30e75eec93ffd9c860f8a0979ba1b7408acf8e217437b5cc20037b6ebf6ef01e9cf5ee99f091c8c92
+	sha512sums = 1f80bc7f4d726b3985b5b8d694d052e0d1e84e0515f855c17892c3141fe97385abe8c10cef17f1e89435dddddaeb679ec1cf1521eb2b62c91958bdb6b4186e87
 	sha512sums = 031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7
 	sha512sums = 38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615
 	sha512sums = 1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67
diff --git a/PKGBUILD b/PKGBUILD
index 644d01ae4898..445b9c31dd69 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=postgresql-10
 pkgname=('postgresql-libs-10' 'postgresql-docs-10' 'postgresql-10')
 pkgver=10.13
 _majorver=${pkgver%.*}
-pkgrel=1
+pkgrel=2
 pkgdesc='Sophisticated object-relational DBMS'
 url='https://www.postgresql.org/'
 arch=('x86_64')
@@ -15,15 +15,17 @@ license=('custom:PostgreSQL')
 makedepends=('krb5' 'libxml2' 'python' 'python2' 'perl' 'tcl>=8.6.0' 'openssl>=1.0.0'
              'pam' 'zlib' 'icu' 'systemd' 'libldap' 'llvm' 'clang')
 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
         postgresql.logrotate
         postgresql.service
         postgresql-check-db-dir
-	postgresql.sysusers
-	postgresql.tmpfiles)
+        postgresql.sysusers
+        postgresql.tmpfiles)
 sha256sums=('4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1'
+            'd8e2e89215c049d27cbdbc6eed1b805028aa0169f3f244399b44180251036f12'
             '8538619cb8bea51078b605ad64fe22abd6050373c7ae3ad6595178da52f6a7d9'
             '5f73b54ca6206bd2c469c507830261ebd167baca074698d8889d769c33f98a31'
             '57dfd072fd7ef0018c6b0a798367aac1abb5979060ff3f9df22d1048bb71c0d5'
@@ -33,6 +35,7 @@ sha256sums=('4d701f450cd92ffb123cf6c296e9656abbc2ab7ea6507894ff1e2475ae0754e1'
             '7fa8f0ef3f9d40abd4749cc327c2f52478cb6dfb6e2405bd0279c95e9ff99f12'
             '4a4c0bb9ceb156cc47e9446d8393d1f72b4fe9ea1d39ba17213359df9211da57')
 sha512sums=('7b268aa4476ed9b168814891e8b19d182683ab4994d4a9b30e75eec93ffd9c860f8a0979ba1b7408acf8e217437b5cc20037b6ebf6ef01e9cf5ee99f091c8c92'
+            '1f80bc7f4d726b3985b5b8d694d052e0d1e84e0515f855c17892c3141fe97385abe8c10cef17f1e89435dddddaeb679ec1cf1521eb2b62c91958bdb6b4186e87'
             '031efe12d18ce386989062327cdbbe611c5ef1f94e4e1bead502304cb3e2d410af533d3c7f1109d24f9da9708214fe32f9a10ba373a3ca8d507bdb521fbb75f7'
             '38302242b30c01c7981574ed28d9cbd9dc73bf6b56ba3a032afb5d0885ae83e5aa72ce578bf2422214dfa6c46f09d0bdd7cccaeb3c25d58754eb1a34f8bf5615'
             '1e6183ab0eb812b3ef687ac2c26ce78f7cb30540f606d20023669ac00ba04075487fb72e4dc89cc05dab0269ff6aca98fc1167cc75669c225b88b592482fbf67'
@@ -46,6 +49,7 @@ prepare() {
   cd postgresql-${pkgver}
   patch -p1 < ../postgresql-run-socket.patch
   patch -p1 < ../postgresql-perl-rpath.patch
+  patch -p1 < ../icu68.patch
 }
 
 build() {
diff --git a/icu68.patch b/icu68.patch
new file mode 100644
index 000000000000..89b0f8362f33
--- /dev/null
+++ b/icu68.patch
@@ -0,0 +1,11 @@
+diff -ur postgresql-10.13.orig/src/include/utils/pg_locale.h postgresql-10.13/src/include/utils/pg_locale.h
+--- postgresql-10.13.orig/src/include/utils/pg_locale.h	2020-05-11 23:12:38.000000000 +0200
++++ postgresql-10.13/src/include/utils/pg_locale.h	2021-04-23 23:05:22.732461418 +0200
+@@ -17,6 +17,7 @@
+ #endif
+ #ifdef USE_ICU
+ #include <unicode/ucol.h>
++#undef bool
+ #endif
+ 
+ #include "utils/guc.h"