Hello community, here is the log from the commit of package glib2 checked in at Wed Aug 13 23:29:16 CEST 2008. -------- --- GNOME/glib2/glib2.changes 2008-07-25 14:05:32.000000000 +0200 +++ glib2/glib2.changes 2008-08-06 19:48:11.000000000 +0200 @@ -1,0 +2,54 @@ +Wed Aug 6 12:35:52 CDT 2008 - maw@suse.de + +- Update to version 2.17.6: + + g_markup_context_get_user_data: New function to access the + user_data outside of callbacks + + GIO: + + g_mount_guess_content_type_sync: synchronous version of + g_mount_guess_content_type + + GEmblem: A GIcon implementation that adds emblem-related + metadata to icons + + GEmblemedIcon: A GIcon implementation that can add emblems + to icons + + Bugs fixed: bgo#544088, bgo#544465, bgo#545485, bgo#545798, + bgo#544140, bgo#529694, bgo#545157, bgo#545203, bgo#545457, + bgo#544177, bgo#545395, bgo#541036, bgo#546079, bgo#545395, + and bgo#546017 + + Updated translations. + +------------------------------------------------------------------- +Thu Jul 31 17:19:22 CDT 2008 - maw@suse.de + +- Update to version 2.17.4: + + GIO: + * New API to handle content types: g_mount_guess_content_type, + g_content_type_guess_for_tree + * Export the eject-button signal on the volume monitor class + * New API to enable out-of-process volume monitors: + g_volume_get_activation_root + + GObject: + * New API to handle signals without slots in the class + structure: g_signal_new_class_handler and + g_signal_override_class_handler + + Internationalization: + + Add an NC_ macro that is a no-op equivalent of C_ + + GMarkup: + * Add two new functions, g_markup_parse_context_push and + g_markup_parse_context_pop, to support "subparsers" + + Bugs fixed: bgo#541208, bgo#541507, bgo#543040, bgo#543560, + bgo#528317, bgo#337518, bgo#541794, bgo#541793, bgo#467707, + bgo#428048, bgo#542332, bgo#482413, bgo#406120, bgo#334234, + bgo#536996, bgo#540616, bgo#539229, bgo#521589, bgo#543168, + bgo#543220, bgo#530759, bgo#535223, and bgo#543504 + + Updated translations +- Tag glib-2.17.3-implicitdecl.patch. + +------------------------------------------------------------------- +Tue Jul 29 01:44:51 CEST 2008 - vuntz@novell.com + +- Add glib2-fate300461-desktop-gettext.patch to support + translation of desktop entries via gettext, using the + X-SUSE-Gettext-Domain key. The patch is based on a similar patch + from Ubuntu. This is part of fate#300461 + +------------------------------------------------------------------- Old: ---- glib-2.17.3.tar.bz2 New: ---- glib-2.17.6.tar.bz2 glib2-fate300461-desktop-gettext.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.R27327/_old 2008-08-13 23:26:57.000000000 +0200 +++ /var/tmp/diff_new_pack.R27327/_new 2008-08-13 23:26:57.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package glib2 (Version 2.17.3) +# spec file for package glib2 (Version 2.17.6) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,8 +24,8 @@ License: LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on -Version: 2.17.3 -Release: 4 +Version: 2.17.6 +Release: 1 Summary: A Library with Convenient Functions Written in C Url: http://www.gtk.org/ Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{_name}/2.14/%{_name}-%{version}.tar.bz2 @@ -41,6 +48,8 @@ # PATCH-FIX-UPSTREAM glib2-base64.patch pchenthill@novell.com bnc382708 Patch9: glib2-base64.patch Patch10: glib-2.17.3-implicitdecl.patch +# PATCH-FEATURE-OPENSUSE glib2-fate300461-desktop-gettext.patch fate300461 vuntz@novell.com -- Look for translation of desktop entry strings via gettext +Patch11: glib2-fate300461-desktop-gettext.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-lang = %{version} # For temporary %%pre script only. @@ -368,6 +377,7 @@ %patch8 %patch9 %patch10 +%patch11 -p1 cp -a %{S:1} %{S:2} %{S:3} . cp -a %{S:4} gnome_defaults.conf if ! test -f %{_datadir}/aclocal/gtk-doc.m4 ; then @@ -501,16 +511,61 @@ %dir %{_datadir}/gtk-doc/html %changelog +* Wed Aug 06 2008 maw@suse.de +- Update to version 2.17.6: + + g_markup_context_get_user_data: New function to access the + user_data outside of callbacks + + GIO: + + g_mount_guess_content_type_sync: synchronous version of + g_mount_guess_content_type + + GEmblem: A GIcon implementation that adds emblem-related + metadata to icons + + GEmblemedIcon: A GIcon implementation that can add emblems + to icons + + Bugs fixed: bgo#544088, bgo#544465, bgo#545485, bgo#545798, + bgo#544140, bgo#529694, bgo#545157, bgo#545203, bgo#545457, + bgo#544177, bgo#545395, bgo#541036, bgo#546079, bgo#545395, + and bgo#546017 + + Updated translations. +* Thu Jul 31 2008 maw@suse.de +- Update to version 2.17.4: + + GIO: + * New API to handle content types: g_mount_guess_content_type, + g_content_type_guess_for_tree + * Export the eject-button signal on the volume monitor class + * New API to enable out-of-process volume monitors: + g_volume_get_activation_root + + GObject: + * New API to handle signals without slots in the class + structure: g_signal_new_class_handler and + g_signal_override_class_handler + + Internationalization: + + Add an NC_ macro that is a no-op equivalent of C_ + + GMarkup: + * Add two new functions, g_markup_parse_context_push and + g_markup_parse_context_pop, to support "subparsers" + + Bugs fixed: bgo#541208, bgo#541507, bgo#543040, bgo#543560, + bgo#528317, bgo#337518, bgo#541794, bgo#541793, bgo#467707, + bgo#428048, bgo#542332, bgo#482413, bgo#406120, bgo#334234, + bgo#536996, bgo#540616, bgo#539229, bgo#521589, bgo#543168, + bgo#543220, bgo#530759, bgo#535223, and bgo#543504 + + Updated translations +- Tag glib-2.17.3-implicitdecl.patch. +* Mon Jul 28 2008 vuntz@novell.com +- Add glib2-fate300461-desktop-gettext.patch to support + translation of desktop entries via gettext, using the + X-SUSE-Gettext-Domain key. The patch is based on a similar patch + from Ubuntu. This is part of fate#300461 * Fri Jul 25 2008 sbrabec@suse.cz - nautilus-folder-handler added to gnome-defaults.conf (bnc#410728) -* Sun Jul 20 2008 crrodriguez@suse.de +* Sat Jul 19 2008 crrodriguez@suse.de - fix build - incidentally, this also fixes a massive PPC problems, caused by endianness bug, GTK2 build failed causing chain-of-errors resulting in misleading libglitz.la related build failures. - run make check, so the next time, the previous problem is catched before it breaks everything. -* Thu Jul 17 2008 maw@suse.de +* Wed Jul 16 2008 maw@suse.de - Update to version 2.17.3: + Bugs fixed: bgo#538119, bgo#537635, bgo#539067, bgo#535949, bgo#539123, bgo#539074, bgo#316221, bgo#539770, bgo#539626, @@ -522,7 +577,7 @@ + The version of PCRE included in 2.17.3 has been fixed with respect to CVE-2008-2371; note, however, that as of 10.3/11.0, SUSE's glib2 packages use the system PCRE. -* Thu Jun 19 2008 maw@suse.de +* Wed Jun 18 2008 maw@suse.de - Update to version 2.17.2: + New function: g_utime(), a gstdio wrapper for utime() + New functions: g_dgettext() and g_dngettext(), wrappers @@ -580,10 +635,10 @@ glib2-fix-bookmark-leak.diff, glib2-bnc379739-handle-blank-tryexec.patch, and glib2-bnc387387-gio-hide-inaccessible-mounts.patch. -* Tue May 20 2008 hpj@suse.de +* Mon May 19 2008 hpj@suse.de - Add glib2-bnc387387-gio-hide-inaccessible-mounts.patch (bnc#387387). -* Wed May 14 2008 hpj@suse.de +* Tue May 13 2008 hpj@suse.de - Add glib2-bnc379739-handle-blank-tryexec.patch (bnc#379739). * Mon May 12 2008 maw@suse.de - Add glib2-base64.patch (bnc#382708). @@ -600,19 +655,19 @@ Fix bnc#379332. * Tue Apr 29 2008 cthiel@suse.de - obsolete glib2-<arch> via baselibs.conf -* Tue Apr 22 2008 hpj@suse.de +* Mon Apr 21 2008 hpj@suse.de - Dropped previously disabled glib2-cast.patch. -* Tue Apr 15 2008 maw@suse.de +* Mon Apr 14 2008 maw@suse.de - Add glib2-fix-bookmark-leak.diff. * Mon Apr 14 2008 sbrabec@suse.cz - Use packageand form of branding supplement and removed self conflict. -* Sat Apr 12 2008 maw@suse.de +* Fri Apr 11 2008 maw@suse.de - Tag glib2-libtool.diff, which was added in the previous submission. * Fri Apr 11 2008 schwab@suse.de - Work around broken configure script. -* Thu Apr 10 2008 maw@suse.de +* Wed Apr 09 2008 maw@suse.de - Update to version 2.16.3: + Bugs fixed: bgo#521513, bgo#316221, bgo#520914, bgo#521045, bgo#521591, bgo#521672, bgo#522292, bgo#522335, bgo#523015, @@ -663,7 +718,7 @@ - moved recommendation of gvfs to gtk2 * Tue Apr 01 2008 sbrabec@suse.cz - SuSEconfig script moved from gnome-vfs2 (bnc#372783). -* Tue Apr 01 2008 federico@novell.com +* Mon Mar 31 2008 federico@novell.com - Added glib2-bnc373149-bgo518160-gbookmark-optimizations.diff and glib2-bnc373149-bgo523877-gbookmark-optimizations.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=373149 - backport @@ -675,7 +730,7 @@ * Fix a crash in g_themed_icon_new * Update the included PCRE to 7.6 - Tag patches -* Fri Feb 29 2008 jpr@suse.de +* Thu Feb 28 2008 jpr@suse.de - Update to version 2.15.6: + GIO: * New file attributes: trash::item-count, filesystem::use-preview @@ -694,7 +749,7 @@ * Fix race conditions in g_spawn implementation on win32 * g_uri_get_scheme has been renamed go g_uri_parse_scheme + Updated translations -* Tue Feb 19 2008 maw@suse.de +* Mon Feb 18 2008 maw@suse.de - Remove glib-cast.patch at least temporarily. * Mon Feb 18 2008 maw@suse.de - Update to version 2.15.5: @@ -812,7 +867,7 @@ + Bugs (bugzilla.gnome.org) fixed: #453998, #462549, and [#417068] + Updated translations. -* Sat Aug 25 2007 maw@suse.de +* Fri Aug 24 2007 maw@suse.de - Update glib-casts.patch to fix g_array_index on ia64. * Thu Aug 09 2007 sbrabec@suse.cz - Removed gtk-doc from BuildRequires and included required @@ -822,7 +877,7 @@ - Use %%fdupes - Split off a -lang subpackage - s#%%run_ldconfig#/sbin/ldconfig/ in %%post and %%postun. -* Mon Aug 06 2007 maw@suse.de +* Sun Aug 05 2007 maw@suse.de - The previous changelog entry refers to #297636. * Sun Aug 05 2007 schwab@suse.de - Fix broken interface. @@ -884,7 +939,7 @@ en_CA,en_GB,et,fa,fr,he,hu,it,ja,ku,lt,mg,mk,ml, nb,ne,nn,pt,pt_BR,ro,sr,sr@Latn,sv,ta,uk,vi,zh_CN, zh_HK,zh_TW) -* Fri Apr 13 2007 maw@suse.de +* Thu Apr 12 2007 maw@suse.de - Pass --enable-static to configure (#263998). * Wed Mar 21 2007 maw@suse.de - Update to version 2.12.11 @@ -970,7 +1025,7 @@ * Thu Dec 07 2006 sbrabec@suse.cz - Prefix changed to /usr. - Spec file cleanup. -* Fri Nov 03 2006 jhargadon@suse.de +* Thu Nov 02 2006 jhargadon@suse.de - added a patch to m4macros/glib-gettext.m4 so that the build variables expand properly. * Mon Oct 02 2006 jhargadon@suse.de @@ -995,7 +1050,7 @@ - 351853 GKeyFile creates non-UTF-8 error messages - Translation updates (fr,hu,ja,ku,lt,lv,ml,or, pt,ru,sv,vi,zh_CN) -* Wed Aug 30 2006 jhargadon@suse.de +* Tue Aug 29 2006 jhargadon@suse.de - update to version 2.12.2 - Normalization is following Unicode TR #29 - 348491 g_utf8_strup() and g_utf8_strdown() returns @@ -1008,7 +1063,7 @@ - 349792 Wrong english string - 349952 gparamspecs.c uses gcc feature - Translation updates -* Tue Aug 01 2006 gekker@suse.de +* Mon Jul 31 2006 gekker@suse.de - Update to version 2.12.1 * Update to final Unicode Character Database 5.0.0 * Bugs fixed: @@ -1020,7 +1075,7 @@ 246494 prototype mismatch in glib/gconvert.c * New and updated translations (bg,bn_IN,ca,dz,eu,fi, fr,he,it,ja,mk,or,pt) -* Wed Jul 19 2006 rml@suse.de +* Tue Jul 18 2006 rml@suse.de - Update to glib 2.12: - Lots of bug fixes - GSlice! @@ -1033,11 +1088,11 @@ * Thu Mar 30 2006 sbrabec@suse.cz - Renamed profile to be executed after lang.*, otherwise G_FILENAME_ENCODING cannot be set. -* Fri Jan 27 2006 mls@suse.de +* Thu Jan 26 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Wed Jan 18 2006 gekker@suse.de +* Tue Jan 17 2006 gekker@suse.de - Fix gstaticmutex define (#141215 patch byjblunck) -* Tue Jan 17 2006 zsu@suse.de +* Mon Jan 16 2006 zsu@suse.de - Fixed implicit cast issue introduced by bugfix #316221 http://bugzilla.gnome.org/show_bug.cgi?id=327022 * Fri Jan 13 2006 sbrabec@suse.cz @@ -1051,7 +1106,7 @@ http://bugzilla.gnome.org/show_bug.cgi?id=316221 * Fri Nov 04 2005 schwab@suse.de - Fix use of atomic builtins. -* Wed Oct 12 2005 gekker@suse.de +* Tue Oct 11 2005 gekker@suse.de - Update to version 2.8.3 * Wed Sep 28 2005 gekker@suse.de - Update to version 2.8.2 @@ -1060,7 +1115,7 @@ - Update to version 2.8.1 * Mon Aug 15 2005 rodrigo@suse.de - Update to version 2.8.0 -* Thu Aug 11 2005 gekker@suse.de +* Wed Aug 10 2005 gekker@suse.de - Update to version 2.7.7 * Mon Aug 01 2005 gekker@suse.de - Update to version 2.7.4 @@ -1068,7 +1123,7 @@ - Update to version 2.7.2 * Thu Jun 23 2005 sbrabec@suse.cz - Fixed devel dependencies. -* Fri Jun 17 2005 gekker@suse.de +* Thu Jun 16 2005 gekker@suse.de - Update to version 2.7.0. - Fix SENTINEL patch to work with upstream version. * Tue Jun 07 2005 gekker@suse.de @@ -1086,7 +1141,7 @@ - Updated to version 2.6.3. * Mon Feb 07 2005 sbrabec@suse.cz - Updated to version 2.6.2. -* Thu Jan 20 2005 meissner@suse.de +* Wed Jan 19 2005 meissner@suse.de - define G_GNUC_SENTINEL for gcc >= 4 - specify G_GNUC_SENTINEL where applicable. * Sun Jan 16 2005 clahey@suse.de @@ -1095,18 +1150,18 @@ - Update to version 2.6.0 * Wed Dec 22 2004 ro@suse.de - remove no translation (obsolete with nb present) -* Wed Dec 15 2004 gekker@suse.de +* Tue Dec 14 2004 gekker@suse.de - Update version to 2.5.7. - Remove the no-no patch, as it is upstreamed. * Tue Nov 16 2004 clahey@suse.de - Update to glib 2.5.6. -* Tue Oct 19 2004 ro@suse.de +* Mon Oct 18 2004 ro@suse.de - remove no locale support: nb is already there * Tue Oct 12 2004 sbrabec@suse.cz - Require gnome-filesystem (#47068). * Wed Sep 29 2004 sbrabec@suse.cz - Fixed glib2.csh for unset LANG (#46282). -* Thu Aug 26 2004 federico@ximian.com +* Wed Aug 25 2004 federico@ximian.com - Update to glib 2.4.5 - Removed glib-pattern.diff, as this bug is fixed in the tarball. * Wed Aug 25 2004 kukuk@suse.de @@ -1136,7 +1191,7 @@ - FHS 2.3 fix (mandir, infodir, #35821). * Wed Mar 10 2004 sbrabec@suse.cz - Fixed %%doc attributes (#33163). -* Sat Jan 10 2004 schwab@suse.de +* Fri Jan 09 2004 schwab@suse.de - Fix quoting in autoconf macros. * Fri Oct 17 2003 adrian@suse.de - fix missing %%run_ldconfig ++++++ glib-2.17.3.tar.bz2 -> glib-2.17.6.tar.bz2 ++++++ ++++ 119759 lines of diff (skipped) ++++++ glib2-fate300461-desktop-gettext.patch ++++++ Index: glib-2.17.3/glib/gkeyfile.c =================================================================== --- glib-2.17.3.orig/glib/gkeyfile.c +++ glib-2.17.3/glib/gkeyfile.c @@ -83,6 +83,7 @@ struct _GKeyFile GKeyFileFlags flags; gchar **locales; + gchar *gettext_domain; }; typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair; @@ -209,6 +210,7 @@ g_key_file_init (GKeyFile *key_file) key_file->list_separator = ';'; key_file->flags = 0; key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); + key_file->gettext_domain = NULL; } static void @@ -228,6 +230,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->parse_buffer = NULL; } + if (key_file->gettext_domain) + { + g_free (key_file->gettext_domain); + key_file->gettext_domain = NULL; + } + tmp = key_file->groups; while (tmp != NULL) { @@ -448,6 +456,11 @@ g_key_file_load_from_fd (GKeyFile return FALSE; } + key_file->gettext_domain = g_key_file_get_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, + NULL); + return TRUE; } @@ -554,6 +567,11 @@ g_key_file_load_from_data (GKeyFile return FALSE; } + key_file->gettext_domain = g_key_file_get_string (key_file, + G_KEY_FILE_DESKTOP_GROUP, + G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, + NULL); + return TRUE; } @@ -1653,6 +1671,8 @@ g_key_file_get_locale_string (GKeyFile GError *key_file_error; gchar **languages; gboolean free_languages = FALSE; + gboolean try_gettext = FALSE; + const gchar *msg_locale; gint i; g_return_val_if_fail (key_file != NULL, NULL); @@ -1682,7 +1702,24 @@ g_key_file_get_locale_string (GKeyFile languages = (gchar **) g_get_language_names (); free_languages = FALSE; } - + + /* we're only interested in gettext translation if we don't have a + * translation in the .desktop file itself and if the key is one of the keys + * we know we want to translate: Name, GenericName, Comment. Blindly doing + * this for all keys can give strange result for the icons, since the Icon is + * a locale string in the spec, eg. We also only get translation in the mo + * file if the requested locale is the LC_MESSAGES one. Ideally, we should do + * more and change LC_MESSAGES to use the requested locale, but there's no + * guarantee it's installed on the system and it might have some + * side-effects. Since this is a corner case, let's ignore it. */ + + msg_locale = setlocale (LC_MESSAGES, NULL); + try_gettext = msg_locale && key_file->gettext_domain && + strcmp (group_name, G_KEY_FILE_DESKTOP_GROUP) == 0 && + (strcmp (key, G_KEY_FILE_DESKTOP_KEY_NAME) == 0 || + strcmp (key, G_KEY_FILE_DESKTOP_KEY_GENERIC_NAME) == 0 || + strcmp (key, G_KEY_FILE_DESKTOP_KEY_COMMENT) == 0); + for (i = 0; languages[i]; i++) { candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); @@ -1697,6 +1734,31 @@ g_key_file_get_locale_string (GKeyFile g_free (translated_value); translated_value = NULL; + + if (try_gettext && strcmp (msg_locale, languages[i]) == 0) + { + gchar *orig_value = g_key_file_get_string (key_file, group_name, key, NULL); + + if (orig_value) + { + gboolean has_gettext; + + 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); + break; + } + else + translated_value = NULL; + } + } } /* Fallback to untranslated key Index: glib-2.17.3/glib/gkeyfile.h =================================================================== --- glib-2.17.3.orig/glib/gkeyfile.h +++ glib-2.17.3/glib/gkeyfile.h @@ -240,6 +240,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify" #define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass" #define G_KEY_FILE_DESKTOP_KEY_URL "URL" +#define G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN "X-SUSE-Gettext-Domain" #define G_KEY_FILE_DESKTOP_TYPE_APPLICATION "Application" #define G_KEY_FILE_DESKTOP_TYPE_LINK "Link" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org