From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:60504) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hNPIh-00012X-PD for guix-patches@gnu.org; Sun, 05 May 2019 18:08:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hNPIg-0004jB-Nu for guix-patches@gnu.org; Sun, 05 May 2019 18:08:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41562) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hNPIg-0004iw-Jx for guix-patches@gnu.org; Sun, 05 May 2019 18:08:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hNPIg-0007ek-Em for guix-patches@gnu.org; Sun, 05 May 2019 18:08:02 -0400 Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander. Resent-Message-ID: Date: Mon, 6 May 2019 00:07:00 +0200 From: =?UTF-8?Q?Bj=C3=B6rn_?= =?UTF-8?Q?H=C3=B6fling?= Message-ID: <20190506000700.69501934@alma-ubu> In-Reply-To: <20190503130134.24788-12-julien@lepiller.eu> References: <20190503145820.606f37db@sybil.lepiller.eu> <20190503130134.24788-1-julien@lepiller.eu> <20190503130134.24788-12-julien@lepiller.eu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; boundary="Sig_/z13iU.e=cF.046FU3c8ntBL"; 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: Julien Lepiller Cc: 35545@debbugs.gnu.org --Sig_/z13iU.e=cF.046FU3c8ntBL Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Fri, 3 May 2019 15:01:29 +0200 Julien Lepiller wrote: > * 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. > --- > +(define-public java-svg-salamander > + (modules '((guix build utils))) > + (snippet > + `(for-each delete-file (find-files "." ".*.jar"))) --> Snippet should return #t. > + (patches > + (search-patches > "java-svg-salamander-Fix-non-det.patch")))) The patch does not apply: ./pre-inst-env guix build -S java-svg-salamander `File svg-core/build.xml is read-only; trying to patch anyway patching file svg-core/build.xml Hunk #1 FAILED at 102 (different line endings). Hunk #2 FAILED at 112 (different line endings). Hunk #3 FAILED at 126 (different line endings). Hunk #4 FAILED at 203 (different line endings). Hunk #5 FAILED at 213 (different line endings). 5 out of 5 hunks FAILED -- saving rejects to file svg-core/build.xml.rej File svg-core/nbproject/build-impl.xml is read-only; trying to patch anyway patching file svg-core/nbproject/build-impl.xml Hunk #1 FAILED at 1045 (different line endings). 1 out of 1 hunk FAILED -- saving rejects to file svg-core/nbproject/build-i= mpl.xml.rej source is under 'java-svg-salamander-1.1.2-checkout' applying '/gnu/store/k2ab07wis5rs3qhm2yj2n4n9pqddvdvy-java-svg-salamander-F= ix-non-det.patch'... Backtrace: 3 (primitive-load "/gnu/store/l2wzcavh9338x55rzxwlg5qbbl0?") In ice-9/eval.scm: 619:8 2 (_ #(# "java-svg-salam?")) In srfi/srfi-1.scm: 640:9 1 (for-each # ("/gnu/store/k2?")) In guix/build/utils.scm: 616:6 0 (invoke _ . _) guix/build/utils.scm:616:6: In procedure invoke: Throw to key `srfi-34' with args `(# Problem is that the build.xml is in CRLF, your patch is in LF line-endings. To apply, I converted the patch with unix2dos and then added these flags to the origin: (patch-flags '("-p1" "--binary")) Not sure why it didn't break for you? > + (license license:bsd-2))) License is either bsd-2 or LGPL (see README.md). Hm, though on the Github homepage there is no mentioning of LGPL. The link from the README is this one: https://svgsalamander.java.net/license/license-lgpl.txt But it only redirects to the Github page. What does that mean now? Bj=C3=B6rn --Sig_/z13iU.e=cF.046FU3c8ntBL Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iF0EARECAB0WIQQiGUP0np8nb5SZM4K/KGy2WT5f/QUCXM9ehAAKCRC/KGy2WT5f /S2UAJ0ZnOGzx6hI5hkot2p+m6adt39/EgCbBwybg9HGFNxgMtpOzxsClHkHZTE= =EZwr -----END PGP SIGNATURE----- --Sig_/z13iU.e=cF.046FU3c8ntBL--