From a737459a81e17064bdd9e82f679ccb3f3e4ad1d3 Mon Sep 17 00:00:00 2001
From: Ricky Wu <rickleaf.wu@gmail.com>
Date: Mon, 10 Oct 2016 19:43:44 +0800
Subject: [PATCH] fix gdl2 gdlmm2 sqlheavy and glade-3 build issues (#1797)

* fix gdl2 build issue

* fix gdlmm2 build issue

* fix sqlheavy building issue on vala 0.32

* 1.fix glade3 build issue; 2.sqlheavy change source package name
---
 mingw-w64-gdl2/002-headers.patch     | 14 ++++++++++++++
 mingw-w64-gdl2/PKGBUILD              |  9 ++++++---
 mingw-w64-gdlmm2/PKGBUILD            |  4 ++--
 mingw-w64-glade3/PKGBUILD            |  8 ++++----
 mingw-w64-sqlheavy/000-libvala.patch |  2 +-
 mingw-w64-sqlheavy/PKGBUILD          |  6 +++---
 6 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 mingw-w64-gdl2/002-headers.patch

diff --git a/mingw-w64-gdl2/002-headers.patch b/mingw-w64-gdl2/002-headers.patch
new file mode 100644
index 0000000000..d79c00cb27
--- /dev/null
+++ b/mingw-w64-gdl2/002-headers.patch
@@ -0,0 +1,14 @@
+diff -rup gdl-2.31.2/gdl/Makefile.am gdl-2.31.2-ricky/gdl/Makefile.am
+--- gdl-2.31.2/gdl/Makefile.am	2010-05-02 20:03:06.000000000 +0800
++++ gdl-2.31.2-ricky/gdl/Makefile.am	2016-10-06 16:21:27.766587200 +0800
+@@ -30,7 +30,9 @@ libgdl_headers = \
+ 	gdl-dock-item-grip.h \
+ 	gdl-dock-layout.h \
+ 	gdl-dock-bar.h \
+-	gdl-dock-placeholder.h
++	gdl-dock-placeholder.h \
++	gdl-dock-notebook.h \
++	gdl-switcher.h
+ 	
+ libgdl_1_la_SOURCES = \
+ 	$(libgdl_headers) \
diff --git a/mingw-w64-gdl2/PKGBUILD b/mingw-w64-gdl2/PKGBUILD
index 6195da48fc..889953beb3 100644
--- a/mingw-w64-gdl2/PKGBUILD
+++ b/mingw-w64-gdl2/PKGBUILD
@@ -16,14 +16,17 @@ makedepends=("intltool"
              "gtk-doc")
 options=('strip' 'staticlibs')
 source=(https://download.gnome.org/sources/${_realname:0:3}/${pkgver:0:4}/${_realname:0:3}-${pkgver}.tar.gz
-        001-pixbuf.patch)
-sha256sums=('34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80'
-            'ba2f1eed43f926df573ec299b973929499e1da78c0f15157a4ec4ae40057afa1')
+        '001-pixbuf.patch'
+        '002-headers.patch')
+sha256sums=('8a450b89e4571750b61f7e6450d5abc16d7d3e526709dd2d8b47317a2090cf3d'
+            '7d9fd1c17a55d754dab63d662a3b3d8fcd98506b6531df192b446eeee03ad2a4'
+            'SKIP')
 
 prepare() {
   cd "${srcdir}"/${_realname:0:3}-${pkgver}
 
   patch -b -V simple -p1 -i ${srcdir}/001-pixbuf.patch
+  patch -b -V simple -p1 -i ${srcdir}/002-headers.patch
 
   autoreconf -f -i
 }
diff --git a/mingw-w64-gdlmm2/PKGBUILD b/mingw-w64-gdlmm2/PKGBUILD
index 4f823c0f2b..1e4b57e870 100644
--- a/mingw-w64-gdlmm2/PKGBUILD
+++ b/mingw-w64-gdlmm2/PKGBUILD
@@ -18,8 +18,8 @@ options=('strip' 'staticlibs')
 source=(https://download.gnome.org/sources/${_realname:0:5}/${pkgver:0:4}/${_realname:0:5}-${pkgver}.tar.gz
 		000-C11.patch
         )
-sha256sums=('34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80'
-            'ba2f1eed43f926df573ec299b973929499e1da78c0f15157a4ec4ae40057afa1')
+sha256sums=('48138b59388fc64340a56f07cc90ea90dbd00bd5070b14897319d8c8e619befd'
+            '1b0f5da73b092808c16987a198ad456044cbe24f929bae6add31adfa5a2bc4fa')
 
 prepare() {
   cd "${srcdir}"/${_realname:0:5}-${pkgver}
diff --git a/mingw-w64-glade3/PKGBUILD b/mingw-w64-glade3/PKGBUILD
index 4eea6c67a7..57abc7c93e 100644
--- a/mingw-w64-glade3/PKGBUILD
+++ b/mingw-w64-glade3/PKGBUILD
@@ -23,10 +23,9 @@ optdepends=("${MINGW_PACKAGE_PREFIX}-python2: Python widgets support"
             )
 install=glade3-${CARCH}.install
 
-source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}3-${pkgver}.tar.xz
-        )
-
+source=(https://download.gnome.org/sources/${_realname}/${pkgver%.*}/${_realname}3-${pkgver}.tar.xz)
 
+sha256sums=('58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735')
 
 prepare() {
   cd "${srcdir}/${_realname}3-${pkgver}"
@@ -49,7 +48,8 @@ build() {
     --host=${MINGW_CHOST} \
     --disable-static \
     --enable-shared \
-    --disable-gtk-doc
+    --disable-gtk-doc \
+    --enable-compile-warnings=minimum
 
   make VERBOSE=1
 }
diff --git a/mingw-w64-sqlheavy/000-libvala.patch b/mingw-w64-sqlheavy/000-libvala.patch
index 719b2c4d94..db039981ff 100644
--- a/mingw-w64-sqlheavy/000-libvala.patch
+++ b/mingw-w64-sqlheavy/000-libvala.patch
@@ -6,7 +6,7 @@ diff -rup sqlheavy-0.1.1-org/configure.ac sqlheavy-0.1.1/configure.ac
  AC_SUBST(SQLITE3_CFLAGS)
  AC_SUBST(SQLITE3_LIBS)
 -VALA_PACKAGE=libvala-0.16
-+VALA_PACKAGE=libvala-0.30
++VALA_PACKAGE=libvala-0.34
  PKG_CHECK_MODULES(VALA, $VALA_PACKAGE >= $VALA_REQUIRED)
  AC_SUBST(VALA_PACKAGE)
  AC_SUBST(VALA_CFLAGS)
diff --git a/mingw-w64-sqlheavy/PKGBUILD b/mingw-w64-sqlheavy/PKGBUILD
index b13a0480d1..525113405a 100644
--- a/mingw-w64-sqlheavy/PKGBUILD
+++ b/mingw-w64-sqlheavy/PKGBUILD
@@ -16,10 +16,10 @@ depends=("${MINGW_PACKAGE_PREFIX}-gtk2"
 makedepends=("intltool"
              "gtk-doc")
 options=('strip' 'staticlibs')
-source=(https://sqlheavy.googlecode.com/files/sqlheavy-0.1.1.tar.xz
+source=(https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${_realname}/${_realname}-${pkgver}.tar.xz
         000-libvala.patch)
-sha256sums=('34cbe104f5df9a20ea26aa8acca2b6d1a73035448aa854162c598e90f4e6ff80'
-            'ba2f1eed43f926df573ec299b973929499e1da78c0f15157a4ec4ae40057afa1')
+sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031'
+            'a2ddd76e5b4a81b1684a16c03abc2fff01a86723748b718641206b3e038a66ae')
 
 prepare() {
   cd "${srcdir}"/${_realname}-${pkgver}