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 gLSTANvbXV9EBgAA0tVLHw (envelope-from ) for ; Sun, 13 Sep 2020 08:44:11 +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 gAxlNtrbXV/1GQAAbx9fmQ (envelope-from ) for ; Sun, 13 Sep 2020 08:44:10 +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 EA14F9404C5 for ; Sun, 13 Sep 2020 08:44:09 +0000 (UTC) Received: from localhost ([::1]:41246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kHNcG-0007nd-K4 for larch@yhetil.org; Sun, 13 Sep 2020 04:44:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48460) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kHNcB-0007nU-87 for guix-patches@gnu.org; Sun, 13 Sep 2020 04:44:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:37869) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kHNcA-0002SJ-Vk for guix-patches@gnu.org; Sun, 13 Sep 2020 04:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kHNcA-0005Mj-JW for guix-patches@gnu.org; Sun, 13 Sep 2020 04:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43368] [PATCH] gnu: josm: Fix formatting and install more files. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 13 Sep 2020 08:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 43368 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43368@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159998661220580 (code B ref -1); Sun, 13 Sep 2020 08:44:02 +0000 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 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) 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=none; dmarc=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: 3.99 X-TUID: LYTbELBB+MdL 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