From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Nieuwenhuizen Subject: Re: [PATCH] gnu: Add tclxml. Date: Thu, 11 Feb 2016 23:11:07 +0100 Message-ID: <87oabmdhj8.fsf@gnu.org> References: <87r3gleiu1.fsf@gnu.org> <20160211221006.40c77212@debian-netbook> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37428) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTzSE-00012g-Lx for guix-devel@gnu.org; Thu, 11 Feb 2016 17:11:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTzSA-0007mk-CS for guix-devel@gnu.org; Thu, 11 Feb 2016 17:11:14 -0500 Received: from lb3-smtp-cloud3.xs4all.net ([194.109.24.30]:60308) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTzSA-0007ls-2d for guix-devel@gnu.org; Thu, 11 Feb 2016 17:11:10 -0500 In-Reply-To: <20160211221006.40c77212@debian-netbook> (Efraim Flashner's message of "Thu, 11 Feb 2016 22:10:06 +0200") 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: Efraim Flashner Cc: guix-devel@gnu.org --=-=-= Content-Type: text/plain Efraim Flashner writes: > You also have to add the patch file to gnu-system.am so it gets picked > up. Thanks, >> + (native-search-paths > this line should line up with the others like (native-inputs. It looks like > it also threw off (arguments Reindented. >> + (list (search-path-specification >> + (variable "TCLLIBPATH") >> + (separator " ") >> + (files (list (string-append "lib/Tclxml" version)))))) > I don't think this needs to be a list. Also, (variable, (separator and (file > should line up with the "e" in (search > the two following string-appends should line up with the above > string-append Somehow TABs got in, fixed. >> + #:phases (modify-phases %standard-phases >> + (delete 'check)))) > normally we put #:tests? #f, with a reason why. Are there no tests? Do they > fail unexpectedly? Ah, there is a test target that passes. Using that now. >> + (home-page "http://tclxml.sourceforge.net/") >> + (synopsis " Tcl library for XML parsing") > ^ > extra space >> + (description " TclXML provides event-based parsing of XML documents. The > ^ > extra space Reindented. > make sure you run guix lint, there are several spaces where you use > tabs and we only use spaces Ah, that helps! Find new patch attached. Greetings, Jan --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-gnu-Add-tclxml.patch >From 217076ae54f7ee0190e834147571ef44b3426c40 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Thu, 11 Feb 2016 22:56:25 +0100 Subject: [PATCH] gnu: Add tclxml. * gnu/packages/tcl.scm (tclxml): New variable. * gnu/packages/patches/tclxml-3.2-install.patch: New file. * gnu-system.am (dist_patch_DATA): Register it. --- gnu-system.am | 1 + gnu/packages/patches/tclxml-3.2-install.patch | 23 +++++++++++++ gnu/packages/tcl.scm | 47 +++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 gnu/packages/patches/tclxml-3.2-install.patch diff --git a/gnu-system.am b/gnu-system.am index f13ba05..3b5f241 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -707,6 +707,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..63542aa --- /dev/null +++ b/gnu/packages/patches/tclxml-3.2-install.patch @@ -0,0 +1,23 @@ +--- ./Makefile.in~ 2016-02-06 01:29:16.595090365 +0100 ++++ ./Makefile.in 2016-02-06 09:29:04.286008931 +0100 +@@ -76,7 +76,7 @@ + + srcdir = @srcdir@ + prefix = @prefix@ +-exec_prefix = @exec_prefix@ ++exec_prefix = @prefix@ + + bindir = @bindir@ + libdir = @libdir@ +@@ -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)" \ diff --git a/gnu/packages/tcl.scm b/gnu/packages/tcl.scm index 361128c..7ae186b 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,49 @@ 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 tcl/tk))) + +(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 "--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 + "http://sourcesdev.debian.net/copyright/license/tclxml/3.2-1/" + "A specific non-copyleft license.")))) -- 2.1.4 --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable --=20 Jan Nieuwenhuizen | GNU LilyPond http://lilypond.org Freelance IT http://JoyofSource.com | Avatar=C2=AE http://AvatarAcademy.nl= =20=20 --=-=-=--