From patchwork Fri May 3 13:01:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 13858 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 37CFA16F8F; Fri, 3 May 2019 14:08:21 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 33F9B16F8D for ; Fri, 3 May 2019 14:08:20 +0100 (BST) Received: from localhost ([127.0.0.1]:40589 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMXvH-00032J-Pn for patchwork@mira.cbaines.net; Fri, 03 May 2019 09:08:19 -0400 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 X-Loop: help-debbugs@gnu.org Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 03 May 2019 13:02:10 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 35545 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 35545@debbugs.gnu.org Received: via spool by 35545-submit@debbugs.gnu.org id=B35545.155688851322579 (code B ref 35545); Fri, 03 May 2019 13:02:10 +0000 Received: (at 35545) by debbugs.gnu.org; 3 May 2019 13:01:53 +0000 Received: from localhost ([127.0.0.1]:48059 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXp2-0005s5-KI for submit@debbugs.gnu.org; Fri, 03 May 2019 09:01:53 -0400 Received: from lepiller.eu ([89.234.186.109]:60758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1hMXox-0005qH-8W for 35545@debbugs.gnu.org; Fri, 03 May 2019 09:01:47 -0400 Received: from localhost.localdomain (89-92-10-229.hfc.dyn.abo.bbox.fr [89.92.10.229]) by lepiller.eu (OpenSMTPD) with ESMTPSA id e24d8cc3 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <35545@debbugs.gnu.org>; Fri, 3 May 2019 13:01:41 +0000 (UTC) From: Julien Lepiller Date: Fri, 3 May 2019 15:01:29 +0200 Message-Id: <20190503130134.24788-12-julien@lepiller.eu> X-Mailer: git-send-email 2.21.0 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 +