Hello community, here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2019-07-21 11:31:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/glib2 (Old) and /work/SRC/openSUSE:Factory/.glib2.new.4126 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2" Sun Jul 21 11:31:31 2019 rev:213 rq:716277 version:2.60.5 Changes: -------- --- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2019-07-13 13:59:44.406910055 +0200 +++ /work/SRC/openSUSE:Factory/.glib2.new.4126/glib2.changes 2019-07-21 11:31:32.504805708 +0200 @@ -1,0 +2,7 @@ +Sat Jul 13 18:23:31 UTC 2019 - Bjørn Lie <[email protected]> + +- Add glib2-keyfile-handle-filename-being-null.patch: key file: + Handle filename being NULL (glgo#GNOME/GLib!1825, + glgo#GNOME/GLib#984). + +------------------------------------------------------------------- New: ---- glib2-keyfile-handle-filename-being-null.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ glib2.spec ++++++ --- /var/tmp/diff_new_pack.s3p7BJ/_old 2019-07-21 11:31:33.168805596 +0200 +++ /var/tmp/diff_new_pack.s3p7BJ/_new 2019-07-21 11:31:33.172805595 +0200 @@ -47,6 +47,9 @@ Patch3: glib2-dbus-socket-path.patch # PATCH-FIX-OPENSUSE glib2-gdbus-codegen-version.patch [email protected] -- 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 BuildRequires: gamin-devel @@ -254,6 +257,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} . cp -a %{SOURCE4} gnome_defaults.conf # replace /usr/bin/env shebangs ++++++ glib2-keyfile-handle-filename-being-null.patch ++++++ >From 953f23f13ced4002834f7622b21da1703a323047 Mon Sep 17 00:00:00 2001 From: Matthias Clasen <[email protected]> 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
