[arch-commits] Commit in gambas3/trunk (PKGBUILD gambas-postgresql-12.patch)

[Antonio Rojas]

    Date: Friday, January 10, 2020 @ 13:11:11
  Author: arojas
Revision: 551607

Workaround build failure with postgresql 12

Added:
  gambas3/trunk/gambas-postgresql-12.patch
Modified:
  gambas3/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |    7 +++++--
 gambas-postgresql-12.patch |   27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-01-10 12:39:11 UTC (rev 551606)
+++ PKGBUILD	2020-01-10 13:11:11 UTC (rev 551607)
@@ -42,9 +42,11 @@
 	 'gmime3')
 options=('!emptydirs' 'libtool')
 source=("https://gitlab.com/gambas/gambas/-/archive/${pkgver}/gambas-${pkgver}.tar.bz2"
-         gambas-poppler-0.83.patch)
+         gambas-poppler-0.83.patch
+         gambas-postgresql-12.patch)
 sha512sums=('677d1ed3e1bf6b8cf6be658b8fef1f6904c052368a4d6d8f7c0d30797a37b0e5ec56b19f1c5f60f0df82bffa814a8969ae2d4c8d1f312eccda4f7025a5d78c01'
-            '1c603540749f2b797052833a50653711c05611df4228efcf57b3ad9f39f225b2b85cbad5a8994a586645832781c199719f710534472fa66574028998fe7b87a1')
+            '1c603540749f2b797052833a50653711c05611df4228efcf57b3ad9f39f225b2b85cbad5a8994a586645832781c199719f710534472fa66574028998fe7b87a1'
+            '803ceaa7a3109828b3336d02b7bc4fc1053ba3dca5f06fc97ff8f7785f983c32b657e3a59ab00081e6cfb047c12181b98a9631587de0af60ce1f30d614df5c49')
 
 create_dirs() {
   install -dm755 ${pkgdir}/usr/lib/gambas3
@@ -55,6 +57,7 @@
   cd ${srcdir}/gambas-${pkgver}
 
   patch -p1 -i ../gambas-poppler-0.83.patch # Fix build with poppler 0.83 (OpenMandriva)
+  patch -p1 -i ../gambas-postgresql-12.patch # Workaround build failure with postgresql 12
   ./reconf-all
 }
 

Added: gambas-postgresql-12.patch
===================================================================
--- gambas-postgresql-12.patch	                        (rev 0)
+++ gambas-postgresql-12.patch	2020-01-10 13:11:11 UTC (rev 551607)
@@ -0,0 +1,27 @@
+diff --git a/gb.db.postgresql/src/main.c b/gb.db.postgresql/src/main.c
+index 5401768d4..e0cca37d5 100644
+--- a/gb.db.postgresql/src/main.c
++++ b/gb.db.postgresql/src/main.c
+@@ -24,15 +24,18 @@
+ 
+ #define __MAIN_C
+ 
++#include <libpq-fe.h>
++#include <postgres.h>
++#include <pg_type.h>
++
++#undef fprintf
++#undef snprintf
++#undef sprintf
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
+ 
+-#include <libpq-fe.h>
+-#include <postgres.h>
+-#include <pg_type.h>
+-
+ #ifdef PACKAGE_NAME
+ 	#undef PACKAGE_NAME
+ 	#undef PACKAGE_BUGREPORT