From patchwork Sat Sep 16 21:21:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 53968 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 6781127BBE9; Sat, 16 Sep 2023 22:22:15 +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 43B3827BBE2 for ; Sat, 16 Sep 2023 22:22:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhcjk-0004nl-HF; Sat, 16 Sep 2023 17:21:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhcjj-0004nM-H2 for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhcjj-0004v7-9D for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhcjq-0002mZ-9w for guix-patches@gnu.org; Sat, 16 Sep 2023 17:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH 1/3] gnu: libosmium: Update to 2.19.0. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 21:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66037@debbugs.gnu.org Received: via spool by 66037-submit@debbugs.gnu.org id=B66037.169489928510622 (code B ref 66037); Sat, 16 Sep 2023 21:22:02 +0000 Received: (at 66037) by debbugs.gnu.org; 16 Sep 2023 21:21:25 +0000 Received: from localhost ([127.0.0.1]:48639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjE-0002lG-DZ for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:24 -0400 Received: from sonic301-32.consmr.mail.ne1.yahoo.com ([66.163.184.201]:34761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjC-0002l1-NT for 66037@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694899269; bh=P9+zizEshpaAAKE5nUudTgorEoD+tqj/32KHJCqCHQI=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=TQIWpdZolWmZtbVbRnSkBKCKpP00aynKGU1BPbc1PZyLTJu33m9PH4KbO93xpwbwNFtMu16e2RgGJ0md0zBKYsbFAyI5TdTpAmFBTK07Xz3WP7q3ynJTwfDH+6BbpoPptfzRW/QN4Vu9HJnMX+2PuMLYL9yj7K2FCPamNpsCJ2XnyMDLBFwUotnRPNfduq98F2dQ+Ezhtt8KHLBidz2JHRJs/vp+42D5lCvHW/bmKejaVyv1CnIDXyiP+MCAiBacns60eroxebmVKGn7PJjFOo+VQTQ8+V6pZ1+ks3zmDW5brlMT497YZmP4acxlHd6kZ5la3yhooRG5upxZbjTO9Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694899269; bh=Gw8DiEZ1rFLIMQRvkglO18fbONxfgAQW4afdU4EdW8V=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=oAWR13oAf0iwwVAqRfn0IGgPEXbNPD9HxV9UbdcxMNMbRh428t0Ss6XUYlrFE7+/8l08I8jdNhOZoLAnUwx0kgO3G91pfKFo6ZCx15zc1JYF9m7SRFjOo72uXI/lXlrHDKcAgXKXnspY8as7Gx9OVMljQENsPyLuvPCYDWseq3xNbJoNXTsZyQpBKqJ1b/WKdDygWYw3cgokrVcZaA+zr7IAeHJpXdl3io1cjHMrsFSsiCkAdoce/ph6p3/pQ53r5CEl3fHjdyLM8yxXQnH4gy0FdX7aYN/B1ZqYbiVTcrLa+ZoIC4FH39uLI2ghCJAvYHk+THd5D6RJyz23QotxtQ== X-YMail-OSG: GQPycssVM1ma3PDSLeoQymOyAincVHawoCl5jUwtho2ClPWS31W68RJ0yTYLXX. DxMrOlaQUMeB5e0Lm4NbHtKlBtzRDc0MZUh.GCggtGxdsq7JjrPbv6upbX8Hrht__ukpAVGRbQyq rRZc.f6QhSLgHM1dD0lt_mKdAAvkfx813ipQ2D91TDRAcnX24r2KhxeLS9um.yDOglnNyvgAC2Yd C_smRWuH0HWWiVkFN2.KI_.TEduXRVn9WHe7Szp1ZEwVelMDM3O1p3UcbCw1xLmXM0dDPrzMr3Mr V4VtLP6Cpl5Hg0lGkubG0eJKy5ys3DWNYUD54XB.BTjJ3QCoiidR.H9Xf_A9v4_c0IlJL7znVN38 tcBUH7Pj1WjWSPOuDQ.wPQY7mLRAl8ivJhvTWiHhk_bxBpAyR3fN_HKaKrCF4nsu9ZLTv62gq7ve LI.3aAGoUOU9f9a76BVgmysvhouCT1JqkMcwXUnd4DLZWucM18NpajnomdYCiZnOW10epAmAiapu yxC7amyxi0mZx0NefdZT7lNh5li0nFu9RLDyW3HivWtnND.6XY8hd_wOXvIoY6ajaNyPqFsfj7bF l4StTHebg4BQb9N4XyUbn4zTBOXs5MbRsvrL0aStVyqqAzYGU6pRntKXGkv5oRm1B6KT6kNLcoyU ZPNVz638XTeqrxidOxSRXcyBMdLtuS36otCOHw9C.Sky8StpdJ0ctYuMmrRdGHVhsJq6HLXSvvyE etBC7WMsJi__vyzf92Hxs2xGDGiFqYX4G6UvQ7CFK8N2F_MekTKLT8YafgQT10Pon4Ck3w24iIJj ZVYGu7Wzc6i1zqteojnfS62qeEZzj8jyNsalGho2bLjmuWsn5uQ2flbw7RAi2eRys6wNrLiu9_2d wlUmUZrL.7jlP4TUSkh.NTVhf8k48Y8GhCDwUA2wkbY.Z8RaH9K11zV2tFTHufMts2AGVI7TAQr7 0YBBTs6cDNcU1Pl9IWqK87WY5z_TjmUVMmNT6LIQDCPGhqCuT7iJyUUbMZkGF5rsLx92_xUDnVfh J46fzIQXDw5WbjwVEUa5NOTrGq9pFwhw0V1WnKYWbO3ijxS8.HveqYMKB_cyrbbOCZqRhnSvnDFe hci0nJYxyIu7JnS6DZCwUwoNQW9nSgdCTkPOmo8G4WAgPJDvncOpT.ZtVILbwz0GeB1WFQOyhIiu l3Mrm3fB56TcaMMgsjhQ5OObiYS0YTEoMgf_6Qq2XdSsqlulNPr9FntLCljORu67Zgl7we5kD8u5 X4P7dl0EaN.7F5nzClo6KuTaXXs._1nsdlpL1aGAzD2lp_fYPoeABVNdK.yJcc1mO1jbA3jS85Lv Z8H8hd9JZswKQudYQUgfA_ACRMssSR6hsPp3ZLkds2hMbWT.77fJ9nGB1F1vrkzo3NCjY1XSiI.i _uCLR.L.sJnzo.doYoVZO_asPTQlsA7YXs30Ln67hcmfA2yHvPpkVXloCqctySz_BkyM8wsCeRlb 89I7xBuSFAa2ilaQnQX9rK54.6gn3At0djeGMB88pkA1VxLS0GgbiOkYN7vFB5EkakLxiDWxjQYN .O7D7bNlOpbLFMOjBYt8REYsaiUx3cU10YGFvo1Y14T.Qrekx5tbmuGlYiVww3L8biriXKWKuT2G 6PaJEKx4h5b4qJiuafJehTqEhb8YXOUTM1nvTOaukazaPJx2vjrpTn.YW4j_m1VWTovak4MSoAMP rqh6CltVpGl2T2s_jUaAxI1_y_skZYnB8xgR6K.oshucUk9n.KI5gZWVx6YGuoAWbjp_NHDWdAt7 k9wdNdVdAjsXNgXn3NawhCFRIcOq7j8t_pg_lW2LlN_E5hJ9sZPQHBfrvZYNQALlAnRC9k1CZZer pKSHCLnh6EYcwV5D6rgQZxwJuGV6NM9zrBxTGI3B3q_VEbU3IHHdJ4ByKeAIkF0Yim4oXYHB.hzY Y2KVlrLOdT81h0mlkmdf3UuEzTv_RWmTrtFwD.E_tEXdRURV39wUdtN._s0fcYvaINfVQRYAevjf QH6YcVElD03hToRI8DlYQuygEWDdEgA_S9RVceMnjO1X82r6OJxd4GX6AunOnZAaGSucmSvsT0P. DXlQfX026uvvTqVkkjy6NU.G14VFWxgpWriR1Fec3ro.RZzq3L9g28yH9dKUJjyWEmPr45sMfmiF P33QWWiqwZpneX9P6PHk88Db78K2pdZxkA8N1cFz411PAgUErSYzQrbWQ8Tn1Xmo5_ncf6eEm X-Sonic-MF: X-Sonic-ID: ef9958f5-b794-491b-be61-414332e12e45 Received: from sonic.gate.mail.ne1.yahoo.com by sonic301.consmr.mail.ne1.yahoo.com with HTTP; Sat, 16 Sep 2023 21:21:09 +0000 Received: by hermes--production-ne1-6cbd549489-4499j (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 589497b75c5fc315c6add4bdb617887f; Sat, 16 Sep 2023 21:21:05 +0000 (UTC) Date: Sat, 16 Sep 2023 17:21:02 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (libosmium): Update to 2.19.0. [inputs]: Replace proj with proj.4. [native-inputs]: Add graphviz, to build documentation. --- gnu/packages/geo.scm | 48 +++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d702046865..3364fe6583 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -89,6 +89,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages gnome) #:use-module (gnu packages gps) #:use-module (gnu packages graphics) + #:use-module (gnu packages graphviz) #:use-module (gnu packages gtk) #:use-module (gnu packages haskell-apps) #:use-module (gnu packages haskell-xyz) @@ -1535,34 +1536,31 @@ (define-public python-metpy (define-public libosmium (package (name "libosmium") - (version "2.18.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/osmcode/libosmium") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0fh57mpii1ksacwfx5rz213j896aklib53jbybld2i517q2mmxr0")))) + (version "2.19.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/osmcode/libosmium") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d69xzd29hk846g049y2g668mr8kaf05f6a26s3qn6az062hxfa7")))) (build-system cmake-build-system) - (propagated-inputs - (list boost - bzip2 - expat - gdal - geos - lz4 - proj - protozero - sparsehash - utfcpp - zlib)) - (native-inputs - (list doxygen)) + (propagated-inputs (list boost + bzip2 + expat + gdal + geos + lz4 + proj.4 + protozero + zlib)) + (native-inputs (list doxygen graphviz)) (home-page "https://osmcode.org/libosmium/") (synopsis "C++ library for working with OpenStreetMap data") - (description "Libosmium is a fast and flexible C++ library for working with + (description + "Libosmium is a fast and flexible C++ library for working with OpenStreetMap data.") (license license:boost1.0))) From patchwork Sat Sep 16 21:21:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 53967 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 8062227BBEA; Sat, 16 Sep 2023 22:22:07 +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=ham 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 3880927BBE2 for ; Sat, 16 Sep 2023 22:22:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhcjl-0004oL-PS; Sat, 16 Sep 2023 17:21:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhcjj-0004nT-Pa for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhcjj-0004vC-HI for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhcjq-0002mg-Nm for guix-patches@gnu.org; Sat, 16 Sep 2023 17:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH 2/3] gnu: osm2pgsql: Update to 1.9.2. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 21:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66037@debbugs.gnu.org Received: via spool by 66037-submit@debbugs.gnu.org id=B66037.169489928910645 (code B ref 66037); Sat, 16 Sep 2023 21:22:02 +0000 Received: (at 66037) by debbugs.gnu.org; 16 Sep 2023 21:21:29 +0000 Received: from localhost ([127.0.0.1]:48643 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjI-0002lb-TI for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:29 -0400 Received: from sonic316-21.consmr.mail.ne1.yahoo.com ([66.163.187.147]:39942) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjE-0002l3-AH for 66037@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694899271; bh=kgEzh5mI3Z2vFN05ettiH5QB8JMxzx1Hc9gsKNoog+A=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=W1L5LjrwoyQj6HJfXcojhjahI8qsZ8oCH1ch6RWFmlbIyaok5vcvQfda57IRPImQfh9oKAFh346+3QQimwsNvXFSO+qc8N7S2wVUNO8JL4hlwUU5huYiYM5qW/aFowAh03ePNw7GOVEwRncnkhRXp3rcv1ODhUns23ntNOdh0Q5uqwfj13KZwqVkqb3EF+uvM3owTbIsc84BbcdXoDGXqlMxaQW5finbju1vYQW+R3WDR46y46ET1FC3j5JJ+5gdVvXOCQeMjeHA9DlThqpMdyoaLGP+cj8uZy2fJKIY2LnWj0sdqpZ1iIQqNki42weGz0nxthhfRsQh4ieP3l3mIQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694899271; bh=HLYLKDhtJN0dOS/50TtKcquFCgANqBm0kaW+rSwNgF2=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=m1xl8FPtZbdu+iGxpioakvSM3dq21E2ScHKdP/ZU9zt/sLxkLfzenCPQBwXd9Sz5SKgmm9KrjQcXdRcKVxBmmQcvBalpmvo87rt+Y/8HXxrAR/ORU45MUE2Bl7r4o7S3QHNwHO6bc8b5YwGtxdbJGf08/5GhXcSkRXe8CBe0n45py6YrRXaYFbcp4tN4g76iQ60WgKj9cMP+7nATmY2uGhKNoRFI+s2qzHRovjpu2hNS34z7PoL6Q3SHNPFBmdi5HD67hvHBxcEcUiCx1RoaJ9H+rlMFvmB+kcdYB+kk3RBBXs9YuQKHo4lu4BXnOlm3H7wXC/oyEGHzmmFzaGDLqA== X-YMail-OSG: pZgkMVQVM1kxSYHZ5ey..SnAZmomG65dyJ7rlzQDixQ.yGlLTjcKn88shG79.Fm d8jzFgb282rNMHVHrcg1HYRq3.bTFLUrXq5RdFj.yHPiKIFkXMBIZCEw6j0X_pkcEXQxhKGygjdZ gjVVeFYwC8coBrmQ7SWyo.V1es6kb6n5QV1to90dHUe99m.7S4Z2FMPdWHzP.5Wjtx9.rP1a8FrC UXLOe6flU5fo2zrdX6wVvnz._KAYFlyk5orA4RW2yle4MU_Ma3fqfMgF4xflV5_RAivW6olxig86 M4MyoX83y7AVutP2HDSyjdAea_mNCX00JLpnWZhBzSxrs2IMurT9FrzesTnqUS0uMeIoe_PzWwlS nfE5SnbUqiJHkY0_MX9OuTquif.gPkmvRaDgHc_nF4U6qJL53d_t8gaDGimaKLPvV2Cz.nYDOsq3 AgrdgU9Ghs0XsxyHW1LkKpV.AY7HcIt3JOh94EszEBKoY3CCkPv8Rm.xpbNMZXYl9KwenxgF0_8f X0UTw_VE0RDVjBdEZjDdJJ0V1TgVeotJ2U59cu3Gf41nyOlXIKCmL3UBrv5UMYQ.ABYbmv8y9mKo UckBXwivyOMU.auj8k9MgWC9RImgrBALxIB7UMk0COcDWZ15.OZCoyP2qfZcllX7FelNYSS3pD7e N0gtUhLAFKb3oWEK2Ed5kPZFBxx3rSx8FqwFNG1a5jN.wUXvupgNUk0IYYYqtDrSmjBDf.wZBjLx 2KhQXqD5uwpQaGawHJlmZ1e_qhGNjYDNQ5IkuM17JBhVKnz2Ps.hXD7eYYmZ5kAPFB9rFmRXDW_M snhjtdePRzjWZ2e2FNbFaTbSYWMQJV6.97yuyLR7khaIdCIrLdJMiVZsRL8rYjN72P3dlcHRZ0Os 8O8_RQ6KGoPXnhtbWUOHzuxgD5QaCgS34tGZ6hUaw1q0n.fqv8ZkqtFZ2uo5pcWN.8LKl7ddzsnY yQ.j_ESdYY4rmW9BMU.78SoV4WamJrVuFnfp7Ggy5ViusP7zTymzs8eGR4uhV6yZsFULqQATTdBX v8eHRWAYRa8PJDB2W.D2xYnP9xNalTid7zD1BHP7KCERQdvb2rYeuH2hebQF0isDcb_z7QWmZGED jHTimXC64jNpks_OEKIk3Z57A40F0Ex2s4NvSTdJ7hGk.roCWX_bpelzbIkJ3ahPj1G_ybt8JlZI 5ktMcrGgkgIyM3RzgGRyNT.VOamYNL9s0iK1K35iLRftYK53bW1V0W4MyT8HlhelCgFIQjfxespm t.K_0laDU5jRhn0mGm89ic6NQkX9ffMWcVtTbnjFy5cWstBbpIeWyg5I5uSPFqM41vZL4CW48QuO AvNIooOLoKCYNEXd5bfwLDtF1HOUvcLGI2_yqxxwlqAAWlUrvHq9vPkcXRAsHTquMwMnpIxhpGt1 BONaf2z6Sc1_VhZOoLWv1giwenFhIFzpnWuWR2zbcCTg2HxBr7.j_tfQifrCzp5oubtkPYMg_0CL pQRAqzyopJlYm_HDPKsVUhIEYDR07tGXYzZuOYE0OVuhPOYHUyu9PnfA_NGIo9OpKDWSKTcPJyQo edStMxjKUEoCqlUmONUWrjCo4c_BVT.01C9CM4bUSKC0ZyBMXSHR7qBA.7EQrGaFvefYi.E8HvP9 ZIFuPze2FW75luqI2fduG74vr04ht4HBxErv_47ls9UB69zhMwHy7ytyWM.dspL_c2dqxY_5aiXw _Od_BBi5_rhlLNKjyjFUhCbkeT0MsRMzys82wAL6EiByYjpSy4ZrVna5W5sCZ3_BekhlbZX7UJo2 lm1qhHKLXQwYFbRD_2jrP0qGT0wQTACvbWcazjrFGrrfGN.nyhID4GcCCowJ__s8TugE1kK2ozAS d3frFMBMJVUS974.uH65IG8F9AOpmrCvstrpfBeNw.XOfJK5gXSKe_TzyIcal4BhF9ph6MRxELzK ErKf_nrp.zdF2ASrS27K0trUYAwpW9iS6GfBKSOKQ99RpBUtPLSNe8LSRKpzIHSwthBxcPo5Gvfv c7P8_Ewnzs4L01Bo4HEYlEspQOUGQ72JHNKBjEnGEdBlMKZMokJhy0bdx9ZVR7klGPw_ifOfTrph hep8sxeMJ5EyN7SyFCdu_dlEdOKypd31zLXD_jth63uRFmRmx1o4kcY_jxXz.EiaS36yz.vNFve. ELeN0tPY0jAEEelUg9xTtd4_3d5Prjkd952JxED8LphhMCqrWfM3boBZ8YBqgi1qf9YTyxpSC0w- - X-Sonic-MF: X-Sonic-ID: cdbc27ff-1a0c-4dc3-9173-0fc03a3f71a8 Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.ne1.yahoo.com with HTTP; Sat, 16 Sep 2023 21:21:11 +0000 Received: by hermes--production-bf1-678f64c47b-8pvsc (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 14d5c843e196271a0428f42e74f66e2b; Sat, 16 Sep 2023 21:21:06 +0000 (UTC) Date: Sat, 16 Sep 2023 17:21:03 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (osm2pgsql): Update to 1.9.2. [arguments]: Use G-expressions. <#:configure-flags>: Ensure compilation with LuaJIT, PROJ API version 6. [inputs]: Replace lua with luajit. Add potrace, nlohmann-json. [native-inputs]: Add pandoc, python-argparse-manpage, for building documentation. Remove python-psycopg2, as it is only used for tests, and testing has been disabled. [home-page]: Update URL. --- gnu/packages/geo.scm | 72 +++++++++++++++++++++++--------------------- 1 file changed, 37 insertions(+), 35 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3364fe6583..45d8f8945e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1596,43 +1596,45 @@ (define-public osmium-tool (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.8.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/openstreetmap/osm2pgsql") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz")) - (modules '((guix build utils))) - (snippet - ;; Remove bundled libraries. - '(delete-file-recursively "contrib")))) + (version "1.9.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openstreetmap/osm2pgsql") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled libraries. + '(delete-file-recursively "contrib")))) (build-system cmake-build-system) (arguments - `(#:tests? #f; tests fail because we need to setup a database - #:configure-flags - (list "-DEXTERNAL_LIBOSMIUM=ON" - "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON"))) - (inputs - (list boost - bzip2 - expat - fmt-8 - libosmium - lua - postgresql - proj - protozero - zlib)) - (native-inputs - (list python python-psycopg2)) - (home-page "https://github.com/openstreetmap/osm2pgsql") - (synopsis "OSM data importer to postgresql") - (description "Osm2pgsql is a tool for loading OpenStreetMap data into a + (list #:tests? #f ;tests fail because we need to setup a database + #:configure-flags #~(list "-DUSE_PROJ_LIB=6" ;use API version 6 + "-DWITH_LUAJIT=ON" + "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_FMT=ON"))) + (inputs (list boost + bzip2 + expat + fmt-8 + libosmium + luajit + nlohmann-json + postgresql + potrace + proj + protozero + zlib)) + (native-inputs (list pandoc python python-argparse-manpage)) + (home-page "https://osm2pgsql.org/") + (synopsis "OSM data importer to PostgreSQL") + (description + "Osm2pgsql is a tool for loading OpenStreetMap data into a PostgreSQL / PostGIS database suitable for applications like rendering into a map, geocoding with Nominatim, or general analysis.") (license license:gpl2+))) From patchwork Sat Sep 16 21:21:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 53969 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 118B927BBE2; Sat, 16 Sep 2023 22:22:19 +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=ham 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 14BA227BBE2 for ; Sat, 16 Sep 2023 22:22:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhcjm-0004oN-5h; Sat, 16 Sep 2023 17:21:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qhcjk-0004nd-7a for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhcjj-0004vJ-Vj for guix-patches@gnu.org; Sat, 16 Sep 2023 17:21:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhcjr-0002mn-4m for guix-patches@gnu.org; Sat, 16 Sep 2023 17:22:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH 3/3] gnu: osmium-tool: Update to 1.15.0. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 21:22:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66037@debbugs.gnu.org Received: via spool by 66037-submit@debbugs.gnu.org id=B66037.169489929010652 (code B ref 66037); Sat, 16 Sep 2023 21:22:03 +0000 Received: (at 66037) by debbugs.gnu.org; 16 Sep 2023 21:21:30 +0000 Received: from localhost ([127.0.0.1]:48645 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjJ-0002le-Ck for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:30 -0400 Received: from sonic311-24.consmr.mail.ne1.yahoo.com ([66.163.188.205]:33364) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcjG-0002l6-76 for 66037@debbugs.gnu.org; Sat, 16 Sep 2023 17:21:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694899273; bh=Ha32SuBU00q4fdzW2aeGIb+IIyqBPcYLYOZ+uDqeQ2o=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=UKI1MEc7dnPq/C25zQ6N8vfp46EGdXxbV7meIUA+qo58WSk5C8OO0+gIiyE4aSeWEnCtakpaq5fyzdgmB5SKwtvnWt1pEcPFFvZAJjtLUNATElnLPTrnrV/lapacDh/CE93ax3O4iKbLauMJQ8M9qTPlZX37N0VnpHbAdv1d46BbAczPB6WHkRWkdRGFCNTP2vSBwgkXFWewbWDKduG7hmFaSiVsEFBEAX+k/L95XlYFCwJfavGIdDWaX8DpOraOMYZbJb+9TKyJSv79l8Ew+auSr4Uizi0bNzBMRnI4czCTZPQMIa9/xoqjhsNgVLIDL2dauM8P1tX/OAGx2hZvbQ== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694899273; bh=CXRWeR8pvajVr24/zw4Q8UAWxNrifvGFaRcdZ8+weEZ=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=gkvFjvxAqon6l96/v9uZUNy8OJyXSoU7sWOHOKzKBpik6Qagjj9n7LKOpbCUulbRpmTPnedxO5K721SMx4fPY9oTQFIpy5/VV7tINulG+k+SplWzvymG+ka1sSYr/kK5zP0hWdzQVLyUwN6M/GdHhuVTvV6awJ5sfT38W/e0gkoi19KYiRoGHDEz5zcvf0kcoW9jnoAf06s0w5v1KzZliQ+hhZ41jj15lRY2HX9s6Zw3mjWGR0ReL8IMHWZL/+1qy2eIX+YnglCLOAhokfuQRjfv7NVYWKkyE34Io5sUvb1SgyPHoYwWIs+eW7Le6e+Dc4jgwWMTpck4uc4vpEOwcA== X-YMail-OSG: MqFkllUVM1nfB3OIEVrhC7tyysK2d7_rjYtkWDlnH11upZ_mqQQj26W69aEh8Bt j.HTxg2gU12uG7ksnHGf.OdFLM6TKMoiyfpbt_R8lHWxETQkvFZDEx6JQe3JhxZSBuue.DHzIGcx lcHtw8oGJLmJLmwYwfoULVkN9LpcFfkdsoXduP1XY7fSxHaFDGcbfyN1BCjIdkQkChKpqdfvkoRm JmTwZm1ZbG6g2XCb3WN3cPaJXfNacMvebqHXXXX_X44hkm0H68Euo8JYvNrnKvbi0w2FhVxUeN7Q HTGwnkV.iDfeL7KaBk8hhf8iL0ZZF.1IsIMEckVaDDpGMJ7YXHRp2NWNhtYGNVLRqQYMqm_NAzMT UCb4A8UKqhmP59osZ9r0paB67IHXVHqp0x.Fd.ecydc4JUSqzMzYLm1yMcjuMNfbSezvPmSV99uv HPvmN_ISUgluGpp8_7n_MNM8ITb1bkevkcQBzqFqfFbhKSAc8y1s3e.47s4rSNt89f2LaXdZ.X09 Ivgk0xcMLoq2cJ8f2fK4B3I4l72DPMldThYHi0mwhdKtrKyHTaCIr1hzWXPDHhuZG.CvqKrutBBU noC86lH.dVkPleWgfcNRePIEQUFw4dmIxbJQEUoHMlOe2oXWiWUfqOdamTKcR30NqA.1x9EHYXAo _7SW0qDAF3A5D.NeblmhBZ_df8z59sVC5gcAIzZT5Bk1362YsypGUgLVYa.pWeLuTj6l5Kh8C_hW ZZwCWMbNU7gIinwGReaT8szh3xf9HAxXC_oN2rmp78.P.D71RG2aE2D6bJB5xIIX70WPoWRWRO_6 _Gz7YdFIRwl9BA2bgZ86o9Aq7TePfBHPpPKodXPXKsxh.v9vCq2LWshegOKMVYWx4MUprqBiN1Db y4BEBO8RQkFjp.m7xdrmJC5XnMhumphdKvoq6kUIV8dFLys7BFhs_AmOpVndbKLJVMaXC4czckVu tBsGeaZcWFKx.VS4rN3xUCn2_HVGfraACQPTWqmIlNPKFuc1x2DpIFBKvaeltG._9LpZ7oKOWA9. WREW3SqCk8.m6mn0w78v3WwPEv1cd0sltf31ADghqodHe19feQdhkoBVd0AtDLRdRuRLge4Kya5L ubtiK.a7my55j295cKHP5jic4cPh9vMSV9XFHUDP95WPGUHymT49vvzMd0_5lZrvjNHbPoc_KFPk klqEZcgwqsLuzCXevE5p9PfVRm74Lsjd1fmHG3WknCysJ1aKsSgS4UStSQYbSlVVBzP06Z7HVSWP Stulp4KYDv.Cj4xD6NJlk5aF5TN1VvcTOALOjZzNvBoe093QILEZPhmD55sF2GF.anBYhxwIfOl5 JCtkUgZ4oocrPwa_Ev.ghLqszlLmSy95dFnRMc1JlpUYmqtZKgExMxPIVGcu4KAyGwf.2smVNonj Mi1JNEBJoduTNRNhDGdkYrmRR3GgUY3XJI1JjnPN7l82Lw89Nh803XzGZ4vTQG.7tEwH0Io5dIN6 etxwmmgZc4rNq3LpXBnPJzHoWzjNMAZcdIv.dYdbZ9qpUDdBGoTabwqq702TkOh.BfuF6c9V3hvf maqSevWqFw36oYwDtDXQeMPA_Ts2_HT72UAxoFOCrodJJzg1pmVWbpScKK8R1BVpdX5M_oPxJj_q bAP59dmmr7Z9rMWubD35Od89JLQFsGAY0kUtk1LPOfZ8hW_Ora4DXb7M61T41vEFaUGQrqN3xrOc 1tDsYyacySaHnLLIlgPe3R0ppMYGZUDYQp7etTpLk1NUsZFiljiIpH4oG4ygwUcPE4uYAn5eaQVo p6vFC9YskfmIJtzzNOlMO84qSO.UmNXcROEZnPNbPSS_lodffu3RHzFyoogrQxIhcPMD6BB9MAcg ylVR0jgUyq7GCmDZi47OtNl_bdV1u06pZ89o4VoonapAPoI7Y4QiGqgAUomXmk4jzMzvD6Pp5shF whVA1LMZmZg7RN3E3bmShahYRyfq42GKjv.MUoRs0JPy5V9VNcKjrGeoyO8gUjpadt1oicp_PB69 uUM4K1kYRvOYRy.1mRrpXtB3Z4UFdSyaGFX_ln67mqFvqShRxzFGkvbqN1gJgjBW6mCiTRWCDtY7 InbFZnbmabItg0OAf4YowsZkJhpKPVAZqsLIHVMK8vb7rXDCGUV4fXjnmQWEnEDjMGoHCMAhJcig nBJCNgODV7P4GMcZyBq6_yI1J70EdlaFSqHcix2rCI8QJyOVS07Hn2qnLehkPNpAYshX.WQ-- X-Sonic-MF: X-Sonic-ID: 02af0d52-79a2-4c0d-b636-159c25f101d5 Received: from sonic.gate.mail.ne1.yahoo.com by sonic311.consmr.mail.ne1.yahoo.com with HTTP; Sat, 16 Sep 2023 21:21:13 +0000 Received: by hermes--production-ne1-6cbd549489-vpng9 (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 752e098c0ffcb6f14264a17ada5924ac; Sat, 16 Sep 2023 21:21:08 +0000 (UTC) Date: Sat, 16 Sep 2023 17:21:04 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 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: , Reply-to: Hendursaga X-ACL-Warn: , Hendursaga via Guix-patches X-Patchwork-Original-From: Hendursaga via Guix-patches via From: Hendursaga Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches gnu/packages/geo.scm (osmium-tool): Update to 1.15.0. --- gnu/packages/geo.scm | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 45d8f8945e..0f7a49ef5a 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1567,26 +1567,23 @@ (define-public libosmium (define-public osmium-tool (package (name "osmium-tool") - (version "1.14.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/osmcode/osmium-tool") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0zgyqyrs89vch0qnkh9m5xq079sr2wmydy5zz4l8xbysbjf6xry5")) - (modules '((guix build utils))) - (snippet - ;; Remove bundled libraries. - '(delete-file-recursively "include/rapidjson")))) + (version "1.15.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/osmcode/osmium-tool") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0d90vz316xdl3c416nicgdw7ybw17l2125wgxglbzl7jaqngapy5")) + (modules '((guix build utils))) + (snippet + ;; Remove bundled libraries. + '(delete-file-recursively "include/rapidjson")))) (build-system cmake-build-system) - (inputs - (list libosmium - rapidjson)) - (native-inputs - (list pandoc)) + (inputs (list libosmium rapidjson)) + (native-inputs (list pandoc)) (home-page "https://osmcode.org/osmium-tool/") (synopsis "Osmium command-line tool") (description "Command line tool for working with OpenStreetMap data