From 347b5471ef85f992354811dc324b4d900e4748a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:20:30 -0500
Subject: [PATCH 1/4] Windows: Apply OSGeo4W patches for Postgres

---
 mswindows/osgeo4w/package.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 50d5b9ddc4d..4497db7a379 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -117,6 +117,8 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	rm -f mswindows/osgeo4w/package.log.*
 
 	mkdir -p mswindows/osgeo4w/lib
+	rm -f $OSGEO4W_ROOT_MSYS/lib/libpq.a
+	cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.lib
 	cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
 
 

From 398dc36250afcd2d036710c45657e29d9b0b2ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:33:24 -0500
Subject: [PATCH 2/4] Update postgres-libs path according to patch

---
 mswindows/osgeo4w/package.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
index 4497db7a379..011ddec8254 100755
--- a/mswindows/osgeo4w/package.sh
+++ b/mswindows/osgeo4w/package.sh
@@ -157,7 +157,7 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 		--with-openmp \
 		--with-postgres \
 		--with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
-		--with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
+		--with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
 		--with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
 		--with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
 		--with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \

From c7b1427e0cd9c3e197374db0112ed9c5a02bb8aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:07:16 -0500
Subject: [PATCH 3/4] Update build_osgeo4w.sh

---
 mswindows/osgeo4w/build_osgeo4w.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh
index 252b615339f..2911af300e3 100755
--- a/mswindows/osgeo4w/build_osgeo4w.sh
+++ b/mswindows/osgeo4w/build_osgeo4w.sh
@@ -55,7 +55,7 @@ CXXFLAGS="$CXXFLAGS -pipe" \
     --with-openmp \
     --with-postgres \
     --with-postgres-includes=${OSGEO4W_ROOT_MSYS}/include \
-    --with-postgres-libs=${OSGEO4W_ROOT_MSYS}/lib \
+    --with-postgres-libs=${SRC}/mswindows/osgeo4w/lib \
     --with-proj-includes=${OSGEO4W_ROOT_MSYS}/include \
     --with-proj-libs=${OSGEO4W_ROOT_MSYS}/lib \
     --with-proj-share=${OSGEO4W_ROOT_MSYS}/share/proj \

From 609420dcfc8f7562538482dc6079335f2e884ad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edouard=20Choini=C3=A8re?=
 <27212526+echoix@users.noreply.github.com>
Date: Mon, 27 Jan 2025 19:04:01 -0500
Subject: [PATCH 4/4] Create directory osgeo4w/lib directory and copy Postgres
 lib in build_osgeo4w.sh like package.sh

---
 mswindows/osgeo4w/build_osgeo4w.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mswindows/osgeo4w/build_osgeo4w.sh b/mswindows/osgeo4w/build_osgeo4w.sh
index 2911af300e3..3a8c767a563 100755
--- a/mswindows/osgeo4w/build_osgeo4w.sh
+++ b/mswindows/osgeo4w/build_osgeo4w.sh
@@ -21,6 +21,11 @@ export C_INCLUDE_PATH=".:${OSGEO4W_ROOT_MSYS}/include:${SRC}/dist.${ARCH}/includ
 export PYTHONHOME=${OSGEO4W_ROOT_MSYS}/apps/Python312
 export ARCH=x86_64-w64-mingw32
 
+
+mkdir -p mswindows/osgeo4w/lib
+rm -f $OSGEO4W_ROOT_MSYS/lib/libpq.a
+cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/libpq.lib
+
 CFLAGS="$CFLAGS -pipe" \
 CXXFLAGS="$CXXFLAGS -pipe" \
 ./configure \