[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
31/34: gnu: dconf: Update to 0.36.0.
From: |
guix-commits |
Subject: |
31/34: gnu: dconf: Update to 0.36.0. |
Date: |
Sat, 25 Jul 2020 14:54:06 -0400 (EDT) |
mbakke pushed a commit to branch wip-staging
in repository guix.
commit 62df18d305bc99a685f6621726b71572771fa09c
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sat Jul 25 13:18:40 2020 +0200
gnu: dconf: Update to 0.36.0.
* gnu/packages/patches/dconf-meson-0.52.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
* gnu/packages/gnome.scm (dconf): Update to 0.36.0.
[source](patches): Remove.
---
gnu/local.mk | 1 -
gnu/packages/gnome.scm | 5 ++---
gnu/packages/patches/dconf-meson-0.52.patch | 19 -------------------
3 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 5fe33a8..4d04c32 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -880,7 +880,6 @@ dist_patch_DATA =
\
%D%/packages/patches/dbus-CVE-2020-12049.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.patch \
- %D%/packages/patches/dconf-meson-0.52.patch \
%D%/packages/patches/debops-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/desmume-gcc6-fixes.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8afeb5e..f05af6b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3478,17 +3478,16 @@ and RDP protocols.")
(define-public dconf
(package
(name "dconf")
- (version "0.34.0")
+ (version "0.36.0")
(source (origin
(method url-fetch)
(uri (string-append
"mirror://gnome/sources/" name "/"
(version-major+minor version) "/"
name "-" version ".tar.xz"))
- (patches (search-patches "dconf-meson-0.52.patch"))
(sha256
(base32
- "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll"))))
+ "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"))))
(build-system meson-build-system)
(propagated-inputs
;; In Requires of dconf.pc.
diff --git a/gnu/packages/patches/dconf-meson-0.52.patch
b/gnu/packages/patches/dconf-meson-0.52.patch
deleted file mode 100644
index c636edc..0000000
--- a/gnu/packages/patches/dconf-meson-0.52.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Fix build failure with Meson 0.52.
-
-Taken from upstream:
-https://gitlab.gnome.org/GNOME/dconf/commit/7ad890fb7a2ec90a777a756a1fa20a615ec7245e
-https://gitlab.gnome.org/GNOME/dconf/merge_requests/54
-
-diff --git a/client/meson.build b/client/meson.build
-index
f3b7122cb05bfa7bb481c487e3cd052aa1ad58e5..de6387e2cac2aba12b83f2614c277bada434fd16
100644
---- a/client/meson.build
-+++ b/client/meson.build
-@@ -28,7 +28,7 @@ libdconf_client = static_library(
-
- libdconf_client_dep = declare_dependency(
- dependencies: gio_dep,
-- link_whole: libdconf_client,
-+ link_with: libdconf_client,
- )
-
- libdconf = shared_library(
- 23/34: gnu: mesa: Update to 20.1.4., (continued)
- 23/34: gnu: mesa: Update to 20.1.4., guix-commits, 2020/07/25
- 24/34: gnu: python-coverage: Update to 5.2.1., guix-commits, 2020/07/25
- 15/34: gnu: wayland: Update to 1.18.0., guix-commits, 2020/07/25
- 18/34: gnu: libevdev: Update to 1.9.1., guix-commits, 2020/07/25
- 19/34: gnu: xkeyboard-config: Update to 2.30., guix-commits, 2020/07/25
- 20/34: gnu: libvdpau: Update to 1.4., guix-commits, 2020/07/25
- 25/34: gnu: linux-pam: Update to 1.4.0., guix-commits, 2020/07/25
- 26/34: gnu: check: Update to 0.15.1., guix-commits, 2020/07/25
- 30/34: gnu: libical: Disable parallel build., guix-commits, 2020/07/25
- 27/34: gnu: Remove python2-sphinx., guix-commits, 2020/07/25
- 31/34: gnu: dconf: Update to 0.36.0.,
guix-commits <=
- 29/34: gnu: popt: Update to 1.18., guix-commits, 2020/07/25
- 32/34: gnu: alsa-lib: Update to 1.2.3.2., guix-commits, 2020/07/25
- 34/34: gnu: dconf: Increase test timeout., guix-commits, 2020/07/25
- 28/34: gnu: Sphinx: Update to 3.1.2., guix-commits, 2020/07/25
- 33/34: gnu: alsa-utils: Update to 1.2.3., guix-commits, 2020/07/25