From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: [PATCH] pspp Date: Sat, 30 Nov 2013 14:18:24 +0100 Message-ID: <20131130131824.GA4676@intra> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="cmJC7u66zC7hs+87" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57672) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmkRK-0000Xu-Nb for guix-devel@gnu.org; Sat, 30 Nov 2013 08:18:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmkRG-0005p5-QU for guix-devel@gnu.org; Sat, 30 Nov 2013 08:18:30 -0500 Received: from de.cellform.com ([88.217.224.109]:51700 helo=jocasta.intra) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmkRG-0005nE-CZ for guix-devel@gnu.org; Sat, 30 Nov 2013 08:18:26 -0500 Received: from muse.intra (muse.intra [192.168.0.6]) by jocasta.intra (8.14.4/8.14.4/Debian-4) with ESMTP id rAUDIOP5000600 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT) for ; Sat, 30 Nov 2013 14:18:25 +0100 Received: from john by muse.intra with local (Exim 4.80) (envelope-from ) id 1VmkRE-0001Dm-Ge for guix-devel@gnu.org; Sat, 30 Nov 2013 14:18:24 +0100 Content-Disposition: inline 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 --cmJC7u66zC7hs+87 Content-Type: multipart/mixed; boundary="HlL+5n6rz5pIUxbD" Content-Disposition: inline --HlL+5n6rz5pIUxbD Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Two patches attached. The first adds the package gtksourceview. Thanks to= Mark Weaver, Andraes Enge et al for their help jumping through the hoops that the upstre= am maintainers placed for me. The other removes the --without-gui flag from pspp J' --=20 PGP Public key ID: 1024D/2DE827B3=20 fingerprint =3D 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3 See http://sks-keyservers.net or any PGP keyserver for public key. --HlL+5n6rz5pIUxbD Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-Added-gtksourceview.patch" Content-Transfer-Encoding: quoted-printable =46rom 69c6338775161fcba20f4ce9452b33fee90dc2d1 Mon Sep 17 00:00:00 2001 =46rom: John Darrington Date: Sat, 30 Nov 2013 11:11:54 +0100 Subject: [PATCH 1/2] gnu: Added gtksourceview * gnu/packages/gtk.scm: New package gtksourceview --- gnu/packages/gtk.scm | 60 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 60 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dff98b9..ee4679f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -27,6 +27,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages ghostscript) #:use-module (gnu packages glib) + #:use-module (gnu packages gnome) #:use-module (gnu packages icu4c) #:use-module (gnu packages libjpeg) #:use-module (gnu packages libpng) @@ -162,6 +163,65 @@ used throughout the world.") (license license:lgpl2.0+) (home-page "https://developer.gnome.org/pango/"))) =20 + +(define-public gtksourceview + (package + (name "gtksourceview") + (version "2.10.5") ; This is the last version which builds against gtk+2 + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/gtksourceview/" (s= tring-take version 4) "/gtksourceview-" + version ".tar.bz2")) + (sha256 + (base32 + "07hrabhpl6n8ajz10s0d960jdwndxs87szxyn428mpxi8cvpg1f5")))) + (build-system gnu-build-system) + (inputs + `( + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("gtk" ,gtk+-2) + ("libxml2" ,libxml2) + + ; These two are needed only to allow the tests to run successfully + ("xorg-server" ,xorg-server) + ("shared-mime-info" ,shared-mime-info) + )) + (arguments + `(#:phases=20 + ; Unfortunately, some of the tests in "make check" are highly depend= ent on the environment + ; therefore, some black magic is required + (alist-cons-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ( + (xorg-server (assoc-ref inputs "xorg-server")) + (mime (assoc-ref inputs "shared-mime-info")) + ) + + ; There must be a running X server and make check doesn't sta= rt one. + ; Therefore we must do it. + (system (format #f "~a/bin/Xvfb :1 &" xorg-server)) + (setenv "DISPLAY" ":1") + + ; The .lang files must be found in $XDG_DATA_HOME/gtksourcevi= ew-2.0 + (system "ln -s gtksourceview gtksourceview-2.0") + (setenv "XDG_DATA_HOME" (string-append (getenv "NIX_BUILD_T= OP") "/gtksourceview-2.10.5")) + + ; Finally, the mimetypes must be available + (setenv "XDG_DATA_DIRS" (string-append mime "/share/") ) + )) + %standard-phases))) + (synopsis "A text widget that extends the standard gtk+ 2.x +text widget GtkTextView.") + (description + "GtkSourceView is a portable C library that extends the standard GTK+ +framework for multiline text editing with support for configurable syntax +highlighting, unlimited undo/redo, search and replace, a completion framew= ork, +printing and other features typical of a source code editor.")=20 + (license license:lgpl2.0+) + (home-page "https://developer.gnome.org/gtksourceview/"))) + + (define-public gdk-pixbuf (package (name "gdk-pixbuf") --=20 1.7.10.4 --HlL+5n6rz5pIUxbD Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0002-gnu-pspp-Enabled-build-of-the-gui.patch" Content-Transfer-Encoding: quoted-printable =46rom 39f8989a6e9067002911257701f90776f5b5b608 Mon Sep 17 00:00:00 2001 =46rom: John Darrington Date: Sat, 30 Nov 2013 13:54:46 +0100 Subject: [PATCH 2/2] gnu: pspp: Enabled build of the gui * gnu/packages/math.scm (): Removed the --without-gui flag and added the necessary inputs to build it. --- gnu/packages/maths.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c1c78d5..69f931b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -144,13 +144,12 @@ LP/MIP solver is included in the package.") ("libxml2" ,libxml2) ("pango" ,pango) ("readline" ,readline) + ("gtk" ,gtk+-2) + ("gtksourceview" ,gtksourceview) ("zlib" ,zlib))) (native-inputs `(("perl" ,perl) ("pkg-config" ,pkg-config))) - (arguments - `(#:configure-flags - `("--without-gui"))) ; FIXME: package missing dependencies (home-page "http://www.gnu.org/software/pspp/") (synopsis "Statistical analysis") (description --=20 1.7.10.4 --HlL+5n6rz5pIUxbD-- --cmJC7u66zC7hs+87 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlKZ5Z8ACgkQimdxnC3oJ7OeXQCfWj2nElFA5Z97YnF0Eob65pPx hJ0AniIUj5P9yBW17Auvs/jFJepegzW0 =eb+J -----END PGP SIGNATURE----- --cmJC7u66zC7hs+87--