From 1e6f43c569fb746ebefc64171950243b12971fb9 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Fri, 27 Jul 2018 12:59:40 +0200
Subject: [PATCH] Update mingw-w64-postgresql to 10.4

---
 ...a-as-extension-for-import-libraries.patch} | 44 ++++++++++++++-----
 postgresql/mingw-w64/PKGBUILD                 | 12 ++---
 2 files changed, 38 insertions(+), 18 deletions(-)
 rename postgresql/mingw-w64/{postgresql-9.4.1-mingw-link.patch => 0001-Use-.dll.a-as-extension-for-import-libraries.patch} (54%)

diff --git a/postgresql/mingw-w64/postgresql-9.4.1-mingw-link.patch b/postgresql/mingw-w64/0001-Use-.dll.a-as-extension-for-import-libraries.patch
similarity index 54%
rename from postgresql/mingw-w64/postgresql-9.4.1-mingw-link.patch
rename to postgresql/mingw-w64/0001-Use-.dll.a-as-extension-for-import-libraries.patch
index 86b57c6a..cf6f0800 100644
--- a/postgresql/mingw-w64/postgresql-9.4.1-mingw-link.patch
+++ b/postgresql/mingw-w64/0001-Use-.dll.a-as-extension-for-import-libraries.patch
@@ -1,6 +1,18 @@
---- postgresql-9.4.1/src/Makefile.shlib.orig	2015-02-10 19:14:10.984800000 +0300
-+++ postgresql-9.4.1/src/Makefile.shlib	2015-02-10 19:14:16.554000000 +0300
-@@ -86,7 +86,7 @@
+From f2d760f71d3201219cc342913ecc535f9776946d Mon Sep 17 00:00:00 2001
+From: Martchus <martchus@gmx.net>
+Date: Fri, 27 Jul 2018 12:50:17 +0200
+Subject: [PATCH] Use *.dll.a as extension for import libraries
+
+---
+ src/Makefile.shlib   |  2 +-
+ src/backend/Makefile | 12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/Makefile.shlib b/src/Makefile.shlib
+index d546ed1f31..b2c2bef2d7 100644
+--- a/src/Makefile.shlib
++++ b/src/Makefile.shlib
+@@ -85,7 +85,7 @@ else
  # Naming convention for dynamically loadable modules
  shlib		= $(NAME)$(DLSUFFIX)
  endif
@@ -9,21 +21,26 @@
  
  ifndef soname
  # additional flags for backend modules
---- postgresql-9.4.1/src/backend/Makefile.orig	2015-02-10 21:01:34.928800000 +0300
-+++ postgresql-9.4.1/src/backend/Makefile	2015-02-10 21:03:43.819000000 +0300
-@@ -79,9 +79,9 @@
+diff --git a/src/backend/Makefile b/src/backend/Makefile
+index 2640834d5f..51f127f0c9 100644
+--- a/src/backend/Makefile
++++ b/src/backend/Makefile
+@@ -80,11 +80,11 @@ ifeq ($(PORTNAME), win32)
  LIBS += -lsecur32
  
  postgres: $(OBJS) $(WIN32RES)
 -	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.a $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) -o $@$(X)
 +	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) -Wl,--stack=$(WIN32_STACK_RLIMIT) -Wl,--export-all-symbols -Wl,--out-implib=libpostgres.dll.a $(call expand_subsys,$(OBJS)) $(WIN32RES) $(LIBS) -o $@$(X)
  
--libpostgres.a: postgres ;
-+libpostgres.dll.a: postgres ;
+-# libpostgres.a is actually built in the preceding rule, but we need this to
++# libpostgres.dll.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
+-libpostgres.a: postgres
++libpostgres.dll.a: postgres
+ 	touch $@
  
  endif # win32
- 
-@@ -207,7 +207,7 @@
+@@ -241,7 +241,7 @@ endif
  endif
  ifeq ($(PORTNAME), win32)
  ifeq ($(MAKE_DLL), true)
@@ -32,7 +49,7 @@
  endif
  endif
  	$(MAKE) -C catalog install-data
-@@ -265,7 +265,7 @@
+@@ -299,7 +299,7 @@ endif
  endif
  ifeq ($(PORTNAME), win32)
  ifeq ($(MAKE_DLL), true)
@@ -41,7 +58,7 @@
  endif
  endif
  	$(MAKE) -C catalog uninstall-data
-@@ -288,7 +288,7 @@
+@@ -324,7 +324,7 @@ ifeq ($(PORTNAME), cygwin)
  	rm -f postgres.dll libpostgres.a
  endif
  ifeq ($(PORTNAME), win32)
@@ -50,3 +67,6 @@
  endif
  
  distclean: clean
+-- 
+2.18.0
+
diff --git a/postgresql/mingw-w64/PKGBUILD b/postgresql/mingw-w64/PKGBUILD
index e81bf550..d6df4b70 100644
--- a/postgresql/mingw-w64/PKGBUILD
+++ b/postgresql/mingw-w64/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: ant32 <antreimer@gmail.com>
 
 pkgname=mingw-w64-postgresql
-pkgver=9.6.4
+pkgver=10.4
 pkgrel=1
-pkgdesc='A sophisticated object-relational DBMS (mingw-w64)'
+pkgdesc='Sophisticated object-relational DBMS (mingw-w64)'
 arch=('any')
 url='https://www.postgresql.org'
 license=('custom:PostgreSQL')
@@ -15,15 +15,15 @@ provides=('mingw-w64-postgresql-libs')
 conflicts=('mingw-w64-postgresql-libs')
 replaces=('mingw-w64-postgresql-libs')
 source=("http://ftp.postgresql.org/pub/source/v${pkgver}/postgresql-${pkgver}.tar.bz2"
-        'postgresql-9.4.1-mingw-link.patch')
-sha256sums=('2b3ab16d82e21cead54c08b95ce3ac480696944a68603b6c11b3205b7376ce13'
-            '0f2b5c7edb48dd106900854c9323ca2d483054595c4cf8a5b796a1d536d22aad')
+        '0001-Use-.dll.a-as-extension-for-import-libraries.patch')
+sha256sums=('1b60812310bd5756c62d93a9f93de8c28ea63b0df254f428cd1cf1a4d9020048'
+            '10fdb0beeb4c282f3395bb9cc7b20234d6534067fc0834e781fc5feb264c2b78')
 
 _architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 prepare() {
   cd postgresql-$pkgver
-  patch -p1 -i ${srcdir}/postgresql-9.4.1-mingw-link.patch
+  patch -p1 -i ${srcdir}/0001-Use-.dll.a-as-extension-for-import-libraries.patch
 }
 
 build() {