Hello community,
here is the log from the commit of package glib2 for openSUSE:Factory checked in at 2019-07-31 14:11:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/glib2 (Old)
and /work/SRC/openSUSE:Factory/.glib2.new.4126 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "glib2"
Wed Jul 31 14:11:50 2019 rev:214 rq:718307 version:2.60.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/glib2/glib2.changes 2019-07-21 11:31:32.504805708 +0200
+++ /work/SRC/openSUSE:Factory/.glib2.new.4126/glib2.changes 2019-07-31 14:11:53.594955345 +0200
@@ -1,0 +2,12 @@
+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.
+
+-------------------------------------------------------------------
Old:
----
glib-2.60.5.tar.xz
glib2-keyfile-handle-filename-being-null.patch
New:
----
glib-2.60.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ glib2.spec ++++++
--- /var/tmp/diff_new_pack.PN2H8M/_old 2019-07-31 14:11:55.582954659 +0200
+++ /var/tmp/diff_new_pack.PN2H8M/_new 2019-07-31 14:11:55.590954656 +0200
@@ -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 @@
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 @@
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE5} .
cp -a %{SOURCE4} gnome_defaults.conf
# replace /usr/bin/env shebangs
++++++ glib-2.60.5.tar.xz -> glib-2.60.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.60.5/NEWS new/glib-2.60.6/NEWS
--- old/glib-2.60.5/NEWS 2019-07-09 12:59:38.000000000 +0200
+++ new/glib-2.60.6/NEWS 2019-07-24 12:52:03.000000000 +0200
@@ -1,3 +1,12 @@
+Overview of changes in GLib 2.60.6
+==================================
+
+* Fix various bugs with use of the `GKeyfileSettingsBackend` within flatpaks (!984, !985, #1825)
+
+* Bugs fixed:
+ - !993 Backport !984, !985 keyfile/portal fixes to glib-2-60
+
+
Overview of changes in GLib 2.60.5
==================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.60.5/gio/gkeyfilesettingsbackend.c new/glib-2.60.6/gio/gkeyfilesettingsbackend.c
--- old/glib-2.60.5/gio/gkeyfilesettingsbackend.c 2019-07-09 12:59:38.000000000 +0200
+++ new/glib-2.60.6/gio/gkeyfilesettingsbackend.c 2019-07-24 12:52:04.000000000 +0200
@@ -80,7 +80,7 @@
#ifdef G_OS_WIN32
#define EXTENSION_PRIORITY 10
#else
-#define EXTENSION_PRIORITY (glib_should_use_portal () ? 110 : 10)
+#define EXTENSION_PRIORITY (glib_should_use_portal () && !glib_has_dconf_access_in_sandbox () ? 110 : 10)
#endif
G_DEFINE_TYPE_WITH_CODE (GKeyfileSettingsBackend,
@@ -740,7 +740,8 @@
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:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.60.5/gio/gportalsupport.c new/glib-2.60.6/gio/gportalsupport.c
--- old/glib-2.60.5/gio/gportalsupport.c 2019-07-09 12:59:39.000000000 +0200
+++ new/glib-2.60.6/gio/gportalsupport.c 2019-07-24 12:52:04.000000000 +0200
@@ -23,6 +23,7 @@
static gboolean flatpak_info_read;
static gboolean use_portal;
static gboolean network_available;
+static gboolean dconf_access;
static void
read_flatpak_info (void)
@@ -40,11 +41,13 @@
use_portal = TRUE;
network_available = FALSE;
+ dconf_access = FALSE;
keyfile = g_key_file_new ();
if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL))
{
char **shared = NULL;
+ char *dconf_policy = NULL;
shared = g_key_file_get_string_list (keyfile, "Context", "shared", NULL, NULL);
if (shared)
@@ -52,6 +55,14 @@
network_available = g_strv_contains ((const char * const *)shared, "network");
g_strfreev (shared);
}
+
+ dconf_policy = g_key_file_get_string (keyfile, "Session Bus Policy", "ca.desrt.dconf", NULL);
+ if (dconf_policy)
+ {
+ if (strcmp (dconf_policy, "talk") == 0)
+ dconf_access = TRUE;
+ g_free (dconf_policy);
+ }
}
g_key_file_unref (keyfile);
@@ -64,6 +75,7 @@
if (var && var[0] == '1')
use_portal = TRUE;
network_available = TRUE;
+ dconf_access = TRUE;
}
}
@@ -81,3 +93,9 @@
return network_available;
}
+gboolean
+glib_has_dconf_access_in_sandbox (void)
+{
+ read_flatpak_info ();
+ return dconf_access;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.60.5/gio/gportalsupport.h new/glib-2.60.6/gio/gportalsupport.h
--- old/glib-2.60.5/gio/gportalsupport.h 2019-07-09 12:59:39.000000000 +0200
+++ new/glib-2.60.6/gio/gportalsupport.h 2019-07-24 12:52:04.000000000 +0200
@@ -24,6 +24,7 @@
gboolean glib_should_use_portal (void);
gboolean glib_network_available_in_sandbox (void);
+gboolean glib_has_dconf_access_in_sandbox (void);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/glib-2.60.5/meson.build new/glib-2.60.6/meson.build
--- old/glib-2.60.5/meson.build 2019-07-09 12:59:39.000000000 +0200
+++ new/glib-2.60.6/meson.build 2019-07-24 12:52:04.000000000 +0200
@@ -1,5 +1,5 @@
project('glib', 'c', 'cpp',
- version : '2.60.5',
+ version : '2.60.6',
meson_version : '>= 0.48.0',
default_options : [
'buildtype=debugoptimized',