remove other packages' dependencies on the gettext tool

This commit is contained in:
Volker Grabsch 2010-02-07 16:31:31 +01:00
parent 63d8aab43d
commit 2d5a694db8
4 changed files with 52 additions and 9 deletions

27
src/glib-win32.patch Normal file
View File

@ -0,0 +1,27 @@
This file is part of mingw-cross-env.
See doc/index.html or doc/README 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
])

View File

@ -53,6 +53,9 @@ define $(PKG)_BUILD
$(MAKE) -C '$(1)/$(glib_SUBDIR)/gobject' -j '$(JOBS)' lib_LTLIBRARIES= install-exec
# cross build
cd '$(1)' && aclocal
cd '$(1)' && $(LIBTOOLIZE) --force
cd '$(1)' && autoconf
$(SED) 's,^\(Libs:.*\),\1 @PCRE_LIBS@ @G_THREAD_LIBS@ @G_LIBS_EXTRA@ -lshlwapi,' -i '$(1)/glib-2.0.pc.in'
# wine confuses the cross-compiling detection, so set it explicitly
$(SED) 's,cross_compiling=no,cross_compiling=yes,' -i '$(1)/configure'
@ -65,5 +68,9 @@ define $(PKG)_BUILD
--with-libiconv=gnu \
CXX='$(TARGET)-c++' \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/glib' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gmodule' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gthread' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gobject' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gio' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef

15
src/libgsf-win32.patch Normal file
View File

@ -0,0 +1,15 @@
This file is part of mingw-cross-env.
See doc/index.html or doc/README for further information.
diff -ru libgsf-1.14.16.orig/configure.in libgsf-1.14.16/configure.in
--- libgsf-1.14.16.orig/configure.in 2009-09-26 01:19:36.000000000 +0200
+++ libgsf-1.14.16/configure.in 2010-02-07 16:21:58.000000000 +0100
@@ -51,8 +51,6 @@
dnl Gettext/i18n stuff
-IT_PROG_INTLTOOL([0.35.0])
-
AM_GLIB_GNU_GETTEXT
GETTEXT_PACKAGE=AC_PACKAGE_NAME

View File

@ -20,13 +20,7 @@ define $(PKG)_UPDATE
endef
define $(PKG)_BUILD
# Don't search for intltool
$(SED) 's,\(INTLTOOL_APPLIED_VERSION\)=.*,\1=0.35.0,' -i '$(1)/configure'
$(SED) 's,^\(INTLTOOL_UPDATE\)=.*,\1=disabled,' -i '$(1)/configure'
$(SED) 's,^\(INTLTOOL_MERGE\)=.*,\1=disabled,' -i '$(1)/configure'
$(SED) 's,^\(INTLTOOL_EXTRACT\)=.*,\1=disabled,' -i '$(1)/configure'
$(SED) 's,require XML::Parser,,' -i '$(1)/configure'
# build
cd '$(1)' && autoconf
cd '$(1)' && ./configure \
--host='$(TARGET)' \
--disable-shared \
@ -41,5 +35,5 @@ define $(PKG)_BUILD
--with-bz2 \
--with-gio \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'
$(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
$(MAKE) -C '$(1)/gsf' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
endef