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+)))