[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
17/18: gnu: glib: Update to 2.60.6.
From: |
guix-commits |
Subject: |
17/18: gnu: glib: Update to 2.60.6. |
Date: |
Wed, 31 Jul 2019 08:58:42 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit f9f72d35361bde53b8face634c72530aa7d81edf
Author: Marius Bakke <address@hidden>
Date: Sat Jul 27 23:45:54 2019 +0200
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.
---
gnu/local.mk | 1 -
gnu/packages/glib.scm | 7 +++----
gnu/packages/patches/glib-keyfile-arguments.patch | 20 --------------------
3 files changed, 3 insertions(+), 25 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 0517578..27edacb 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -856,7 +856,6 @@ dist_patch_DATA =
\
%D%/packages/patches/ghostscript-no-header-uuid.patch \
%D%/packages/patches/ghostscript-no-header-creationdate.patch \
%D%/packages/patches/giflib-make-reallocarray-private.patch \
- %D%/packages/patches/glib-keyfile-arguments.patch \
%D%/packages/patches/glib-tests-timer.patch \
%D%/packages/patches/glibc-CVE-2015-5180.patch \
%D%/packages/patches/glibc-CVE-2015-7547.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 8f1b91e..438c1f9 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -159,7 +159,7 @@ shared NFS home directories.")
(define glib
(package
(name "glib")
- (version "2.60.5")
+ (version "2.60.6")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
@@ -167,9 +167,8 @@ shared NFS home directories.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0bk2l9mhvc44c0gfg442wrifwj2fci1w71dsp3nb50pffvsivpry"))
- (patches (search-patches "glib-tests-timer.patch"
- "glib-keyfile-arguments.patch"))
+ "0v7vpx2md1gn0wwiirn7g4bhf2csfvcr03y96q2zv97ain6sp3zz"))
+ (patches (search-patches "glib-tests-timer.patch"))
(modules '((guix build utils)))
(snippet
'(begin
diff --git a/gnu/packages/patches/glib-keyfile-arguments.patch
b/gnu/packages/patches/glib-keyfile-arguments.patch
deleted file mode 100644
index 8d428f4..0000000
--- 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:
- branch core-updates updated (6a2e542 -> 51d4c79), guix-commits, 2019/07/31
- 02/18: gnu: prank: Update to 170427., guix-commits, 2019/07/31
- 01/18: gnu: ftgl: Update to 2.4.0., guix-commits, 2019/07/31
- 05/18: gnu: icu4c: Make 'libicudata.so' behave the same on all architectures., guix-commits, 2019/07/31
- 07/18: gnu: libarchive: Do not build 'libarchive.a'., guix-commits, 2019/07/31
- 15/18: gnu: gnutls: Update to 3.6.9., guix-commits, 2019/07/31
- 03/18: gnu: gpsbabel: Remove GCC 5 workaround., guix-commits, 2019/07/31
- 16/18: gnu: libice: Update to 1.0.10., guix-commits, 2019/07/31
- 13/18: gnu: poppler: Update to 0.79.0., guix-commits, 2019/07/31
- 09/18: gnu: Remove workarounds for missing libarchive nettle propagation., guix-commits, 2019/07/31
- 17/18: gnu: glib: Update to 2.60.6.,
guix-commits <=
- 08/18: gnu: libarchive: Embed absolute references to required libraries in .la file., guix-commits, 2019/07/31
- 06/18: gnu: libarchive: Enable zstd support., guix-commits, 2019/07/31
- 18/18: gnu: Remove workarounds for <https://bugs.gnu.org/36721>., guix-commits, 2019/07/31
- 10/18: gnu: CMake: Update to 3.15.1., guix-commits, 2019/07/31
- 04/18: gnu: icu4c: Add upstream patches., guix-commits, 2019/07/31
- 11/18: gnu: boost: Do not install CMake files., guix-commits, 2019/07/31
- 14/18: gnu: libtasn1: Update to 4.14., guix-commits, 2019/07/31
- 12/18: gnu: curl: Update to 7.65.3., guix-commits, 2019/07/31