changeset 2630:ba6d0a9ae212

Merge pull request #49 from william3/libglade add libglade package
author mabrand <mabrand@mabrand.nl>
date Sun, 17 Jun 2012 11:04:31 -0700
parents 5b3e0a7b7880 (current diff) 13c54fdfba7f (diff)
children d92fc97479a2
files index.html
diffstat 3 files changed, 96 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/index.html	Sat Jun 16 20:42:27 2012 +0200
+++ b/index.html	Sun Jun 17 11:04:31 2012 -0700
@@ -1374,6 +1374,11 @@
         <td id="libgeotiff-website"><a href="http://trac.osgeo.org/geotiff/">GeoTiff</a></td>
     </tr>
     <tr>
+        <td id="libglade-package">libglade</td>
+        <td id="libglade-version">2.6.4</td>
+        <td id="libglade-website"><a href="http://glade.gnome.org/">glade</a></td>
+    </tr>
+    <tr>
         <td id="libgnurx-package">libgnurx</td>
         <td id="libgnurx-version">2.5.1</td>
         <td id="libgnurx-website"><a href="http://sourceforge.net/projects/mingw/files/UserContributed/regex/">libgnurx</a></td>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libglade-1-fixes.patch	Sun Jun 17 11:04:31 2012 -0700
@@ -0,0 +1,65 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+[master 1ae0f2e] new version
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+From 1ae0f2e805de5bee3fa36584a87a47fe11893e8f Mon Sep 17 00:00:00 2001
+From: MXE
+Date: Sun, 17 Jun 2012 17:04:04 +0200
+Subject: [PATCH] new version
+
+
+diff --git a/configure.in b/configure.in
+index e0c52a8..e4691a3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -15,6 +15,16 @@ AC_CONFIG_HEADERS([config.h])
+ 
+ AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2])
+ 
++# pkg-config check put earlier in configure.in, because before LIBGLADE did not 
++# use the cross-compiled-pkg-cfg.
++PKG_PROG_PKG_CONFIG
++
++PKG_CHECK_MODULES(LIBGLADE, [dnl
++  libxml-2.0 >= required_libxml_version dnl
++  atk >= required_atk_version dnl
++  gtk+-2.0 >= required_gtk_version dnl
++  glib-2.0 >= required_glib_version])
++
+ GNOME_COMMON_INIT
+ 
+ if test "$enable_debug" != "no"; then
+@@ -40,14 +50,6 @@ AC_CHECK_FUNC(gtk_plug_get_type,
+   AC_DEFINE(HAVE_GTK_PLUG,1,[gtk has GtkPlug/GtkSocket implementation]))
+ LIBS=$save_LIBS
+ 
+-PKG_PROG_PKG_CONFIG
+-
+-PKG_CHECK_MODULES(LIBGLADE, [dnl
+-  libxml-2.0 >= required_libxml_version dnl
+-  atk >= required_atk_version dnl
+-  gtk+-2.0 >= required_gtk_version dnl
+-  glib-2.0 >= required_glib_version])
+-
+ AC_MSG_CHECKING([for native Win32])
+ case "$host" in
+   *-*-mingw*)
+diff --git a/glade/Makefile.am b/glade/Makefile.am
+index f6271f7..0641232 100644
+--- a/glade/Makefile.am
++++ b/glade/Makefile.am
+@@ -13,7 +13,7 @@ if OS_WIN32
+ export_symbols = -export-symbols glade.def
+ 
+ install-libtool-import-lib:
+-	$(INSTALL) .libs/libglade-2.0.dll.a $(DESTDIR)$(libdir)
++#	$(INSTALL) .libs/libglade-2.0.dll.a $(DESTDIR)$(libdir)
+ 
+ uninstall-libtool-import-lib:
+ 	-rm $(DESTDIR)$(libdir)/libglade-2.0.dll.a
+-- 
+1.7.9.5
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/libglade.mk	Sun Jun 17 11:04:31 2012 -0700
@@ -0,0 +1,26 @@
+# This file is part of MXE.
+# See index.html for further information.
+
+PKG             := libglade
+$(PKG)_IGNORE   :=
+$(PKG)_CHECKSUM := 3cc65ed13c10025780488935313329170baa33c6
+$(PKG)_SUBDIR   := libglade-$($(PKG)_VERSION)
+$(PKG)_FILE     := libglade-$($(PKG)_VERSION).tar.gz
+$(PKG)_URL      := http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/$($(PKG)_FILE)
+$(PKG)_DEPS     := gcc libxml2 atk glib gtk2
+
+define $(PKG)_UPDATE
+    wget -q -O- 'http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/' | \
+    $(SED) -n 's,.*"libglade-\([0-9][^"]*\)\.tar.gz.*,\1,p' | \
+    tail -1
+endef
+
+define $(PKG)_BUILD
+	cd '$(1)' && autoreconf -fi
+    cd '$(1)' && ./configure \
+        --host='$(TARGET)' \
+		--build="`config.guess`" \
+        --disable-shared \
+        --prefix='$(PREFIX)/$(TARGET)'
+	cd '$(1)' && make install
+endef