[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: dbus-glib: Propagate inputs dbus and glib.
|
From: |
Andreas Enge |
|
Subject: |
01/01: gnu: dbus-glib: Propagate inputs dbus and glib. |
|
Date: |
Sat, 23 May 2015 15:32:50 +0000 |
andreas pushed a commit to branch master
in repository guix.
commit 2e88d113aac31dbea0b998fca92b35dbfc998872
Author: Andreas Enge <address@hidden>
Date: Sat May 23 16:43:18 2015 +0200
gnu: dbus-glib: Propagate inputs dbus and glib.
* gnu/packages/glib.scm (dbus-glib): Propagate inputs dbus and glib.
* gnu/packages/audio.scm (patchage),
gnu/packages/gnuzilla.scm (icecat),
gnu/packages/python.scm (python-dbus): Drop inputs dbus and glib.
* gnu/packages/gnome.scm (colord, gconf, gnome-vfs, upower),
gnu/packages/mail.scm (claws-mail),
gnu/packages/messaging.scm (hexchat),
gnu/packages/wicd.scm (wicd): Drop input dbus.
---
gnu/packages/audio.scm | 2 --
gnu/packages/glib.scm | 5 +++--
gnu/packages/gnome.scm | 6 +-----
gnu/packages/gnuzilla.scm | 2 --
gnu/packages/mail.scm | 2 +-
gnu/packages/messaging.scm | 1 +
gnu/packages/python.scm | 4 +---
gnu/packages/wicd.scm | 4 ++--
8 files changed, 9 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index e607d1a..fdc783a 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -991,10 +991,8 @@ buffers, and audio capture.")
("boost" ,boost)
("jack" ,jack-1)
("ganv" ,ganv)
- ("glib" ,glib)
("glibmm" ,glibmm)
("gtkmm" ,gtkmm-2)
- ("dbus" ,dbus)
("dbus-glib" ,dbus-glib)))
(native-inputs
`(("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1d43895..305c89c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -353,10 +353,11 @@ translated.")
(base32
"1xi1v1msz75qs0s4lkyf1psrksdppa3hwkg0mznc6gpw5flg3hdz"))))
(build-system gnu-build-system)
- (inputs
+ (propagated-inputs ; according to dbus-glib-1.pc
`(("dbus" ,dbus)
- ("expat" ,expat)
("glib" ,glib)))
+ (inputs
+ `(("expat" ,expat)))
(native-inputs
`(("glib" ,glib "bin")
("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 970df5e..de40420 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -823,8 +823,7 @@ use in GNOME applications, built on top of CORBA.")
(sha256
(base32
"0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr"))))
(build-system gnu-build-system)
- (inputs `(("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
+ (inputs `(("dbus-glib" ,dbus-glib)
("libxml2" ,libxml2)))
(propagated-inputs `(("glib" ,glib) ; referred to in the .pc file
("orbit2" ,orbit2)))
@@ -893,7 +892,6 @@ designed to be accessed through the MIME functions in
GnomeVFS.")
%standard-phases))))
(inputs `(("libxml2" ,libxml2)
("dbus-glib" ,dbus-glib)
- ("dbus" ,dbus)
("gconf" ,gconf)
("gnome-mime-data" ,gnome-mime-data)
("zlib" ,zlib)))
@@ -1935,7 +1933,6 @@ keyboard shortcuts.")
("intltool" ,intltool)))
(inputs
`(("eudev" ,eudev)
- ("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("libusb" ,libusb)
("lcms" ,lcms)
@@ -2069,7 +2066,6 @@ faster results and to avoid unnecessary server load.")
("python" ,python)))
(inputs
`(("eudev" ,eudev)
- ("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
("libusb" ,libusb)))
(home-page "http://upower.freedesktop.org/";)
diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm
index 4410c5b..20930c3 100644
--- a/gnu/packages/gnuzilla.scm
+++ b/gnu/packages/gnuzilla.scm
@@ -245,9 +245,7 @@ standards.")
`(("alsa-lib" ,alsa-lib)
("bzip2" ,bzip2)
("cairo" ,cairo)
- ("dbus" ,dbus)
("dbus-glib" ,dbus-glib)
- ("glib" ,glib)
("gstreamer" ,gstreamer)
("gst-plugins-base" ,gst-plugins-base)
("gtk+" ,gtk+-2)
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index f9eb5a7..70b0b02 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -7,6 +7,7 @@
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
;;; Copyright © 2015 Paul van der Walt <address@hidden>
;;; Copyright © 2015 Eric Bavier <address@hidden>
+;;; Copyright © 2015 Andreas Enge <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -493,7 +494,6 @@ MailCore 2.")
(inputs `(("bogofilter" ,bogofilter)
("curl" ,curl)
("dbus-glib" ,dbus-glib)
- ("dbus" ,dbus)
("enchant" ,enchant)
("expat" ,expat)
("ghostscript" ,ghostscript)
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 99c5bdb..50d59cf 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2014, 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2014 Julien Lepiller <address@hidden>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <address@hidden>
+;;; Copyright © 2015 Andreas Enge <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9da9111..9b4f6b6 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3274,9 +3274,7 @@ features useful for text console applications.")
`(("pkg-config" ,pkg-config)))
(inputs
`(("python" ,python)
- ("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
- ("glib" ,glib)))
+ ("dbus-glib" ,dbus-glib)))
(synopsis "Python bindings for D-bus")
(description "python-dbus provides bindings for libdbus, the reference
implementation of D-Bus.")
diff --git a/gnu/packages/wicd.scm b/gnu/packages/wicd.scm
index 779ec84..908b15e 100644
--- a/gnu/packages/wicd.scm
+++ b/gnu/packages/wicd.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Mark H Weaver <address@hidden>
;;; Copyright © 2015 Pierre-Antoine Rault <address@hidden>
+;;; Copyright © 2015 Andreas Enge <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,8 +50,7 @@
"wicd-template-instantiation.patch")))))
(build-system python-build-system)
(native-inputs `(("gettext" ,gnu-gettext)))
- (inputs `(("dbus" ,dbus)
- ("dbus-glib" ,dbus-glib)
+ (inputs `(("dbus-glib" ,dbus-glib)
("python2-dbus" ,python2-dbus)
("python2-pygtk" ,python2-pygtk)
("python2-urwid" ,python2-urwid)