diff --git a/glib-patches/no-gettext.patch b/glib-patches/no-gettext.patch new file mode 100644 index 0000000..342ce76 --- /dev/null +++ b/glib-patches/no-gettext.patch @@ -0,0 +1,42 @@ +diff --git a/glib/configure.ac b/glib/configure.ac +index a78d516..8ac9631 100644 +--- a/glib/configure.ac ++++ b/glib/configure.ac +@@ -455,23 +455,12 @@ dnl + dnl gettext support + dnl + +-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 + AC_SUBST(GETTEXT_PACKAGE) + AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], + [Define the gettext package to be used]) + +-GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR) ++AC_DEFINE_UNQUOTED([GLIB_LOCALE_DIR], [""], [Dummy catalog directory]) + + dnl + dnl Now we are done with gettext checks, figure out ICONV_LIBS +diff --git a/glib/glib/ggettext.c b/glib/glib/ggettext.c +index ff1bb6b..c2d1ad5 100644 +--- a/glib/glib/ggettext.c ++++ b/glib/glib/ggettext.c +@@ -40,7 +40,7 @@ + + #include + #include +-#include ++#include "glibintl.h" + + #ifdef G_OS_WIN32 + diff --git a/glib-patches/patchlist b/glib-patches/patchlist index e539292..065bb5c 100644 --- a/glib-patches/patchlist +++ b/glib-patches/patchlist @@ -3,5 +3,6 @@ no-installed-files.patch foreign-automake.patch no-gregex.patch no-pkg-config.patch +no-gettext.patch cross-compiling.patch static-only.patch diff --git a/glib/configure.ac b/glib/configure.ac index a78d516..8ac9631 100644 --- a/glib/configure.ac +++ b/glib/configure.ac @@ -455,23 +455,12 @@ dnl dnl gettext support dnl -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 AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"], [Define the gettext package to be used]) -GLIB_DEFINE_LOCALEDIR(GLIB_LOCALE_DIR) +AC_DEFINE_UNQUOTED([GLIB_LOCALE_DIR], [""], [Dummy catalog directory]) dnl dnl Now we are done with gettext checks, figure out ICONV_LIBS diff --git a/glib/glib/ggettext.c b/glib/glib/ggettext.c index ff1bb6b..c2d1ad5 100644 --- a/glib/glib/ggettext.c +++ b/glib/glib/ggettext.c @@ -40,7 +40,7 @@ #include #include -#include +#include "glibintl.h" #ifdef G_OS_WIN32