Subject: bug#43368: closed (Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files.)

From: [email-masked] (GNU bug Tracking System)
Date: Sun, 13 Sep 2020 12:26:02 +0000

Your bug report

#43368: [PATCH] gnu: josm: Fix formatting and install more files.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
43368: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=43368
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files.
From: Christopher Baines <[email-masked]>
To: Julien Lepiller <[email-masked]>
Cc: [email-masked]
Date: Sun, 13 Sep 2020 13:25:11 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

Julien Lepiller <[email-masked]> 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

Subject: [PATCH] gnu: josm: Fix formatting and install more files.
From: Christopher Baines <[email-masked]>
To: [email-masked]
Date: Sun, 13 Sep 2020 09:43:23 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

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