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

Accepting request 880936 from GNOME:Next

Browse Source 
GNOME 40 - here we come

OBS-URL: https://build.opensuse.org/request/show/880936
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=450
This commit is contained in:
Dominique Leuenberger 2021-03-24 16:32:24 +00:00 committed by Git OBS Bridge
parent 67d4189494
commit f166335523
9 changed files with 173 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.66.7.tar.xz
View File

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

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

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

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

@ -1,19 +1,19 @@
Index: glib-2.66.5/glib/gkeyfile.c
Index: glib-2.67.2/glib/gkeyfile.c
===================================================================
--- glib-2.66.5.orig/glib/gkeyfile.c
+++ glib-2.66.5/glib/gkeyfile.c
@@ -511,6 +511,7 @@ struct _GKeyFile
GKeyFileFlags flags;
--- glib-2.67.2.orig/glib/gkeyfile.c
+++ glib-2.67.2/glib/gkeyfile.c
@@ -512,6 +512,7 @@ struct _GKeyFile
gboolean checked_locales;
gchar **locales;
+ gchar *gettext_domain;
volatile gint ref_count;
gint ref_count; /* (atomic) */
};
@@ -636,6 +637,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->parse_buffer = NULL;
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
+ key_file->gettext_domain = NULL;
}
@ -55,7 +55,7 @@ Index: glib-2.66.5/glib/gkeyfile.c
return TRUE;
}
@@ -2213,6 +2231,8 @@ g_key_file_get_locale_string (GKeyFile
@@ -2225,6 +2243,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.66.5/glib/gkeyfile.c
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
@@ -2234,6 +2254,23 @@ g_key_file_get_locale_string (GKeyFile
@@ -2246,6 +2266,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE;
}
@ -88,7 +88,7 @@ Index: glib-2.66.5/glib/gkeyfile.c
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2250,6 +2287,39 @@ g_key_file_get_locale_string (GKeyFile
@@ -2262,6 +2299,39 @@ g_key_file_get_locale_string (GKeyFile
translated_value = NULL;
}
@ -128,10 +128,10 @@ Index: glib-2.66.5/glib/gkeyfile.c
/* Fallback to untranslated key
*/
if (!translated_value)
Index: glib-2.66.5/glib/gkeyfile.h
Index: glib-2.67.2/glib/gkeyfile.h
===================================================================
--- glib-2.66.5.orig/glib/gkeyfile.h
+++ glib-2.66.5/glib/gkeyfile.h
--- glib-2.67.2.orig/glib/gkeyfile.h
+++ glib-2.67.2/glib/gkeyfile.h
@@ -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"

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

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

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

@ -1,18 +1,18 @@
Index: glib-2.66.5/glib/gkeyfile.c
Index: glib-2.67.2/glib/gkeyfile.c
===================================================================
--- glib-2.66.5.orig/glib/gkeyfile.c
+++ glib-2.66.5/glib/gkeyfile.c
@@ -512,6 +512,7 @@ struct _GKeyFile
--- glib-2.67.2.orig/glib/gkeyfile.c
+++ glib-2.67.2/glib/gkeyfile.c
@@ -513,6 +513,7 @@ struct _GKeyFile
gboolean checked_locales;
gchar **locales;
gchar *gettext_domain;
+ gchar *file_basename;
volatile gint ref_count;
gint ref_count; /* (atomic) */
};
@@ -638,6 +639,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;
+ key_file->file_basename = NULL;
}
@ -110,7 +110,7 @@ Index: glib-2.66.5/glib/gkeyfile.c
if (found_file && full_path)
*full_path = output_path;
else
@@ -2296,14 +2348,40 @@ g_key_file_get_locale_string (GKeyFile
@@ -2308,14 +2360,40 @@ g_key_file_get_locale_string (GKeyFile
{
gboolean codeset_set;
const gchar *translated;
@ -156,10 +156,10 @@ Index: glib-2.66.5/glib/gkeyfile.c
g_free (orig_value);
Index: glib-2.66.5/glib/gkeyfile.h
Index: glib-2.67.2/glib/gkeyfile.h
===================================================================
--- glib-2.66.5.orig/glib/gkeyfile.h
+++ glib-2.66.5/glib/gkeyfile.h
--- glib-2.67.2.orig/glib/gkeyfile.h
+++ glib-2.67.2/glib/gkeyfile.h
@@ -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"

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

@ -1,44 +1,44 @@
Index: glib-2.66.5/gio/gdbus-2.0/codegen/codegen.py
Index: glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py
===================================================================
--- glib-2.66.5.orig/gio/gdbus-2.0/codegen/codegen.py
+++ glib-2.66.5/gio/gdbus-2.0/codegen/codegen.py
@@ -79,8 +79,7 @@ class HeaderCodeGenerator:
--- glib-2.67.2.orig/gio/gdbus-2.0/codegen/codegen.py
+++ glib-2.67.2/gio/gdbus-2.0/codegen/codegen.py
@@ -95,8 +95,7 @@ class HeaderCodeGenerator:
# ----------------------------------------------------------------------------------------------------
def generate_header_preamble(self):
- basenames = ', '.join(self.input_files_basenames)
- basenames = ", ".join(self.input_files_basenames)
- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames))
+ self.outfile.write(LICENSE_STR)
self.outfile.write('\n')
self.outfile.write("\n")
if self.use_pragma:
@@ -721,8 +720,7 @@ class InterfaceInfoHeaderCodeGenerator:
@@ -1040,8 +1039,7 @@ class InterfaceInfoHeaderCodeGenerator:
# ----------------------------------------------------------------------------------------------------
def generate_header_preamble(self):
- basenames = ', '.join(self.input_files_basenames)
- basenames = ", ".join(self.input_files_basenames)
- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames))
+ self.outfile.write(LICENSE_STR)
self.outfile.write('\n')
self.outfile.write("\n")
if self.use_pragma:
@@ -781,8 +779,7 @@ class InterfaceInfoBodyCodeGenerator:
@@ -1112,8 +1110,7 @@ class InterfaceInfoBodyCodeGenerator:
# ----------------------------------------------------------------------------------------------------
def generate_body_preamble(self):
- basenames = ', '.join(self.input_files_basenames)
- basenames = ", ".join(self.input_files_basenames)
- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames))
+ self.outfile.write(LICENSE_STR)
if self.symbol_decoration_define is not None:
self.outfile.write('\n')
@@ -1023,8 +1020,7 @@ class CodeGenerator:
self.outfile.write("\n")
@@ -1466,8 +1463,7 @@ class CodeGenerator:
# ----------------------------------------------------------------------------------------------------
def generate_body_preamble(self):
- basenames = ', '.join(self.input_files_basenames)
- basenames = ", ".join(self.input_files_basenames)
- self.outfile.write(LICENSE_STR.format(config.VERSION, basenames))
+ self.outfile.write(LICENSE_STR)
if self.symbol_decoration_define is not None:
self.outfile.write('\n')
self.outfile.write('#define %s\n' % self.symbol_decoration_define)
self.outfile.write("\n")
self.outfile.write("#define %s\n" % self.symbol_decoration_define)

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

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

118
glib2.changes
View File

@ -1,3 +1,121 @@
-------------------------------------------------------------------
Thu Mar 18 17:10:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.68.0:
+ Bugs fixed:
- build: Drop gconstructor_as_data_h usage from
glib-compile-schemas.
- glib.supp: Generalize some suppressions.
- gbytesicon: Fix error in g_bytes_icon_new() documentation.
- glocalfileoutputstream: Tidy up error handling.
- tests: Fix copy/paste error in queue test.
-------------------------------------------------------------------
Thu Mar 18 11:04:24 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.67.6:
+ Fix a security issue when using `g_file_replace()` with
`G_FILE_CREATE_REPLACE_DESTINATION`.
+ Disallow operations on the empty path with
`g_file_new_from_path()`.
+ Various fixes for GLib when building with clang-cl on Windows.
+ Updated translations.
-------------------------------------------------------------------
Mon Mar 8 09:58:03 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.67.5:
+ Fix more issues with `glib_typeof` macro from 2.67.3–2.67.4.
+ Fix regression with some FD mappings passed to
`g_subprocess_launcher_spawnv()` caused by changes for #2097 in
GLib 2.67.4.
+ Fix detection of `str[n]casecmp()` when building with
`clang-cl`.
+ Use zlib from subproject if configured with
`wrap_mode=forcefallback`.
+ Updated translations.
-------------------------------------------------------------------
Wed Feb 17 09:38:03 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.67.4:
+ Add a `g_string_replace()` function.
+ Add `G_DBUS_SERVER_FLAGS_AUTHENTICATION_REQUIRE_SAME_USER` flag
to simplify the common case for writing a D-Bus authentication
observer, allowing most uses of `GDBusAuthObserver` to be
dropped.
+ Add a new `g_spawn_with_pipes_and_fds()` variant which supports
renumbering FDs.
+ Add new g_memdup2() API to replace g_memdup(), which is
vulnerable to a silent integer truncation and heap overflow
problem if not used carefully.
+ Fix various regressions caused by rushed security fixes in
2.66.6.
+ Fix a silent integer truncation when calling
g_byte_array_new_take() for byte arrays bigger than G_MAXUINT.
+ Fix `g_utf8_strdown()` to fix some issues in Turkish.
+ Updated translations.
-------------------------------------------------------------------
Thu Feb 11 13:33:22 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.67.3:
+ Add new `g_memdup2()` API to replace `g_memdup()`, which is
vulnerable to a silent integer truncation and heap overflow
problem if not used carefully.
+ Add new `g_dbus_object_path_escape()` and
`g_dbus_object_path_unescape()` APIs to provide one way of
escaping arbitrary bytestrings for use in D-Bus object paths.
+ Use `bash-completion.pc` (if available) to provide the path to
install completion files into.
+ Fix support for public/private trigraphs in `glib-mkenums`.
+ Add `glib_debug` configure option to allow disabling debug
infrastructure in builds with debug symbols enabled.
+ Fix a regression where `PATH` would always be searched when
using `g_spawn()`, even when it wasn’t supposed to.
+ Override `gio-querymodules` in Meson when used as a submodule.
+ Updated translations.
- Rebase glib2-dbus-socket-path.patch.
-------------------------------------------------------------------
Thu Feb 11 13:33:21 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.67.2:
+ Add `gio launch` command to execute programs.
+ Fix unused parameter warnings in code generated by
`gdbus-codegen`.
+ Officially deprecate `to-pixdata` option for
`glib-compile-resources`, in favour of simply embedding more
modern image formats in linked-in `GResource` files.
+ Support querying and running UWP applications on Windows.
+ Support `gio trash --restore` and `gio trash --list` commands.
+ No longer read environment variables for GIO module locations
when running as setuid.
+ More progress on fixing compiler warnings.
+ `GKeyFile` performance improvements.
+ Improve UDP socket behaviour on Windows.
+ Add `-Dtests` meson configure option for disabling tests
entirely.
- Changes from version 1.67.1:
+ Deprecate `g_time_zone_new()` in favour of
`g_time_zone_new_identifier()`, which makes error checking
easier.
+ Remove `volatile` from various public APIs, including
`G_DEFINE_*`. You should adjust your code to not use `volatile`
for atomic variables, `GOnce` variables, or mostly anything.
+ Support passing file handles to `gdbus` command line tool.
+ Add `g_assert_cmpstrv()` test convenience function.
+ Changes to the behaviour of the `G_URI_FLAGS_SCHEME_NORMALIZE`
scheme normalization flag in `GUri`.
+ Add new `--run-prefix` and `--skip-prefix` options to GTest, to
allow running or skipping test suites by prefix.
+ Fix thread-safety of `GBinding`.
+ Updated translations.
- Rebase glib2-bgo569829-gettext-gkeyfile.patch,
glib2-fate300461-gettext-gkeyfile-suse.patch,
glib2-dbus-socket-path.patch and
glib2-gdbus-codegen-version.patch.
-------------------------------------------------------------------
Thu Feb 11 13:33:20 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>

6
glib2.spec
View File

@ -19,13 +19,13 @@
%bcond_without systemtap
%bcond_without gtk_doc
Name: glib2
Version: 2.66.7
Version: 2.68.0
Release: 0
Summary: General-Purpose Utility Library
License: LGPL-2.1-or-later
Group: Development/Libraries/C and C++
URL: https://wiki.gnome.org/Projects/GLib
Source0: https://download.gnome.org/sources/glib/2.66/glib-%{version}.tar.xz
Source0: https://download.gnome.org/sources/glib/2.68/glib-%{version}.tar.xz
Source1: glib2.sh
Source2: glib2.csh
# Not upstream file. Only proposes upstream packages:
@ -188,10 +188,10 @@ object files (commonly known as 'plug-ins').
%package -n %{libgio}
Summary: A virtual file system library API
Group: System/Libraries
# The tools are useful for people having libgio
# bnc#555605: shared-mime-info is required by libgio to properly detect mime types, but not during build
#!BuildIgnore: shared-mime-info
Group: System/Libraries
Requires: %{name}-tools
# bnc#678518: libgio interacts with others by means of dbus-launch
Requires: dbus-launch