From e05c68c8056127a1d7a7181a2602a2ba472bd5d79fec4449adf94315387eb4be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Wed, 24 Jul 2019 15:46:39 +0000 Subject: [PATCH] Accepting request 718195 from GNOME:Next New stable release OBS-URL: https://build.opensuse.org/request/show/718195 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=400 --- glib-2.60.5.tar.xz | 3 -- glib-2.60.6.tar.xz | 3 ++ ...2-keyfile-handle-filename-being-null.patch | 30 ------------------- glib2.changes | 12 ++++++++ glib2.spec | 5 +--- 5 files changed, 16 insertions(+), 37 deletions(-) delete mode 100644 glib-2.60.5.tar.xz create mode 100644 glib-2.60.6.tar.xz delete mode 100644 glib2-keyfile-handle-filename-being-null.patch diff --git a/glib-2.60.5.tar.xz b/glib-2.60.5.tar.xz deleted file mode 100644 index bb710af..0000000 --- a/glib-2.60.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3edf1df576ee82b2ecb8ba85c343644e48ee62e68290e71e6084b00d6ba2622e -size 4589708 diff --git a/glib-2.60.6.tar.xz b/glib-2.60.6.tar.xz new file mode 100644 index 0000000..98313d0 --- /dev/null +++ b/glib-2.60.6.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff8fab8d8deaa4fd0536c90f90d9769a09071779c7e6183907f6855645bffb6c +size 4589516 diff --git a/glib2-keyfile-handle-filename-being-null.patch b/glib2-keyfile-handle-filename-being-null.patch deleted file mode 100644 index 3df3cce..0000000 --- a/glib2-keyfile-handle-filename-being-null.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 953f23f13ced4002834f7622b21da1703a323047 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Wed, 10 Jul 2019 11:14:03 -0400 -Subject: [PATCH] key file: Handle filename being NULL - -This happens when we are default-constructed -without explicit arguments. - -Closes: https://gitlab.gnome.org/GNOME/glib/issues/1825 ---- - gio/gkeyfilesettingsbackend.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c -index 3bc392351..b33a4ad69 100644 ---- a/gio/gkeyfilesettingsbackend.c -+++ b/gio/gkeyfilesettingsbackend.c -@@ -740,7 +740,8 @@ g_keyfile_settings_backend_set_property (GObject *object, - case PROP_FILENAME: - /* Construct only. */ - g_assert (kfsb->file == NULL); -- kfsb->file = g_file_new_for_path (g_value_get_string (value)); -+ if (g_value_get_string (value)) -+ kfsb->file = g_file_new_for_path (g_value_get_string (value)); - break; - - case PROP_ROOT_PATH: --- -2.21.0 - diff --git a/glib2.changes b/glib2.changes index 8d161a9..0716040 100644 --- a/glib2.changes +++ b/glib2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Jul 24 11:38:32 UTC 2019 - Bjørn Lie + +- Update to version 2.60.6: + + Fix various bugs with use of the `GKeyfileSettingsBackend` + within flatpaks (glgo#GNOME/GLib!984, glgo#GNOME/GLib!985, + glgo#GNOME/GLib#1825). + + Bugs fixed: glgo#GNOME/GLib!993, glgo#GNOME/GLib!984, + glgo#GNOME/GLib!985. +- Drop glib2-keyfile-handle-filename-being-null.patch: Fixed + upstream. + ------------------------------------------------------------------- Sat Jul 13 18:23:31 UTC 2019 - Bjørn Lie diff --git a/glib2.spec b/glib2.spec index 485daa2..f8b2bea 100644 --- a/glib2.spec +++ b/glib2.spec @@ -19,7 +19,7 @@ # systemtap is only offered as build-option, but not enabled, as it causes a build cycle %bcond_with systemtap Name: glib2 -Version: 2.60.5 +Version: 2.60.6 Release: 0 Summary: General-Purpose Utility Library License: LGPL-2.1-or-later @@ -47,8 +47,6 @@ Patch2: glib2-suppress-schema-deprecated-path-warning.patch 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 -# PATCH-FIX-UPSTREAM glib2-keyfile-handle-filename-being-null.patch -- key file: Handle filename being NULL -Patch5: glib2-keyfile-handle-filename-being-null.patch BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -257,7 +255,6 @@ translation-update-upstream %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf # replace /usr/bin/env shebangs