diff options
| -rw-r--r-- | src/glib-1-win32.patch | 29 | ||||
| -rw-r--r-- | src/glib-2-fix-tool-paths.patch | 19 | ||||
| -rw-r--r-- | src/glib-win32.patch | 43 | ||||
| -rw-r--r-- | src/glib.mk | 16 |
4 files changed, 54 insertions, 53 deletions
diff --git a/src/glib-1-win32.patch b/src/glib-1-win32.patch new file mode 100644 index 0000000..238452f --- /dev/null +++ b/src/glib-1-win32.patch @@ -0,0 +1,29 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru glib-2.23.4.orig/configure.in glib-2.23.4/configure.in +--- glib-2.23.4.orig/configure.in 2010-02-21 21:54:55.000000000 +0100 ++++ glib-2.23.4/configure.in 2010-02-23 17:44:18.000000000 +0100 +@@ -476,13 +476,6 @@ + AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS']) + GLIB_GNU_GETTEXT + +-if test "$gt_cv_have_gettext" != "yes" ; then +- AC_MSG_ERROR([ +-*** You must have either have gettext support in your C library, or use the +-*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html +-]) +-fi +- + LIBS="$INTLLIBS $LIBS" + + GETTEXT_PACKAGE=glib20 +@@ -2748,8 +2741,6 @@ + dnl *** Checks for gtk-doc *** + dnl ************************** + +-GTK_DOC_CHECK([1.11]) +- + AC_ARG_ENABLE(man, + [AC_HELP_STRING([--enable-man], + [regenerate man pages from Docbook [default=no]])],enable_man=yes, diff --git a/src/glib-2-fix-tool-paths.patch b/src/glib-2-fix-tool-paths.patch new file mode 100644 index 0000000..6273410 --- /dev/null +++ b/src/glib-2-fix-tool-paths.patch @@ -0,0 +1,19 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in +--- glib-2.23.2.orig/glib-2.0.pc.in 2009-04-01 01:04:20.000000000 +0200 ++++ glib-2.23.2/glib-2.0.pc.in 2010-02-07 23:58:08.000000000 +0100 +@@ -3,9 +3,9 @@ + libdir=@libdir@ + includedir=@includedir@ + +-glib_genmarshal=glib-genmarshal +-gobject_query=gobject-query +-glib_mkenums=glib-mkenums ++glib_genmarshal=@bindir@/glib-genmarshal ++gobject_query=@bindir@/gobject-query ++glib_mkenums=@bindir@/glib-mkenums + + Name: GLib + Description: C Utility Library diff --git a/src/glib-win32.patch b/src/glib-win32.patch deleted file mode 100644 index c8a7f2a..0000000 --- a/src/glib-win32.patch +++ /dev/null @@ -1,43 +0,0 @@ -This file is part of mingw-cross-env. -See doc/index.html for further information. - -diff -ru glib-2.23.2.orig/configure.in glib-2.23.2/configure.in ---- glib-2.23.2.orig/configure.in 2010-01-25 02:50:02.000000000 +0100 -+++ glib-2.23.2/configure.in 2010-02-07 14:29:02.000000000 +0100 -@@ -2735,8 +2735,6 @@ - dnl *** Checks for gtk-doc *** - dnl ************************** - --GTK_DOC_CHECK([1.11]) -- - AC_ARG_ENABLE(man, - [AC_HELP_STRING([--enable-man], - [regenerate man pages from Docbook [default=no]])],enable_man=yes, -diff -ru glib-2.23.2.orig/m4macros/glib-gettext.m4 glib-2.23.2/m4macros/glib-gettext.m4 ---- glib-2.23.2.orig/m4macros/glib-gettext.m4 2009-04-01 01:04:20.000000000 +0200 -+++ glib-2.23.2/m4macros/glib-gettext.m4 2010-02-07 15:37:34.000000000 +0100 -@@ -246,8 +246,6 @@ - esac]) - LIBS="$glib_save_LIBS" - INSTOBJEXT=.mo -- else -- gt_cv_have_gettext=no - fi - fi - ]) -diff -ru glib-2.23.2.orig/glib-2.0.pc.in glib-2.23.2/glib-2.0.pc.in ---- glib-2.23.2.orig/glib-2.0.pc.in 2009-04-01 01:04:20.000000000 +0200 -+++ glib-2.23.2/glib-2.0.pc.in 2010-02-07 23:58:08.000000000 +0100 -@@ -3,9 +3,9 @@ - libdir=@libdir@ - includedir=@includedir@ - --glib_genmarshal=glib-genmarshal --gobject_query=gobject-query --glib_mkenums=glib-mkenums -+glib_genmarshal=@bindir@/glib-genmarshal -+gobject_query=@bindir@/gobject-query -+glib_mkenums=@bindir@/glib-mkenums - - Name: GLib - Description: C Utility Library diff --git a/src/glib.mk b/src/glib.mk index 7ab4c4b..4f35860 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -4,8 +4,8 @@ # GLib PKG := glib $(PKG)_IGNORE := -$(PKG)_VERSION := 2.23.3 -$(PKG)_CHECKSUM := 9ba908954fbcab7f8b74faf483f83b7ef8d28cf9 +$(PKG)_VERSION := 2.23.4 +$(PKG)_CHECKSUM := a2ba4fac49acc09cca457b20feec178c02075cf1 $(PKG)_SUBDIR := glib-$($(PKG)_VERSION) $(PKG)_FILE := glib-$($(PKG)_VERSION).tar.bz2 $(PKG)_WEBSITE := http://www.gtk.org/ @@ -21,8 +21,10 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib) - mv '$(1)/$(glib_SUBDIR)' '$(1).native' + cd '$(1)' && aclocal + cd '$(1)' && $(LIBTOOLIZE) --force + cd '$(1)' && autoconf + cp -Rp '$(1)' '$(1).native' # native build of libiconv (used by glib-genmarshal) cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv) @@ -32,9 +34,6 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' # native build for glib-genmarshal, without pkg-config, gettext and zlib - $(SED) -i 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' '$(1).native/configure' - $(SED) -i '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' '$(1).native/configure' - $(SED) -i 's,found_zlib=no,found_zlib=yes,' '$(1).native/configure' cd '$(1).native' && ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -52,9 +51,6 @@ define $(PKG)_BUILD $(MAKE) -C '$(1).native/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec # cross build - cd '$(1)' && aclocal - cd '$(1)' && $(LIBTOOLIZE) --force - cd '$(1)' && autoconf $(SED) -i 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' '$(1)/glib-2.0.pc.in' # wine confuses the cross-compiling detection, so set it explicitly $(SED) -i 's,cross_compiling=no,cross_compiling=yes,' '$(1)/configure' |