From 86cf191426534ba5eac15e02ae20b1a0ba7f0bf4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 30 Nov 2016 18:07:03 +0100
Subject: gnu: dbus: Eliminate graft.

* gnu/packages/glib.scm (dbus)[replacement]: Remove field.
[version]: Update to 1.10.12.
[source]: Update hash.
(dbus-1.10.12): Remove variable.
---
 gnu/packages/glib.scm | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

(limited to 'gnu/packages/glib.scm')

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2b57f85d75..e7419fd88b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -64,8 +64,7 @@
 (define dbus
   (package
     (name "dbus")
-    (replacement dbus-1.10.12)
-    (version "1.10.10")
+    (version "1.10.12")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -73,7 +72,7 @@
                     version ".tar.gz"))
               (sha256
                (base32
-                "0hwsfczhx2djmc9116vj5v230i7gpjihwh3vbljs1ldlk831v3wx"))
+                "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"))
               (patches (search-patches "dbus-helper-search-path.patch"))))
     (build-system gnu-build-system)
     (arguments
@@ -132,21 +131,6 @@ or through unencrypted TCP/IP suitable for use behind a firewall with
 shared NFS home directories.")
     (license license:gpl2+)))                     ; or Academic Free License 2.1
 
-(define dbus-1.10.12
-  (package
-    (inherit dbus)
-    (name "dbus")
-    (source
-      (let ((version "1.10.12"))
-        (origin
-          (inherit (package-source dbus))
-          (uri (string-append
-                "https://dbus.freedesktop.org/releases/dbus/dbus-"
-                version ".tar.gz"))
-          (sha256
-           (base32
-            "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1")))))))
-
 (define glib
   (package
    (name "glib")
-- 
cgit 1.4.1


From 8b6aee5f82461f43a3ff4f12ccb84ae87413b112 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 30 Nov 2016 18:09:41 +0100
Subject: gnu: dbus: Update to 1.10.14.

* gnu/packages/glib.scm (dbus): Update to 1.10.14.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/glib.scm')

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index e7419fd88b..3683068dc4 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -64,7 +64,7 @@
 (define dbus
   (package
     (name "dbus")
-    (version "1.10.12")
+    (version "1.10.14")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -72,7 +72,7 @@
                     version ".tar.gz"))
               (sha256
                (base32
-                "0pa71vf5c0d7k3gni06iascmplj0j5g70wbc833ayvi71d1pj2i1"))
+                "10x0wvv2ly4lyyfd42k4xw0ar5qdbi9cksw3l5fcwf1y6mq8y8r3"))
               (patches (search-patches "dbus-helper-search-path.patch"))))
     (build-system gnu-build-system)
     (arguments
-- 
cgit 1.4.1


From 000c5a1163f7c2b39cefb373a14288b89e03cee8 Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Wed, 30 Nov 2016 19:16:48 +0100
Subject: gnu: libsigc++: Update to 2.10.0.

* gnu/packages/glib.scm (libsigc++): Update to 2.10.0.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'gnu/packages/glib.scm')

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 2b57f85d75..ba2184c6ad 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -471,7 +471,7 @@ by GDBus included in Glib.")
 (define libsigc++
   (package
     (name "libsigc++")
-    (version "2.8.0")
+    (version "2.10.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/libsigc++/"
@@ -479,7 +479,7 @@ by GDBus included in Glib.")
                                  name "-" version ".tar.xz"))
              (sha256
               (base32
-               "0lcnzzdq6718znfshs1hflpwqq6awbzwdyp4kv5lfaf54z880jbp"))))
+               "10cd54l4zihss9qxfhd2iip2k7mr292k37i54r2cpgv0c8sdchzq"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
                      ("m4" ,m4)))
-- 
cgit 1.4.1