From: Julien Lepiller <julien@lepiller.eu>
To: 35545@debbugs.gnu.org
Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander.
Date: Fri, 3 May 2019 15:01:29 +0200 [thread overview]
Message-ID: <20190503130134.24788-12-julien@lepiller.eu> (raw)
In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu>
* gnu/packages/java.scm (java-svg-salamander): New variable.
* gnu/packages/patches/java-svg-salamander-Fix-non-det.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
gnu/local.mk | 1 +
gnu/packages/java.scm | 47 ++++++++++
.../java-svg-salamander-Fix-non-det.patch | 86 +++++++++++++++++++
3 files changed, 134 insertions(+)
create mode 100644 gnu/packages/patches/java-svg-salamander-Fix-non-det.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index a0f40d13ae..556f4a03f0 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -932,6 +932,7 @@ dist_patch_DATA = \
%D%/packages/patches/java-jeromq-fix-tests.patch \
%D%/packages/patches/java-powermock-fix-java-files.patch \
%D%/packages/patches/java-simple-xml-fix-tests.patch \
+ %D%/packages/patches/java-svg-salamander-Fix-non-det.patch \
%D%/packages/patches/java-xerces-bootclasspath.patch \
%D%/packages/patches/java-xerces-build_dont_unzip.patch \
%D%/packages/patches/java-xerces-xjavac_taskdef.patch \
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index b9ac4459b0..ede24d130c 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -11296,3 +11296,50 @@ library and the API is similar.")
reading metadata from image files. It is able to read metadata in Exif,
IPTC, XMP, ICC and more formats.")
(license license:asl2.0)))
+
+(define-public java-svg-salamander
+ (package
+ (name "java-svg-salamander")
+ (version "1.1.2")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/blackears/svgSalamander")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1zv3kjdkf6iqf02x6ln76254y634j2ji448y706a65lsbfjmmicf"))
+ (modules '((guix build utils)))
+ (snippet
+ `(for-each delete-file (find-files "." ".*.jar")))
+ (patches
+ (search-patches "java-svg-salamander-Fix-non-det.patch"))))
+ (build-system ant-build-system)
+ (arguments
+ `(#:tests? #f; no tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _
+ (chdir "svg-core")
+ #t))
+ (add-before 'build 'copy-jars
+ (lambda* (#:key inputs #:allow-other-keys)
+ (copy-file (car (find-files (assoc-ref inputs "javacc") "\\.jar$"))
+ "../libraries/javacc.jar")
+ (copy-file (car (find-files (assoc-ref inputs "ant") "ant\\.jar$"))
+ "../libraries/ant.jar")
+ #t))
+ (replace 'install
+ (install-jars "dist")))))
+ (native-inputs
+ `(("javacc" ,javacc)))
+ (home-page "https://github.com/blackears/svgSalamander")
+ (synopsis "SVG engine for Java")
+ (description "SVG Salamander is an SVG engine for Java that's designed
+to be small, fast, and allow programmers to use it with a minimum of fuss.
+It's in particular targeted for making it easy to integrate SVG into Java
+games and making it much easier for artists to design 2D game content - from
+rich interactive menus to charts and graphcs to complex animations.")
+ (license license:bsd-2)))
diff --git a/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch
new file mode 100644
index 0000000000..418fa0867f
--- /dev/null
+++ b/gnu/packages/patches/java-svg-salamander-Fix-non-det.patch
@@ -0,0 +1,86 @@
+From c812efa9fcbfb49a571cc73af83c8da5cb951bcf Mon Sep 17 00:00:00 2001
+From: Julien Lepiller <julien@lepiller.eu>
+Date: Thu, 2 May 2019 19:05:33 +0200
+Subject: [PATCH] Fix non determinism and installation
+
+---
+ svg-core/build.xml | 22 ----------------------
+ svg-core/nbproject/build-impl.xml | 1 -
+ 2 files changed, 23 deletions(-)
+
+diff --git a/svg-core/build.xml b/svg-core/build.xml
+index cc72eb7..0f9c3e6 100755
+--- a/svg-core/build.xml
++++ b/svg-core/build.xml
+@@ -102,7 +102,6 @@
+ <jar destfile="${maven-javadoc-jar}" update="false">
+ <manifest>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="dist/javadoc">
+@@ -112,7 +111,6 @@
+ <jar destfile="${maven-sources-jar}" update="false">
+ <manifest>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="src/main/java">
+@@ -126,7 +124,6 @@
+ <manifest>
+ <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="build/classes">
+@@ -203,7 +200,6 @@
+ <manifest>
+ <attribute name="Main-Class" value="com.kitfox.svg.app.SVGPlayer"/>
+ <attribute name="Version" value="${version}"/>
+- <attribute name="Date" value="${TODAY}"/>
+ </manifest>
+
+ <fileset dir="build/classes">
+@@ -213,24 +209,6 @@
+ </fileset>
+ </jar>
+
+- <delete file="${key.location}"/>
+- <genkey alias="${key.user}" storepass="${key.password}" keystore="${key.location}" validity="1000" verbose="true">
+- <dname>
+- <param name="CN" value="Mark McKay, mark@kitfox.com"/>
+- <param name="OU" value="kitfox.com"/>
+- <param name="O" value="kitfox"/>
+- <param name="L" value="Toronto"/>
+- <param name="S" value="Ontario"/>
+- <param name="C" value="CA"/>
+- </dname>
+- </genkey>
+-
+- <copy file="${dist.jar}" toFile="${project.www.jar}"/>
+- <signjar jar="${project.www.jar}"
+- alias="${key.user}"
+- storepass="${key.password}"
+- keystore="${key.location}"/>
+-
+ <delete file="${project.tiny.jar}"/>
+ <jar destfile="${project.tiny.jar}" update="true">
+ <manifest>
+diff --git a/svg-core/nbproject/build-impl.xml b/svg-core/nbproject/build-impl.xml
+index b448d8a..37725ad 100755
+--- a/svg-core/nbproject/build-impl.xml
++++ b/svg-core/nbproject/build-impl.xml
+@@ -1045,7 +1045,6 @@ is divided into following sections:
+ </manifest>
+ </target>
+ <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
+- <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
+ <echo level="info">To run this application from the command line without Ant, try:</echo>
+ <property location="${dist.jar}" name="dist.jar.resolved"/>
+ <echo level="info">java -jar "${dist.jar.resolved}"</echo>
+--
+2.21.0
+
--
2.21.0
next prev parent reply other threads:[~2019-05-03 13:02 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-03 12:58 [bug#35545] [PATCH] Add josm Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 01/17] gnu: Add java-signpost-core Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 02/17] gnu: Add java-jsonp-api Julien Lepiller
2019-05-05 10:37 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 03/17] gnu: Add java-jsonp-impl Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 04/17] gnu: Add java-xmp Julien Lepiller
2019-05-05 10:52 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 05/17] gnu: Add java-metadata-extractor Julien Lepiller
2019-05-05 11:07 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 06/17] gnu: javacc: Install binaries Julien Lepiller
2019-05-04 11:52 ` Ricardo Wurmus
2019-05-04 12:14 ` Julien Lepiller
2019-05-04 17:08 ` Ricardo Wurmus
2019-05-03 13:01 ` [bug#35545] [PATCH 07/17] gnu: Add java-openjfx-build Julien Lepiller
2019-05-03 15:14 ` Nicolas Goaziou
2019-05-04 11:48 ` Ricardo Wurmus
2019-05-04 12:22 ` Julien Lepiller
2019-05-05 22:05 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 08/17] gnu: Add java-openjfx-base Julien Lepiller
2019-05-03 15:15 ` Nicolas Goaziou
2019-05-04 11:38 ` Julien Lepiller
2019-05-04 21:03 ` Nicolas Goaziou
2019-05-04 11:46 ` Ricardo Wurmus
2019-05-03 13:01 ` [bug#35545] [PATCH 09/17] gnu: Add java-openjfx-graphics Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 10/17] gnu: Add java-openjfx-media Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 11/17] gnu: Add java-jmapviewer Julien Lepiller
2019-05-05 22:06 ` Björn Höfling
2019-05-03 13:01 ` Julien Lepiller [this message]
2019-05-05 22:07 ` [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 13/17] gnu: Add java-jboss-transaction-api-spec Julien Lepiller
2019-05-05 22:07 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 14/17] gnu: Add java-commons-pool2 Julien Lepiller
2019-05-05 22:07 ` Björn Höfling
2019-05-03 13:01 ` [bug#35545] [PATCH 15/17] gnu: Add java-commons-dbcp2 Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 16/17] gnu: Add java-commons-jcs Julien Lepiller
2019-05-03 13:01 ` [bug#35545] [PATCH 17/17] gnu: Add josm Julien Lepiller
2019-05-05 22:22 ` Björn Höfling
2019-05-05 10:07 ` [bug#35545] [PATCH 01/17] gnu: Add java-signpost-core Björn Höfling
2019-05-05 11:18 ` [bug#35545] [PATCH] Add josm Björn Höfling
2019-05-05 11:37 ` Julien Lepiller
2019-05-05 22:53 ` Björn Höfling
2019-06-18 12:29 ` Julien Lepiller
2019-06-18 16:14 ` Björn Höfling
2019-06-20 11:39 ` Ludovic Courtès
2019-11-13 21:52 ` bug#35545: " Julien Lepiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503130134.24788-12-julien@lepiller.eu \
--to=julien@lepiller.eu \
--cc=35545@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).