pool/glib2
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 256872 from GNOME:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/256872
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=161
This commit is contained in:
Stephan Kulow 2014-10-17 06:50:32 +00:00 committed by Git OBS Bridge
commit fee8aee4a3
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
glib2-fate300461-gettext-gkeyfile-suse.patch
View File

@ -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.42.0.orig/glib/gkeyfile.c
+++ glib-2.37.5/glib/gkeyfile.c +++ glib-2.42.0/glib/gkeyfile.c
@@ -446,6 +446,7 @@ struct _GKeyFile @@ -443,6 +443,7 @@ struct _GKeyFile
gchar **locales; gchar **locales;
gchar *gettext_domain; gchar *gettext_domain;
@ -10,7 +10,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
volatile gint ref_count; 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->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
key_file->gettext_domain = NULL; key_file->gettext_domain = NULL;
@ -18,7 +18,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
} }
static void 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; key_file->gettext_domain = NULL;
} }
@ -31,7 +31,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
tmp = key_file->groups; tmp = key_file->groups;
while (tmp != NULL) 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; return fd;
} }
@ -71,7 +71,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
static gboolean static gboolean
g_key_file_load_from_fd (GKeyFile *key_file, g_key_file_load_from_fd (GKeyFile *key_file,
gint fd, 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, G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL); NULL);
@ -81,7 +81,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
return TRUE; 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; return FALSE;
} }
@ -90,7 +90,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
return TRUE; 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, G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL); NULL);
@ -100,7 +100,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
return TRUE; 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 @@ Index: glib-2.37.5/glib/gkeyfile.c
if (found_file && full_path) if (found_file && full_path)
*full_path = output_path; *full_path = output_path;
else 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; 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; - codeset_set = bind_textdomain_codeset (key_file->gettext_domain, "UTF-8") != NULL;
+ if (_g_key_file_is_default_gettext_domain (key_file->gettext_domain)) + if (_g_key_file_is_default_gettext_domain (key_file->gettext_domain))
@ -153,11 +156,11 @@ Index: glib-2.37.5/glib/gkeyfile.c
g_free (orig_value); 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.42.0.orig/glib/gkeyfile.h
+++ glib-2.37.5/glib/gkeyfile.h +++ glib-2.42.0/glib/gkeyfile.h
@@ -307,7 +307,7 @@ gboolean g_key_file_remove_group @@ -310,7 +310,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_URL "URL" #define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable" #define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"
#define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions" #define G_KEY_FILE_DESKTOP_KEY_ACTIONS "Actions"

6
glib2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Oct 15 21:16:31 UTC 2014 - gber@opensuse.org
- Update glib2-fate300461-gettext-gkeyfile-suse.patch: Initialize
variable has_gettext.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 22 18:37:27 UTC 2014 - zaitor@opensuse.org Mon Sep 22 18:37:27 UTC 2014 - zaitor@opensuse.org