From a981385e7f7d1142439abadb32afe3fed66255c3 Mon Sep 17 00:00:00 2001
From: Andrea Zagli <andrea.zagli@email.it>
Date: Fri, 27 Jan 2017 12:50:51 +0100
Subject: [PATCH] libgda-full: aggiustamenti.

---
 .../003-give-cc-to-gir-scanner.all.patch      | 22 -------------------
 packages/mingw-w64-libgda-full/PKGBUILD       | 17 ++++++--------
 2 files changed, 7 insertions(+), 32 deletions(-)
 delete mode 100644 packages/mingw-w64-libgda-full/003-give-cc-to-gir-scanner.all.patch

diff --git a/packages/mingw-w64-libgda-full/003-give-cc-to-gir-scanner.all.patch b/packages/mingw-w64-libgda-full/003-give-cc-to-gir-scanner.all.patch
deleted file mode 100644
index 359b71c..0000000
--- a/packages/mingw-w64-libgda-full/003-give-cc-to-gir-scanner.all.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur libgda-5.2.2-orig/libgda/Makefile.am libgda-5.2.2/libgda/Makefile.am
---- libgda-5.2.2-orig/libgda/Makefile.am	2013-12-20 00:52:43.000000000 +0400
-+++ libgda-5.2.2/libgda/Makefile.am	2014-08-20 19:41:13.641600000 +0400
-@@ -307,6 +307,7 @@
- 			     --namespace Gda \
- 			     --warn-all \
- 			     --c-include=libgda/libgda.h
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
- INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
- 
- psupport = \
-diff -Naur libgda-5.2.2-orig/libgda-ui/Makefile.am libgda-5.2.2/libgda-ui/Makefile.am
---- libgda-5.2.2-orig/libgda-ui/Makefile.am	2013-10-19 16:35:28.000000000 +0400
-+++ libgda-5.2.2/libgda-ui/Makefile.am	2014-08-20 19:41:40.541400000 +0400
-@@ -176,6 +176,7 @@
- if ENABLE_GDAUI_GI
- -include $(INTROSPECTION_MAKEFILE)
- INTROSPECTION_GIRS =
-+INTROSPECTION_SCANNER_ENV = CC="$(CC)"
- INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
-                              --add-include-path=$(top_builddir)/libgda \
-                              --add-include-path=$(top_builddir)/libgda-ui \
diff --git a/packages/mingw-w64-libgda-full/PKGBUILD b/packages/mingw-w64-libgda-full/PKGBUILD
index 58653ae..4746f29 100644
--- a/packages/mingw-w64-libgda-full/PKGBUILD
+++ b/packages/mingw-w64-libgda-full/PKGBUILD
@@ -36,14 +36,12 @@ install=${_realname}-${CARCH}.install
 source=(http://ftp.gnome.org/pub/gnome/sources/${_realname}/${pkgver:0:3}/${_realname}-$pkgver.tar.xz
         001-lemon.patch
         002-mysql-m4.patch
-        003-give-cc-to-gir-scanner.all.patch
         004-add-missing-symbols.patch
         005-hack-convert-path-back-to-unix.patch
         999-oracle-64bit.patch)
 sha256sums=('2cee38dd583ccbaa5bdf6c01ca5f88cc08758b9b144938a51a478eb2684b765e'
             'e61c10e41ea2b343c6a50d0cbf1f2912b9d9273882249a998f60cda2f4a94d4c'
             '5a9959715e63a82e5bf62bb3e6ffbe4d4b587094d13b671e2a676720c765e048'
-            'a0a2e3ca548feedc6502f29ff0ef5f047bf2a7dabd7722011147872a5aea733b'
             '852956cb1f2cd77174b53ab56f509f4766442277d236b0e0eed5650f288d9c89'
             '88718da49d5c9671f4b7c7ac4a859762012c723928f3ad7c7000bad776200596'
             'a06d60ae54e38fac7809b7af612f1e9ea69d38059f5135a915cd00bd634b4363')
@@ -53,7 +51,6 @@ prepare() {
 
   patch -p1 -i ${srcdir}/001-lemon.patch
   patch -p1 -i ${srcdir}/002-mysql-m4.patch
-  patch -p1 -i ${srcdir}/003-give-cc-to-gir-scanner.all.patch
   patch -p1 -i ${srcdir}/004-add-missing-symbols.patch
   patch -p1 -i ${srcdir}/005-hack-convert-path-back-to-unix.patch
 
@@ -66,13 +63,13 @@ prepare() {
 
 build() {
   if [ "${CARCH}" = "i686" ]; then
-    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
-    export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/include/graphviz"
-    export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/i686/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
+    local _conf='--with-oracle=/instantclient_11_2_i686/sdk --with-oracle-libdir-name=lib'
+    export GRAPHVIZ_CFLAGS="-I/graphviz-2.38_i686/include/graphviz"
+    export GRAPHVIZ_LIBS="-L/graphviz-2.38_i686/lib/release/dll -lgvc -lcgraph -lcdt"
   else
-    local _conf='--with-oracle=/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/instantclient_10_2/sdk --with-oracle-libdir-name=lib'
-    #export GRAPHVIZ_CFLAGS="-I/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/include/graphviz"
-    #export GRAPHVIZ_LIBS="-L/c/Users/AndreaZ/Documents/development_environment_gtk3/binaries/x86_64/graphviz/lib/release/dll -lgvc -lcgraph -lcdt"
+    local _conf='--with-oracle=/instantclient_11_2_x86_64/sdk --with-oracle-libdir-name=lib'
+    #export GRAPHVIZ_CFLAGS="-I/graphviz-2.38_x86_64/include/graphviz"
+    #export GRAPHVIZ_LIBS="-L/graphviz-2.38_x86_64/lib/release/dll -lgvc -lcgraph -lcdt"
   fi
 
   mkdir -p build-${MINGW_CHOST}
@@ -85,7 +82,7 @@ build() {
   ../${_realname}-${pkgver}/configure \
     --host=${MINGW_CHOST} \
     --target=${MINGW_CHOST} \
-    --build=${MINGW_CHOST} \
+    --build=${MINGW_CHOST} \
     --prefix=${MINGW_PREFIX} \
     --libexecdir=${MINGW_PREFIX}/lib \
     --enable-gda-gi \
-- 
2.49.0