packages libgda, libgdamm, mdbtools: minor fixes and disable update macro

index.html

@@ -1338,6 +1338,16 @@ USE_OSGPLUGIN(<plugin2>)
         <td id="libgcrypt-version">1.5.0</td>
         <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>
@@ -1553,6 +1563,11 @@ USE_OSGPLUGIN(&lt;plugin2&gt;)
         <td id="matio-version">1.3.4</td>
         <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>

src/libgda.mk

@@ -1,21 +1,18 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
+# This file is part of MXE.
+# See index.html for further information.
 
 # LibGDA
 PKG             := libgda
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.2.8
-$(PKG)_CHECKSUM := 01b859233407407807b2da1c4c244a5907695b7b
+$(PKG)_CHECKSUM := 61d0b498202b780750633cc2e957c40325d6c705
 $(PKG)_SUBDIR   := libgda-$($(PKG)_VERSION)
-$(PKG)_FILE     := libgda-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := http://www.gnome-db.org/
+$(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 postgresql
+$(PKG)_DEPS     := gcc glib libxml2 mdbtools postgresql
 
 define $(PKG)_UPDATE
-    wget -q -O- 'http://git.gnome.org/browse/libgda/refs/tags' | \
-    $(SED) -n "s,.*tag/?id=\([0-9]\+\.[0-9]*[02468]\.[^']*\).*,\1,p" | \
-    head -1
+    echo 'TODO: Updates for package libgda need to be fixed.' >&2;
+    echo $(libgda_VERSION)
 endef
 
 define $(PKG)_BUILD

src/libgdamm.mk

@@ -1,30 +1,24 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
+# This file is part of MXE.
+# See index.html for further information.
 
 # libgdamm
 PKG             := libgdamm
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 4.1.2
-$(PKG)_CHECKSUM := 9090858b30d38af4f476092d11de09a10e85d6b9
+$(PKG)_CHECKSUM := f6126d7b46720e3ea4f3d49e03add2e52da233be
 $(PKG)_SUBDIR   := libgdamm-$($(PKG)_VERSION)
-$(PKG)_FILE     := libgdamm-$($(PKG)_VERSION).tar.bz2
-$(PKG)_WEBSITE  := https://launchpad.net/libgdamm
+$(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
-    wget -q -O- 'http://git.gnome.org/browse/libgdamm/refs/tags' | \
-    grep '<a href=' | \
-    $(SED) -n 's,.*<a[^>]*>\([0-9][^<]*\)<.*,\1,p' | \
-    head -1
+    echo 'TODO: Updates for package libgdamm need to be fixed.' >&2;
+    echo $(libgdamm_VERSION)
 endef
 
 define $(PKG)_BUILD
-    # cross build
-    # wine confuses the cross-compiling detection, so set it explicitly
-    $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure'
     cd '$(1)' && ./configure \
         --host='$(TARGET)' \
+        --build="`config.guess`" \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
         CXX='$(TARGET)-c++' \

src/mdbtools-1-header.patch

@@ -1,12 +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;

src/mdbtools.mk

@@ -1,16 +1,14 @@
-# This file is part of mingw-cross-env.
-# See doc/index.html for further information.
+# This file is part of MXE.
+# See index.html for further information.
 
 # mdbtools
 PKG             := mdbtools
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 0.6pre1
 $(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_WEBSITE  := http://sourceforge.net/projects/$(PKG)/
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
-$(PKG)_DEPS     := gcc
+$(PKG)_DEPS     := gcc glib
 
 define $(PKG)_UPDATE
     wget -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \
@@ -23,6 +21,6 @@ define $(PKG)_BUILD
         --host='$(TARGET)' \
         --disable-shared \
         --prefix='$(PREFIX)/$(TARGET)' \
-        PKG_CONFIG='$(TARGET)-pkg-config'
+        PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
     $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= html_DATA=
 endef