From patchwork Mon Sep 19 16:08:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Morgan Smith X-Patchwork-Id: 42747 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 450C427BBEA; Mon, 19 Sep 2022 17:20:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BDB0B27BBE9 for ; Mon, 19 Sep 2022 17:20:39 +0100 (BST) Received: from localhost ([::1]:40310 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oaJVd-0003iT-To for patchwork@mira.cbaines.net; Mon, 19 Sep 2022 12:20:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49940) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaJSB-000885-6B for guix-patches@gnu.org; Mon, 19 Sep 2022 12:17:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55921) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oaJSA-0005OM-Tm for guix-patches@gnu.org; Mon, 19 Sep 2022 12:17:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oaJSA-0007Wg-F0 for guix-patches@gnu.org; Mon, 19 Sep 2022 12:17:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57938] [PATCH] gnu: emacs-osm: Update to 0.8. Resent-From: Morgan.J.Smith@outlook.com Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 19 Sep 2022 16:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57938 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57938@debbugs.gnu.org Cc: Morgan Smith X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.166360416528850 (code B ref -1); Mon, 19 Sep 2022 16:17:02 +0000 Received: (at submit) by debbugs.gnu.org; 19 Sep 2022 16:16:05 +0000 Received: from localhost ([127.0.0.1]:54999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaJRE-0007VF-F8 for submit@debbugs.gnu.org; Mon, 19 Sep 2022 12:16:04 -0400 Received: from lists.gnu.org ([209.51.188.17]:34260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oaJRC-0007Us-Fx for submit@debbugs.gnu.org; Mon, 19 Sep 2022 12:16:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaJR1-0007C8-SV for guix-patches@gnu.org; Mon, 19 Sep 2022 12:15:56 -0400 Received: from mail-sn1anam02olkn2082b.outbound.protection.outlook.com ([2a01:111:f400:7ea9::82b]:30996 helo=NAM02-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oaJQz-0005A1-Ij for guix-patches@gnu.org; Mon, 19 Sep 2022 12:15:51 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=n1nPhgF8mFas/Z6FxmPxuIshvlWxVfUYgqW0C2XdofR3Gbyp5QKpkg88z/zMSDAw4Aiv8P+qig+KJiTOFeoWDxX6WzYIfOumnnjAsxNAoonlt8/eIYQUh8UumoHCL5OIiXiNZ+DZCNXkqNcdIXgBbcZe7YKJdGFCYWnEG2KdJAQXsB6wigwYa8/5GSL4NGVQq2FkTKOsT93FVVdy2ehLwMbenbTmiwl/QrCyAO9nl0oQrNPZ12BEHEfBGS8Fec0SBQI9c41hWzn2fzPHcGlTvcETJNUG6jdkhunyi3pIhB/MlW00D4RPTe5F4WtXq62JvYM/Zg1Q+IDvCjrz7xYK9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nkxIK7L0VPTZLpoOs2QbT/sAYJajSiIBhKztbd9tNWc=; b=a+YjNoR5thIrH2L1mYy43PFLn6a2EjobrWsDA/W1EgwE9f9LD6pAGAepjrX7aCTKyWZhu8Rcg1lHdtpE0Oa5I3OSjsGlFEI0jCFR4nRCWuKBlh8HprOiSeEIQsFghM19xbzHuiFgm9zi3JaW8jpnIYXB3T705dYbsxqKUlXi4Cq1YsliImb6M7M/kXpZbywfOo4IH+qFebIWAJUsEE+ie7fejV1PC6pQRV7cHHt1TexIHy8RaQGLJxLQ9FOsNUgoaoINCoaFV5SmV/lsQghV9znWlHQWqpp7pNA+rMgPcaKoihJtYebPLlCo6YpEjIEhU9q6q2nIejHIpocRfdLLpw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nkxIK7L0VPTZLpoOs2QbT/sAYJajSiIBhKztbd9tNWc=; b=AXhaetL9V9zHSUFNC4Vcg6iWBwhyge2KLFtlxAvQ4YBRUOrmdwsWa/pyvyFNy3Toe1eCMX7fnPTb+JrsAMStzTjVji3gewOZ2fFCkf2RqbE3UEefatmRNJfWHvaOWxJXFsWQalS2I52nuhw5LnF6T6AFnRb8mGIKgIs9ffrAGXbES7sYZquehgzEjMYIPiFx7rDq130/47O0Obmvl6qKW1gDh60wqJqO/qdRD0T69l0Xj0Qnevro8yJ4fsU6rNVK6PsAZy1NkZU0pNyg5eDR0SZ8NeYi6P1IMjwW+3YwjfukmGsEagvqQdbytD08W1i3V0KfiCYXEhU22bxFmkOWCg== Received: from DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) by PH0PR03MB6251.namprd03.prod.outlook.com (2603:10b6:510:ec::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.21; Mon, 19 Sep 2022 16:10:45 +0000 Received: from DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::c09c:32ec:dfab:b714]) by DM5PR03MB3163.namprd03.prod.outlook.com ([fe80::c09c:32ec:dfab:b714%7]) with mapi id 15.20.5632.021; Mon, 19 Sep 2022 16:10:45 +0000 From: Morgan.J.Smith@outlook.com Date: Mon, 19 Sep 2022 12:08:40 -0400 Message-ID: X-Mailer: git-send-email 2.37.3 X-TMN: [wKyDDpc/GPap3EqtFTFq0fRc6oxu66dR] X-ClientProxiedBy: YT3PR01CA0087.CANPRD01.PROD.OUTLOOK.COM (2603:10b6:b01:84::29) To DM5PR03MB3163.namprd03.prod.outlook.com (2603:10b6:4:40::24) X-Microsoft-Original-Message-ID: <20220919160839.19644-1-Morgan.J.Smith@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM5PR03MB3163:EE_|PH0PR03MB6251:EE_ X-MS-Office365-Filtering-Correlation-Id: f82ab356-7b22-4343-0be1-08da9a5981d1 X-MS-Exchange-SLBlob-MailProps: feAVlmA1hHW8Sx0qJbsMRgxka61YY23AFGg4jMAp3lfsks1b8RKamATYjSNk6iYl8ZX6DVBVS9RbtlbNxYdsXKnBCt74MeOb5AZlaGF5YZv6D6MTkSUymsmPvqzvlInam9/BdgrUF3TFXumKEV16F5Q26igTumBGjnozwqEJP95tOWcUuMoPAGXiScxj93v4MKvgxg9qtxd0wlJVDgmv6zHckKYkQqYLkG83BOLyIuRyxQNM6Xz8hgKwrvyrBvbKqvsLrrX0jQBZaH6cCaT6L9LcAq/iDTNvA6RU9eZsO3kY0gScUvOpXKg1frLy/4XmNCuZ6jMA5fgYeMB2cv8faC8QKMsD9pfR3ajgbBoP5amsc6eFjp/crsbq/tXKYP2PB9IHbSPFTacX+OGnXmYUj/kblAe8OLPOudwg4MGLNoAQ2bfsDa+x9Pbnk7ii2SpKFY8nqxxbW7XOAyoZSdGjRkzMrGNjLOtUbB0uCm2wFk7eh8Z0CSVK29n5tlg8F6QyVVnrcicaglZzmKjZRYjOi/wrwb6jAkHmz92BTTqMxPSrEG0g07pjfOBzh0Ul6lMCiC2cWFxJnxt55CaVxSJ6vwO9DbIrw39/CmiJ0rjrC9c5Rxzn7zS7dr4rbKSU8H/YJymO2d2MzfT/9kzuAquGbTyrF1hZhZ1dJrcYBrYWziYTRdvkiRZyHB3PdvItQWcA8DpUjX+NDQCeVMcls5NEVg== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yQOOS65Wh/5DKHSiiGIZpBTwITq6OS5jx47fPX4BvBh+OfZFHFQw+L2BMVOWX1pL3tSDAWXvmM4QViKQreXK+1ZtkTloAb1VB39J2q5/vhCIA2aesU5nO1BsTiYP7PJEdjEH9Xhu4ELAAOpks+SOkx9diRh0ATX3Z0Gj0LSdORueqdlNj6bhtytQumjhbOZukK/czi7+2UQErRhozO8FfOKC1wmPjllHC7tnsJXnGWSHH+J4eGxi2wD/lp2SiR1yi/DwNAlA2UvbsMRn+xid7Bo0pygkz0kkPjFpvlDn6orL8Yes3MzFrq++m97Sa0ysOpixj0dZg6zDbaWoFpqQ63qHJpdSb9dxf1P+yAlDjEpZ2sB6P62a99v7jYursgJYZNXCsHUE77o0UpFL4H7OO3sfx0QwKLfAyW5hZn5G4BXW+29HD2IUrEmSoJWhbw4LuL5IBEw8DGxB9SdJn55XhTjgIPmrUKLHNzQ2B6VEa2GDSyjWhcCoXRwA32zVUGKFb8k6Pk11PyXyfMupUCTaqACQENurc0aYseL4tswattYrbeHWXV+0uWcFy5ebGHIXFR/Hff3/CYDnSG7C+oXS9WYRKKEZqE4nbb4zKaUmrRQp0SBcjWdObyj8SKRP6gz1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: D4TsA/0zOfHXw5mCuXsXsxDSf3XDfEBze35AETKHl7UEFXv1mWFVnZprQ9VGBcWUdbUDaVsx4OdeQNLvE8UC5M4va8LQcLm7VXyO+ftxHNN9P6M3f/9rTCS+GZqNICr4/sflQIhrS3lvMdDo3q2Xc79Il3uEf7SdNYEt+6B9Av0dpkRdWMOJFcZ1B1t+tq/lN9wkT1B9FsyNxn3nFRnU7ujzxSneDqOpwhDHony2VJhAcB66sTMUv5gOH7E074YgItFKw+zU9pZxHsoLpqiYRWpUkxao3Jsp/1Bw/d+SS+gLabQ/NBIFHFPX0q28CVusR8FTTyIK6UEimFHnhe3yUF/xqB2AePRn9LM8bKZPXbRsScUoAnT1qPDcVx9jYCUIYT9GfLagv6AUIG8PUKDgMiI69lQt7cQpe7EPZ0+McRYAn4HWKkyiKlmDIlSfxr742MZZFPHzh5aS4MFxFtWmW2BPmZ7bKaCwvIvgr1XiutaKll8VJI/bYRUtyQ2O4D9OVdXNT2EyMhEHxruVRFN+cM6Z50tjRwFkxFF9PkoYP1mKWjA7+dmhjFGbql+VMWGVRzhdOSwjsUj+NpRq2cAFg/GIOlN0gx8kvd7Q5dUTDHnDy0852jKvJ+cZ/cOpmbx/fAub+W92GvOzHP+yB7D4W9LWEFbKLlGa3I7Ml/0yoByVWecF5SyeN/nGi6PGdjsjiGGtfnEt2xJY5aCpgmxNei9pnGxZu6MQ0dLj6A1p/oBP3u1L7w890H37tw1JwghriUbRuBdmCAtKkjBD0Exu/Ok3UJSfIjlLvqRzDk4cnY7b/x0sOD8gDNXbRGVKg2Vrdr3SEDNCqDdttwWZdyOP4ptCeW5xkCmp8UXBCx3j9LNd04hJwSLDpxGKK0nuWYRgp3K0k1tyNFRRqzLkCaAbgwWb1USk/FD0Ited/QqTbDqzTQs8DSBRmyRNtyDyu8pwTuHVEP+FVQH56HZHSQr1rm0LKk+m2gdedyMpGUJTJzlOVqIslNgwF9OoyugG5uZz0CEnl1iVUE0EAR13fkV5bi4eHIEJIoUGjoTNfbCHKoa6Z5y9fnFVALynG/kOZp/o1Jrx8v+H0xRvpJO0xuwF0rg8LwnYVmCVlvLzBcAXYiqls0lL8T7qfLF84dFSiyVqErcri/U9ALYNoj0SOK3drJCnN7rrCBONKQQNBycwejrrh8256KCgqi36IfWa06pwpna4oeQlrUcoqoVHoqbxiLZ2dToxIZRQuBGUuNhkVGDaJKJLivpYddU9GJbAycFYcC6RzOH1DUmzEbGBhAHA30+jLAdkpdopoTH32kJrBIg= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f82ab356-7b22-4343-0be1-08da9a5981d1 X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3163.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2022 16:10:45.5354 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR03MB6251 Received-SPF: pass client-ip=2a01:111:f400:7ea9::82b; envelope-from=Morgan.J.Smith@outlook.com; helo=NAM02-SN1-obe.outbound.protection.outlook.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches From: Morgan Smith * gnu/packages/emacs-xyz.scm (emacs-osm): Update to 0.8. [arguments]<#:phases>: Add makeinfo phase [native-inputs]: Add texinfo --- I think the line length formatting for this is not optimal but it's what guix style did gnu/packages/emacs-xyz.scm | 47 +++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 16 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 3311e973e6..15c594446f 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -32381,26 +32381,41 @@ (define-public emacs-straight-el (define-public emacs-osm (package (name "emacs-osm") - (version "0.6") + (version "0.8") (home-page "https://github.com/minad/osm") - (source - (origin - (method git-fetch) - (uri (git-reference (url home-page) (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0aiq2z9vv4jsl0s0x9vpjgp0mnn27wanhirzj3h80ivgiphzs7l5")))) + (source (origin + (method git-fetch) + (uri (git-reference + (url home-page) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j")))) (build-system emacs-build-system) (arguments - `(#:phases (modify-phases %standard-phases - (add-after 'unpack 'set-curl-file-name - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "osm.el" - (("\"curl( ?)\"" _ space) - (string-append "\"" - (search-input-file inputs "/bin/curl") - space "\"")))))))) + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-curl-file-name + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osm.el" + (("\"curl( ?)\"" _ space) + (string-append "\"" + (search-input-file inputs + "/bin/curl") + space "\""))))) + (add-after 'install 'makeinfo + (lambda _ + (invoke "emacs" + "--batch" + "--eval=(require 'ox-texinfo)" + "--eval=(setq org-export-with-broken-links t)" + "--eval=(find-file \"README.org\")" + "--eval=(org-texinfo-export-to-info)") + (install-file "osm.info" + (string-append #$output + "/share/info"))))))) (inputs (list curl)) + (native-inputs (list texinfo)) (synopsis "OpenStreetMap viewer for Emacs") (description "This package provides an OpenStreetMap viewer for Emacs, featuring