Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2014-10-17 08:50:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2014-09-30 19:40:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new/glib2.changes 2014-10-17 08:50:56.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Oct 15 21:16:31 UTC 2014 - [email protected] + +- Update glib2-fate300461-gettext-gkeyfile-suse.patch: Initialize + variable has_gettext. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2-fate300461-gettext-gkeyfile-suse.patch ++++++ --- /var/tmp/diff_new_pack.YgIyMm/_old 2014-10-17 08:50:57.000000000 +0200 +++ /var/tmp/diff_new_pack.YgIyMm/_new 2014-10-17 08:50:57.000000000 +0200 @@ -1,8 +1,8 @@ -Index: glib-2.37.5/glib/gkeyfile.c +Index: glib-2.42.0/glib/gkeyfile.c =================================================================== ---- glib-2.37.5.orig/glib/gkeyfile.c -+++ glib-2.37.5/glib/gkeyfile.c -@@ -446,6 +446,7 @@ struct _GKeyFile +--- glib-2.42.0.orig/glib/gkeyfile.c ++++ glib-2.42.0/glib/gkeyfile.c +@@ -443,6 +443,7 @@ struct _GKeyFile gchar **locales; gchar *gettext_domain; @@ -10,7 +10,7 @@ volatile gint ref_count; }; -@@ -571,6 +572,7 @@ g_key_file_init (GKeyFile *key_file) +@@ -568,6 +569,7 @@ g_key_file_init (GKeyFile *key_file) key_file->flags = 0; key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); key_file->gettext_domain = NULL; @@ -18,7 +18,7 @@ } static void -@@ -596,6 +598,12 @@ g_key_file_clear (GKeyFile *key_file) +@@ -593,6 +595,12 @@ g_key_file_clear (GKeyFile *key_file) key_file->gettext_domain = NULL; } @@ -31,7 +31,7 @@ tmp = key_file->groups; while (tmp != NULL) { -@@ -739,6 +747,39 @@ find_file_in_data_dirs (const gchar *f +@@ -736,6 +744,39 @@ find_file_in_data_dirs (const gchar *f return fd; } @@ -71,7 +71,7 @@ static gboolean g_key_file_load_from_fd (GKeyFile *key_file, gint fd, -@@ -816,6 +857,9 @@ g_key_file_load_from_fd (GKeyFile +@@ -813,6 +854,9 @@ g_key_file_load_from_fd (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); @@ -81,7 +81,7 @@ return TRUE; } -@@ -865,6 +909,8 @@ g_key_file_load_from_file (GKeyFile +@@ -862,6 +906,8 @@ g_key_file_load_from_file (GKeyFile return FALSE; } @@ -90,7 +90,7 @@ return TRUE; } -@@ -926,6 +972,9 @@ g_key_file_load_from_data (GKeyFile +@@ -923,6 +969,9 @@ g_key_file_load_from_data (GKeyFile G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN, NULL); @@ -100,7 +100,7 @@ return TRUE; } -@@ -995,6 +1044,9 @@ g_key_file_load_from_dirs (GKeyFile +@@ -992,6 +1041,9 @@ g_key_file_load_from_dirs (GKeyFile } } @@ -110,9 +110,12 @@ if (found_file && full_path) *full_path = output_path; else -@@ -2168,12 +2220,38 @@ g_key_file_get_locale_string (GKeyFile +@@ -2163,14 +2215,40 @@ g_key_file_get_locale_string (GKeyFile + { + gboolean codeset_set; const gchar *translated; - gboolean has_gettext; +- gboolean has_gettext; ++ gboolean has_gettext = FALSE; - codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL; + if (_g_key_file_is_default_gettext_domain (key_file->gettext_domain)) @@ -153,11 +156,11 @@ g_free (orig_value); -Index: glib-2.37.5/glib/gkeyfile.h +Index: glib-2.42.0/glib/gkeyfile.h =================================================================== ---- glib-2.37.5.orig/glib/gkeyfile.h -+++ glib-2.37.5/glib/gkeyfile.h -@@ -307,7 +307,7 @@ gboolean g_key_file_remove_group +--- glib-2.42.0.orig/glib/gkeyfile.h ++++ glib-2.42.0/glib/gkeyfile.h +@@ -310,7 +310,7 @@ gboolean g_key_file_remove_group #define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable" #define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions" -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
