From patchwork Sun Sep 17 19:39:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 54006 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 C13DB27BBEC; Sun, 17 Sep 2023 20:41:16 +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 B8DDA27BBE2 for ; Sun, 17 Sep 2023 20:41:15 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxda-00016U-Qx; Sun, 17 Sep 2023 15:40: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 1qhxdX-00015g-9r for guix-patches@gnu.org; Sun, 17 Sep 2023 15:40: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 1qhxdX-0003BF-1l for guix-patches@gnu.org; Sun, 17 Sep 2023 15:40:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxde-0001kp-PC for guix-patches@gnu.org; Sun, 17 Sep 2023 15:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH v2 2/3] gnu: osm2pgsql: Update to 1.9.2. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:41: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.16949796046650 (code B ref 66037); Sun, 17 Sep 2023 19:41:02 +0000 Received: (at 66037) by debbugs.gnu.org; 17 Sep 2023 19:40:04 +0000 Received: from localhost ([127.0.0.1]:51501 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxch-0001j6-PE for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:40:04 -0400 Received: from sonic314-21.consmr.mail.ne1.yahoo.com ([66.163.189.147]:42885) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxce-0001i4-87 for 66037@debbugs.gnu.org; Sun, 17 Sep 2023 15:40:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694979586; bh=w5OTPfsTonf/QwwDOw7kLBZj6NzIq2jl/jdem89OlJE=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=JNt3izfNLrQAxxOM6BMa+XC/aBjPKKcMCTC1gVSDGglyE59heH2UrXWw9CQGRDQf7Z830nooZowPMJZprtkS5QG753CXsSHRx4lR7gvToD0mwj1CkvimBbKJP8W+EAiSrzmxBT1UOtaONaqs2Dz80bfKkHQwFUdn6q1R51eP/Awthe7OXvGy1/7b8p1t5eNgZDfp6hBWhwcIb4WZWx0eq/IWrLCC9M3+lTpnJ5AIxXqlqn++6/ykLR0tYvJD35K/3ibODV8nd+pcBfWu/NVqXa+JvSRTJiIEUj2LT87AuHsVmMHNTQRDHPbILrp3PgaXU21kNRxe63ZQvCW9YEvfWw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694979586; bh=Hj6KvLjw2wY3QmOzY0WD3hAC+quRrslxVBYsNnCePQW=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=HbKoe4OSoeOVTQXvzfP/iv1RjBpRfCkhV3gtEDICo9gpbQM+UsxYIwLi3gaMhJ6WRv1eeyRQfkW06menyPfHzJNI5X+oc9MdrNa3/nqyg6Z99fnXL9HxKLIXbVzbgO1FkCaTXYp7OtSdXqrZO58jWv2RQhrCeCFAgySmuizrGSd748bzFgiBWy0Y0kDgKYNOglv6IOt+4mPegT1egLRcBfnJgaevlfAMsNyL7HB12H6/x172fSipcY4erwh861rDtlWb1nG2EXHjwW7fCMCLeJBHfk+XMVcU9epYxKf0ZLt6YZOsxZxmdKMecg6RDsIGBTFKbMaNxHKWY40W+D4QTw== X-YMail-OSG: WUFiWGcVM1k.PsQx6VS_R.nkwR3Fas0ZAhQ8BFV.5c7xwJnyvGdT.NemJBOyVs7 7rQ9zp_uikQ4.tNXutdkcnNUC6plMcFnuWjyB0MQWE5PoXVuBZ2UKeGG8BQGBAPkuTdpi5z6YEh1 mQoai0vC5.idgDju8AA5QD2ODPDEQ6lPxQZhBwHneTOCaZIsEe8eFXMvlInWqDU_0yBAjBFG6Fbf W4sVcMQJKM_lmnsFOpJTujj.wy_vB3gSTr8oqp3h.i0zbUgvoWLqmJfWxRjp4R4wWWfTxXZkV88p yT8i1.pkcLZPjUiUKutEgEd.pSHTO.b_MXRDGvEZPb1wXf7R8AiFopgIqLIbIXqs1qa1CEsJDUSx ZYpjzje9t55xxq7dr4XudfB5GH8teoFTK9.4wHGLWtI8tRoyf1b5w3EZYXSP4qjOlVAUiL8EzW1q MFB2uFoVml3LCUf_ieWQ_9_QETuDOi5mq5zodkcLcGzXW3ePeiPEkwpjR7vVwZzGIPiXVYsTjd1S 73R8A0bvIiWddKHNhXlppeo8XCZhSAJOJXT.HsjbbIv8d61nEpk8bsyn96VpPGT3Y6vZ2Ywz65ph 0QAAx.boPnfYPIt8YC4PC9pBxG9kxtpi6lEXDQP4QTXOB1m7v5hGTV46qmVKJmTkFRl52s73cPbw e8cfRRn2fFB51KfgyLG1ZQwODzcqV2qk04mthd5RZtWSDPorOd.wQ8PPafwYOM4xVodtMZhIHQ4g LHHRhTo9MsoYZik0FepKQZkEBRvON0kQHPeEBOiEJFTpgRSMOn9OTY9KIeahQVYakebzck4PLTIJ YNHQa.jGwRacVsyNdTnRZfLTtTKSFfgjdnR4VoAWP_RQY8Y9lJVoj.GBXlt48IbBvADcubLvTCXT JaytlebKn3cn1L3AotPivHNOawTE_EEfAmoT340_J30V6RSLdM6HptUcw4HnGUVeG9Z19_IzM0.Q 9IjA2y7Z8R00hrqK2KkTfl3tgIv9XdqGg53LQy6rxSyeoQ5JebqnAvmWksaC_J.Zpowtv3oxwA2Z w22hwwg0Qluy7.UHP5ngh3bXN.edNw0v8KO_odcoPWbbrAyPh53b3VJyTRlARetmdN_ho1qe1zrN tygOt1GUY4Er6NmL42CB49UXG2SJ86f7uzgJQi..CVSKl.2Ey21nP8hIAhwvnQQKATWqW_POoHrD s0cuNgK7KkkzBXp46CtuDnPM8FmcICIL_vekbP2h7ej0zhrnrFosxcKW9Iy3uQ4mj_VtBUY.FoNv qzDEYALmdj2xutXZeM2G9PtpUvDiLiaEMEiCbLt11Rf4C6qjY3HQlwvNwNUVkpqQ4WyHwAQ5cU9X 4b4FxS.MuCE.9hk.6MpkTJXjlFxzg8vbug98NoTWVcbojhxXYUvgkBwZbH9T0VFHISIlesXxZU1K bbDDZCk27S71opJiPtWZa9klZ0AaOS7T.ZBM2NpVJhNk2NoMeppiZPpzIbo3a3Sq2pimUnpTiYKa VIimbkOwixB3BKL.3dMHch4_75tCOwkEC980YxGAiAWlQIpzdySD5i.dJ2_WGJ5jTepkcOzZoH_T 2siRreKJNDDKyjznl5HU849OfH1zjeLNDske_G88yd39izfFQKjCFhML7jJXjn9WpJ2Y98AhNNgD HrXTdqx33S5pEaPqN1roxknG8muCsT_Pll9_N.Vt6XGW.1RzFg0qKimTLKF9PI63lks9Vu_bEDk6 baCbvYREWON7.4SPkbv6EXDNE9Lo7a2yMaeXh2koEX_reFXQVPgzhv6_baakN.4R90h1RUIniRFX 3lc_3DAikTSP4lP8RYpTxCAUE8zV.WjP4mKc4ZySs6pB52MpzT7qt6R5I8Bv.UFX1hdMb4xaKy7D qxnHCIMmCW.17YKhpQvi2EKqGj.f13gkGfp4ciWGpEzX_NFnfJOXgP9WeWpmaiPvE.uPaU.zAQ.n x_W.Nq8ffa87qt2ovfGE.Oc3xyL06mddQtx.RhOL8w9eEH6gNvjzm_D3Fp7inZ8GJo2Elg7h6a7s 2_fDKamfbD40zGYc7YKLp8bWb23Z_lOX6jb105yKm3SDAv49iw6LAoXgbqyWmYKsh07h.h2gqhwc VVpEHkDQejD5sbUgtsmXL1c.m.nJ..W1Dsun.JYiFJO9M6ghXARpB8YgQbaWw3G6RomsaaHndy2p aV1uZ1uYgb4FpZqE430TrZvo6NUzMKuq3HxPySJF2SwMXhjtbmvQ2Gmfowb5cqnTNMbAC4jb1 X-Sonic-MF: X-Sonic-ID: 86a83bcf-7636-432a-b073-f83333dcd97d Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ne1.yahoo.com with HTTP; Sun, 17 Sep 2023 19:39:46 +0000 Received: by hermes--production-bf1-678f64c47b-7r85z (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 2cecf932b9bac054da0ce7828c37ace2; Sun, 17 Sep 2023 19:39:40 +0000 (UTC) Date: Sun, 17 Sep 2023 15:39:36 -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 4. [inputs]: Replace lua with luajit. Add 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 | 71 ++++++++++++++++++++++---------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index f41ef826fd..c7ee877a1e 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1596,43 +1596,44 @@ (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=4" ;use API version 4 + "-DWITH_LUAJIT=ON" + "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_FMT=ON"))) + (inputs (list boost + bzip2 + expat + fmt-8 + libosmium + luajit + nlohmann-json + postgresql + proj-7 + 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+)))