summary refs log tree commit diff
path: root/gnu/packages/patches
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-27 23:45:54 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-31 14:41:37 +0200
commitf9f72d35361bde53b8face634c72530aa7d81edf (patch)
tree59f98671b700dc5b9abef145a5d58a88d3601c25 /gnu/packages/patches
parent014d4c149594f8e7f0e74eefd7255a03946596f3 (diff)
downloadguix-f9f72d35361bde53b8face634c72530aa7d81edf.tar.gz
gnu: glib: Update to 2.60.6.
* gnu/packages/patches/glib-keyfile-arguments.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/glib.scm (glib): Update to 2.60.6.
[source](patches): Remove obsolete patch.
Diffstat (limited to 'gnu/packages/patches')
-rw-r--r--gnu/packages/patches/glib-keyfile-arguments.patch20
1 files changed, 0 insertions, 20 deletions
diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch b/gnu/packages/patches/glib-keyfile-arguments.patch
deleted file mode 100644
index 8d428f4192..0000000000
--- a/gnu/packages/patches/glib-keyfile-arguments.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fix a problem with the keyfile backend whereby instantiating it with
-the default NULL value would cause an assertion error:
-
-https://gitlab.gnome.org/GNOME/glib/issues/1825
-
-This issue showed up when running the test suites of uhttpmock and spice.
-
-diff --git a/gio/gkeyfilesettingsbackend.c b/gio/gkeyfilesettingsbackend.c
---- 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: