From: Cyril Roelandt <tipecaml@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 2/6] gnu: gtk+: enable introspection.
Date: Sat, 30 Nov 2013 02:13:32 +0100 [thread overview]
Message-ID: <1385774016-1418-3-git-send-email-tipecaml@gmail.com> (raw)
In-Reply-To: <1385774016-1418-1-git-send-email-tipecaml@gmail.com>
* gnu/packages/gtk.scm (atk, gdk-pixbuf, gtk+, pango): enable introspection
---
gnu/packages/gtk.scm | 43 +++++++++++++++++++++++++++++++++++++++----
1 file changed, 39 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index dff98b9..9048fd0 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -28,6 +28,7 @@
#:use-module (gnu packages ghostscript)
#:use-module (gnu packages glib)
#:use-module (gnu packages icu4c)
+ #:use-module (gnu packages libffi)
#:use-module (gnu packages libjpeg)
#:use-module (gnu packages libpng)
#:use-module (gnu packages libtiff)
@@ -53,6 +54,8 @@
"1c2hbg66wfvibsz2ia0ri48yr62751fn950i97c53j3b0fjifsb3"))))
(build-system gnu-build-system)
(inputs `(("glib" ,glib)
+ ("gobject-introspection" ,gobject-introspection)
+ ("libffi" ,libffi)
("pkg-config" ,pkg-config)))
(synopsis "GNOME accessibility toolkit")
(description
@@ -152,7 +155,9 @@ affine transformation (scale, rotation, shear, etc.)")
`(("cairo" ,cairo)
("harfbuzz" ,harfbuzz)))
(inputs
- `(("pkg-config" ,pkg-config)
+ `(("gobject-introspection" ,gobject-introspection)
+ ("libffi" ,libffi)
+ ("pkg-config" ,pkg-config)
("zlib" ,zlib)))
(synopsis "GNOME text and font handling library")
(description
@@ -176,6 +181,8 @@ used throughout the world.")
(build-system gnu-build-system)
(inputs
`(("glib" ,glib)
+ ("gobject-introspection", gobject-introspection)
+ ("libffi" ,libffi)
("libjpeg" ,libjpeg)
("libpng" ,libpng)
("libtiff" ,libtiff)
@@ -304,7 +311,9 @@ application suites.")
("libxinerama" ,libxinerama)
("pango" ,pango)))
(inputs
- `(("libxml2" ,libxml2)
+ `(("gobject-introspection" ,gobject-introspection)
+ ("libffi" ,libffi)
+ ("libxml2" ,libxml2)
("perl" ,perl)
("pkg-config" ,pkg-config)
("python-wrapper" ,python-wrapper)
@@ -313,8 +322,11 @@ application suites.")
`(#:phases
(alist-replace
'configure
- (lambda* (#:key #:allow-other-keys #:rest args)
- (let ((configure (assoc-ref %standard-phases 'configure)))
+ (lambda* (#:key inputs #:allow-other-keys #:rest args)
+ (let ((configure (assoc-ref %standard-phases 'configure))
+ (gir-path (lambda (pkg-name)
+ (string-append (assoc-ref inputs pkg-name)
+ "/share/gir-1.0"))))
;; Disable most tests, failing in the chroot with the message:
;; D-Bus library appears to be incorrectly set up; failed to read
;; machine uuid: Failed to open "/etc/machine-id": No such file or
@@ -322,6 +334,29 @@ application suites.")
;; See the manual page for dbus-uuidgen to correct this issue.
(substitute* "testsuite/Makefile.in"
(("SUBDIRS = gdk gtk a11y css reftests") "SUBDIRS = gdk"))
+
+ (substitute* "gdk/Makefile.in"
+ (("--add-include-path=../gdk")
+ (string-append
+ "--add-include-path=../gdk"
+ " --add-include-path=" (gir-path "gdk-pixbuf")
+ " --add-include-path=" (gir-path "pango")))
+ (("--includedir=\\.")
+ (string-append "--includedir=."
+ " --includedir=" (gir-path "gdk-pixbuf")
+ " --includedir=" (gir-path "pango"))))
+
+ (substitute* "gtk/Makefile.in"
+ (("--add-include-path=../gdk")
+ (string-append "--add-include-path=../gdk"
+ " --add-include-path=" (gir-path "atk")
+ " --add-include-path=" (gir-path "gdk-pixbuf")
+ " --add-include-path=" (gir-path "pango")))
+ (("--includedir=../gdk")
+ (string-append "--includedir=../gdk"
+ " --includedir=" (gir-path "atk")
+ " --includedir=" (gir-path "gdk-pixbuf")
+ " --includedir=" (gir-path "pango"))))
(apply configure args)))
%standard-phases)))))
--
1.8.4.rc3
next prev parent reply other threads:[~2013-11-30 1:13 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-30 1:13 [PATCH 0/6] Add eog Cyril Roelandt
2013-11-30 1:13 ` [PATCH 1/6] gnu: gobject-introspection: look for 'gcc' when no compiler seems available Cyril Roelandt
2013-11-30 21:59 ` Ludovic Courtès
2013-12-01 3:15 ` Cyril Roelandt
2013-12-01 22:11 ` Ludovic Courtès
2013-11-30 1:13 ` Cyril Roelandt [this message]
2013-11-30 22:01 ` [PATCH 2/6] gnu: gtk+: enable introspection Ludovic Courtès
2013-12-01 3:43 ` Cyril Roelandt
2013-12-01 22:12 ` Ludovic Courtès
2013-12-07 15:11 ` Cyril Roelandt
2013-12-07 15:27 ` Ludovic Courtès
2013-12-08 20:32 ` [PATCH 2/6 v2] " Cyril Roelandt
2013-12-08 23:53 ` Ludovic Courtès
2013-12-10 23:43 ` [PATCH 2/6 v3] " Cyril Roelandt
2013-12-11 21:09 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 3/6] gnu: Add libpeas Cyril Roelandt
2013-11-30 22:03 ` Ludovic Courtès
2013-12-01 3:45 ` Cyril Roelandt
2013-12-01 22:13 ` Ludovic Courtès
2013-12-08 20:33 ` [PATCH 3/6 v2] " Cyril Roelandt
2013-12-08 23:55 ` Ludovic Courtès
2013-12-10 23:44 ` [PATCH 3/6 v6] " Cyril Roelandt
2013-12-11 21:10 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 4/6] gnu: Add iso-codes Cyril Roelandt
2013-11-30 22:05 ` Ludovic Courtès
2013-12-01 3:47 ` Cyril Roelandt
2013-12-01 22:13 ` Ludovic Courtès
2013-12-08 20:33 ` [PATCH 4/6 v2] " Cyril Roelandt
2013-12-08 23:55 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 5/6] gnu: Add gnome-desktop Cyril Roelandt
2013-11-30 22:07 ` Ludovic Courtès
2013-12-08 20:34 ` [PATCH 5/6 v2] " Cyril Roelandt
2013-12-08 23:57 ` Ludovic Courtès
2013-12-09 0:06 ` Cyril Roelandt
2013-12-09 17:34 ` Ludovic Courtès
2013-12-10 23:44 ` [PATCH 5/6 v3] " Cyril Roelandt
2013-12-11 21:11 ` Ludovic Courtès
2013-12-12 6:07 ` John Darrington
2013-12-12 21:22 ` Ludovic Courtès
2013-11-30 1:13 ` [PATCH 6/6] gnu: Add eog Cyril Roelandt
2013-11-30 22:06 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385774016-1418-3-git-send-email-tipecaml@gmail.com \
--to=tipecaml@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.