emacs-bug-tracker
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

bug#43368: closed ([PATCH] gnu: josm: Fix formatting and install more fi


From: GNU bug Tracking System
Subject: bug#43368: closed ([PATCH] gnu: josm: Fix formatting and install more files.)
Date: Sun, 13 Sep 2020 12:26:01 +0000

Your message dated Sun, 13 Sep 2020 13:25:11 +0100
with message-id <87v9ghhniw.fsf@cbaines.net>
and subject line Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install 
more files.
has caused the debbugs.gnu.org bug report #43368,
regarding [PATCH] gnu: josm: Fix formatting and install more files.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
43368: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43368
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
--- Begin Message --- Subject: [PATCH] gnu: josm: Fix formatting and install more files. Date: Sun, 13 Sep 2020 09:43:23 +0100
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




--- End Message ---
--- Begin Message --- Subject: Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files. Date: Sun, 13 Sep 2020 13:25:11 +0100 User-agent: mu4e 1.4.13; emacs 26.3
Julien Lepiller <julien@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

Attachment: signature.asc
Description: PGP signature


--- End Message ---

reply via email to

[Prev in Thread] Current Thread [Next in Thread]