# HG changeset patch
# User Tony Theodore <tonyt@logyst.com>
# Date 1335965527 -36000
# Node ID 145b67adfecf5581abcf1e257402a2e0cd716a19
# Parent  51a4ed33302da6d0edb00089ad972ff62624ed32# Parent  1804bb1dccfc18a8bfd9e0b849764ea759c0f90a
Merge branch 'new-packages'

diff -r 51a4ed33302d -r 145b67adfecf index.html
--- a/index.html	Wed May 02 21:36:59 2012 +1000
+++ b/index.html	Wed May 02 23:32:07 2012 +1000
@@ -1339,6 +1339,16 @@
         <td id="libgcrypt-website"><a href="ftp://ftp.gnupg.org/gcrypt/libgcrypt/">libgcrypt</a></td>
     </tr>
     <tr>
+        <td id="libgda-package">libgda</td>
+        <td id="libgda-version">4.2.13</td>
+        <td id="libgda-website"><a href="http://www.gnome-db.org/">libgda</a></td>
+    </tr>
+    <tr>
+        <td id="libgdamm-package">libgdamm</td>
+        <td id="libgdamm-version">4.1.3</td>
+        <td id="libgdamm-website"><a href="https://launchpad.net/libgdamm">libgdamm</a></td>
+    </tr>
+    <tr>
         <td id="libgee-package">libgee</td>
         <td id="libgee-version">0.5.0</td>
         <td id="libgee-website"><a href="http://live.gnome.org/Libgee">libgee</a></td>
@@ -1554,6 +1564,11 @@
         <td id="matio-website"><a href="http://sourceforge.net/projects/matio/">matio</a></td>
     </tr>
     <tr>
+        <td id="mdbtools-package">mdbtools</td>
+        <td id="mdbtools-version">0.6pre1</td>
+        <td id="mdbtools-website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td>
+    </tr>
+    <tr>
         <td id="mingw-utils-package">mingw-utils</td>
         <td id="mingw-utils-version">0.4-1</td>
         <td id="mingw-utils-website"><a href="http://www.mingw.org/">MinGW Utilities</a></td>
diff -r 51a4ed33302d -r 145b67adfecf src/libgda.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgda.mk	Wed May 02 23:32:07 2012 +1000
@@ -0,0 +1,34 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# LibGDA
+PKG             := libgda
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 61d0b498202b780750633cc2e957c40325d6c705
+$(PKG)_SUBDIR   := libgda-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgda-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgda/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib libxml2 mdbtools postgresql
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgda need to be fixed.' >&2;
+    echo $(libgda_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        --disable-shared \
+        --disable-gtk-doc \
+        --without-bdb \
+        --with-mdb \
+        --without-oracle \
+        --without-mysql \
+        --without-firebird \
+        --without-java \
+        --enable-binreloc \
+        --disable-crypto
+    $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+    $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 51a4ed33302d -r 145b67adfecf src/libgdamm.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libgdamm.mk	Wed May 02 23:32:07 2012 +1000
@@ -0,0 +1,28 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# libgdamm
+PKG             := libgdamm
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := f6126d7b46720e3ea4f3d49e03add2e52da233be
+$(PKG)_SUBDIR   := libgdamm-$($(PKG)_VERSION)
+$(PKG)_FILE     := libgdamm-$($(PKG)_VERSION).tar.xz
+$(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/libgdamm/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libgda glibmm
+
+define $(PKG)_UPDATE
+    echo 'TODO: Updates for package libgdamm need to be fixed.' >&2;
+    echo $(libgdamm_VERSION)
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --build="`config.guess`" \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        CXX='$(TARGET)-c++' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        MAKE=$(MAKE)
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
+endef
diff -r 51a4ed33302d -r 145b67adfecf src/mdbtools-1-header.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools-1-header.patch	Wed May 02 23:32:07 2012 +1000
@@ -0,0 +1,15 @@
+This file is part of MXE.
+See index.html for further information.
+
+diff -ur mdbtools-0.6pre1-orig//include/mdbtools.h mdbtools-0.6pre1//include/mdbtools.h
+--- mdbtools-0.6pre1-orig//include/mdbtools.h	2011-06-01 00:07:12.336088034 +0900
++++ mdbtools-0.6pre1//include/mdbtools.h	2011-06-01 00:10:51.536088143 +0900
+@@ -147,7 +147,7 @@
+ #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
+
+ /* hash to store registered backends */
+-extern GHashTable	*mdb_backends;
++static GHashTable	*mdb_backends;
+
+ /* forward declarations */
+ typedef struct mdbindex MdbIndex;
diff -r 51a4ed33302d -r 145b67adfecf src/mdbtools.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/mdbtools.mk	Wed May 02 23:32:07 2012 +1000
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+# mdbtools
+PKG             := mdbtools
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0
+$(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc glib
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \
+    $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+    head -1
+endef
+
+define $(PKG)_BUILD
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)' \
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
+    $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
+endef