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

Accepting request 927985 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/927985
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=467
This commit is contained in:
Dominique Leuenberger 2021-11-05 08:44:42 +00:00 committed by Git OBS Bridge
parent 75afd89a2c
commit e57fc17ad1
9 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.70.0.tar.xz
View File

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

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

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

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

@ -1,8 +1,8 @@
Index: glib-2.67.2/glib/gkeyfile.c Index: glib-2.70.1/glib/gkeyfile.c
=================================================================== ===================================================================
--- glib-2.67.2.orig/glib/gkeyfile.c --- glib-2.70.1.orig/glib/gkeyfile.c
+++ glib-2.67.2/glib/gkeyfile.c +++ glib-2.70.1/glib/gkeyfile.c
@@ -512,6 +512,7 @@ struct _GKeyFile @@ -513,6 +513,7 @@ struct _GKeyFile
gboolean checked_locales; gboolean checked_locales;
gchar **locales; gchar **locales;
@ -10,7 +10,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
gint ref_count; /* (atomic) */ gint ref_count; /* (atomic) */
}; };
@@ -636,6 +637,7 @@ g_key_file_init (GKeyFile *key_file) @@ -637,6 +638,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->parse_buffer = NULL; key_file->parse_buffer = NULL;
key_file->list_separator = ';'; key_file->list_separator = ';';
key_file->flags = 0; key_file->flags = 0;
@ -18,7 +18,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
} }
static void static void
@@ -655,6 +657,12 @@ g_key_file_clear (GKeyFile *key_file) @@ -657,6 +659,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL; key_file->parse_buffer = NULL;
} }
@ -31,7 +31,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
tmp = key_file->groups; tmp = key_file->groups;
while (tmp != NULL) while (tmp != NULL)
{ {
@@ -874,6 +882,11 @@ g_key_file_load_from_fd (GKeyFile @@ -876,6 +884,11 @@ g_key_file_load_from_fd (GKeyFile
return FALSE; return FALSE;
} }
@ -43,7 +43,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -986,6 +999,11 @@ g_key_file_load_from_data (GKeyFile @@ -988,6 +1001,11 @@ g_key_file_load_from_data (GKeyFile
return FALSE; return FALSE;
} }
@ -55,7 +55,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -2225,6 +2243,8 @@ g_key_file_get_locale_string (GKeyFile @@ -2227,6 +2245,8 @@ g_key_file_get_locale_string (GKeyFile
GError *key_file_error; GError *key_file_error;
gchar **languages; gchar **languages;
gboolean free_languages = FALSE; gboolean free_languages = FALSE;
@ -64,7 +64,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
gint i; gint i;
g_return_val_if_fail (key_file != NULL, NULL); g_return_val_if_fail (key_file != NULL, NULL);
@@ -2246,6 +2266,23 @@ g_key_file_get_locale_string (GKeyFile @@ -2248,6 +2268,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE; free_languages = FALSE;
} }
@ -88,8 +88,8 @@ Index: glib-2.67.2/glib/gkeyfile.c
for (i = 0; languages[i]; i++) for (i = 0; languages[i]; i++)
{ {
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]); candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2262,6 +2299,39 @@ g_key_file_get_locale_string (GKeyFile @@ -2261,6 +2298,39 @@ g_key_file_get_locale_string (GKeyFile
translated_value = NULL; break;
} }
+ /* Fallback to gettext */ + /* Fallback to gettext */
@ -128,10 +128,10 @@ Index: glib-2.67.2/glib/gkeyfile.c
/* Fallback to untranslated key /* Fallback to untranslated key
*/ */
if (!translated_value) if (!translated_value)
Index: glib-2.67.2/glib/gkeyfile.h Index: glib-2.70.1/glib/gkeyfile.h
=================================================================== ===================================================================
--- glib-2.67.2.orig/glib/gkeyfile.h --- glib-2.70.1.orig/glib/gkeyfile.h
+++ glib-2.67.2/glib/gkeyfile.h +++ glib-2.70.1/glib/gkeyfile.h
@@ -320,6 +320,7 @@ gboolean g_key_file_remove_group @@ -320,6 +320,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"

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

@ -1,7 +1,7 @@
Index: glib-2.67.3/gio/gdbusaddress.c Index: glib-2.70.0/gio/gdbusaddress.c
=================================================================== ===================================================================
--- glib-2.67.3.orig/gio/gdbusaddress.c --- glib-2.70.0.orig/gio/gdbusaddress.c
+++ glib-2.67.3/gio/gdbusaddress.c +++ glib-2.70.0/gio/gdbusaddress.c
@@ -1337,7 +1337,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp @@ -1337,7 +1337,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp
if (ret == NULL) if (ret == NULL)

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

@ -1,8 +1,8 @@
Index: glib-2.67.2/glib/gkeyfile.c Index: glib-2.70.0/glib/gkeyfile.c
=================================================================== ===================================================================
--- glib-2.67.2.orig/glib/gkeyfile.c --- glib-2.70.0.orig/glib/gkeyfile.c
+++ glib-2.67.2/glib/gkeyfile.c +++ glib-2.70.0/glib/gkeyfile.c
@@ -513,6 +513,7 @@ struct _GKeyFile @@ -514,6 +514,7 @@ struct _GKeyFile
gboolean checked_locales; gboolean checked_locales;
gchar **locales; gchar **locales;
gchar *gettext_domain; gchar *gettext_domain;
@ -10,7 +10,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
gint ref_count; /* (atomic) */ gint ref_count; /* (atomic) */
}; };
@@ -638,6 +639,7 @@ g_key_file_init (GKeyFile *key_file) @@ -639,6 +640,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->list_separator = ';'; key_file->list_separator = ';';
key_file->flags = 0; key_file->flags = 0;
key_file->gettext_domain = NULL; key_file->gettext_domain = NULL;
@ -18,7 +18,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
} }
static void static void
@@ -663,6 +665,12 @@ g_key_file_clear (GKeyFile *key_file) @@ -665,6 +667,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.67.2/glib/gkeyfile.c
tmp = key_file->groups; tmp = key_file->groups;
while (tmp != NULL) while (tmp != NULL)
{ {
@@ -806,6 +814,39 @@ find_file_in_data_dirs (const gchar *f @@ -808,6 +816,39 @@ find_file_in_data_dirs (const gchar *f
return fd; return fd;
} }
@ -71,7 +71,7 @@ Index: glib-2.67.2/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,
@@ -887,6 +928,9 @@ g_key_file_load_from_fd (GKeyFile @@ -889,6 +930,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.67.2/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -943,6 +987,8 @@ g_key_file_load_from_file (GKeyFile @@ -945,6 +989,8 @@ g_key_file_load_from_file (GKeyFile
return FALSE; return FALSE;
} }
@ -90,7 +90,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -1004,6 +1050,9 @@ g_key_file_load_from_data (GKeyFile @@ -1006,6 +1052,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.67.2/glib/gkeyfile.c
return TRUE; return TRUE;
} }
@@ -1108,6 +1157,9 @@ g_key_file_load_from_dirs (GKeyFile @@ -1110,6 +1159,9 @@ g_key_file_load_from_dirs (GKeyFile
} }
} }
@ -110,7 +110,7 @@ Index: glib-2.67.2/glib/gkeyfile.c
if (found_file && full_path) if (found_file && full_path)
*full_path = output_path; *full_path = output_path;
else else
@@ -2308,14 +2360,40 @@ g_key_file_get_locale_string (GKeyFile @@ -2310,14 +2362,40 @@ g_key_file_get_locale_string (GKeyFile
{ {
gboolean codeset_set; gboolean codeset_set;
const gchar *translated; const gchar *translated;
@ -156,10 +156,10 @@ Index: glib-2.67.2/glib/gkeyfile.c
g_free (orig_value); g_free (orig_value);
Index: glib-2.67.2/glib/gkeyfile.h Index: glib-2.70.0/glib/gkeyfile.h
=================================================================== ===================================================================
--- glib-2.67.2.orig/glib/gkeyfile.h --- glib-2.70.0.orig/glib/gkeyfile.h
+++ glib-2.67.2/glib/gkeyfile.h +++ glib-2.70.0/glib/gkeyfile.h
@@ -320,7 +320,7 @@ gboolean g_key_file_remove_group @@ -320,7 +320,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"

6
glib2-gdbus-codegen-version.patch
View File

@ -1,7 +1,7 @@
Index: glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py Index: glib-2.70.0/gio/gdbus-2.0/codegen/codegen.py
=================================================================== ===================================================================
--- glib-2.67.2.orig/gio/gdbus-2.0/codegen/codegen.py --- glib-2.70.0.orig/gio/gdbus-2.0/codegen/codegen.py
+++ glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py +++ glib-2.70.0/gio/gdbus-2.0/codegen/codegen.py
@@ -95,8 +95,7 @@ class HeaderCodeGenerator: @@ -95,8 +95,7 @@ class HeaderCodeGenerator:
# ---------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------

10
glib2-suppress-schema-deprecated-path-warning.patch
View File

@ -1,8 +1,8 @@
Index: glib-2.56.2/gio/glib-compile-schemas.c Index: glib-2.70.0/gio/glib-compile-schemas.c
=================================================================== ===================================================================
--- glib-2.56.2.orig/gio/glib-compile-schemas.c 2018-08-17 02:03:20.000000000 +0200 --- glib-2.70.0.orig/gio/glib-compile-schemas.c
+++ glib-2.56.2/gio/glib-compile-schemas.c 2018-08-17 10:53:47.342889761 +0200 +++ glib-2.70.0/gio/glib-compile-schemas.c
@@ -1219,6 +1219,7 @@ parse_state_start_schema (ParseState *s @@ -1232,6 +1232,7 @@ parse_state_start_schema (ParseState *s
return; return;
} }
@ -10,7 +10,7 @@ Index: glib-2.56.2/gio/glib-compile-schemas.c
if (path && (g_str_has_prefix (path, "/apps/") || if (path && (g_str_has_prefix (path, "/apps/") ||
g_str_has_prefix (path, "/desktop/") || g_str_has_prefix (path, "/desktop/") ||
g_str_has_prefix (path, "/system/"))) g_str_has_prefix (path, "/system/")))
@@ -1231,6 +1232,7 @@ parse_state_start_schema (ParseState *s @@ -1244,6 +1245,7 @@ parse_state_start_schema (ParseState *s
g_printerr ("%s\n", message); g_printerr ("%s\n", message);
g_free (message); g_free (message);
} }

14
glib2.changes
View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Oct 28 14:20:39 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.70.1:
+ Fix network changes not being signalled from NetworkManager.
+ Fix build when building with --fatal-meson-warnings.
+ Bugs fixed: glgo#GNOME/GLib#2505, glgo#GNOME/GLib!2245,
glgo#GNOME/GLib!2253, glgo#GNOME/GLib!2256,
glgo#GNOME/GLib!2259, glgo#GNOME/GLib!2262,
glgo#GNOME/GLib!2271, glgo#GNOME/GLib!2276,
glgo#GNOME/GLib!2300, glgo#GNOME/GLib!2301,
glgo#GNOME/GLib!2302, glgo#GNOME/GLib!2304.
- Refresh patches with quilt.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 17 12:12:52 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org> Fri Sep 17 12:12:52 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>

2
glib2.spec
View File

@ -19,7 +19,7 @@
%bcond_without systemtap %bcond_without systemtap
%bcond_without gtk_doc %bcond_without gtk_doc
Name: glib2 Name: glib2
Version: 2.70.0 Version: 2.70.1
Release: 0 Release: 0
Summary: General-Purpose Utility Library Summary: General-Purpose Utility Library
License: LGPL-2.1-or-later License: LGPL-2.1-or-later