Mercurial > mxe-octave

annotate src/glib-2-optional-gettext.patch @ 975:dd1f42da3294

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved patches of package glib
author Volker Grabsch <vog@notjusthosting.com>
date Sun, 16 May 2010 16:24:45 +0200
parents
children 750e3f9eec37
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
975
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
1 This file is part of mingw-cross-env.
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
2 See doc/index.html for further information.
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
3
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
4 diff -r 0afda95c1aa4 configure.in
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
5 --- a/configure.in Sun May 16 15:54:15 2010 +0200
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
6 +++ b/configure.in Sun May 16 16:07:08 2010 +0200
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
7 @@ -477,8 +477,8 @@
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
8 GLIB_GNU_GETTEXT
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
9
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
10 if test "$gt_cv_have_gettext" != "yes" ; then
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
11 - AC_MSG_ERROR([
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
12 -*** You must have either have gettext support in your C library, or use the
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
13 + AC_MSG_WARN([
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
14 +*** You should either have gettext support in your C library, or use the
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
15 *** GNU gettext library. (http://www.gnu.org/software/gettext/gettext.html
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
16 ])
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
17 fi
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
18 diff -r f084585629df gio/gsettings.c
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
19 --- a/gio/gsettings.c Tue Apr 27 23:13:34 2010 +0200
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
20 +++ b/gio/gsettings.c Tue Apr 27 23:17:47 2010 +0200
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
21 @@ -782,16 +782,13 @@
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
22 const gchar *translated;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
23 GError *error = NULL;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
24 const gchar *domain;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
25 - gint lc_category;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
26
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
27 domain = g_settings_schema_get_gettext_domain (settings->priv->schema);
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
28
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
29 if (lc_char == 't')
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
30 - lc_category = LC_TIME;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
31 + translated = dcgettext (domain, unparsed, LC_TIME);
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
32 else
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
33 - lc_category = LC_MESSAGES;
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
34 -
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
35 - translated = dcgettext (domain, unparsed, lc_category);
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
36 + translated = dgettext (domain, unparsed);
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
37
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
38 if (translated != unparsed)
dd1f42da3294 improved patches of package glib
Volker Grabsch <vog@notjusthosting.com>
parents:
diff changeset
39 /* it was translated, so we need to re-parse it */