From unknown Tue Jun 17 20:06:17 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#43368 <43368@debbugs.gnu.org> To: bug#43368 <43368@debbugs.gnu.org> Subject: Status: [PATCH] gnu: josm: Fix formatting and install more files. Reply-To: bug#43368 <43368@debbugs.gnu.org> Date: Wed, 18 Jun 2025 03:06:17 +0000 retitle 43368 [PATCH] gnu: josm: Fix formatting and install more files. reassign 43368 guix-patches submitter 43368 Christopher Baines severity 43368 normal tag 43368 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 13 04:43:32 2020 Received: (at submit) by debbugs.gnu.org; 13 Sep 2020 08:43:32 +0000 Received: from localhost ([127.0.0.1]:49415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHNbg-0005Ls-7O for submit@debbugs.gnu.org; Sun, 13 Sep 2020 04:43:32 -0400 Received: from lists.gnu.org ([209.51.188.17]:35910) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHNbe-0005Ll-Vo for submit@debbugs.gnu.org; Sun, 13 Sep 2020 04:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHNbe-0007m2-Or for guix-patches@gnu.org; Sun, 13 Sep 2020 04:43:30 -0400 Received: from mira.cbaines.net ([212.71.252.8]:54658) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHNbc-0002RZ-Rs for guix-patches@gnu.org; Sun, 13 Sep 2020 04:43:30 -0400 Received: from localhost (unknown [46.237.172.13]) by mira.cbaines.net (Postfix) with ESMTPSA id 749C927BBE7 for ; Sun, 13 Sep 2020 09:43:26 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id b0acabf9 for ; Sun, 13 Sep 2020 08:43:23 +0000 (UTC) From: Christopher Baines To: guix-patches@gnu.org Subject: [PATCH] gnu: josm: Fix formatting and install more files. Date: Sun, 13 Sep 2020 09:43:23 +0100 Message-Id: <20200913084323.32740-1-mail@cbaines.net> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/13 04:43:26 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 13 06:26:24 2020 Received: (at 43368) by debbugs.gnu.org; 13 Sep 2020 10:26:24 +0000 Received: from localhost ([127.0.0.1]:49541 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHPDD-0007so-P2 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 06:26:24 -0400 Received: from lepiller.eu ([89.234.186.109]:57840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHPDA-0007se-V8 for 43368@debbugs.gnu.org; Sun, 13 Sep 2020 06:26:22 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4426631b; Sun, 13 Sep 2020 10:26:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date :in-reply-to:references:mime-version:content-type :content-transfer-encoding:subject:to:from:message-id; s=dkim; bh=OBCi7nQf9lq3APsB64Kfh7hFiomq7l7ZOSbe51WVLnk=; b=k/TvhY0Y070Y YxDGsL0jG4lpvKpMaJPhsiMyhZqomU4rIRa08LBcyYRNiZ8/drPDZWJ/v0+K8azP XticuJqJnT2FGBPoybd6ioME570591Feb4Y5XozGEPIO+fRNSvLDaDbzYYWMKjiU oPHJdKFX9pFCO2cmFM5TDuBOG/g+7KKKoCjw4L+jJqlTx0VmF9YFrQiHBbGrSfsB G4J3IJuFC4mkJ19k3EkznWRokfeXeLLTeW0dk4N5Zc3saYBKgOM25d0W1BqP+y4B x5+mLA7ISS0UGTC/u8p83Pv9RmG6twV6b0A3Ev0L6GoEXTvsrkZH88o7vehnBK27 KCLuz8H15Q== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id d43a4a98 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Sun, 13 Sep 2020 10:26:18 +0000 (UTC) Date: Sun, 13 Sep 2020 06:26:07 -0400 User-Agent: K-9 Mail for Android In-Reply-To: <20200913084323.32740-1-mail@cbaines.net> References: <20200913084323.32740-1-mail@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/alternative; boundary="----5LTOVCSX9K82TJS2PV2ROGX4BO79YW" Content-Transfer-Encoding: 7bit Subject: Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files. To: Christopher Baines ,43368@debbugs.gnu.org From: Julien Lepiller Message-ID: <42CF4931-2004-40A2-9EA2-9411F9185CF2@lepiller.eu> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 43368 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) ------5LTOVCSX9K82TJS2PV2ROGX4BO79YW Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable LGTM! Do you already have a copyright line? Le 13 septembre 2020 04:43:23 GMT-04:00, Christopher Baines a =C3=A9crit : >This means that JOSM appears in the GNOME Shell menu=2E > >* gnu/packages/geo=2Escm (josm)[source]: Replace tab character=2E >[arguments]: Reduce line length, and add install-share-directories >phase=2E >--- > gnu/packages/geo=2Escm | 18 ++++++++++++++++-- > 1 file changed, 16 insertions(+), 2 deletions(-) > >diff --git a/gnu/packages/geo=2Escm b/gnu/packages/geo=2Escm >index ab1d691c6c=2E=2Ea896364c35 100644 >--- a/gnu/packages/geo=2Escm >+++ b/gnu/packages/geo=2Escm >@@ -1290,7 +1290,7 @@ to the OSM opening hours specification=2E") > (modules '((guix build utils))) > (snippet > '(begin >- (for-each delete-file (find-files "=2E" "=2E*=2Ejar$")) >+ (for-each delete-file (find-files "=2E" "=2E*=2Ejar$")) > #t)))) > (build-system ant-build-system) > (native-inputs >@@ -1339,7 +1339,8 @@ to the OSM opening hours specification=2E") > (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=2E") > "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 >+ =20 >"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")) >--=20 >2=2E28=2E0 ------5LTOVCSX9K82TJS2PV2ROGX4BO79YW Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable LGTM! Do you already have a copyright line?
Le 13 septembre 2020 04:43:23 GMT-04:00, Christ= opher Baines <mail@cbaines=2Enet> a =C3=A9crit :
This means that JOSM appears in the GNOME Shell menu=
=2E

* gnu/packages/geo=2Escm (josm)[source]: Replace tab character=
=2E
[arguments]: Reduce line length, and add install-share-directories p=
hase=2E
 gnu/packages/geo=2Escm | 18 ++++++++++++++++--
 1 file chang=
ed, 16 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/geo=
=2Escm b/gnu/packages/geo=2Escm
index ab1d691c6c=2E=2Ea896364c35 100644<=
br>--- a/gnu/packages/geo=2Escm
+++ b/gnu/packages/geo=2Escm
@@ -1290=
,7 +1290,7 @@ to the OSM opening hours specification=2E")
              =
 (modules '((guix build utils)))
             (snippet
              =
'(begin
-		(for-each delete-file (find-files "=2E" "=2E*=2Ejar$"))
+ =
               (for-each delete-file (find-files "=2E" "=2E*=2Ejar$"))
 =
                #t))))
     (build-system ant-build-system)
     (nat=
ive-inputs
@@ -1339,7 +1339,8 @@ to the OSM opening hours specification=
=2E")
                        (filter
                          (lamb=
da (s)
                            (let ((source (assoc-ref inputs "sour=
ce")))
-                             (not (equal? (substring s 0 (string=
-length source)) source))))
+                             (not (equal? (=
substring s 0 (string-length source))
+                                 =
         source))))
                          (string-split (getenv "CLA=
SSPATH") #\:))
                        ":"))
              #t))
@@=
 -1386,6 +1387,19 @@ to the OSM opening hours specification=2E")
       =
                            "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"))
+                   (shar=
e-directories '("applications" "icons" "man" "menu"
+                   =
                     "metainfo" "mime" "pixmaps")))
+               (for=
-each (lambda (directory)
+                           (copy-recursively =
(string-append
+                                              "native/li=
nux/tested/usr/share/"
+                                              di=
rectory)
+                                             (string-append+                                              out "/share/" directory)))<=
br>+                         share-directories))
+             #t))
 =
         (add-after 'install 'install-bin
            (lambda* (#:key ou=
tputs inputs #:allow-other-keys)
              (let* ((out (assoc-ref ou=
tputs "out"))
------5LTOVCSX9K82TJS2PV2ROGX4BO79YW-- From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 13 08:25:19 2020 Received: (at 43368-done) by debbugs.gnu.org; 13 Sep 2020 12:25:19 +0000 Received: from localhost ([127.0.0.1]:49621 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHR4J-0006ja-37 for submit@debbugs.gnu.org; Sun, 13 Sep 2020 08:25:19 -0400 Received: from mira.cbaines.net ([212.71.252.8]:60550) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kHR4F-0006jJ-4Z for 43368-done@debbugs.gnu.org; Sun, 13 Sep 2020 08:25:17 -0400 Received: from localhost (unknown [46.237.172.13]) by mira.cbaines.net (Postfix) with ESMTPSA id 2118F27BBE7; Sun, 13 Sep 2020 13:25:14 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 81d1f35e; Sun, 13 Sep 2020 12:25:11 +0000 (UTC) References: <20200913084323.32740-1-mail@cbaines.net> <42CF4931-2004-40A2-9EA2-9411F9185CF2@lepiller.eu> User-agent: mu4e 1.4.13; emacs 26.3 From: Christopher Baines To: Julien Lepiller Subject: Re: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files. In-reply-to: <42CF4931-2004-40A2-9EA2-9411F9185CF2@lepiller.eu> Date: Sun, 13 Sep 2020 13:25:11 +0100 Message-ID: <87v9ghhniw.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 43368-done Cc: 43368-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain Julien Lepiller 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 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl9eD6dfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xd5mQ/8Czj4ZmM24G12F091c2Qn7fLhKvKOyuuA5g/2S80+4x8oALfVqxf6OneU P9QgZKNPYYSMUtaINcuf1NHNaHFF6D6kw5uWWu5+cup5+ioeled9ZY/sK39PIuBa tCKdbIVo/gCwofZhYxGUeyse1ARcflP/8J1mAHm+FkiXxxNTYLWaaHe3FCHQ9qkX wcah/bwBpj2J0ZWfmIVB93eqQPHObX9GItp/puxvqnB2OWEu2uHw4EWw6KlRL3Ji H3S33XR84tBbDl9VKabpeb8hnnK00Smp7U/7LBiuUL+aZuebmzuShsJc68n11E88 ia4KZa4e09vKgdqm2yd2JYQCtCesA4eBVj0fDHpSCVb8Slmc0S7ucTeUvN0RdLqH J7QAy5LZPYVwPQxRUL1mZinEnTL07PvZ9W+BYc6tNIvTcYZYBRNOcUC0PIjmRc2F cbVrkQvheSzYqrIpu6lb+8eM3CUzv2FT9kRlh3/ragb+XHSFlIOPBamfH9mzJMcl 0aED2yxsHw/nVy1vJbM/xtdgZD8GVOmNHBY6QKQrF91G+b5/E2jlK66L66fqt6dz 7KqwForDXufn/X21uC88DnVeNSgFPoveyK3Ee0BIgup4l1M6c1O6c1ounyygpmAl 8S3bkIb1zNP28zjDRIz5Oo+ZiYD9Q+NfHNMEAe5OCAGV7tXRKA8= =CrEU -----END PGP SIGNATURE----- --=-=-=-- From unknown Tue Jun 17 20:06:17 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 12 Oct 2020 11:24:08 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator