data/patches/glib_skip-gettext.patch

   1 diff --git a/acinclude.m4 b/acinclude.m4
   2 index cac7f21..aff165a 100644
   3 --- a/acinclude.m4
   4 +++ b/acinclude.m4
   5 @@ -449,4 +449,3 @@ AC_DEFUN([jm_AC_HEADER_INTTYPES_H],
   6  m4_include(acglib.m4)dnl
   7  m4_include(glib/libcharset/codeset.m4)dnl
   8  m4_include(glib/libcharset/glibc21.m4)dnl
   9 -m4_include(m4macros/glib-gettext.m4)dnl
  10 diff --git a/autogen.sh b/autogen.sh
  11 old mode 100644
  12 new mode 100755
  13 diff --git a/configure.ac b/configure.ac
  14 index b6640da..55262f3 100644
  15 --- a/configure.ac
  16 +++ b/configure.ac
  17 @@ -454,13 +454,6 @@ ALL_LINGUAS="`grep -v '^#' "$srcdir/po/LINGUAS" | tr '\n' ' '`"
  18  AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
  19  GLIB_GNU_GETTEXT
  20
  21 -if test "$gt_cv_have_gettext" != "yes" ; then
  22 -  AC_MSG_ERROR([
  23 -*** You must have either have gettext support in your C library, or use the
  24 -*** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
  25 -])
  26 -fi
  27 -
  28  LIBS="$INTLLIBS $LIBS"
  29
  30  GETTEXT_PACKAGE=glib20
  31 diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c
  32 index 3bfbd4f..f27e731 100644
  33 --- a/gio/gunixconnection.c
  34 +++ b/gio/gunixconnection.c
  35 @@ -26,6 +26,8 @@
  36  #include <string.h>
  37  #include <unistd.h>
  38
  39 +#define ngettext(t1, t2, n) t1
  40 +
  41  /**
  42   * SECTION:gunixconnection
  43   * @title: GUnixConnection
  44 diff --git a/glib/ggettext.c b/glib/ggettext.c
  45 index bf74ccb..2430a0d 100644
  46 --- a/glib/ggettext.c
  47 +++ b/glib/ggettext.c
  48 @@ -40,7 +40,6 @@
  49
  50  #include <string.h>
  51  #include <locale.h>
  52 -#include <libintl.h>
  53
  54  #ifdef G_OS_WIN32
  55
  56 diff --git a/glib/gi18n.h b/glib/gi18n.h
  57 index f765c3d..2c950cd 100644
  58 --- a/glib/gi18n.h
  59 +++ b/glib/gi18n.h
  60 @@ -20,13 +20,13 @@
  61
  62  #include <glib.h>
  63
  64 -#include <libintl.h>
  65  #include <string.h>
  66
  67 -#define  _(String) gettext (String)
  68 -#define Q_(String) g_dpgettext (NULL, String, 0)
  69 +#define  _(String) String
  70  #define N_(String) (String)
  71 -#define C_(Context,String) g_dpgettext (NULL, Context "\004" String, strlen (Context) + 1)
  72  #define NC_(Context, String) (String)
  73
  74 +#define textdomain(...)
  75 +#define bindtextdomain(...)
  76 +
  77  #endif  /* __G_I18N_H__ */
  78 diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
  79 index 971871c..8a4f40c 100644
  80 --- a/m4macros/Makefile.am
  81 +++ b/m4macros/Makefile.am
  82 @@ -1,6 +1,6 @@
  83  include $(top_srcdir)/glib.mk
  84
  85 -installed_m4= glib-2.0.m4 glib-gettext.m4 gsettings.m4
  86 +installed_m4= glib-2.0.m4 gsettings.m4
  87
  88  EXTRA_DIST+=$(installed_m4)
  89