From 6a17de0c04536cda3e70af30ce17da7940679a29 Mon Sep 17 00:00:00 2001 From: Tony Theodore Date: Wed, 2 May 2012 23:31:27 +1000 Subject: packages libgda, libgdamm, mdbtools: minor fixes and disable update macro --- index.html | 15 +++++++++++++++ src/libgda.mk | 17 +++++++---------- src/libgdamm.mk | 20 +++++++------------- src/mdbtools-1-header.patch | 7 +++++-- src/mdbtools.mk | 10 ++++------ 5 files changed, 38 insertions(+), 31 deletions(-) diff --git a/index.html b/index.html index b356086..39b4cf7 100644 --- a/index.html +++ b/index.html @@ -1339,6 +1339,16 @@ USE_OSGPLUGIN(<plugin2>) libgcrypt + libgda + 4.2.13 + libgda + + + libgdamm + 4.1.3 + libgdamm + + libgee 0.5.0 libgee @@ -1554,6 +1564,11 @@ USE_OSGPLUGIN(<plugin2>) matio + mdbtools + 0.6pre1 + mdbtools + + mingw-utils 0.4-1 MinGW Utilities diff --git a/src/libgda.mk b/src/libgda.mk index 8946cc9..d13d24d 100644 --- a/src/libgda.mk +++ b/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 diff --git a/src/libgdamm.mk b/src/libgdamm.mk index 6b4a628..e2e3d30 100644 --- a/src/libgdamm.mk +++ b/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 ']*>\([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++' \ diff --git a/src/mdbtools-1-header.patch b/src/mdbtools-1-header.patch index 744458c..90874c5 100644 --- a/src/mdbtools-1-header.patch +++ b/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; diff --git a/src/mdbtools.mk b/src/mdbtools.mk index cfef4bb..a6082b6 100644 --- a/src/mdbtools.mk +++ b/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 -- cgit v0.12