From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g9rQj-0006tH-Rg for guix-patches@gnu.org; Tue, 09 Oct 2018 08:48:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g9rQg-0007yN-LI for guix-patches@gnu.org; Tue, 09 Oct 2018 08:48:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37043) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g9rQg-0007yE-GV for guix-patches@gnu.org; Tue, 09 Oct 2018 08:48:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1g9rQg-00089F-Cz for guix-patches@gnu.org; Tue, 09 Oct 2018 08:48:02 -0400 Subject: [bug#32948] [PATCH 08/21] gnu: Add java-w3c-svg. Resent-Message-ID: Date: Tue, 9 Oct 2018 14:47:42 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20181009144742.3c581b3d@alma-ubu> In-Reply-To: <20181005155020.10239-8-dannym@scratchpost.org> References: <20181005154453.10159-1-dannym@scratchpost.org> <20181005155020.10239-1-dannym@scratchpost.org> <20181005155020.10239-8-dannym@scratchpost.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/g=n+TM.84JbAhkx6f_RZGIY"; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Danny Milosavljevic Cc: 32948@debbugs.gnu.org --Sig_/g=n+TM.84JbAhkx6f_RZGIY Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 5 Oct 2018 17:50:09 +0200 Danny Milosavljevic wrote: > * gnu/packages/batik.scm (java-w3c-svg-1.0): New variable. > (java-w3c-svg): New variable. > --- > gnu/packages/batik.scm | 68 > ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 > insertions(+) >=20 > diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm > index ccab88568..05ca234ea 100644 > --- a/gnu/packages/batik.scm > +++ b/gnu/packages/batik.scm > @@ -194,3 +194,71 @@ SAC is an interface for CSS parsers.") > (description "This package provides a SAC interface by the W3C. > SAC is an interface for CSS parsers.") > (license license:w3c))) > + > +(define-public java-w3c-svg-1.0 > + (package > + (name "java-w3c-svg") > + (version "20010904") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "http://www.w3.org/TR/2001/REC-SVG-" > version > + "/java-binding.zip")) > + (sha256 > + (base32 > + "0gnxvx51bg6ijplf6l2q0i1m07101f7fickawshfygnsdjqfdnbp")))) > + (build-system ant-build-system) > + (arguments > + `(#:jar-name "w3c-svg.jar" > + #:source-dir "." > + #:tests? #f ; No tests exist. > + #:phases > + (modify-phases %standard-phases > + (replace 'unpack > + (lambda* (#:key source #:allow-other-keys) > + (invoke "unzip" source))) > + (add-after 'unpack 'patch-interface > + (lambda _ > + ;; Make it compatible with batik. > + ;; This is equivalent to usingxml commons externals' > + ;; "externals" part from > https://xerces.apache.org/mirrors.cgi > + (substitute* "SVGFEConvolveMatrixElement.java" > + (("public SVGAnimatedLength[ ]*getKernelUnitLength") > + "public SVGAnimatedNumber getKernelUnitLength")) > + (substitute* "SVGFEMorphologyElement.java" > + (("public SVGAnimatedLength[ ]*getRadius") > + "public SVGAnimatedNumber getRadius")) > + (call-with-output-file "EventListenerInitializer.java" > + (lambda (port) > + (format port " > +// License: http://www.apache.org/licenses/LICENSE-2.0 > +package org.w3c.dom.svg; > +public interface EventListenerInitializer { > + public void initializeEventListeners(SVGDocument doc); > +} > + > +"))) > + #t))))) > + (propagated-inputs > + `(("java-w3c-smil" ,java-w3c-smil-3.0))) > + (native-inputs > + `(("unzip" ,unzip))) > + (home-page "https://www.w3.org/Style/CSS/SAC/") > + (synopsis "W3C SVG interface") > + (description "This package provides a SVG interface.") > + (license license:w3c))) > + > +(define-public java-w3c-svg > + (package > + (inherit java-w3c-svg-1.0) > + (version "20110816") > + (source > + (origin > + (method url-fetch) > + (uri (string-append "http://www.w3.org/TR/2011/REC-SVG11-" > version > + "/java-binding.zip")) > + (sha256 > + (base32 > + "0jicqcrxav8ggs37amgvvwgc2f0qp1c5wns4rb2i3si83s2m09ns")))) > + (propagated-inputs > + `()))) >=20 >=20 This does not build on Hydra and locally. https://hydra.gnu.org/build/3113818 starting phase `patch-interface' Backtrace: 6 (primitive-load "/gnu/store/rrz82jnhlq4lfkk5wpiidxb6mdw=C3=A2= =E2=82=AC=C2=A6") In ice-9/eval.scm: 191:35 5 (_ #f) In srfi/srfi-1.scm: 640:9 4 (for-each # =C3=A2=E2=82=AC=C2=A6) In /gnu/store/ghwa6l2079l50ryzygybbkb8lhmm5hha-module-import/guix/build/gnu= -build-system.scm: 799:31 3 (_ _) In ice-9/eval.scm: 619:8 2 (_ #(#(#) (#:inputs # =C3=A2=E2= =82=AC=C2=A6))) In /gnu/store/ghwa6l2079l50ryzygybbkb8lhmm5hha-module-import/guix/build/uti= ls.scm: 636:30 1 (with-atomic-file-replacement "SVGFEConvolveMatrixElem=C3=A2= =E2=82=AC=C2=A6" =C3=A2=E2=82=AC=C2=A6) In unknown file: 0 (stat "SVGFEConvolveMatrixElement.java" #) ERROR: In procedure stat: In procedure stat: No such file or directory: "SVGFEConvolveMatrixElement.j= ava" Below is a fix. Is there a reason you added the version number to the scheme-variable? I thought that is done only when we have different versions of the same package. Bj=C3=B6rn diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm index cdd1e4471..d8d70adcd 100644 --- a/gnu/packages/batik.scm +++ b/gnu/packages/batik.scm @@ -114,6 +114,7 @@ SAC is an interface for CSS parsers.") (invoke "unzip" source))) (add-after 'unpack 'patch-interface (lambda _ + (chdir "org/w3c/dom/svg/") ;; Make it compatible with batik. ;; This is equivalent to usingxml commons externals' ;; "externals" part from https://xerces.apache.org/mirrors.cgi @@ -134,7 +135,7 @@ public interface EventListenerInitializer { =20 "))) #t))))) - (propagated-inputs + (inputs `(("java-w3c-smil" ,java-w3c-smil-3.0))) (native-inputs `(("unzip" ,unzip))) --Sig_/g=n+TM.84JbAhkx6f_RZGIY Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlu8o28ACgkQvyhstlk+X/21NwCgq/igZAS6R1/CDlyoOhH1minR +mgAnjINRPdJa/INFYF+UOVOibNay6rj =qPlt -----END PGP SIGNATURE----- --Sig_/g=n+TM.84JbAhkx6f_RZGIY--