* [PATCH] gnu: Add tclxml.
@ 2016-02-09 20:20 Jan Nieuwenhuizen
2016-02-11 20:10 ` Efraim Flashner
0 siblings, 1 reply; 6+ messages in thread
From: Jan Nieuwenhuizen @ 2016-02-09 20:20 UTC (permalink / raw)
To: guix-devel
[-- Attachment #1: Type: text/plain, Size: 51 bytes --]
Hi,
Another tcl library package.
Greetings, Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-tclxml.patch --]
[-- Type: text/x-diff, Size: 3964 bytes --]
From 79f56d9c3f21e624ba9a3bfda00d2fc264796494 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 9 Feb 2016 20:45:51 +0100
Subject: [PATCH] gnu: Add tclxml.
* gnu/packages/tcl.scm (tclxml): New variable.
* gnu/packages/patches/tclxml-3.2-install.patch: New file.
---
gnu/packages/patches/tclxml-3.2-install.patch | 23 +++++++++++++
gnu/packages/tcl.scm | 47 +++++++++++++++++++++++++--
2 files changed, 68 insertions(+), 2 deletions(-)
create mode 100644 gnu/packages/patches/tclxml-3.2-install.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 8d6059d..101b8f8 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))
@@ -248,5 +249,47 @@ interfaces (GUIs) in the Tcl language.")
(license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
"Tcl/Tk license"))))
-
-
+(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 (string-append (getenv "HOME") "/development.git/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"))
+ #:phases (modify-phases %standard-phases
+ (delete 'check))))
+ (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/"
+ ""))))
--
2.1.4
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] gnu: Add tclxml.
2016-02-09 20:20 [PATCH] gnu: Add tclxml Jan Nieuwenhuizen
@ 2016-02-11 20:10 ` Efraim Flashner
2016-02-11 22:11 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 6+ messages in thread
From: Efraim Flashner @ 2016-02-11 20:10 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 5929 bytes --]
On Tue, 09 Feb 2016 21:20:54 +0100
Jan Nieuwenhuizen <janneke@gnu.org> wrote:
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> To: guix-devel@gnu.org
> Subject: [PATCH] gnu: Add tclxml.
> Date: Tue, 09 Feb 2016 21:20:54 +0100
> Sender: guix-devel-bounces+efraim=flashner.co.il@gnu.org
> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)
> Organization: AvatarAcademy.nl
>
> Hi,
>
> Another tcl library package.
>
> Greetings, Jan
>
You also have to add the patch file to gnu-system.am so it gets picked up.
>
> From 79f56d9c3f21e624ba9a3bfda00d2fc264796494 Mon Sep 17 00:00:00 2001
> From: Jan Nieuwenhuizen <janneke@gnu.org>
> Date: Tue, 9 Feb 2016 20:45:51 +0100
> Subject: [PATCH] gnu: Add tclxml.
>
> * gnu/packages/tcl.scm (tclxml): New variable.
> * gnu/packages/patches/tclxml-3.2-install.patch: New file.
> ---
> gnu/packages/patches/tclxml-3.2-install.patch | 23 +++++++++++++
> gnu/packages/tcl.scm | 47 +++++++++++++++++++++++++--
> 2 files changed, 68 insertions(+), 2 deletions(-)
> create mode 100644 gnu/packages/patches/tclxml-3.2-install.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 8d6059d..101b8f8 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))
>
> @@ -248,5 +249,47 @@ interfaces (GUIs) in the Tcl language.")
> (license (non-copyleft "http://www.tcl.tk/software/tcltk/license.html"
> "Tcl/Tk license"))))
>
> -
> -
> +(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 (string-append (getenv "HOME") "/development.git/tclxml-3.2-install.patch"))))))
this line should be (patches (search-path "tclxml-3.2-install.patch"))))
(I think, check other packages with patches)
> + (build-system gnu-build-system)
> + (native-inputs
> + `(("tcl" ,tcl)
> + ("tcllib" ,tcllib)
> + ("libxml2" ,libxml2)
> + ("libxslt" ,libxslt)))
> + (native-search-paths
this line should line up with the others like (native-inputs. It looks like
it also threw off (arguments
> + (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
> + (arguments
> + `(#:configure-flags
> + (list (string-append "--with-tclconfig="
> + (assoc-ref %build-inputs "tcl")
> + "/lib")
line these two lines up with the "--
the two following string-appends should line up with the above string-append
> + (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"))
> + #:phases (modify-phases %standard-phases
> + (delete 'check))))
normally we put #:tests? #f, with a reason why. Are there no tests? Do they
fail unexpectedly?
> + (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
> + 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/"
this line is too long. Also, is there a spot on their website that lists the
license? If not, it'd be better to point to a file in the tarball.
> + ""))))
make sure you run guix lint, there are several spaces where you use tabs and we only use spaces
--
Efraim Flashner <efraim@flashner.co.il> אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] gnu: Add tclxml.
2016-02-11 20:10 ` Efraim Flashner
@ 2016-02-11 22:11 ` Jan Nieuwenhuizen
2016-02-13 0:07 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 6+ messages in thread
From: Jan Nieuwenhuizen @ 2016-02-11 22:11 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]
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
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-tclxml.patch --]
[-- Type: text/x-diff, Size: 4775 bytes --]
From 217076ae54f7ee0190e834147571ef44b3426c40 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
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
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] gnu: Add tclxml.
2016-02-11 22:11 ` Jan Nieuwenhuizen
@ 2016-02-13 0:07 ` Jan Nieuwenhuizen
2016-02-13 0:22 ` Leo Famulari
0 siblings, 1 reply; 6+ messages in thread
From: Jan Nieuwenhuizen @ 2016-02-13 0:07 UTC (permalink / raw)
To: Efraim Flashner; +Cc: guix-devel
[-- Attachment #1: Type: text/plain, Size: 83 bytes --]
Jan Nieuwenhuizen writes:
Hi,
Rebased against master, cleanups.
Greetings,
Jan
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-tclxml.patch --]
[-- Type: text/x-diff, Size: 4711 bytes --]
From bf4e4975f7470d0f82dd2451d45de99e57193efd Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
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.
---
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
[-- Attachment #3: Type: text/plain, Size: 154 bytes --]
--
Jan Nieuwenhuizen <janneke@gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] gnu: Add tclxml.
2016-02-13 0:07 ` Jan Nieuwenhuizen
@ 2016-02-13 0:22 ` Leo Famulari
2016-02-13 8:09 ` Jan Nieuwenhuizen
0 siblings, 1 reply; 6+ messages in thread
From: Leo Famulari @ 2016-02-13 0:22 UTC (permalink / raw)
To: Jan Nieuwenhuizen; +Cc: guix-devel
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 <janneke@gnu.org>
> 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 <janneke@gnu.org> | GNU LilyPond http://lilypond.org
> Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.nl
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-13 8:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-09 20:20 [PATCH] gnu: Add tclxml Jan Nieuwenhuizen
2016-02-11 20:10 ` Efraim Flashner
2016-02-11 22:11 ` Jan Nieuwenhuizen
2016-02-13 0:07 ` Jan Nieuwenhuizen
2016-02-13 0:22 ` Leo Famulari
2016-02-13 8:09 ` Jan Nieuwenhuizen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).