From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: Re: [PATCH] gnu: Add tclxml. Date: Fri, 12 Feb 2016 19:22:24 -0500 Message-ID: <20160213002224.GA10770@jasmine> References: <87r3gleiu1.fsf@gnu.org> <20160211221006.40c77212@debian-netbook> <87oabmdhj8.fsf@gnu.org> <87ziv5a2ww.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUNyh-0004vK-Ji for guix-devel@gnu.org; Fri, 12 Feb 2016 19:22:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUNye-0007qq-9P for guix-devel@gnu.org; Fri, 12 Feb 2016 19:22:23 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:43129) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUNye-0007qX-5L for guix-devel@gnu.org; Fri, 12 Feb 2016 19:22:20 -0500 Content-Disposition: inline In-Reply-To: <87ziv5a2ww.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: Jan Nieuwenhuizen Cc: guix-devel@gnu.org On Sat, Feb 13, 2016 at 01:07:27AM +0100, Jan Nieuwenhuizen wrote: > Jan Nieuwenhuizen writes: > > Hi, > > Rebased against master, cleanups. > > Greetings, > Jan > > From bf4e4975f7470d0f82dd2451d45de99e57193efd Mon Sep 17 00:00:00 2001 > From: Jan Nieuwenhuizen > Date: Sat, 13 Feb 2016 00:27:17 +0100 > Subject: [PATCH] gnu: Add tclxml. > > * gnu/packages/patches/tclxml-3.2-install.patch: New file. > * gnu-system.am (dist_patch_DATA): Add it. > * gnu/packages/tcl.scm (tclxml): New variable. Thanks for the patch! Pushed as 511539ae811 > --- > gnu-system.am | 1 + > gnu/packages/patches/tclxml-3.2-install.patch | 17 ++++++++++ > gnu/packages/tcl.scm | 46 +++++++++++++++++++++++++++ > 3 files changed, 64 insertions(+) > create mode 100644 gnu/packages/patches/tclxml-3.2-install.patch > > diff --git a/gnu-system.am b/gnu-system.am > index 7f3dfb8..19f1244 100644 > --- a/gnu-system.am > +++ b/gnu-system.am > @@ -710,6 +710,7 @@ dist_patch_DATA = \ > gnu/packages/patches/tar-d_ino_in_dirent-fix.patch \ > gnu/packages/patches/tar-skip-unreliable-tests.patch \ > gnu/packages/patches/tcl-mkindex-deterministic.patch \ > + gnu/packages/patches/tclxml-3.2-install.patch \ > gnu/packages/patches/tcsh-fix-autotest.patch \ > gnu/packages/patches/texi2html-document-encoding.patch \ > gnu/packages/patches/texi2html-i18n.patch \ > diff --git a/gnu/packages/patches/tclxml-3.2-install.patch b/gnu/packages/patches/tclxml-3.2-install.patch > new file mode 100644 > index 0000000..09d5992 > --- /dev/null > +++ b/gnu/packages/patches/tclxml-3.2-install.patch > @@ -0,0 +1,17 @@ > +Install everything in PREFIX, set EXTRA_PATH to find it there. > + > +--- ./Makefile.in~ 2016-02-06 01:29:16.595090365 +0100 > ++++ ./Makefile.in 2016-02-06 09:29:04.286008931 +0100 > +@@ -133,9 +133,9 @@ > + # require for testing here (like TCLX_LIBRARY). > + #======================================================================== > + > +-EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR) > ++EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(libdir) > + #EXTRA_PATH = $(top_builddir):$(TCL_BIN_DIR):$(TK_BIN_DIR) > +-TCLLIBPATH = $(top_builddir) > ++TCLLIBPATH = $(pkglibdir) > + TCLSH_ENV = TCL_LIBRARY=`@CYGPATH@ $(TCL_SRC_DIR)/library` \ > + @LD_LIBRARY_PATH_VAR@="$(EXTRA_PATH):$(@LD_LIBRARY_PATH_VAR@)" \ > + PATH="$(EXTRA_PATH):$(PATH)" \ > + > \ No newline at end of file > diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm > index d98d2d6..1f30145 100644 > --- a/gnu/packages/tcl.scm > +++ b/gnu/packages/tcl.scm > @@ -30,6 +30,7 @@ > #:use-module (gnu packages fontutils) > #:use-module (gnu packages perl) > #:use-module (gnu packages pkg-config) > + #:use-module (gnu packages xml) > #:use-module (gnu packages xorg) > #:use-module (guix licenses)) > > @@ -244,3 +245,48 @@ interfaces (GUIs) in the Tcl language.") > (description "Tcllib, the standard Tcl library, is a collection of common > utility functions and modules all written in high-level Tcl.") > (license (package-license tcl)))) > + > +(define-public tclxml > + (package > + (name "tclxml") > + (version "3.2") > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://sourceforge/" name "/" > + name "-" version ".tar.gz")) > + (sha256 > + (base32 > + "0ffb4aw63inig3aql33g4pk0kjk14dv238anp1scwjdjh1k6n4gl")) > + (patches (list (search-patch "tclxml-3.2-install.patch"))))) > + (build-system gnu-build-system) > + (native-inputs > + `(("tcl" ,tcl) > + ("tcllib" ,tcllib) > + ("libxml2" ,libxml2) > + ("libxslt" ,libxslt))) > + (native-search-paths > + (list (search-path-specification > + (variable "TCLLIBPATH") > + (separator " ") > + (files (list (string-append "lib/Tclxml" version)))))) > + (arguments > + `(#:configure-flags > + (list (string-append "--exec-prefix=" (assoc-ref %outputs "out")) > + (string-append "--with-tclconfig=" > + (assoc-ref %build-inputs "tcl") "/lib") > + (string-append "--with-xml2-config=" > + (assoc-ref %build-inputs "libxml2") > + "/bin/xml2-config") > + (string-append "--with-xslt-config=" > + (assoc-ref %build-inputs "libxslt") > + "/bin/xslt-config")) > + #:test-target "test")) > + (home-page "http://tclxml.sourceforge.net/") > + (synopsis "Tcl library for XML parsing") > + (description "TclXML provides event-based parsing of XML documents. The > +application may register callback scripts for certain document features, and > +when the parser encounters those features while parsing the document the > +callback is evaluated.") > + (license (non-copyleft > + "file://LICENCE" > + "See LICENCE in the distribution.")))) > -- > 2.1.4 > > > -- > Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org > Freelance IT http://JoyofSource.com | AvatarŪ http://AvatarAcademy.nl