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

Accepting request 1073814 from GNOME:Factory

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1073814
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glib2?expand=0&rev=264
This commit is contained in:
Dominique Leuenberger 2023-03-24 14:18:39 +00:00 committed by Git OBS Bridge
commit d219382edc
8 changed files with 171 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib-2.74.6.tar.xz
View File

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

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

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

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

@ -1,8 +1,8 @@
Index: glib-2.74.1/glib/gkeyfile.c
Index: glib-2.75.4/glib/gkeyfile.c
===================================================================
--- glib-2.74.1.orig/glib/gkeyfile.c
+++ glib-2.74.1/glib/gkeyfile.c
@@ -515,6 +515,7 @@ struct _GKeyFile
--- glib-2.75.4.orig/glib/gkeyfile.c
+++ glib-2.75.4/glib/gkeyfile.c
@@ -519,6 +519,7 @@ struct _GKeyFile
gboolean checked_locales; /* TRUE if @locales has been initialised */
gchar **locales; /* (nullable) */
@ -10,7 +10,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
gint ref_count; /* (atomic) */
};
@@ -641,6 +642,7 @@ g_key_file_init (GKeyFile *key_file)
@@ -645,6 +646,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->parse_buffer = NULL;
key_file->list_separator = ';';
key_file->flags = 0;
@ -18,7 +18,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
}
static void
@@ -661,6 +663,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -665,6 +667,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->parse_buffer = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -881,6 +889,11 @@ g_key_file_load_from_fd (GKeyFile
@@ -885,6 +893,11 @@ g_key_file_load_from_fd (GKeyFile
return FALSE;
}
@ -43,7 +43,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
return TRUE;
}
@@ -993,6 +1006,11 @@ g_key_file_load_from_data (GKeyFile
@@ -997,6 +1010,11 @@ g_key_file_load_from_data (GKeyFile
return FALSE;
}
@ -55,7 +55,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
return TRUE;
}
@@ -2242,6 +2260,8 @@ g_key_file_get_locale_string (GKeyFile
@@ -2246,6 +2264,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.74.1/glib/gkeyfile.c
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
@@ -2263,6 +2283,23 @@ g_key_file_get_locale_string (GKeyFile
@@ -2267,6 +2287,23 @@ g_key_file_get_locale_string (GKeyFile
free_languages = FALSE;
}
@ -88,7 +88,7 @@ Index: glib-2.74.1/glib/gkeyfile.c
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
@@ -2276,6 +2313,39 @@ g_key_file_get_locale_string (GKeyFile
@@ -2280,6 +2317,39 @@ g_key_file_get_locale_string (GKeyFile
break;
}
@ -128,10 +128,10 @@ Index: glib-2.74.1/glib/gkeyfile.c
/* Fallback to untranslated key
*/
if (!translated_value)
Index: glib-2.74.1/glib/gkeyfile.h
Index: glib-2.75.4/glib/gkeyfile.h
===================================================================
--- glib-2.74.1.orig/glib/gkeyfile.h
+++ glib-2.74.1/glib/gkeyfile.h
--- glib-2.75.4.orig/glib/gkeyfile.h
+++ glib-2.75.4/glib/gkeyfile.h
@@ -322,6 +322,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"

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

@ -1,13 +0,0 @@
Index: glib-2.70.0/gio/gdbusaddress.c
===================================================================
--- glib-2.70.0.orig/gio/gdbusaddress.c
+++ glib-2.70.0/gio/gdbusaddress.c
@@ -1337,7 +1337,7 @@ g_dbus_address_get_for_bus_sync (GBusTyp
if (ret == NULL)
{
- ret = g_strdup ("unix:path=/var/run/dbus/system_bus_socket");
+ ret = g_strdup ("unix:path=/run/dbus/system_bus_socket");
}
break;

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

@ -1,8 +1,8 @@
Index: glib-2.74.3/glib/gkeyfile.c
Index: glib-2.75.4/glib/gkeyfile.c
===================================================================
--- glib-2.74.3.orig/glib/gkeyfile.c
+++ glib-2.74.3/glib/gkeyfile.c
@@ -516,6 +516,7 @@ struct _GKeyFile
--- glib-2.75.4.orig/glib/gkeyfile.c
+++ glib-2.75.4/glib/gkeyfile.c
@@ -520,6 +520,7 @@ struct _GKeyFile
gboolean checked_locales; /* TRUE if @locales has been initialised */
gchar **locales; /* (nullable) */
gchar *gettext_domain;
@ -10,7 +10,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
gint ref_count; /* (atomic) */
};
@@ -643,6 +644,7 @@ g_key_file_init (GKeyFile *key_file)
@@ -647,6 +648,7 @@ g_key_file_init (GKeyFile *key_file)
key_file->list_separator = ';';
key_file->flags = 0;
key_file->gettext_domain = NULL;
@ -18,7 +18,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
}
static void
@@ -669,6 +671,12 @@ g_key_file_clear (GKeyFile *key_file)
@@ -673,6 +675,12 @@ g_key_file_clear (GKeyFile *key_file)
key_file->gettext_domain = NULL;
}
@ -31,7 +31,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
tmp = key_file->groups;
while (tmp != NULL)
{
@@ -813,6 +821,39 @@ find_file_in_data_dirs (const gchar *f
@@ -817,6 +825,39 @@ find_file_in_data_dirs (const gchar *f
return fd;
}
@ -71,7 +71,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
static gboolean
g_key_file_load_from_fd (GKeyFile *key_file,
gint fd,
@@ -894,6 +935,9 @@ g_key_file_load_from_fd (GKeyFile
@@ -898,6 +939,9 @@ g_key_file_load_from_fd (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -81,7 +81,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
return TRUE;
}
@@ -950,6 +994,8 @@ g_key_file_load_from_file (GKeyFile
@@ -954,6 +998,8 @@ g_key_file_load_from_file (GKeyFile
return FALSE;
}
@ -90,7 +90,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
return TRUE;
}
@@ -1011,6 +1057,9 @@ g_key_file_load_from_data (GKeyFile
@@ -1015,6 +1061,9 @@ g_key_file_load_from_data (GKeyFile
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@ -100,7 +100,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
return TRUE;
}
@@ -1115,6 +1164,9 @@ g_key_file_load_from_dirs (GKeyFile
@@ -1119,6 +1168,9 @@ g_key_file_load_from_dirs (GKeyFile
}
}
@ -110,7 +110,7 @@ Index: glib-2.74.3/glib/gkeyfile.c
if (found_file && full_path)
*full_path = output_path;
else
@@ -2322,14 +2374,40 @@ g_key_file_get_locale_string (GKeyFile
@@ -2326,14 +2378,40 @@ g_key_file_get_locale_string (GKeyFile
{
gboolean codeset_set;
const gchar *translated;
@ -156,10 +156,10 @@ Index: glib-2.74.3/glib/gkeyfile.c
g_free (orig_value);
Index: glib-2.74.3/glib/gkeyfile.h
Index: glib-2.75.4/glib/gkeyfile.h
===================================================================
--- glib-2.74.3.orig/glib/gkeyfile.h
+++ glib-2.74.3/glib/gkeyfile.h
--- glib-2.75.4.orig/glib/gkeyfile.h
+++ glib-2.75.4/glib/gkeyfile.h
@@ -322,7 +322,7 @@ gboolean g_key_file_remove_group
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
#define G_KEY_FILE_DESKTOP_KEY_DBUS_ACTIVATABLE "DBusActivatable"

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

@ -1,8 +1,8 @@
Index: glib-2.74.1/gio/glib-compile-schemas.c
Index: glib-2.75.3/gio/glib-compile-schemas.c
===================================================================
--- glib-2.74.1.orig/gio/glib-compile-schemas.c
+++ glib-2.74.1/gio/glib-compile-schemas.c
@@ -1234,6 +1234,7 @@ parse_state_start_schema (ParseState *s
--- glib-2.75.3.orig/gio/glib-compile-schemas.c
+++ glib-2.75.3/gio/glib-compile-schemas.c
@@ -1231,6 +1231,7 @@ parse_state_start_schema (ParseState *s
return;
}
@ -10,7 +10,7 @@ Index: glib-2.74.1/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/")))
@@ -1246,6 +1247,7 @@ parse_state_start_schema (ParseState *s
@@ -1243,6 +1244,7 @@ parse_state_start_schema (ParseState *s
g_printerr ("%s\n", message);
g_free (message);
}

121
glib2.changes
View File

@ -1,3 +1,124 @@
-------------------------------------------------------------------
Wed Mar 22 13:16:16 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.76.1:
+ Fix build failures in third party C++ projects using
`g_strdup()` via C++ qualified symbol lookup.
+ Downgrade critical warnings from `GFileInfo` about missing
attributes to debug messages, as it was affecting too many
apps; the critical warnings will be reinstated early in the
2.78 cycle, so apps should continue to fix their ambiguous use
of `GFileInfo` API.
+ Bugs fixed: glgo#GNOME/GLib#159, glgo#GNOME/GLib#352,
glgo#GNOME/GLib#919, glgo#GNOME/GLib#2922,
glgo#GNOME/GLib#2936, glgo#GNOME/GLib#2943,
glgo#GNOME/GLib#2948, glgo#GNOME/GLib!3241,
glgo#GNOME/GLib!3315, glgo#GNOME/GLib!3318,
glgo#GNOME/GLib!3319, glgo#GNOME/GLib!3321,
glgo#GNOME/GLib!3323, glgo#GNOME/GLib!3324,
glgo#GNOME/GLib!3325, glgo#GNOME/GLib!3330,
glgo#GNOME/GLib!3338.
+ Updated translations.
-------------------------------------------------------------------
Fri Mar 10 16:55:57 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Update to version 2.76.0:
+ Fix several regressions in handling `GFileInfo` attributes
+ Bugs fixed:
- ETAG_VALUE not set in GFileInfo when requested
- File attributes are not set when their value is FALSE/NULL
- gfile: Fix file size detection when copying on btrfs
- glocalfileinfo:
. Mark the lost+found dir as hidden again
. Ensure that is-backup is always set
+ Updated translations.
- Rebase patches with quilt.
-------------------------------------------------------------------
Wed Mar 8 16:10:34 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.75.4:
+ Emit a critical warning when acquiring the notification queue
during GObject finalization. A type's `finalize()`
implementation should not call public API that emits property
notifications.
+ Updated translations.
-------------------------------------------------------------------
Tue Mar 7 10:23:08 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
- Rebase glib2-suppress-schema-deprecated-path-warning.patch with
quilt.
-------------------------------------------------------------------
Fri Feb 24 15:54:20 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Fix license files in packages: COPYING in the source tree is
a symlink to LICENSES/LGPL-2.1-or-later.txt, but rpm's %license
macro copies the symlink, not the target. Explicitly package
LICENSES/LGPL-2.1-or-later.txt in this case (boo#1208497).
-------------------------------------------------------------------
Fri Feb 24 13:09:51 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.75.3:
+ Drop the implementation of GSlice, and make the API use the
system `malloc()` internally.
+ Use a thread-spawning thread to keep thread scheduler settings
consistent; fixes GThreadPool critical warnings due to failing
to set scheduler settings in some situations.
+ GIR annotation improvements for multiple APIs.
+ Optimise printing of nested maybes in `g_variant_print()`.
+ Use `tap` test protocol within GLib, and support TAP 13/14.
+ Fix a regression in glib-compile-schemas 2.75.2 causing schemas
and override files to be sorted incorrectly.
+ Support per-desktop overrides in `GSettingsAction`.
+ Various optimisations to `GString`.
+ Reduce allocations in message printing functions if there’s
nothing to format.
+ Add inline version of `g_strdup()`, allowing the compiler to do
`NULL` folding and constant folding on `strlen()` calls.
+ Add a `GPathBuf` API for building and manipulating file paths.
+ Add `g_string_free_and_steal()` and use it to warn on unused
results from`g_string_free (_, FALSE)`.
+ Add `g_free_sized()` and `g_aligned_free_sized()` to mirror the
upcoming `free_sized()` function in C23; use these if porting
away from `g_slice_free()`.
+ Fix underspecified dependencies on generated headers in
`meson.build`, which should reduce spurious build failures.
+ Updated translations.
-------------------------------------------------------------------
Fri Feb 24 02:50:22 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Update to version 2.75.2:
+ Add `g_ptr_array_sort_values()` and
`g_ptr_array_sort_values_with_data()` APIs.
+ Some fixes for activation of UWP apps on Windows.
+ Support Markdown output from `gdbus-codegen`.
- Changes from version 2.75.1:
+ Add new `GFileInfo` properties for large thumbnails.
+ Fix missing input validation in `GDBusMenuModel`.
+ Change default `g_desktop_app_info_search()` algorithm to
include substring matches.
+ Various GVariant security fixes when handling untrusted data.
+ Add support for XDG Activation protocol in `GAppLaunchContext`.
+ Return `application/x-zerosize` rather than `text/plain` as
content type for empty files.
+ Deprecate `-Druntime_libdir` configure option because it was
unused.
+ Check for snap plugs when accessing portals.
+ Add `GArray` and `GPtrArray` constructors to take or copy C
arrays.
+ Add `GHashTable` methods to get and steal hash table keys and
values as `GPtrArray`s.
+ Change the default D-Bus system bus socket address from
`/var/run/dbus/system_bus_socket` to
`/run/dbus/system_bus_socket`, in line with changes in
dbus.git.
- Drop glib2-dbus-socket-path.patch: fixed upstream.
-------------------------------------------------------------------
Thu Feb 23 14:27:05 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>

30
glib2.spec
View File

@ -30,13 +30,13 @@
%define libgthread libgthread-%{libver}
%bcond_without systemtap
Name: glib2%{psuffix}
Version: 2.74.6
Version: 2.76.1
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.74/glib-%{version}.tar.xz
Source0: https://download.gnome.org/sources/glib/2.76/glib-%{version}.tar.xz
Source1: glib2.sh
Source2: glib2.csh
# Not upstream file. Only proposes upstream packages:
@ -54,8 +54,6 @@ Patch0: glib2-bgo569829-gettext-gkeyfile.patch
Patch1: glib2-fate300461-gettext-gkeyfile-suse.patch
# PATCH-FIX-OPENSUSE glib2-suppress-schema-deprecated-path-warning.patch rh#814053 badshah400@gmail.com -- Suppress the deprecated path warning since it fills up screen unnecessarily during package installations/upgrade.
Patch2: glib2-suppress-schema-deprecated-path-warning.patch
# PATCH-FIX-OPENSUSE glib2-dbus-socket-path.patch bnc#845287 dimstar@opensuse.org -- Have gio look for the system dbus socket in /run instead of /var/run.
Patch3: glib2-dbus-socket-path.patch
# PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch olaf@aepfle.de -- Remove version string from files generated by gdbus-codegen
Patch4: glib2-gdbus-codegen-version.patch
@ -259,7 +257,6 @@ the functionality of the installed glib2 package.
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
@ -374,7 +371,7 @@ done
%else
%files tools
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%doc README.md
%{_bindir}/gapplication
%{_bindir}/gdbus
@ -407,29 +404,29 @@ done
%{_sysconfdir}/profile.d/zzz-glib2.*
%files -n gio-branding-upstream
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%doc README.Gsettings-overrides
%config (noreplace) %{_sysconfdir}/gnome_defaults.conf
%files -n %{libglib}
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%doc NEWS
%{_libdir}/libglib*.so.*
%files -n %{libgmodule}
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/libgmodule*.so.*
%files -n %{libgobject}
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/libgobject*.so.*
%files -n %{libgthread}
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/libgthread*.so.*
%files -n %{libgio}
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/libgio*.so.*
%dir %{_libdir}/gio
%dir %{_libdir}/gio/modules
@ -446,8 +443,7 @@ done
%ghost %{_localstatedir}/cache/gio-2.0/budgie-mimeapps.list
%files devel
%license COPYING
%doc HACKING
%license LICENSES/LGPL-2.1-or-later.txt
%{_bindir}/gdbus-codegen
%{_bindir}/glib-compile-resources
%{_bindir}/glib-genmarshal
@ -502,14 +498,14 @@ done
%dir %{_datadir}/gtk-doc/html
%files devel-static
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/lib*.a
%files lang -f glib20.lang
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%files tests-devel
%license COPYING
%license LICENSES/LGPL-2.1-or-later.txt
%{_libexecdir}/installed-tests
%attr(0755 - -) %{_libexecdir}/installed-tests/glib/taptestrunner.py
%attr(0755 - -) %{_libexecdir}/installed-tests/glib/x-content/unix-software/autorun.sh