all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Björn Höfling" <bjoern.hoefling@bjoernhoefling.de>
To: Julien Lepiller <julien@lepiller.eu>
Cc: 35545@debbugs.gnu.org
Subject: [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander.
Date: Mon, 6 May 2019 00:07:00 +0200	[thread overview]
Message-ID: <20190506000700.69501934@alma-ubu> (raw)
In-Reply-To: <20190503130134.24788-12-julien@lepiller.eu>

[-- Attachment #1: Type: text/plain, Size: 2656 bytes --]

On Fri,  3 May 2019 15:01:29 +0200
Julien Lepiller <julien@lepiller.eu> 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

  reply	other threads:[~2019-05-05 22:08 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   ` [bug#35545] [PATCH 12/17] gnu: Add java-svg-salamander Julien Lepiller
2019-05-05 22:07     ` Björn Höfling [this message]
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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190506000700.69501934@alma-ubu \
    --to=bjoern.hoefling@bjoernhoefling.de \
    --cc=35545@debbugs.gnu.org \
    --cc=julien@lepiller.eu \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.