guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

41/108: gnu: dconf: Update to 0.36.0.


From: guix-commits
Subject: 41/108: gnu: dconf: Update to 0.36.0.
Date: Sat, 25 Apr 2020 15:22:47 -0400 (EDT)

kkebreau pushed a commit to branch wip-gnome3.36
in repository guix.

commit f142e4aff5320434f85615df010d55c1b1f911cc
Author: Kei Kebreau <address@hidden>
AuthorDate: Sun Apr 19 00:44:41 2020 -0400

    gnu: dconf: Update to 0.36.0.
    
    * gnu/packages/gnome.scm (dconf): Update to 0.36.0.
    [source]: Remove obsolete patch.
    [home-page]: Follow redirect.
    * gnu/packages/patches/dconf-meson-0.52.patch: Delete file.
    * gnu/local.mk: Remove it.
---
 gnu/local.mk                                |  1 -
 gnu/packages/gnome.scm                      |  7 +++----
 gnu/packages/patches/dconf-meson-0.52.patch | 19 -------------------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 40a6538..1d2937d 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -842,7 +842,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/dbus-helper-search-path.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/deja-dup-use-ref-keyword-for-iter.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1b93fcb..58cb20b 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3395,17 +3395,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.
@@ -3428,7 +3427,7 @@ and RDP protocols.")
                    ; or /etc/machine-id.
        #:glib-or-gtk? #t
        #:configure-flags '("-Denable-gtk-doc=true")))
-    (home-page "https://developer.gnome.org/dconf";)
+    (home-page "https://developer.gnome.org/dconf/";)
     (synopsis "Low-level GNOME configuration system")
     (description "Dconf is a low-level configuration system.  Its main purpose
 is to provide a backend to GSettings on platforms that don't already have
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(



reply via email to

[Prev in Thread] Current Thread [Next in Thread]