From patchwork Sun Sep 17 19:39:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 54005 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 EA6D627BBEA; Sun, 17 Sep 2023 20:40:13 +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 F404327BBE2 for ; Sun, 17 Sep 2023 20:40:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhxcd-0000wR-67; Sun, 17 Sep 2023 15:39:59 -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 1qhxcZ-0000tQ-7q for guix-patches@gnu.org; Sun, 17 Sep 2023 15:39: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 1qhxcY-0002pS-Fh for guix-patches@gnu.org; Sun, 17 Sep 2023 15:39:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxcg-0001im-7J for guix-patches@gnu.org; Sun, 17 Sep 2023 15:40:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH v2 1/3] gnu: libosmium: Update to 2.19.0. Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:40: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.16949795986592 (code B ref 66037); Sun, 17 Sep 2023 19:40:02 +0000 Received: (at 66037) by debbugs.gnu.org; 17 Sep 2023 19:39:58 +0000 Received: from localhost ([127.0.0.1]:51494 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxcb-0001iF-Ow for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:39:58 -0400 Received: from sonic313-9.consmr.mail.ne1.yahoo.com ([66.163.185.32]:45274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxca-0001hy-73 for 66037@debbugs.gnu.org; Sun, 17 Sep 2023 15:39:56 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694979581; bh=gpXTYCQP3L2RXNcAVFp9Kq6pNtpoGe4BOdm5+GQlhNM=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=sxZu5TNvXEc0ReGPmSM3Jrbro0rHMVTFt13HeebmhOoCfuhXXHV3udrh+5Cv0/jqhnEHxk1QeHB+GjzUK3IKh8+P6a5OHAdhP8HPJOVe8DNAuFp1aRCafj4Tv0PaAPqxrkK0HFiLh1gHLu3lNF08B5ni7v1Fysxhrof/beeYHW/oxpych/dLaur/AVj5xGs3auEWSRDZ0GJcVhY1XEC3/IxPFEpNVN9fDZwV5J9IOJkEJKK3rOJn3GLchw2/d5BPZ88TLvbflwTK2Uo3hP3oIOIIJTih0nzhE4/xziUfIh/nZvG82ZVpxtSX9li6V5fj2vj11SGUWNM/Ljbrr2j/Fg== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694979581; bh=sI/ElOYvcS8u9/WuRDoB+dNFtnOWPhFn+o2DQedwXXe=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=VudcTUkor72tqIt6tpew26+J6qBza9QfJpXKk0Q9FYchPcz0yuUT0zUoTuIN/7q0XbRj2zL5f1RKPhsCmB9KvccKoHaNC5XK+eQADBpE2OMA3gPdyxaF855Ix4dZpdNHex2jHiOcvIVUFgzQCu3DLrJV962mcHkl3TW3Ya+2oP8H9+hi/Pyfxw3lFJb7pT5dEpdVhyK5kck/SZxhyyr0OB7d9veAOo3TrPRtYwx9D1iCQdCaJF6hNYDzhPg2hIdAnlrdrYWC5VoGR7Pf4AF2cKW0ZF+qw1003+4/fkyOTvQHmewIcLd+Gtl1YHji+Bf3ihzWl6gEw4nvmyjzYC8qAw== X-YMail-OSG: xM3fyXEVM1nVNyqDpqnEyMAjm7OwHrj9C72g1v2EjFXGEkGnhnQ1vbXq9D6O62P ZkubbDJ3LgqIbIaaxNT5M8MyNHVFE6dS0TAhOrtKz7g2eBFQEjK0UkeFpUjb8n6OX924PKMwpcH_ .IK.a7w0U36mn0LZtWPCrUwURjwMOYlGsGTSvyW2aHlHb3Sggj5I6A2D3S5lsRaEiksKP_HEE6E7 b3h5YR52jbZfftdy629Yz9i_pt4VEr70A2_lfE9bSlduUrAWB_8JWreeQpE610cYa8vLVGx46Bcj mwvTlnC2dRNWr5nMthJpyKeO78hhA1CafZ1syB9f3rgb9gMEHzE1vvF7P_KF70Mnp1LHjDTzOu3F SWU0EE3eGMCFfPuPEPce8YGoYOA1NhldkOica9zk2Qvy2pdel49lt1YhLlWobw8EhTI3yJVQEpuK SGYzCqeVNRmJcLD9Cwwz455lAENUEXH8PbAqgG6FJbanOfHOugdaqOg6w5AJpxNqCqjdSwBH_iPH fvZOuTuPLRp_y4dTAda.AOw1e5fojrmCVQv_1xmGPQI.oBMMRmVsZBW1LkR89jAbZIoDBrUFDFAk iGp.yUr45OI3al5.CyhMLRZQVYYEfNyGjVLo99fwybfb2oZSb.fX_ojw2T.CSY1OR8ATA8GnTcGJ HjbLz.NSSpsfjt7rtNSBC2Wz8rvT0R4_NmnBBGshOsou7nZiqv2RN3qEsvh2WF1Qx04fuqBRuOBz QGDmdyqkRFvKLIHE6L4l3QUTZPLW58HMN3sYD0DScMXDoLcp.j0RTIbXnBtrc6wxmhcTL6K53G0I 4KZRVvdAid42U1gdDDSuoJmczEiMQfL4nNcdPC5GKlRHDpiE5Zk1ImWfAKQQ9h0vNlPLrz5weDlh OkiOlCDOAhHDBykhmxeUaW6YWzKhNHIvMrMk4XpZGUcHFn_zRhxdHDU3xOtuXFuJ2RSLEbO_mwkE 2F3SEuosBkaUMtOBFzLN7_HYafS_y44aXLCKr4LVXm2pgWbHjtfxUZ5230U8kO3H9BZ.HfaFa1ia emughvjA3gK6BHPwYaGEn7nVzF6natchSjkzTBjRgNnDJpvvCC7MuElTm3V7keGqnJtszKzna9Wl gIY4L09TW8_BhNKr9dOJQRRIZ_SM_heaAFMy.fWAUIuc1sn2A6kzxChuLlEYJHtBMnI1zanF_oWC uL8aWYZ36ujmUVG8r6d5jZoRfERzy4v73KKO62yNHjdExZ9PjhOWRl_dr15oRkqR.bnAyoMHDK7Z 1QlocUhuVtDyfrtoqVyBBUYkY8sglwgwsEhs_qGmM2O4B6SIMlemhY85T.NbnVBYEd03mnE1bjof Kw2wkNEifER.nm0NQuG_4KE7dLuKEoGUAPQX2KTuRo5nbsWWnIbrGzpOvGWLVuyz3Epb4p917AYU ZQ_rASvwBrI8E0WkJ9vWHP6CiOOwnrL8Z3hTOkatWIy3V3WBJQc2f_pTpUFbaelaF30dETi8WOiw yRwPPsTPbvLYHbTpAfu974.OEe_spj.U0KS4kZU4vM4fCAKF_nrXq4LfrrJTFYLNm8Pkjd012SHZ E8WLUc0gb.ezg_.DnKQQTSHLMWwBI_RrZg0oiRs1.qauF42d8J6rlf1CHsGnTx4Q7.uJFb5Xzuwr EaYqgUT9lwIavJmsrwut3uGZm9koFU9_pK4Lih1Pv_70Zm99aJUAYz4CH7Vbwqcrb9rM7ncNJUe9 _vEvhpiy.WHxSEwMFmMruCs9.7iCPxTO5H36nlVMtmhEYA_y_I4VUIAHtyRJ0Sh7FLb87gYYWDzB v_vEIl59DIM9lHF5361fH9uWv4LNCyHf9cvH7A4hUjRtbh3zkranWlanK6eWMfUmM4EfTnA2S9nF rIUhCS2c8tovJsbf8Sbh0X.8uAQKQj9JhBQhFcbInqMI2sbr7mciIHc94kxMHjSYuF43riDOMBDD l1Pu5zgI0ktvJIhB5WxdATzH6D0RB699U17oEIp27JvySNEDW_Z0gN45KF57.i6VgJ0sPX9S.tZs TiKgxsk2L8ZxjDijwNLr2NfMEcDEH8HF7tPKgpoYaDN_5y_w7rYvRpIX5pton0QQVDmnRgV_.u3P lAQgKK4TVxd_Ihzo4U6iC72xlqLFrqAc.CwU3IlPqmgTMIbBfQf0z6eyTJlnLyL6F3F9yp3EV6_y bjUkSoxhrsFoeVvCg9hTY.b5Ymqb28KTwwD9jCm1Evbo5NpdfFApuNDSFgOziJycJujYZsrvCmA- - X-Sonic-MF: X-Sonic-ID: 0200c3cd-5e55-445e-9801-ee9ffc8e20ae Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.ne1.yahoo.com with HTTP; Sun, 17 Sep 2023 19:39:41 +0000 Received: by hermes--production-ne1-6cbd549489-84thk (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 730d91ac318f6daacc0c4252738f1400; Sun, 17 Sep 2023 19:39:38 +0000 (UTC) Date: Sun, 17 Sep 2023 15:39:35 -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-7, the last version with PROJ API version 4 compatibility. [native-inputs]: Add graphviz-minimal, 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..f41ef826fd 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-7 + protozero + zlib)) + (native-inputs (list doxygen graphviz-minimal)) (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 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+))) From patchwork Sun Sep 17 19:39:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hendursaga X-Patchwork-Id: 54007 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 22B0027BBE9; Sun, 17 Sep 2023 20:41:18 +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 C904327BBEA 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 1qhxdZ-00015x-3V; Sun, 17 Sep 2023 15:40: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 1qhxdX-00015Z-2o 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 1qhxdW-0003BB-RB for guix-patches@gnu.org; Sun, 17 Sep 2023 15:40:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qhxde-0001kh-7o for guix-patches@gnu.org; Sun, 17 Sep 2023 15:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH v2 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: 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.16949796036643 (code B ref 66037); Sun, 17 Sep 2023 19:41:02 +0000 Received: (at 66037) by debbugs.gnu.org; 17 Sep 2023 19:40:03 +0000 Received: from localhost ([127.0.0.1]:51499 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxch-0001j4-6P for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:40:03 -0400 Received: from sonic303-22.consmr.mail.ne1.yahoo.com ([66.163.188.148]:44136) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxcb-0001i0-J9 for 66037@debbugs.gnu.org; Sun, 17 Sep 2023 15:39:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694979583; bh=I7BKE6DgHXuFACHDMRpQLNmEuEgii/OzEaloRItpIGo=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=mibfbvZhggz1XA0N6orpLWLUcIzQOhQrW4VZ0O3lUgEEGTOQ5fT6uHtlTu33KtpwBtLWV0UVY3LMvkxoLXFtxcB1am60g1HDOG/2pisyTBQBtdwlUYovmTeyuy+N4z0duLz01ZZu3+PVUobvO91HJYsfzHBU6jgnjsEpGseyNlg6FwXrBTlj7oGtU/xzwbNxwi9GIiX23sVIo0oK9AwT6yN1cRd90YOuRWpzfzCQUJ9oNCKXLU0j60OktSLxEe+2vVhK/UYzxZ07hoefYSjK+j4kE4SQYcBzppQxY1kAnL1ZxbABEfVLY+2RllqL6gqtqXXPvcjv0BY3lEaQgEeb/Q== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694979583; bh=rjPd3TgfBQZAfcJ5ISK+6xUj9aCWRlH2TnnIvIE/h+h=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=cWS6yxcMB23JlSo8MIaU2b9woE5g+oiAjEQo4bt1DKXiuahYGtwC9pozpHUthy8a87O/EtZz8i83sabaB6tGuokuCaF+yzd5cNbr9WzzY2Mti1yJXBURQpBM8xmetiSeSIuCtGGzKzeUHDj3Jui91iOzEupjMchZhfSGqgFvAoxqTWUb99LC1pR+hSCSC5NK0obJwCMemvXoRyXFtNG/aJ5P5TRNDDvkTc4e57ziIUL9xJZEIpt/ePKOP34pXPfOeCT7bf/SY3Ue1qmQduKRiEfyr95cRbMLU/D/tqFNWQm7qejvvaLHc6NTyubRn4RsGSln+lO9zJl+SgJRoS04sA== X-YMail-OSG: kZ4xn1EVM1n.AEIUXA.bKoG24KCNGNNu5FsP7hYLvKmd5Qq2lLKuSQIFW8MY9pO PEVvfPaHAZ.koSIrYU4r21HU4Xq_caMDFBfMi9_.ogB8sF3NWxRuTdqtzkKvAJ7_ProG5oboyI.S 6y9srbr4zeTfJRaYG6VjbMWPQGjxcrZxlzlr82V3zfVoTBncuywNpGf_VPeE3U8RTTKcv1FzPde7 ExlO6yygGQVgAnUMnT3be6IBENvoyH7kqaZWzk80X6NyrUYkgQg4hPx0ec.vIPWZWsvaOH3I07Tg Z6OjenKNZBdWweApUss3tpmmesM3Aejr101MU7TY8bOjHT5M4mY4vJl1gVLd0cLQkwo_0MRFx1mN kwae_nQqTAHT3wGFL0GCDJ0VwVeWpp3n1kIGAdwZyYcficK_JoKBivmVUUeKue_3aiZOd6.oQdzz ZFAJw8FzA78zfvcSK9wZ4ngEhkNlCubZ0VYjzCATAGRUMWLfMULYjco6mi4VZWA0V28b9KmVH5Vu lnpQIK28owHEvawc2B.JMz0cl6bj3F.b3bYeRTnDmkN8lcivlt2gyH9_DzcV0Sr_0j8h9GqvhjU_ LsWlCf_zzFqeFmZdTf1wX5P8BBUPds_9K96Mbfcx.Fdx41G67wbeF7CSgMzdj5R9slxNe5AyjOXZ 5Du3tZyZaZFIxOcfrw4jDt5h0QfZV6fuDFBwgm7LyOwn0SVjHGQYvPdmR9ZMpc4zk9g5SknLJJq9 EAc9uMaLw5w.sxWPE0IBgMMctuZKLbdhNoW_xQKkYuKb3yhY7S1VOu5SFIwQamz4nZJMueKaVt5g UDT3dH7vsJrVXIJ8niJkmiGHTyMLCC_kFCyT2nBEEAECx_a1vDqd7kMyUsvJgwixaXZsDpcWP.Qn caV67GZ6ZvIbwda8yWlwG6T2BgBFsy_E6oiStQVf0mvCr0nb67HFLzI2lyLgx55l2s25_vcXyPz. syCzUAB3xu_Co7jJJSQ87PPH6K8LIWvgI20zAUjo.79AO8lUjV4ohazsDcN72vrXLxV..sP5asI. ZIaGJUYnm7iv7EZeId0aP6Rv6pGWz0kiI9Qil7y4kZfflJZV3UWCTrnca9_JJnNYMgDoeeo5LzrY 8TKUZq7JaBrpblc2KJan8iPZtUxTqaX7YeVDgscLpMCSO6PBcd0hK4jRknR1R7HUZ7tn9qgqHKi7 wNpDST4Up4uQDm5TeCWMESkNA_5baCDQE5bEnrNVR5qMVA3wHwK.kZ_VXDOwKh53UjUqfKTsrDOY EErBJk.Aw_DqHN4Ipz3KBDgBjo4ZTj9dSxI8gRGtXlnMnJDQGgn7.LaMTggnEjL9H3skf4kK.8K9 85RZK2DwOfWAd35gSYQSggulGTAkO7.oS_ynPf0__pSQp7SbFyHPkSaAoLO6zO6E7hcNcFJvplJ2 BspgWgJ_e6NTACJu.y0lS0kRB.P4i3xLWnnyHOj8XvBMQUVbtcV2mg5Q2tNIcc1pvKF6ZL9dLVNU LIJrbQTbjsx9566X4D.aIm1FiRN8UmMR3lVutc6wT86Rwgb7XONLdJmuDDlour491TQ9H.zuWmSx CkEM7YBHcyP0Mz7GKoK_WIjA2QntEJWwpkdvP0zj3u3GpSNnA9k_njXIhYo7EBuD_nBHiGDr4F37 .8j8V8iPr7ARZq4ZEiiBrTkQnTL0ECXyf5R.hegUKn8sxrmdtStJm_Cj8OaI4Cn6CzJSYEKrmskL GHLoWovgLjC2HeZ4V0l6epno4bZNKxxfNC1fdmBwHasd6d4DWm7jxmyMGdDSkm0t2Y34Xh2d.FEi 1z7O2Eicq47fB78ZNg5U2QhJ4tRPLtz.ajix4.tOMPlLE05jewN.wHb_LDgGR.BmHjYKFzI3M4GI kfFfGpVs.6KH7WLIfnJlHs1m.d_noLyih_B.08.3vINLTgjI.qQMKzHAl4Mo.nHNmKpLppXPXcNN aMAkIEexEvW2PspOlA0CukzlTxvTGlIfb4c2RblSH9xi.83XORVmzYqnBDnASGUcFA2AgPftfVi3 OKHe3Ms59sECszW79Acw6um_X5gZCVLZQrEd3Yk_mQw3qILl7pefoRR5RzrblYBCegEAcAaPhSDE 0A7DcK0ceqGNcm63mj52uhWpUvevMz3RaZsoV5hAvlGHlAVSMdzm3RpAumHVaHmzHbl4iYUvz59e OJD6bDRJsZym_.uW_3i3RSue4IVHJqBTuw92qUePzyPOHgpiskvFaMUhwcchBrEO4FSm46SyVNg- - X-Sonic-MF: X-Sonic-ID: 2b8751ce-1376-427a-b6f1-050182df7bff Received: from sonic.gate.mail.ne1.yahoo.com by sonic303.consmr.mail.ne1.yahoo.com with HTTP; Sun, 17 Sep 2023 19:39:43 +0000 Received: by hermes--production-ne1-6cbd549489-4mvvz (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 0e6847f180efb169b360a535fa20500e; Sun, 17 Sep 2023 19:39:42 +0000 (UTC) Date: Sun, 17 Sep 2023 15:39:37 -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 c7ee877a1e..8ee3b1a7ec 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