me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2020-07-25 13:18:40 +02:00
parent 2960d31aec
commit 62df18d305
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
3 changed files with 2 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@ -880,7 +880,6 @@ dist_patch_DATA = \
%D%/packages/patches/dbus-CVE-2020-12049.patch \ %D%/packages/patches/dbus-CVE-2020-12049.patch \
%D%/packages/patches/dbus-c++-gcc-compat.patch \ %D%/packages/patches/dbus-c++-gcc-compat.patch \
%D%/packages/patches/dbus-c++-threading-mutex.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-constants-for-external-program-names.patch \
%D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \ %D%/packages/patches/debops-debops-defaults-fall-back-to-less.patch \
%D%/packages/patches/desmume-gcc6-fixes.patch \ %D%/packages/patches/desmume-gcc6-fixes.patch \

5
gnu/packages/gnome.scm
View File

@ -3478,17 +3478,16 @@ and RDP protocols.")
(define-public dconf (define-public dconf
(package (package
(name "dconf") (name "dconf")
(version "0.34.0") (version "0.36.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
"mirror://gnome/sources/" name "/" "mirror://gnome/sources/" name "/"
(version-major+minor version) "/" (version-major+minor version) "/"
name "-" version ".tar.xz")) name "-" version ".tar.xz"))
(patches (search-patches "dconf-meson-0.52.patch"))
(sha256 (sha256
(base32 (base32
"0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll")))) "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz"))))
(build-system meson-build-system) (build-system meson-build-system)
(propagated-inputs (propagated-inputs
;; In Requires of dconf.pc. ;; In Requires of dconf.pc.

19
gnu/packages/patches/dconf-meson-0.52.patch
View File

@ -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(