[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander.
From: |
Björn Höfling |
Subject: |
[bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander. |
Date: |
Mon, 6 May 2019 00:07:00 +0200 |
On Fri, 3 May 2019 15:01:29 +0200
Julien Lepiller <address@hidden> 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-impl.xml.rej
source is under 'java-svg-salamander-1.1.2-checkout'
applying
'/gnu/store/k2ab07wis5rs3qhm2yj2n4n9pqddvdvy-java-svg-salamander-Fix-non-det.patch'...
Backtrace:
3 (primitive-load "/gnu/store/l2wzcavh9338x55rzxwlg5qbbl0?")
In ice-9/eval.scm:
619:8 2 (_ #(#<directory (guile-user) 5ce140> "java-svg-salam?"))
In srfi/srfi-1.scm:
640:9 1 (for-each #<procedure apply-patch (a)> ("/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 `(#<condition &invoke-error [program:
"/gnu/store/a4rxl40jr7gmq8bp3dryq4yq67cwkwiw-patch-2.7.6/bin/patch" arguments>
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örn
pgpNAmG6GXGAd.pgp
Description: OpenPGP digital signature
- [bug#35545] [PATCH 09/17] gnu: Add java-openjfx-graphics., (continued)
- [bug#35545] [PATCH 09/17] gnu: Add java-openjfx-graphics., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 11/17] gnu: Add java-jmapviewer., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 13/17] gnu: Add java-jboss-transaction-api-spec., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 02/17] gnu: Add java-jsonp-api., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 14/17] gnu: Add java-commons-pool2., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander.,
Björn Höfling <=
- [bug#35545] [PATCH 10/17] gnu: Add java-openjfx-media., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 16/17] gnu: Add java-commons-jcs., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 15/17] gnu: Add java-commons-dbcp2., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 17/17] gnu: Add josm., Julien Lepiller, 2019/05/03
- [bug#35545] [PATCH 01/17] gnu: Add java-signpost-core., Björn Höfling, 2019/05/05
- [bug#35545] [PATCH] Add josm., Björn Höfling, 2019/05/05