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

Accepting request 596120 from GNOME:Factory

Browse Source 
(forwarded request 594240 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/596120
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=197
This commit is contained in:
Dominique Leuenberger 2018-04-19 13:21:53 +00:00 committed by Git OBS Bridge
commit 56defe277b
8 changed files with 97 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.56.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecef6e17e97b8d9150d0e8a4b3edee1ac37331213b8a2a87a083deea408a0fc7
size 8026416

3
glib-2.56.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40ef3f44f2c651c7a31aedee44259809b6f03d3d20be44545cd7d177221c0b8d
size 8028716

30
glib2-bgo569829-gettext-gkeyfile.patch
View File

@ -1,8 +1,8 @@
Index: glib-2.37.5/glib/gkeyfile.c
Index: glib-2.56.1/glib/gkeyfile.c
===================================================================
--- glib-2.37.5.orig/glib/gkeyfile.c
+++ glib-2.37.5/glib/gkeyfile.c
@@ -445,6 +445,7 @@ struct _GKeyFile
--- glib-2.56.1.orig/glib/gkeyfile.c 2018-03-12 17:23:37.000000000 +0100
+++ glib-2.56.1/glib/gkeyfile.c 2018-04-07 16:53:59.164856822 +0200
@@ -511,6 +511,7 @@ struct _GKeyFile
GKeyFileFlags flags;
gchar **locales;
@ -10,7 +10,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
volatile gint ref_count;
};
@@ -569,6 +570,7 @@ g_key_file_init (GKeyFile *key_file)
@@ -635,6 +636,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 ());
@ -18,7 +18,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
}
static void
@@ -588,6 +590,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -654,6 +656,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -803,6 +811,11 @@ g_key_file_load_from_fd (GKeyFile
@@ -873,6 +881,11 @@ g_key_file_load_from_fd (GKeyFile
return FALSE;
}
@ -43,7 +43,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
return TRUE;
}
@@ -908,6 +921,11 @@ g_key_file_load_from_data (GKeyFile
@@ -985,6 +998,11 @@ g_key_file_load_from_data (GKeyFile
return FALSE;
}
@ -55,7 +55,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
return TRUE;
}
@@ -2083,6 +2101,8 @@ g_key_file_get_locale_string (GKeyFile
@@ -2208,6 +2226,8 @@ g_key_file_get_locale_string (GKeyFile
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@ -64,7 +64,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
@@ -2104,6 +2124,23 @@ g_key_file_get_locale_string (GKeyFile
@@ -2229,6 +2249,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE;
}
@ -88,7 +88,7 @@ Index: glib-2.37.5/glib/gkeyfile.c
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2120,6 +2157,39 @@ g_key_file_get_locale_string (GKeyFile
@@ -2245,6 +2282,39 @@ g_key_file_get_locale_string (GKeyFile
translated_value = NULL;
}
@ -128,11 +128,11 @@ Index: glib-2.37.5/glib/gkeyfile.c
/* Fallback to untranslated key
*/
if (!translated_value)
Index: glib-2.37.5/glib/gkeyfile.h
Index: glib-2.56.1/glib/gkeyfile.h
===================================================================
--- glib-2.37.5.orig/glib/gkeyfile.h
+++ glib-2.37.5/glib/gkeyfile.h
@@ -307,6 +307,7 @@ gboolean g_key_file_remove_group
--- glib-2.56.1.orig/glib/gkeyfile.h 2018-02-06 17:05:56.000000000 +0100
+++ glib-2.56.1/glib/gkeyfile.h 2018-04-07 16:53:59.164856822 +0200
@@ -320,6 +320,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"

10
glib2-dbus-socket-path.patch
View File

@ -1,7 +1,8 @@
diff -Naur glib-2.38.0/gio/gdbusaddress.c glib-2.38.0.new/gio/gdbusaddress.c
--- glib-2.38.0/gio/gdbusaddress.c 2013-09-17 20:47:14.000000000 +0200
+++ glib-2.38.0.new/gio/gdbusaddress.c 2013-11-15 21:56:29.143203355 +0100
@@ -1515,7 +1515,7 @@
Index: glib-2.56.1/gio/gdbusaddress.c
===================================================================
--- glib-2.56.1.orig/gio/gdbusaddress.c 2018-02-06 16:44:20.000000000 +0100
+++ glib-2.56.1/gio/gdbusaddress.c 2018-04-07 16:53:59.200857044 +0200
@@ -1624,7 +1624,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp
ret = g_strdup (g_getenv ("DBUS_SYSTEM_BUS_ADDRESS"));
if (ret == NULL)
{
@ -10,4 +11,3 @@ diff -Naur glib-2.38.0/gio/gdbusaddress.c glib-2.38.0.new/gio/gdbusaddress.c
}
break;

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

@ -1,8 +1,8 @@
Index: glib-2.42.0/glib/gkeyfile.c
Index: glib-2.56.1/glib/gkeyfile.c
===================================================================
--- glib-2.42.0.orig/glib/gkeyfile.c
+++ glib-2.42.0/glib/gkeyfile.c
@@ -443,6 +443,7 @@ struct _GKeyFile
--- glib-2.56.1.orig/glib/gkeyfile.c 2018-04-07 16:53:59.164856822 +0200
+++ glib-2.56.1/glib/gkeyfile.c 2018-04-07 16:53:59.176856896 +0200
@@ -512,6 +512,7 @@ struct _GKeyFile
gchar **locales;
gchar *gettext_domain;
@ -10,7 +10,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
volatile gint ref_count;
};
@@ -568,6 +569,7 @@ g_key_file_init (GKeyFile *key_file)
@@ -637,6 +638,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 @@ Index: glib-2.42.0/glib/gkeyfile.c
}
static void
@@ -593,6 +595,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -662,6 +664,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->gettext_domain = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -736,6 +744,39 @@ find_file_in_data_dirs (const gchar *f
@@ -805,6 +813,39 @@ find_file_in_data_dirs (const gchar *f
return fd;
}
@ -71,7 +71,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
static gboolean
g_key_file_load_from_fd (GKeyFile *key_file,
gint fd,
@@ -813,6 +854,9 @@ g_key_file_load_from_fd (GKeyFile
@@ -886,6 +927,9 @@ g_key_file_load_from_fd (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -81,7 +81,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
return TRUE;
}
@@ -862,6 +906,8 @@ g_key_file_load_from_file (GKeyFile
@@ -942,6 +986,8 @@ g_key_file_load_from_file (GKeyFile
return FALSE;
}
@ -90,7 +90,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
return TRUE;
}
@@ -923,6 +969,9 @@ g_key_file_load_from_data (GKeyFile
@@ -1003,6 +1049,9 @@ g_key_file_load_from_data (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -100,7 +100,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
return TRUE;
}
@@ -992,6 +1041,9 @@ g_key_file_load_from_dirs (GKeyFile
@@ -1107,6 +1156,9 @@ g_key_file_load_from_dirs (GKeyFile
}
}
@ -110,7 +110,7 @@ Index: glib-2.42.0/glib/gkeyfile.c
if (found_file && full_path)
*full_path = output_path;
else
@@ -2163,14 +2215,40 @@ g_key_file_get_locale_string (GKeyFile
@@ -2291,14 +2343,40 @@ g_key_file_get_locale_string (GKeyFile
{
gboolean codeset_set;
const gchar *translated;
@ -156,11 +156,11 @@ Index: glib-2.42.0/glib/gkeyfile.c
g_free (orig_value);
Index: glib-2.42.0/glib/gkeyfile.h
Index: glib-2.56.1/glib/gkeyfile.h
===================================================================
--- 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
--- glib-2.56.1.orig/glib/gkeyfile.h 2018-04-07 16:53:59.164856822 +0200
+++ glib-2.56.1/glib/gkeyfile.h 2018-04-07 16:53:59.176856896 +0200
@@ -320,7 +320,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"

88
glib2-gsettings-overrides-per-session.patch
View File

@ -1,7 +1,7 @@
diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c
index 2dc8c7171..59fb68ee7 100644
--- a/gio/glib-compile-schemas.c
+++ b/gio/glib-compile-schemas.c
Index: glib-2.56.1/gio/glib-compile-schemas.c
===================================================================
--- glib-2.56.1.orig/gio/glib-compile-schemas.c 2018-04-07 16:53:59.188856969 +0200
+++ glib-2.56.1/gio/glib-compile-schemas.c 2018-04-07 16:53:59.228857214 +0200
@@ -179,6 +179,8 @@ typedef struct
GString *unparsed_default_value;
GVariant *default_value;
@ -33,7 +33,7 @@ index 2dc8c7171..59fb68ee7 100644
g_slice_free (KeyState, state);
}
@@ -1878,6 +1888,8 @@ set_overrides (GHashTable *schema_table,
@@ -1880,6 +1890,8 @@ set_overrides (GHashTable *schema_table
gchar **groups;
gint i;
@ -42,7 +42,7 @@ index 2dc8c7171..59fb68ee7 100644
key_file = g_key_file_new ();
if (!g_key_file_load_from_file (key_file, filename, 0, &error))
{
@@ -1900,18 +1912,31 @@ set_overrides (GHashTable *schema_table,
@@ -1902,18 +1914,31 @@ set_overrides (GHashTable *schema_table
for (i = 0; groups[i]; i++)
{
const gchar *group = groups[i];
@ -80,7 +80,7 @@ index 2dc8c7171..59fb68ee7 100644
keys = g_key_file_get_keys (key_file, group, NULL, NULL);
g_assert (keys != NULL);
@@ -1939,6 +1964,32 @@ set_overrides (GHashTable *schema_table,
@@ -1941,6 +1966,32 @@ set_overrides (GHashTable *schema_table
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
@ -113,7 +113,7 @@ index 2dc8c7171..59fb68ee7 100644
g_strfreev (groups);
g_strfreev (keys);
@@ -1969,6 +2020,7 @@ set_overrides (GHashTable *schema_table,
@@ -1971,6 +2022,7 @@ set_overrides (GHashTable *schema_table
fprintf (stderr, _("--strict was specified; exiting.\n"));
g_key_file_free (key_file);
@ -121,7 +121,7 @@ index 2dc8c7171..59fb68ee7 100644
g_strfreev (groups);
g_strfreev (keys);
@@ -1997,6 +2049,7 @@ set_overrides (GHashTable *schema_table,
@@ -1999,6 +2051,7 @@ set_overrides (GHashTable *schema_table
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
@ -129,7 +129,7 @@ index 2dc8c7171..59fb68ee7 100644
g_strfreev (groups);
g_strfreev (keys);
@@ -2025,6 +2078,7 @@ set_overrides (GHashTable *schema_table,
@@ -2027,6 +2080,7 @@ set_overrides (GHashTable *schema_table
fprintf (stderr, _(" and --strict was specified; exiting.\n"));
g_key_file_free (key_file);
@ -137,7 +137,7 @@ index 2dc8c7171..59fb68ee7 100644
g_strfreev (groups);
g_strfreev (keys);
@@ -2032,11 +2086,24 @@ set_overrides (GHashTable *schema_table,
@@ -2034,11 +2088,24 @@ set_overrides (GHashTable *schema_table
}
}
@ -164,11 +164,11 @@ index 2dc8c7171..59fb68ee7 100644
g_strfreev (keys);
}
diff --git a/gio/gsettings.c b/gio/gsettings.c
index 7b0b6a162..5a91ec0d6 100644
--- a/gio/gsettings.c
+++ b/gio/gsettings.c
@@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings *settings,
Index: glib-2.56.1/gio/gsettings.c
===================================================================
--- glib-2.56.1.orig/gio/gsettings.c 2018-03-12 17:23:37.000000000 +0100
+++ glib-2.56.1/gio/gsettings.c 2018-04-07 16:53:59.232857239 +0200
@@ -1204,10 +1204,7 @@ g_settings_get_value (GSettings *setti
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
@ -180,7 +180,7 @@ index 7b0b6a162..5a91ec0d6 100644
g_settings_schema_key_clear (&skey);
@@ -1304,10 +1301,7 @@ g_settings_get_default_value (GSettings *settings,
@@ -1304,10 +1301,7 @@ g_settings_get_default_value (GSettings
value = g_settings_read_from_backend (settings, &skey, FALSE, TRUE);
if (value == NULL)
@ -192,7 +192,7 @@ index 7b0b6a162..5a91ec0d6 100644
g_settings_schema_key_clear (&skey);
@@ -1360,10 +1354,7 @@ g_settings_get_enum (GSettings *settings,
@@ -1360,10 +1354,7 @@ g_settings_get_enum (GSettings *settin
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
@ -204,7 +204,7 @@ index 7b0b6a162..5a91ec0d6 100644
result = g_settings_schema_key_to_enum (&skey, value);
g_settings_schema_key_clear (&skey);
@@ -1473,10 +1464,7 @@ g_settings_get_flags (GSettings *settings,
@@ -1473,10 +1464,7 @@ g_settings_get_flags (GSettings *setti
value = g_settings_read_from_backend (settings, &skey, FALSE, FALSE);
if (value == NULL)
@ -216,7 +216,7 @@ index 7b0b6a162..5a91ec0d6 100644
result = g_settings_schema_key_to_flags (&skey, value);
g_settings_schema_key_clear (&skey);
@@ -1751,6 +1739,13 @@ g_settings_get_mapped (GSettings *settings,
@@ -1751,6 +1739,13 @@ g_settings_get_mapped (GSettings
if (okay) goto okay;
}
@ -230,10 +230,14 @@ index 7b0b6a162..5a91ec0d6 100644
if (mapping (skey.default_value, &result, user_data))
goto okay;
@@ -2661,6 +2656,20 @@ g_settings_binding_key_changed (GSettings *settings,
if (variant == NULL)
{
@@ -2657,6 +2652,20 @@ g_settings_binding_key_changed (GSetting
g_variant_unref (variant);
variant = NULL;
}
+ }
+
+ if (variant == NULL)
+ {
+ variant = g_settings_schema_key_get_per_desktop_default (&binding->key);
+ if (variant &&
+ !binding->get_mapping (&value, variant, binding->user_data))
@ -244,17 +248,13 @@ index 7b0b6a162..5a91ec0d6 100644
+ g_variant_unref (variant);
+ variant = NULL;
+ }
+ }
+
+ if (variant == NULL)
+ {
variant = g_variant_ref (binding->key.default_value);
if (!binding->get_mapping (&value, variant, binding->user_data))
g_error ("The schema default value for key '%s' in schema '%s' "
diff --git a/gio/gsettingsschema-internal.h b/gio/gsettingsschema-internal.h
index f54de3b34..5f996b4bc 100644
--- a/gio/gsettingsschema-internal.h
+++ b/gio/gsettingsschema-internal.h
}
if (variant == NULL)
Index: glib-2.56.1/gio/gsettingsschema-internal.h
===================================================================
--- glib-2.56.1.orig/gio/gsettingsschema-internal.h 2017-07-14 01:03:39.000000000 +0200
+++ glib-2.56.1/gio/gsettingsschema-internal.h 2018-04-07 16:53:59.232857239 +0200
@@ -37,6 +37,7 @@ struct _GSettingsSchemaKey
const GVariantType *type;
GVariant *minimum, *maximum;
@ -263,7 +263,7 @@ index f54de3b34..5f996b4bc 100644
gint ref_count;
};
@@ -58,6 +59,7 @@ gboolean g_settings_schema_key_type_check (GSettin
@@ -58,6 +59,7 @@ gboolean g_settings_schem
GVariant * g_settings_schema_key_range_fixup (GSettingsSchemaKey *key,
GVariant *value);
GVariant * g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key);
@ -271,10 +271,10 @@ index f54de3b34..5f996b4bc 100644
gint g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value);
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 4e12243d8..42722892b 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
Index: glib-2.56.1/gio/gsettingsschema.c
===================================================================
--- glib-2.56.1.orig/gio/gsettingsschema.c 2018-01-22 21:28:02.000000000 +0100
+++ glib-2.56.1/gio/gsettingsschema.c 2018-04-07 16:53:59.232857239 +0200
@@ -27,6 +27,7 @@
#include <glibintl.h>
#include <locale.h>
@ -283,7 +283,7 @@ index 4e12243d8..42722892b 100644
/**
* SECTION:gsettingsschema
@@ -1283,6 +1284,11 @@ g_settings_schema_key_init (GSettingsSchemaKey *key,
@@ -1283,6 +1284,11 @@ g_settings_schema_key_init (GSettingsSch
endian_fixup (&key->maximum);
break;
@ -295,7 +295,7 @@ index 4e12243d8..42722892b 100644
default:
g_warning ("unknown schema extension '%c'", code);
break;
@@ -1303,6 +1309,9 @@ g_settings_schema_key_clear (GSettingsSchemaKey *key)
@@ -1303,6 +1309,9 @@ g_settings_schema_key_clear (GSettingsSc
if (key->maximum)
g_variant_unref (key->maximum);
@ -305,7 +305,7 @@ index 4e12243d8..42722892b 100644
g_variant_unref (key->default_value);
g_settings_schema_unref (key->schema);
@@ -1410,6 +1419,35 @@ g_settings_schema_key_get_translated_default (GSettingsSchemaKey *key)
@@ -1410,6 +1419,35 @@ g_settings_schema_key_get_translated_def
return value;
}
@ -341,7 +341,7 @@ index 4e12243d8..42722892b 100644
gint
g_settings_schema_key_to_enum (GSettingsSchemaKey *key,
GVariant *value)
@@ -1699,6 +1737,9 @@ g_settings_schema_key_get_default_value (GSettingsSchemaKey *key)
@@ -1699,6 +1737,9 @@ g_settings_schema_key_get_default_value
value = g_settings_schema_key_get_translated_default (key);
if (!value)

13
glib2.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Sat Apr 7 14:45:53 UTC 2018 - bjorn.lie@gmail.com
- Update to version 2.56.1:
+ Bugs fixed: bgo#793400, bgo#793578, bgo#793645, bgo#794194,
bgo#794473, bgo#794506, bgo#794528, bgo#794606, bgo#794686.
+ Updated translations.
- Refresh following patches with quilt:
+ glib2-bgo569829-gettext-gkeyfile.patch.
+ glib2-dbus-socket-path.patch.
+ glib2-fate300461-gettext-gkeyfile-suse.patch.
+ glib2-gsettings-overrides-per-session.patch.
-------------------------------------------------------------------
Tue Mar 20 17:30:58 UTC 2018 - dimstar@opensuse.org

2
glib2.spec
View File

@ -19,7 +19,7 @@
%define with_systemtap 0
%define _name glib
Name: glib2
Version: 2.56.0
Version: 2.56.1
Release: 0
# FIXME: find out if tapsets should really be in devel package or in main package
Summary: General-Purpose Utility Library