r11500 - in /desktop/experimental/glib2.0/debian: changelog patches/01_gettext-desktopfiles.patch patches/series rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Wed Jun 13 09:58:45 UTC 2007
Author: lool
Date: Wed Jun 13 09:58:45 2007
New Revision: 11500
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11500
Log:
* New upstream release series; these are development releases, the new API
may still change incompatibly.
- Target at experimental; include check-dist.
- Bump up shlibs to >= 2.13.4.
* New patch but disabled, 01_gettext-desktopfiles, permits overriding the
gettext domain when desktop files have such a field; found in the Ubuntu
package.
Added:
desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/patches/series
desktop/experimental/glib2.0/debian/rules
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=11500&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Wed Jun 13 09:58:45 2007
@@ -1,8 +1,15 @@
-glib2.0 (2.12.12-2) UNRELEASED; urgency=low
+glib2.0 (2.13.4-1) experimental; urgency=low
* Also honor parallel=n in DEB_BUILD_OPTIONS.
-
- -- Loic Minier <lool at dooz.org> Tue, 08 May 2007 11:44:03 +0200
+ * New upstream release series; these are development releases, the new API
+ may still change incompatibly.
+ - Target at experimental; include check-dist.
+ - Bump up shlibs to >= 2.13.4.
+ * New patch but disabled, 01_gettext-desktopfiles, permits overriding the
+ gettext domain when desktop files have such a field; found in the Ubuntu
+ package.
+
+ -- Loic Minier <lool at dooz.org> Wed, 13 Jun 2007 10:52:27 +0200
glib2.0 (2.12.12-1) unstable; urgency=low
Added: desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=11500&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch (added)
+++ desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch Wed Jun 13 09:58:45 2007
@@ -1,0 +1,97 @@
+diff -Nur glib-2.10.2/glib/gkeyfile.c glib-2.10.2.new/glib/gkeyfile.c
+--- glib-2.10.2/glib/gkeyfile.c 2006-01-18 04:51:28.000000000 +0100
++++ glib-2.10.2.new/glib/gkeyfile.c 2006-05-22 17:46:12.000000000 +0200
+@@ -21,6 +21,9 @@
+ * Boston, MA 02111-1307, USA.
+ */
+
++#define X_GETTEXT_DOMAIN "X-Ubuntu-Gettext-Domain"
++#define X_DESKTOP_ENTRY "Desktop Entry"
++
+ #include "config.h"
+
+ #include "gkeyfile.h"
+@@ -80,6 +83,7 @@
+ gchar list_separator;
+
+ GKeyFileFlags flags;
++ char *gettext_domain;
+ };
+
+ typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
+@@ -203,6 +207,7 @@
+ key_file->approximate_size = 0;
+ key_file->list_separator = ';';
+ key_file->flags = 0;
++ key_file->gettext_domain = NULL;
+ }
+
+ static void
+@@ -212,6 +217,7 @@
+
+ if (key_file->parse_buffer)
+ g_string_free (key_file->parse_buffer, TRUE);
++ g_free(key_file->gettext_domain);
+
+ tmp = key_file->groups;
+ while (tmp != NULL)
+@@ -429,6 +435,8 @@
+ return FALSE;
+ }
+
++ key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL);
++
+ return TRUE;
+ }
+
+@@ -533,6 +541,8 @@
+ g_propagate_error (error, key_file_error);
+ return FALSE;
+ }
++
++ key_file->gettext_domain = g_key_file_get_string (key_file, X_DESKTOP_ENTRY, X_GETTEXT_DOMAIN, NULL);
+
+ return TRUE;
+ }
+@@ -1581,6 +1591,32 @@
+ languages = (gchar **) g_get_language_names ();
+ free_languages = FALSE;
+ }
++
++ if (key_file->gettext_domain)
++ {
++ char *orig_value = g_key_file_get_string (key_file, group_name, key, NULL);
++ if (orig_value)
++ {
++ gboolean has_gettext;
++
++ /* fprintf (stderr, "Resolved: '%s'='%s'\n", key, orig_value); */
++ translated_value = dgettext (key_file->gettext_domain, orig_value);
++ has_gettext = translated_value != orig_value;
++ g_free (orig_value);
++
++ if (has_gettext)
++ {
++ if (bind_textdomain_codeset (key_file->gettext_domain, NULL))
++ translated_value = g_strdup (translated_value);
++ else
++ translated_value = g_locale_to_utf8 (translated_value, -1, NULL, NULL, NULL);
++ /* fprintf (stderr, "Translated: '%s' -(via %s)- '%s'\n", orig_value, key_file->gettext_domain, translated_value); */
++ goto done;
++ }
++ else
++ translated_value = NULL;
++ }
++ }
+
+ for (i = 0; languages[i]; i++)
+ {
+@@ -1609,6 +1645,8 @@
+ g_propagate_error (error, key_file_error);
+ }
+
++done:
++
+ if (free_languages)
+ g_strfreev (languages);
+
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=11500&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series (original)
+++ desktop/experimental/glib2.0/debian/patches/series Wed Jun 13 09:58:45 2007
@@ -1,1 +1,2 @@
+#01_gettext_desktopfiles.patch
60_output-lines-during-tests.patch
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=11500&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Wed Jun 13 09:58:45 2007
@@ -2,6 +2,7 @@
DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := glib
@@ -40,7 +41,7 @@
APIVER := 2.0
SONAME := 0
-SHVER := 2.12.9
+SHVER := 2.13.4
# package names
SHARED_PKG := libglib$(APIVER)-$(SONAME)
More information about the pkg-gnome-commits
mailing list