From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id UGPOCgv0XV9yfQAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 10:27:23 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id QF8BBQv0XV+7agAAbx9fmQ (envelope-from ) for ; Sun, 13 Sep 2020 10:27:23 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 74EB194042A for ; Sun, 13 Sep 2020 10:27:22 +0000 (UTC) Received: from localhost ([::1]:33998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHPE9-0002AA-8W for larch@yhetil.org; Sun, 13 Sep 2020 06:27:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHPDq-0001wA-7Y for guix-patches@gnu.org; Sun, 13 Sep 2020 06:27:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37995) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHPDp-0004eX-Sk for guix-patches@gnu.org; Sun, 13 Sep 2020 06:27:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHPDp-0007ts-PC for guix-patches@gnu.org; Sun, 13 Sep 2020 06:27:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 10:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Christopher Baines ,43368@debbugs.gnu.org Received: via spool by 43368-submit@debbugs.gnu.org id=B43368.159999278430312 (code B ref 43368); Sun, 13 Sep 2020 10:27:01 +0000 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 From: Julien Lepiller Message-ID: <42CF4931-2004-40A2-9EA2-9411F9185CF2@lepiller.eu> X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=lepiller.eu header.s=dkim header.b=k/TvhY0Y; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: hVjRQ2DjPPJo ------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--