From mboxrd@z Thu Jan 1 00:00:00 1970 From: Cyril Roelandt Subject: [PATCH 2/6] gnu: gtk+: enable introspection. Date: Sat, 30 Nov 2013 02:13:32 +0100 Message-ID: <1385774016-1418-3-git-send-email-tipecaml@gmail.com> References: <1385774016-1418-1-git-send-email-tipecaml@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:32859) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmZ7I-0005mB-KL for guix-devel@gnu.org; Fri, 29 Nov 2013 20:13:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmZ7A-0003Uo-DI for guix-devel@gnu.org; Fri, 29 Nov 2013 20:13:04 -0500 Received: from mail-wg0-x235.google.com ([2a00:1450:400c:c00::235]:60948) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmZ7A-0003Uk-3T for guix-devel@gnu.org; Fri, 29 Nov 2013 20:12:56 -0500 Received: by mail-wg0-f53.google.com with SMTP id k14so7393361wgh.20 for ; Fri, 29 Nov 2013 17:12:55 -0800 (PST) In-Reply-To: <1385774016-1418-1-git-send-email-tipecaml@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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