postgresql: update to 16.1

2023-09-15 06:52:55 +01:00
parent e9a26aceb2
commit bdb02ffed6
5 changed files with 25 additions and 43 deletions
--- a/mingw-w64-postgresql/PKGBUILD
+++ b/mingw-w64-postgresql/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=postgresql
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=15.3
-pkgrel=3
+pkgver=16.1
+pkgrel=1
 pkgdesc="Libraries for use with PostgreSQL (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
@@ -33,18 +33,16 @@ source=("https://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.t
        postgresql-9.4.1-mingw-enable-readline.patch
        postgresql-13.1-disable-wsa-invalid-event-static-assert.patch
        postgresql-13.1-pgevent-def.patch
-        postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
-        postgresql-15.1-clang-16.patch)
-sha256sums=('ffc7d4891f00ffbf5c3f4eab7fbbced8460b8c0ee63c5a5167133b9e6599d932'
-            '607217b422349770d25af20f88e4a7925e68bb934232dff368c2ee59f24249a4'
+        postgresql-14.0-use-mingw-setjmp-on-ucrt.patch)
+sha256sums=('ce3c4d85d19b0121fe0d3f8ef1fa601f71989e86f8a66f7dc3ad546dd5564fec'
+            '54958a6116e401d13b2394c7b428a039d8a185bf2aaedf7b89e3ee203dc8f324'
            '99e6c8b9d58a9615c7bb1e7471b8e9c074add7bffc7d2cf742bafa38e9654e1f'
            'ced0ccf978eefc1ad0641803c9759b652e588eb552ec9179cd9dfc9d94ecf499'
            'b12c4e493845b3ead8950bbc26b1cc7bd4fb0dc3313fea4f7b281866d18c0402'
            'cd52d56833c60afdce98d91eece73c11978762671e36be7bd9c31a1ea0a0282d'
            '72c14a78eeafdd3c9a13c3e124b1941b5da090488c7bd73f08b3cd78bacd07d5'
-            'ffaecbe5a38877728bddbf307b379b39c645dd1ffe53aa8d84dfa96807494764'
-            'e65f664644faa5cbd392c575a13bace31799e19d16be64cee362ba0e4a361c23'
-            '77876e4f8fd2500db2a1815628bd8d8bbd825563da19f8ea70ac9f9b6659414c')
+            '5941c74c6ab66d42d6ac6e7d5da358d44e479fd519bd4e025f08eba06bf30752'
+            'fe336eac7892b23988189be0178efc95449d8d08493db83754058f5f37bb8ea9')

 # Helper macros to help make tasks easier #
 apply_patch_with_msg() {
@@ -64,8 +62,7 @@ prepare() {
    postgresql-9.4.1-pl-tcl.patch \
    postgresql-13.1-disable-wsa-invalid-event-static-assert.patch \
    postgresql-13.1-pgevent-def.patch \
-    postgresql-14.0-use-mingw-setjmp-on-ucrt.patch \
-    postgresql-15.1-clang-16.patch
+    postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
  #patch -p1 -i ${srcdir}/postgresql-9.4.1-mingw-enable-readline.patch

  autoreconf -fiv
@@ -85,7 +82,6 @@ build() {
    --enable-integer-datetimes \
    --enable-nls \
    --disable-rpath \
-    --with-icu \
    --with-ldap \
    --with-libxml \
    --with-libxslt \
--- a/mingw-w64-postgresql/postgresql-12.0-mingw-link.patch
+++ b/mingw-w64-postgresql/postgresql-12.0-mingw-link.patch
@@ -1,6 +1,6 @@
--- postgresql-12.0/src/Makefile.shlib.orig	2015-02-10 19:14:10.984800000 +0300
-+++ postgresql-12.0/src/Makefile.shlib	2015-02-10 19:14:16.554000000 +0300
-@@ -86,7 +86,7 @@
+--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
+@@ -85,7 +85,7 @@
 # Naming convention for dynamically loadable modules
 shlib		= $(NAME)$(DLSUFFIX)
 endif
@@ -9,14 +9,14 @@
 
 ifndef soname
 # additional flags for backend modules
--- postgresql-12.0/src/backend/Makefile.orig	2015-02-10 21:01:34.928800000 +0300
-+++ postgresql-12.0/src/backend/Makefile	2015-02-10 21:03:43.819000000 +0300
-@@ -82,11 +82,11 @@
+--- a/src/backend/Makefile
+++ b/src/backend/Makefile
+@@ -87,11 +87,11 @@
 LIBS += -lsecur32
 
 postgres: $(OBJS) $(WIN32RES)
-	$(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X)
-+	$(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.dll.a $(LIBS) -o $@$(X)
+-	$(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(LIBS) -o $@$(X)
+	$(CC) $(CFLAGS) $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LDFLAGS) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.dll.a $(LIBS) -o $@$(X)
 
 # libpostgres.a is actually built in the preceding rule, but we need this to
 # ensure it's newer than postgres; see notes in src/backend/parser/Makefile
@@ -25,7 +25,7 @@
 	touch $@
 
 endif # win32
-@@ -200,7 +200,7 @@
+@@ -196,7 +196,7 @@
 endif
 ifeq ($(PORTNAME), win32)
 ifeq ($(MAKE_DLL), true)
@@ -34,7 +34,7 @@
 endif
 endif
 	$(MAKE) -C catalog install-data
-@@ -265,7 +265,7 @@
+@@ -255,7 +255,7 @@
 endif
 ifeq ($(PORTNAME), win32)
 ifeq ($(MAKE_DLL), true)
@@ -43,7 +43,7 @@
 endif
 endif
 	$(MAKE) -C catalog uninstall-data
-@@ -287,7 +287,7 @@
+@@ -277,7 +277,7 @@
 	rm -f postgres.dll libpostgres.a
 endif
 ifeq ($(PORTNAME), win32)
--- a/mingw-w64-postgresql/postgresql-13.1-pgevent-def.patch
+++ b/mingw-w64-postgresql/postgresql-13.1-pgevent-def.patch
@@ -1,12 +1,12 @@
--- postgresql-13.1/src/bin/pgevent/Makefile.orig	2021-07-18 16:38:12.660763100 -0700
-+++ postgresql-13.1/src/bin/pgevent/Makefile	2021-07-18 16:38:41.035766900 -0700
-@@ -29,6 +29,9 @@
+--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
+@@ -30,6 +30,9 @@
 
 include $(top_srcdir)/src/Makefile.shlib
 
 +libpgeventdll.def: pgevent.def
 +	cp -f $< $@
 +
- pgmsgevent.o: pgmsgevent.rc win32ver.rc
+ pgmsgevent.o: pgmsgevent.rc
 	$(WINDRES) $< -o $@ --include-dir=$(top_builddir)/src/include --include-dir=$(top_srcdir)/src/include --include-dir=$(srcdir) --include-dir=.
 
--- a/mingw-w64-postgresql/postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
+++ b/mingw-w64-postgresql/postgresql-14.0-use-mingw-setjmp-on-ucrt.patch
@@ -2,7 +2,7 @@ diff --git a/src/include/c.h b/src/include/c.h
 index c8ede08..e445524 100644
 --- a/src/include/c.h
 +++ b/src/include/c.h
-@@ -1340,17 +1340,18 @@ extern unsigned long long strtoull(const char *str, char **endptr, int base);
+@@ -1360,15 +1360,15 @@ extern unsigned long long strtoull(const char *str, char **endptr, int base);
  * so on that toolchain we cheat and use gcc's builtins.
  */
 #ifdef WIN32
@@ -20,7 +20,4 @@ index c8ede08..e445524 100644
 +#endif							/* defined(__MINGW64__) && !defined(_UCRT) */
 #endif							/* WIN32 */
 
-+
- /* EXEC_BACKEND defines */
- #ifdef EXEC_BACKEND
- #define NON_EXEC_STATIC
+ /* /port compatibility functions */
--- a/mingw-w64-postgresql/postgresql-15.1-clang-16.patch
+++ b/mingw-w64-postgresql/postgresql-15.1-clang-16.patch
@@ -1,11 +0,0 @@
--- postgresql-15.3/src/include/port/win32.h.orig	2023-07-25 21:15:00.352361300 +0200
-+++ postgresql-15.3/src/include/port/win32.h	2023-07-25 21:17:23.862789100 +0200
-@@ -16,7 +16,7 @@
-  * get support for GetLocaleInfoEx() with locales. For everything else
-  * the minimum version is Windows XP (0x0501).
-  */
-#if defined(_MSC_VER) && _MSC_VER >= 1900
-+#if (defined(_MSC_VER) && _MSC_VER >= 1900) || defined (__MINGW32__)
- #define MIN_WINNT 0x0600
- #else
- #define MIN_WINNT 0x0501