diff options
author | Eric Bavier <bavier@member.fsf.org> | 2014-07-02 13:32:59 -0500 |
---|---|---|
committer | Eric Bavier <bavier@member.fsf.org> | 2014-07-02 13:32:59 -0500 |
commit | 221ed17a580f5e3df0347cc83064bb50c41d1231 (patch) | |
tree | 59b9be8bed503247bcaa199780b2019f36640cdb /gnu/packages | |
parent | 44add1ce19473990654b399c2a83707b3b76034b (diff) | |
download | patches-221ed17a580f5e3df0347cc83064bb50c41d1231.tar patches-221ed17a580f5e3df0347cc83064bb50c41d1231.tar.gz |
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.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/gnome.scm | 22 | ||||
-rw-r--r-- | gnu/packages/gtk.scm | 2 | ||||
-rw-r--r-- | gnu/packages/maths.scm | 4 |
3 files changed, 18 insertions, 10 deletions
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa96ab1763..4f672ba227 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -42,7 +42,8 @@ #:use-module (gnu packages xml) #:use-module (gnu packages gl) #:use-module (gnu packages compression) - #:use-module (gnu packages xorg)) + #:use-module (gnu packages xorg) + #:use-module (srfi srfi-1)) (define-public brasero (package @@ -720,7 +721,7 @@ featuring mature C, C++ and Python bindings.") (native-inputs `(("intltool" ,intltool) ("pkg-config" ,pkg-config) - ("glib" ,glib "bin") + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("flex" ,flex) ("bison" ,bison))) (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 (native-inputs `(("intltool" ,intltool) + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://projects.gnome.org/gconf/") (synopsis "store application preferences") @@ -823,7 +825,8 @@ designed to be accessed through the MIME functions in GnomeVFS.") ("gnome-mime-data" ,gnome-mime-data) ("zlib" ,zlib))) (native-inputs - `(("intltool" ,intltool) + `(("glib" ,glib "bin") ; for glib-mkenums, etc. + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/gnome-vfs/") (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) ("libxml2" ,libxml2))) (native-inputs - `(("intltool" ,intltool) + `(("glib" ,glib "bin") ; for glib-mkenums, etc. + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) ;; The following are listed as Required in the .pc file ;; (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))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libgnomecanvas/") (synopsis "Flexible widget for creating interactive structured graphics") @@ -957,7 +961,8 @@ creating interactive structured graphics.") ("libxml2" ,libxml2) ("libglade" ,libglade))) (native-inputs - `(("intltool" ,intltool) + `(("glib" ,glib "bin") ; for glib-mkenums, etc. + ("intltool" ,intltool) ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libgnomeui/") (synopsis "Additional widgets for applications") @@ -1013,7 +1018,7 @@ widgets built in the loading process.") ("libxml2" ,libxml2))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (home-page "https://projects.gnome.org/gnome-print/home/faq.html") (synopsis "printing framework for GNOME") @@ -1088,7 +1093,8 @@ widgets built in the loading process.") ("libgnomecanvas" ,libgnomecanvas) ("libglade" ,libglade))) (native-inputs - `(("intltool" ,intltool) + `(("glib" ,glib "bin") ; for glib-genmarshal, etc. + ("intltool" ,intltool) ("xorg-server" ,xorg-server) ; For running the tests ("pkg-config" ,pkg-config))) (home-page "https://developer.gnome.org/libbonoboui/") diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index db2e849deb..a37565f1a8 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -218,7 +218,7 @@ functions which were removed.") ("shared-mime-info" ,shared-mime-info))) (native-inputs `(("intltool" ,intltool) - ("glib" ,glib "bin") + ("glib" ,glib "bin") ; for glib-genmarshal, etc. ("pkg-config" ,pkg-config))) (arguments `(#:phases diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index d1860dfa97..79a30fa536 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -41,6 +41,7 @@ #:use-module (gnu packages gcc) #:use-module (gnu packages gd) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages less) #:use-module (gnu packages gnome) @@ -169,7 +170,8 @@ LP/MIP solver is included in the package.") ("gtksourceview" ,gtksourceview) ("zlib" ,zlib))) (native-inputs - `(("perl" ,perl) + `(("glib" ,glib "bin") ;for glib-genmarshal + ("perl" ,perl) ("pkg-config" ,pkg-config))) (home-page "http://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") |