Accepting request 855794 from home:gmbr3:StagingI

- Add icu-68.patch: fix build with ICU 68

OBS-URL: https://build.opensuse.org/request/show/855794
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=30

icu68.patch

@@ -0,0 +1,12 @@
+diff -rupN a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
+--- a/src/backend/commands/collationcmds.c	2020-11-07 08:03:24.122756440 +0300
++++ b/src/backend/commands/collationcmds.c	2020-11-07 08:04:18.168901199 +0300
+@@ -464,7 +464,7 @@ get_icu_language_tag(const char *localen
+ 	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",

postgresql12.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec 14 16:19:33 UTC 2020 - Callum Farmer <gmbr3@opensuse.org>
+
+- Add icu-68.patch: fix build with ICU 68
+
 -------------------------------------------------------------------
 Fri Nov 20 11:51:37 UTC 2020 - Reinhard Max <max@suse.com>
 

postgresql12.spec

@@ -145,6 +145,7 @@ Patch4:         postgresql-plperl-keep-rpath.patch
 Patch6:         postgresql-testsuite-int8.sql.patch
 Patch8:         postgresql-testsuite-keep-results-file.patch
 Patch9:         postgresql-var-run-socket.patch
+Patch10:        icu68.patch
 URL:            https://www.postgresql.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       postgresql = %version-%release
@@ -452,6 +453,7 @@ touch -r configure tmp
 %patch6
 %patch8 -p1
 %patch9
+%patch10 -p1
 touch -r tmp configure
 rm tmp
 find src/test/ -name '*.orig' -delete