From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Darrington Subject: Re: [PATCH] pspp Date: Sun, 1 Dec 2013 08:02:58 +0100 Message-ID: <20131201070257.GA4803@intra> References: <20131130131824.GA4676@intra> <87haatv8n0.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="SkvwRMAIpAhPCcCJ" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:39468) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Vn13a-0000Y2-Hr for guix-devel@gnu.org; Sun, 01 Dec 2013 02:03:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Vn13W-0007Bj-L2 for guix-devel@gnu.org; Sun, 01 Dec 2013 02:03:06 -0500 Content-Disposition: inline In-Reply-To: <87haatv8n0.fsf@gnu.org> 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: Ludovic =?iso-8859-1?Q?Court=E8s?= Cc: guix-devel@gnu.org --SkvwRMAIpAhPCcCJ Content-Type: multipart/mixed; boundary="9jxsPFA5p3P2qPhR" Content-Disposition: inline --9jxsPFA5p3P2qPhR Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable New patches attached. J' On Sat, Nov 30, 2013 at 11:15:31PM +0100, Ludovic Court=C3=A8s wrote: Hi John, =20 This looks great! I just have minor stylistic notes: =20 John Darrington skribis: =20 > From 69c6338775161fcba20f4ce9452b33fee90dc2d1 Mon Sep 17 00:00:00 20= 01 > From: 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 =20 Rather: =20 * gnu/packages/gtk.scm (gtksourceview): New variable. =20 > + (uri (string-append "mirror://gnome/sources/gtksourcevi= ew/" (string-take version 4) "/gtksourceview-" > + version ".tar.bz2")) =20 Please try to keep lines below 80 chars. =20 > + (inputs > + `( > + ("intltool" ,intltool) > + ("pkg-config" ,pkg-config) > + ("gtk" ,gtk+-2) > + ("libxml2" ,libxml2) > + > + ; These two are needed only to allow the tests to run success= fully > + ("xorg-server" ,xorg-server) > + ("shared-mime-info" ,shared-mime-info) > + )) =20 [...] =20 > + (arguments > + `(#:phases=20 > + ; Unfortunately, some of the tests in "make check" are highly= dependent on the environment > + ; therefore, some black magic is required =20 Please use the same style as the rest; in particular, no line break after an opening paren, no hanging closing parens, and two semicolons = to introduce comments that are on line of their own (see =E2=80=98HACKING= =E2=80=99.) =20 (Nice that you managed to get the X tests running, BTW!) =20 > + (synopsis "A text widget that extends the standard gtk+ 2.x > +text widget GtkTextView.") =20 Rather like =E2=80=9CWidget that extends GtkTextView from GTK+ 2.x=E2= =80=9D (no final period, no =E2=80=9CA=E2=80=9D.) =20 > From 39f8989a6e9067002911257701f90776f5b5b608 Mon Sep 17 00:00:00 20= 01 > From: 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. =20 Should be =E2=80=98pspp=E2=80=99, not =E2=80=98=E2=80=99. =20 OK to apply modulo these cosmetic changes. Could you post updated patches? =20 Thanks! =20 Ludo=E2=80=99. --=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. --9jxsPFA5p3P2qPhR Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="0001-gnu-Added-gtksourceview.patch" Content-Transfer-Encoding: quoted-printable =46rom 1e5f4146bbe1d1ba4d73a5ff52b9e80e461bbe8c 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 (gtksourceview): New variable. --- gnu/packages/gtk.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++= ++++ 1 file changed, 58 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index dff98b9..f55b5f1 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,63 @@ 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/"=20 + (string-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 depen= dent + ;; 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 st= art 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/gtksourcev= iew-2.0 + (system "ln -s gtksourceview gtksourceview-2.0") + (setenv "XDG_DATA_HOME" (string-append (getenv "NIX_BUILD_T= OP")=20 + "/gtksourceview-2.10= =2E5")) + + ;; Finally, the mimetypes must be available. + (setenv "XDG_DATA_DIRS" (string-append mime "/share/")) )) + %standard-phases))) + (synopsis "Widget that extends the standard gtk+ 2.x text widget GtkTex= tView.") + (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 --9jxsPFA5p3P2qPhR 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 77393a25d625be57a0f0fa7e573e72a7338d6b10 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 (pspp): 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 --9jxsPFA5p3P2qPhR-- --SkvwRMAIpAhPCcCJ Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iEYEARECAAYFAlKa3yEACgkQimdxnC3oJ7O//wCfYxqYXgj5nDNCOWIwDyLAjqEw M8UAn2TCshznuFDaKnQcDfvknoUI+FNF =apYZ -----END PGP SIGNATURE----- --SkvwRMAIpAhPCcCJ--