GNU bug report logs -
#43368
[PATCH] gnu: josm: Fix formatting and install more files.
Previous Next
Reported by: Christopher Baines <mail <at> cbaines.net>
Date: Sun, 13 Sep 2020 08:44:02 UTC
Severity: normal
Tags: patch
Done: Christopher Baines <mail <at> cbaines.net>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 43368 in the body.
You can then email your comments to 43368 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
Report forwarded
to
guix-patches <at> gnu.org:
bug#43368; Package
guix-patches.
(Sun, 13 Sep 2020 08:44:02 GMT)
Full text and
rfc822 format available.
Acknowledgement sent
to
Christopher Baines <mail <at> cbaines.net>:
New bug report received and forwarded. Copy sent to
guix-patches <at> gnu.org.
(Sun, 13 Sep 2020 08:44:02 GMT)
Full text and
rfc822 format available.
Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
This means that JOSM appears in the GNOME Shell menu.
* gnu/packages/geo.scm (josm)[source]: Replace tab character.
[arguments]: Reduce line length, and add install-share-directories phase.
---
gnu/packages/geo.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index ab1d691c6c..a896364c35 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -1290,7 +1290,7 @@ to the OSM opening hours specification.")
(modules '((guix build utils)))
(snippet
'(begin
- (for-each delete-file (find-files "." ".*.jar$"))
+ (for-each delete-file (find-files "." ".*.jar$"))
#t))))
(build-system ant-build-system)
(native-inputs
@@ -1339,7 +1339,8 @@ to the OSM opening hours specification.")
(filter
(lambda (s)
(let ((source (assoc-ref inputs "source")))
- (not (equal? (substring s 0 (string-length source)) source))))
+ (not (equal? (substring s 0 (string-length source))
+ source))))
(string-split (getenv "CLASSPATH") #\:))
":"))
#t))
@@ -1386,6 +1387,19 @@ to the OSM opening hours specification.")
"Is-Local-Build: true\n"
"Build-Date: 1970-01-01 00:00:00 +0000\n"))))
#t))
+ (add-after 'install 'install-share-directories
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out"))
+ (share-directories '("applications" "icons" "man" "menu"
+ "metainfo" "mime" "pixmaps")))
+ (for-each (lambda (directory)
+ (copy-recursively (string-append
+ "native/linux/tested/usr/share/"
+ directory)
+ (string-append
+ out "/share/" directory)))
+ share-directories))
+ #t))
(add-after 'install 'install-bin
(lambda* (#:key outputs inputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
--
2.28.0
Information forwarded
to
guix-patches <at> gnu.org:
bug#43368; Package
guix-patches.
(Sun, 13 Sep 2020 10:27:01 GMT)
Full text and
rfc822 format available.
Message #8 received at 43368 <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
LGTM! Do you already have a copyright line?
Le 13 septembre 2020 04:43:23 GMT-04:00, Christopher Baines <mail <at> cbaines.net> a écrit :
>This means that JOSM appears in the GNOME Shell menu.
>
>* gnu/packages/geo.scm (josm)[source]: Replace tab character.
>[arguments]: Reduce line length, and add install-share-directories
>phase.
>---
> gnu/packages/geo.scm | 18 ++++++++++++++++--
> 1 file changed, 16 insertions(+), 2 deletions(-)
>
>diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
>index ab1d691c6c..a896364c35 100644
>--- a/gnu/packages/geo.scm
>+++ b/gnu/packages/geo.scm
>@@ -1290,7 +1290,7 @@ to the OSM opening hours specification.")
> (modules '((guix build utils)))
> (snippet
> '(begin
>- (for-each delete-file (find-files "." ".*.jar$"))
>+ (for-each delete-file (find-files "." ".*.jar$"))
> #t))))
> (build-system ant-build-system)
> (native-inputs
>@@ -1339,7 +1339,8 @@ to the OSM opening hours specification.")
> (filter
> (lambda (s)
> (let ((source (assoc-ref inputs "source")))
>- (not (equal? (substring s 0
>(string-length source)) source))))
>+ (not (equal? (substring s 0
>(string-length source))
>+ source))))
> (string-split (getenv "CLASSPATH") #\:))
> ":"))
> #t))
>@@ -1386,6 +1387,19 @@ to the OSM opening hours specification.")
> "Is-Local-Build: true\n"
> "Build-Date: 1970-01-01 00:00:00 +0000\n"))))
> #t))
>+ (add-after 'install 'install-share-directories
>+ (lambda* (#:key outputs #:allow-other-keys)
>+ (let ((out (assoc-ref outputs "out"))
>+ (share-directories '("applications" "icons" "man"
>"menu"
>+ "metainfo" "mime" "pixmaps")))
>+ (for-each (lambda (directory)
>+ (copy-recursively (string-append
>+
>"native/linux/tested/usr/share/"
>+ directory)
>+ (string-append
>+ out "/share/"
>directory)))
>+ share-directories))
>+ #t))
> (add-after 'install 'install-bin
> (lambda* (#:key outputs inputs #:allow-other-keys)
> (let* ((out (assoc-ref outputs "out"))
>--
>2.28.0
[Message part 2 (text/html, inline)]
Reply sent
to
Christopher Baines <mail <at> cbaines.net>:
You have taken responsibility.
(Sun, 13 Sep 2020 12:26:01 GMT)
Full text and
rfc822 format available.
Notification sent
to
Christopher Baines <mail <at> cbaines.net>:
bug acknowledged by developer.
(Sun, 13 Sep 2020 12:26:02 GMT)
Full text and
rfc822 format available.
Message #13 received at 43368-done <at> debbugs.gnu.org (full text, mbox):
[Message part 1 (text/plain, inline)]
Julien Lepiller <julien <at> lepiller.eu> writes:
> LGTM! Do you already have a copyright line?
Great, I didn't have a copyright line in this file, so I've added on and
pushed as 1192ae940434808560b3170107e4ce44855816c3.
Thanks for taking a look,
Chris
[signature.asc (application/pgp-signature, inline)]
bug archived.
Request was from
Debbugs Internal Request <help-debbugs <at> gnu.org>
to
internal_control <at> debbugs.gnu.org.
(Mon, 12 Oct 2020 11:24:08 GMT)
Full text and
rfc822 format available.
This bug report was last modified 3 years and 189 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.