pool/glib2
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 715833 from GNOME:Next

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/715833
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/glib2?expand=0&rev=398
This commit is contained in:
Dominique Leuenberger
2019-07-18 10:28:38 +00:00
committed by Git OBS Bridge
parent 43eaf3ac99
commit 631cef8ca0
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
glib2-keyfile-handle-filename-being-null.patch Normal file
View File

@@ -0,0 +1,30 @@
From 953f23f13ced4002834f7622b21da1703a323047 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
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

7
glib2.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Sat Jul 13 18:23:31 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>
- Add glib2-keyfile-handle-filename-being-null.patch: key file:
Handle filename being NULL (glgo#GNOME/GLib!1825,
glgo#GNOME/GLib#984).
-------------------------------------------------------------------
Tue Jul 9 11:12:41 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

4
glib2.spec
View File

@@ -47,6 +47,9 @@ 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
BuildRequires: gamin-devel
@@ -254,6 +257,7 @@ 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