branch master updated: gnu: libsigc++: Remove duplicate definition.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 31c81fe  gnu: libsigc++: Remove duplicate definition.
31c81fe is described below

commit 31c81fefff7c3290f0a6f0b8d2c2d3855a7ba196
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Oct 5 14:10:00 2020 +0300

    gnu: libsigc++: Remove duplicate definition.
    
    * gnu/packages/glib.scm (libsigc++-2): Remove variable.
    (glibmm-2.64)[propagated-inputs]: Adjust accordingly.
    * gnu/packages/gtk.scm (cairomm-1.13)[propagated-inputs]: Same.
---
 gnu/packages/glib.scm | 17 +----------------
 gnu/packages/gtk.scm  |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 06cee22..cde95b1 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -619,21 +619,6 @@ It also contains adaptor classes for connection of 
dissimilar callbacks and
 has an ease of use unmatched by other C++ callback libraries.")
     (license license:lgpl2.1+)))
 
-(define-public libsigc++-2
-  (package
-    (inherit libsigc++)
-    (name "libsigc++")
-    (version "2.10.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri
-        (string-append "mirror://gnome/sources/libsigc++/"
-                       (version-major+minor version) "/"
-                       name "-" version ".tar.xz"))
-       (sha256
-        (base32 "11j7j1jv4z58d9s7jvl42fnqa1dzl4idgil9r45cjv1w673dys0b"))))))
-
 (define glibmm
   (package
     (name "glibmm")
@@ -692,7 +677,7 @@ useful for C++.")
        (sha256
         (base32 "1v6lp23fr2qh4zshcnm28sn29j3nzgsvcqj2nhmrnvamipjq4lm7"))))
      (propagated-inputs
-      `(("libsigc++" ,libsigc++-2)
+      `(("libsigc++" ,libsigc++)
         ("glib" ,glib)))))
 
 (define-public python2-pygobject-2
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ff8547d..e32bf70 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1217,7 +1217,7 @@ library.")
         (base32 "1xlfl0fm5mgv53lr8xjv2kqsk3bz67qkk6qzvbrqmbvbvvbqp9wp"))))
     (propagated-inputs
      `(("cairo" ,cairo)
-       ("sigc++" ,libsigc++-2)))))
+       ("sigc++" ,libsigc++)))))
 
 (define-public pangomm
   (package