gnu: Adjust yet more packages to GLib "bin" split.

* gnu/packages/maths.scm (pspp): Add glib:bin to 'native-inputs'.
* gnu/packages/gnome.scm (gconf, gnome-vfs, libgnome, libgnomeui,
  libbonoboui): Likewise.
  (libbonobo, libgnomecanvas, libgnomeprint): Comment on why glib:bin.
* gnu/packages/gtk.scm (gtksourceview): Likewise.
This commit is contained in:
Eric Bavier 2014-07-02 13:32:59 -05:00
parent 44add1ce19
commit 221ed17a58
3 changed files with 18 additions and 10 deletions

View File

@ -42,7 +42,8 @@
#:use-module (gnu packages xml) #:use-module (gnu packages xml)
#:use-module (gnu packages gl) #:use-module (gnu packages gl)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages xorg)) #:use-module (gnu packages xorg)
#:use-module (srfi srfi-1))
(define-public brasero (define-public brasero
(package (package
@ -720,7 +721,7 @@ featuring mature C, C++ and Python bindings.")
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("glib" ,glib "bin") ("glib" ,glib "bin") ; for glib-genmarshal, etc.
("flex" ,flex) ("flex" ,flex)
("bison" ,bison))) ("bison" ,bison)))
(home-page "https://developer.gnome.org/libbonobo/") (home-page "https://developer.gnome.org/libbonobo/")
@ -755,6 +756,7 @@ use in GNOME applications, built on top of CORBA.")
(propagated-inputs `(("orbit2" ,orbit2))) ; referred to in the .pc file (propagated-inputs `(("orbit2" ,orbit2))) ; referred to in the .pc file
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://projects.gnome.org/gconf/") (home-page "https://projects.gnome.org/gconf/")
(synopsis "store application preferences") (synopsis "store application preferences")
@ -823,7 +825,8 @@ designed to be accessed through the MIME functions in GnomeVFS.")
("gnome-mime-data" ,gnome-mime-data) ("gnome-mime-data" ,gnome-mime-data)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("glib" ,glib "bin") ; for glib-mkenums, etc.
("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/gnome-vfs/") (home-page "https://developer.gnome.org/gnome-vfs/")
(synopsis "access files and folders in GNOME applications") (synopsis "access files and folders in GNOME applications")
@ -860,7 +863,8 @@ allows applications to access local and remote files with a single consistent AP
(inputs `(("popt" ,popt) (inputs `(("popt" ,popt)
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("glib" ,glib "bin") ; for glib-mkenums, etc.
("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
;; The following are listed as Required in the .pc file ;; The following are listed as Required in the .pc file
;; (except for libcanberra -- which seems to be oversight on the part ;; (except for libcanberra -- which seems to be oversight on the part
@ -924,7 +928,7 @@ high-quality vector-based 2D library with antialiasing and alpha composition.")
("gtk+" ,gtk+-2))) ("gtk+" ,gtk+-2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin") ("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/libgnomecanvas/") (home-page "https://developer.gnome.org/libgnomecanvas/")
(synopsis "Flexible widget for creating interactive structured graphics") (synopsis "Flexible widget for creating interactive structured graphics")
@ -957,7 +961,8 @@ creating interactive structured graphics.")
("libxml2" ,libxml2) ("libxml2" ,libxml2)
("libglade" ,libglade))) ("libglade" ,libglade)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("glib" ,glib "bin") ; for glib-mkenums, etc.
("intltool" ,intltool)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/libgnomeui/") (home-page "https://developer.gnome.org/libgnomeui/")
(synopsis "Additional widgets for applications") (synopsis "Additional widgets for applications")
@ -1013,7 +1018,7 @@ widgets built in the loading process.")
("libxml2" ,libxml2))) ("libxml2" ,libxml2)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin") ("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://projects.gnome.org/gnome-print/home/faq.html") (home-page "https://projects.gnome.org/gnome-print/home/faq.html")
(synopsis "printing framework for GNOME") (synopsis "printing framework for GNOME")
@ -1088,7 +1093,8 @@ widgets built in the loading process.")
("libgnomecanvas" ,libgnomecanvas) ("libgnomecanvas" ,libgnomecanvas)
("libglade" ,libglade))) ("libglade" ,libglade)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("glib" ,glib "bin") ; for glib-genmarshal, etc.
("intltool" ,intltool)
("xorg-server" ,xorg-server) ; For running the tests ("xorg-server" ,xorg-server) ; For running the tests
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "https://developer.gnome.org/libbonoboui/") (home-page "https://developer.gnome.org/libbonoboui/")

View File

@ -218,7 +218,7 @@ functions which were removed.")
("shared-mime-info" ,shared-mime-info))) ("shared-mime-info" ,shared-mime-info)))
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("intltool" ,intltool)
("glib" ,glib "bin") ("glib" ,glib "bin") ; for glib-genmarshal, etc.
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(arguments (arguments
`(#:phases `(#:phases

View File

@ -41,6 +41,7 @@
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gd) #:use-module (gnu packages gd)
#:use-module (gnu packages ghostscript) #:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk) #:use-module (gnu packages gtk)
#:use-module (gnu packages less) #:use-module (gnu packages less)
#:use-module (gnu packages gnome) #:use-module (gnu packages gnome)
@ -169,7 +170,8 @@ LP/MIP solver is included in the package.")
("gtksourceview" ,gtksourceview) ("gtksourceview" ,gtksourceview)
("zlib" ,zlib))) ("zlib" ,zlib)))
(native-inputs (native-inputs
`(("perl" ,perl) `(("glib" ,glib "bin") ;for glib-genmarshal
("perl" ,perl)
("pkg-config" ,pkg-config))) ("pkg-config" ,pkg-config)))
(home-page "http://www.gnu.org/software/pspp/") (home-page "http://www.gnu.org/software/pspp/")
(synopsis "Statistical analysis") (synopsis "Statistical analysis")