From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:56517) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXpL-0006eG-Uh for guix-patches@gnu.org; Fri, 03 May 2019 09:02:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMXpK-0000l5-AU for guix-patches@gnu.org; Fri, 03 May 2019 09:02:11 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:34532) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMXpK-0000kw-6r for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hMXpK-0005uD-38 for guix-patches@gnu.org; Fri, 03 May 2019 09:02:10 -0400 Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander. Resent-Message-ID: From: Julien Lepiller Date: Fri, 3 May 2019 15:01:29 +0200 Message-Id: <20190503130134.24788-12-julien@lepiller.eu> In-Reply-To: <20190503130134.24788-1-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 35545@debbugs.gnu.org * 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 +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 @@ + + + +- + + + +@@ -112,7 +111,6 @@ + + + +- + + + +@@ -126,7 +124,6 @@ + + + +- + + + +@@ -203,7 +200,6 @@ + + + +- + + + +@@ -213,24 +209,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +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: + + + +- + To run this application from the command line without Ant, try: + + java -jar "${dist.jar.resolved}" +-- +2.21.0 + -- 2.21.0