From unknown Sun Aug 17 22:07:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH 0/3] Update libosmium and dependents Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 21:19:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 66037 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66037@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169489912010310 (code B ref -1); Sat, 16 Sep 2023 21:19:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Sep 2023 21:18:40 +0000 Received: from localhost ([127.0.0.1]:48631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcgZ-0002gE-Qc for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:18:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcgV-0002fx-6W for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:18:38 -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 1qhcgF-0004FO-Pk for guix-patches@gnu.org; Sat, 16 Sep 2023 17:18:20 -0400 Received: from sonic314-21.consmr.mail.ne1.yahoo.com ([66.163.189.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhcgC-0004Co-74 for guix-patches@gnu.org; Sat, 16 Sep 2023 17:18:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694899091; bh=DUdRV2YWu3AOYWS5I7tXDXt3f0Sk0E39rNQtZH/9lVY=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=jqjrBxNRjxHeWWv+pU81+pSm6fr5UnSwL2fgCVagaastI8GpW974vnk06ggygJbutsHcp29ef2SgRHqdgxpCpkG3jqdqQQKuTY502DERAUMI29kamzbUvTXrKVNJ0aalyRsIttpctsv2DErQmU760RgjOxyK4fWYTH2AHutuHqhVdwtbj4gJFA6fbXEIKltOBu6exfpQZK7Tfp3KWF39zAw4UCeK1Bio61QA0etpLj/qnOkTYIe7XrHwKf3UB4DKfYZa0l+Hw3qcG00wkfGhhyZ5AjGsWKCY8+L4dSz7mWKN5Z+/oX7P5M9vL1JBLTGzAPpCe6h5nRQWpJnnYsvu5A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694899091; bh=hnL4AhcRtOZJ0xzhpNZvEE11GXUCwCWEuqWymkt+oO7=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=sl3jS1InpoaHSGcWyfNtDKruXJGP+G+hmj0bFCwFvXbaAr+meHmu/1QkhYNt+gnUD2EZHse49jVzX1q4wcFac/kKbigLNq18uOd3lm+QMgRymxotFtNpyoEPpuZfrsboxVkYA+ejix6IQxNswsUoM80wVZwLwKPrO6QVXfCWM0wT7L1un5xQkqarMJNBzfPAgTNtp0K0/OuNGFJTmoU7PlaE2r/lssu7DnKjPzfTk4CZvXVg7amMGXcWBnDDLAfCAesxrGuG771/tXewmO776XSMO4stzjbEjGgFRt4ijO9W1FcYG5RHbU6GDNDFx1jM+bprJbUOE46BBD9kSj5dXg== X-YMail-OSG: .VCPFVAVM1lzl.itJbl2OsE3OaZGJsLHfWLgS2n6gl9nTF7AMjxLrJ3cCT4Oexa VrRLoS6yNxV9MulS4zAjLb_1RU_wTYnzBjaibvdXxGLEksBtPH0BRwR7xRRr.v5GxT9PwETI5LnS 2690dmKhEXSlv9JtssME_90W1H_URxHgvG71KXW5mdJDNoZYpaTQATyDQQmwvGMpIszDrewX6xkn 2Dq4Mm0JP9KPDnK2wq0l1NNCfZj_vWS4EWT6000JIa.1ZNiZVBS92VAG.Oe_OFNnBsTIjxfsgUmc SBUfO1EiYfzA6D7WKlV0Gj9NXKaof1JD6FMcB3w2h0UzLxqRVtju7aOi9g5n.lPW2H_wMXqrW_d3 PIHCC6SnESAR7A6ZbMaqAn4DzNJCmFBjwm8harKn7jCGcE7yS1FgReBePAQGGBdID.HIx6el8Dy. fawFDOPivHn205r8AfG0ddBz5lowxBX_hmj_U6Yba_6mgDrai5TQIMvIxlDg5YV8uyXDRjUaVYaK D0Y1ARtRh_R6JAQQHJocWTeytz5Y2UF_88wPP9EKwzcWCg47OJ_yujyy6vQzSCmiiGT4OBm7t2g8 MjZE9QiBRgmAH71Khr7bWyufCZQfaXPNvR7IgtfLsqn88GlIofuCiJwFdQg1LwSn_KTI4_gTTna_ GSGSO3k786S3yJB_LDpc9iHxf4Zt9yOslDy2da0lHP2e_lGHGxgxNuUbuJDN5TV7dMC6B5AU5F0N BbWXIcEvsmr3TcG3.3GO5gIBN74Yy4RGYJE3m1WSdWGyveP6NSwc49ckvz33zvGG5n_fhZ200VtO 5KLZJIcPMU6Tmyw.bBETvcrgwAytTuM4vZSY9pvR5nEkBKJRlUkROmu9P6PmzAJyTsjel2jL3O20 jQ2TOm7LgiVd4g2BYeqfNJ5EXIvExiPQEq8V2gxaKjEAt3DndOk3vz44AplAuoH6C8M1icY49LKV l5CDuO75l7Uw3wgucB9M5MKCUtFFrs.01XubeslPHgZr97RFnvnXGGvSg0aI5Os.vHJsKE3SV8Do ocBV5JvtQpi4LJHx8rJrUPARN5prKPeGw.0_kh8irvAtNjJpDwYFf5oO9VMOPxbffw9UkPprbI5e LuwIQ_Aqnq9ll9HwlVIS_4OEGzx8MZe29.pqiVdLPrw4togQFcaRTis8SSdCRibTR4LfnUxrZEly _qNQlfCc1n_mPDDfKEMSPRlMJt_W_xVYVysIa7WpijhYwW8L3UqMtN9H.ezaybzbWWtyL3mYqjeY YD4TpWe3oIP3dK7RxyAco5FZUeRGa4aQDiZp4SuJdZSCaLvRnmgt7uAmkHRd7uY..by50UYySgMX cprqJC0KyflEj4XxwhEzXHFGPSgSNpme1n_XXZWQXti7UeYi6isMTy582nSGJExc3xSzJQ91bju1 m09iuYI7ve8sHwEHqb4UeF9YQ5kIGdJlxFOdyKfFRs9wlt_RIzHiY9S6sc2cOliHXqNBNDWv1OLi iuLDybeGSa5F2oHOQyt2sNX.MyE3Z7Li_dBHY2ctAvOhjLmBqiNyHf_H9J69GyOHj4U6S4OBTslK L8zWil.Cs6c6so1tJaV9mPARwwM0vYR3bCAXa2m6RazBigllbDFSXho76G.gtJZWolyZTZaQcF0C yEmMK6Z9hrmQHxTzSWDLIJ07FWwKb6BruYaNi3RsEe7GKudMyxie7ejt.l_5Ba.m03sxzWOwfYW1 x3V8ycWUJS4wRYOTR7uW9ANZ4PBZ6qK2Tl5AtzoLlv0OQIFPofwdFWdClGVwy2UXPb2hBivP_Qpa Ih2TNSJZNKRYmGZUP4hh8kSMQu7EvGGS0Kknk3P3FbbjSVc7VCC6cikbWyCz5xB6bxIalFiZI6b8 CjFAvPr_tXleHcXxT9PhnnnLxJ4G9Ll3JAaamuZFExZL9nIV5zHxbc3jGM5c5hJ5gFLuci8C72w7 SzFxEt23PIaZ4cvBy5ZXcEUhEt7bWnDYaqCkEnWFZGOStzwAF_MHDRwn39pfk5pqD3scdRUx7O3M pmKw0M5EN9etwU5jhN2sVpShYLECynq2AKgypR0LQ7wlSU2R9Nh_FmVbQvkpPgNHlb0A7oUl0rb0 fdkCTh3ZZOdvSjEh7ccnWAyL9al51lrxnaBP3dGK9GSkve7kc6xSykSqU2qWI94BkqEf2Qup5tjD uXiXJ7qrK9K1vMpblbB14NWPGF9WO6NfEE9bazrkw2UbOO71aeCxbS4Ai6Y6pzUEJ X-Sonic-MF: X-Sonic-ID: f87d73bb-7625-4611-841d-8e482a8671e6 Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ne1.yahoo.com with HTTP; Sat, 16 Sep 2023 21:18:11 +0000 Received: by hermes--production-bf1-678f64c47b-85tfq (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 456ea6bb104973ae15b677987f61fd9b; Sat, 16 Sep 2023 21:18:10 +0000 (UTC) From: Hendursaga Date: Sat, 16 Sep 2023 17:18:08 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit References: Content-Length: 622 Received-SPF: pass client-ip=66.163.189.147; envelope-from=hendursaga@aol.com; helo=sonic314-21.consmr.mail.ne1.yahoo.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello Guixers! This is my first patch series in a few years, so I hope I got everything right! I updated libosmium to the latest stable release, but then osm2pgsql broke, due to API changes, so I updated it, and then I went ahead and updated osmium-tool for good measure, even though it did not break. Hendursaga (3): gnu: libosmium: Update to 2.19.0. gnu: osm2pgsql: Update to 1.9.2. gnu: osmium-tool: Update to 1.15.0. gnu/packages/geo.scm | 155 +++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 79 deletions(-) base-commit: 0dc83ce53b8bad8473c80689ba212d9f9bb712b3 -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 2673 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))) -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 3713 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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+))) -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 1944 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH 1/3] gnu: libosmium: Update to 2.19.0. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 16 Sep 2023 21:36: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: Hendursaga Cc: 66037@debbugs.gnu.org Received: via spool by 66037-submit@debbugs.gnu.org id=B66037.169490010712070 (code B ref 66037); Sat, 16 Sep 2023 21:36:02 +0000 Received: (at 66037) by debbugs.gnu.org; 16 Sep 2023 21:35:07 +0000 Received: from localhost ([127.0.0.1]:48676 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcwV-00038c-Bn for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:35:07 -0400 Received: from smtpmciv2.myservices.hosting ([185.26.107.238]:40260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcwR-00038R-HY for 66037@debbugs.gnu.org; Sat, 16 Sep 2023 17:35:05 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv2.myservices.hosting (Postfix) with ESMTP id 41AFF20DDF; Sat, 16 Sep 2023 23:34:54 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 7E23080060; Sat, 16 Sep 2023 23:34:51 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id XU0-rgzqFzJa; Sat, 16 Sep 2023 23:34:51 +0200 (CEST) Received: from [192.168.1.116] (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 158998005B; Sat, 16 Sep 2023 23:34:51 +0200 (CEST) Message-ID: Date: Sat, 16 Sep 2023 22:34:50 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US References: From: Bruno Victal In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hi Hendursaga, On 2023-09-16 22:21, Hendursaga via Guix-patches via wrote: > + (native-inputs (list doxygen graphviz)) Perhaps you could use graphviz-minimal instead? -- Furthermore, I consider that nonfree software must be eradicated. Cheers, Bruno. From unknown Sun Aug 17 22:07:27 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#66037] [PATCH v2 0/3] Update libosmium and dependents Resent-From: Hendursaga Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 17 Sep 2023 19:39:01 +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.16949795046450 (code B ref 66037); Sun, 17 Sep 2023 19:39:01 +0000 Received: (at 66037) by debbugs.gnu.org; 17 Sep 2023 19:38:24 +0000 Received: from localhost ([127.0.0.1]:51486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxb6-0001fw-Ap for submit@debbugs.gnu.org; Sun, 17 Sep 2023 15:38:24 -0400 Received: from sonic315-21.consmr.mail.ne1.yahoo.com ([66.163.190.147]:33795) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhxb2-0001fe-S0 for 66037@debbugs.gnu.org; Sun, 17 Sep 2023 15:38:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694979485; bh=V9iRgFdiWTWVNpFJlQGRLLPjj0gxEim5qEXJ4B5buAQ=; h=From:To:Subject:Date:In-Reply-To:References:From:Subject:Reply-To; b=c+jUE3dRrfhZJXna+ztQiJEGLN0XqfU9RY5sakbCGOovA4ifE+i4ZZT120mlr1Mgh2yymtkCY+yK3YUVaF7ATH2WfOgrxtTUoz3IHG5o9kowwevl2jBYIrteHhZ7BbyMh7uTZ6cLgp9pxekS8L65rQDZoXWXZJANJCOLeMFMgigEKYjfrMbqPFHnYpg14Kyp2ZdYzo1XFrTJLIYdy2U0HcG1tmOMAE4BHWGA6eu3J6bq38uVAIERZiJ1baJ2mvrt5EMPzzaD+GppVCxdd+HqbxgBN9NYvA4/htbfk7nHbYCBZzH9zN9W8cXp+BvbdJpdFKcLmlxiUfoS/zSy7i8IRw== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694979485; bh=Dy3s+Pl+J8JlVC9XFO42PXrPeZHK3yGGZ2uoaiQgDHA=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=YxSMwOmAn6xS6yAUBy/NTrWyvuA8j/CKd1HRh3JYsBJI413Gk8Jk3PDL320OnX1k7zFtFi8Nis4omiK2fSfewlYxLi0K/SuCyEXijizTXECEJmVAGJ2yN9UdOdifwP5NhluHMVwh0pAk0G+NAqlQPejtyIBjf3BpfY7BWBJteEw7eo9uaO/5I1cw/jR5XICTVzvRHfqVFo6T76KC8blTU5idyiFKRSQhcxUAvwHHcuGqm5pMsUYN0viwvmx//62NDRKRlHinAUxqCpFNLNltVDLfL/ZOToT4IxMzk7iZilhn5YO8pQixqDXInB6qXr0sz0mdEpepNxOwABKMCk3/0A== X-YMail-OSG: x0e_MEcVM1nUpOz.0NAdq1uk6gmYM1D7evbtBZ4w7Mu2b.b8eyIvYUmA_Npsv8H 3Rh0EmD9S.CR6lDWw0cvEU6uyRoj1CYAlCyVx7LIK1Vm7zQw1lPfHvHqUI8W9cEtr1jQLDB3_ahq BLelVIncqL3zz19Z5SAHRhL0ubYU2aF6SnoTzJYJTDrKyq0UvKZt3jbeWwa26zwvN2aNc0Qr763J esgF1f0D1QVNmPH6sjS0IGHpUmuICkKD1hFcvwRWmMdxMcrLsY_855pgtYZB_0FAbf1Jp_eV_L0F 9yHrDZ_NLf6Csd7sWK_IZR2mdxr07I8O2.4S4cSRO6dRwuQye1CJejMDTNZ339cgTWZz5Vb_nnCE jNXxsxDx3eoPFIXvJaLa9fUpmyQsrtV2EnT5u151CvfiG9QJpP0JyUqOIayGImeB6tZ6WRMEoyzf 2xfIGGhwlRtQiz6whpopUxMz46nqerNCOwyxIyXVS76g8U5qSTJnO4A1JDZsgTypopjshk4jaJdy LD59N2oPMeRdAXMupOzg4vad.dkiSLcvXZxDY2VLgvRrY3DvccuUTRQ2H2aaGt7YwvokJrt0xjBN E1xJWOwmXVxVfQFhDYFjPcb0IECp4UsKqUApop6miR2GhZn6Y2NTY_U6Yp0ztD4IcPkx.hqqfn6S VH12s422FzpqI0D_K_txarHTihBDKGca0wBP53CERpY7NEH6qcwtC3ilhsSjfO1RM4tEa6O_Ovtl HjOrYPePon5L5.UZ7Ok1MPbpeB7R7N6_XQc69EPZ_v.ttFZsVJBQc4QspyIBV1qgYfJcF2prktQZ ObkOpIfHEttzSCf1s8gDrI24Rcj7dEr7VHQE68XWDnG_qA_uUhhE9cxIwziyvsGQeiM4gQgtJfSL wVCWPFGwWA5wOiZGA0bp3hQF7QElvwFzUF1BT7IFCzHvcmBGyW3GdY39sfxFUgMBfiU6iM9KvB7Y ThF8.Q12J6vUl8C_PES6cbOlcMeXqwrVA5VIzeSD9ZhlQtoEhOZ2B3K4NVUFK5vtxEIeDm.J19UR RPO5hrvmq63Lj5BAjGx9t784kIYfK7IuF2DVSLnwSpyvkzMeAh4srbdBTRqG70BpTOpjR9572SLF pgiKktfAZbow.l6SB9yqx2o0WQzyS.HUufFHXSeFg9G1XXidSqOlePTmZJQzKQ.KScDWJb5qL4me 1T7TRWpA.CovcLdTIBqiyXL5X8kS6HcYTA4Ultji4EUPlHK__QSuxzX2hGVFQUi3nNg9qkQDeWBE M8OAECRVT1qph4YM2XsHSwHA5tSmmi06BcHRlYg1WD78opJu0MSj78tbjRyPrs1gGSHdR0exdaaq mQ.Ll0KhAyIKHJmSUqARZhR.C7uau.kKlPh8Jue2gB5nOZIGJAp9rQ7EsviT4feU5QR_V5fWNTRY m6aHX1QyKHcvNuHruCnlBsDOGrAVBfkE9PVkXMnrTDEiHm2UYlksLWTsz8l_P1EJ7od3JQ0gTRsh SIV5Og5kwIKD4Xv4IpK9L4hhO8ojczb9DjUz1Ysgnpzx1wSh.81DC17zAWX4snfuJRtJcSKUtwgV spf5oI_JYcnpzkz7z9Nvrn5eTTo0QFx9_83qKyDh2WwjKyaTcwPh_c97U4HPm3t1TOmUwWliO0F_ ldW9Rz4R3SyLjXS2FenTZXt5yr0Es2GAGhcmA8GIsLel27EmZh0jvac_Pr3Y0.cepfaOJBwhWsbm aBg5q07itwwgatq7HJbheH60Oq9egu2UDao7aklDx6m3EE6wB9B9xXi2dp.QwbMGKC61t1nDWT2j zypU.CmSlPJYVcEL_KhEmt_Q1UjkhPay_Jae0yLN5x4QkBIVviPhCBInGxDhyVFNZss82PsVlQpv zx8jN2fv8SYwgSINhjaScSbDAjEQcK3NB9MIaoyZoKq2nQbb92dqwhoTeXB4ch4jKI55yIwtdUjO nUJO3joB7b30F0VkPYOvBVgxorhlrodRVH8KS8OC4DkUlgMbn9G8vdMbFPXZpRFHojKLFy4TUyFu c2SU33LFRTAlhuL8UEdL4HGlhldQFqNHzz1Bazs131DeA.wQnLHfF76ZeJj2CXLJ3gODHxwkIQa4 Xaz4RNTf7NwRO7OC2hOdsII2G7ukisgh52unu3FybhZcSMCppjn9pYP0qAO_Aoz4OL_TC9lHKW_7 OnqYi1Q_WKgTIQV5qRFU_YryKQO2rCrByBxfSMOR6QbChOAfAv.fDmA2_gmziikhrhdHQxiCV9Q- - X-Sonic-MF: X-Sonic-ID: a17cda46-a7ae-452d-972c-2cd199196353 Received: from sonic.gate.mail.ne1.yahoo.com by sonic315.consmr.mail.ne1.yahoo.com with HTTP; Sun, 17 Sep 2023 19:38:05 +0000 Received: by hermes--production-ne1-6cbd549489-lrnsj (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 22be462b5bcefc5c6fe585ccd0bbeaec; Sun, 17 Sep 2023 19:38:02 +0000 (UTC) From: Hendursaga Date: Sun, 17 Sep 2023 15:38:01 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Length: 982 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) I don't believe I ever sent a revised patch series, so I hope I did everything just right! In addition to replacing graphviz with graphviz-minimal, as suggested, I realized that the package `proj-7` was more up-to-date than `proj.4`, but still retained the PROJ API version 4, so I used that for libosmium and osm2pgsql, so that they both had the same API version. I figure mixing API versions 4 and 6 might cause some subtle bugs. Finally, I also realized that `potrace` was not being used for osm2pgsql, as apparently one would need both it and `CImg` for that optional feature to be enabled, and `CImg` has not been packaged yet, nor do I care to do so, here. Hendursaga (3): gnu: libosmium: Update to 2.19.0. gnu: osm2pgsql: Update to 1.9.2. gnu: osmium-tool: Update to 1.15.0. gnu/packages/geo.scm | 154 +++++++++++++++++++++---------------------- 1 file changed, 75 insertions(+), 79 deletions(-) base-commit: fc3a53525ab3dcaf7c22eec8d62294017f9760fe -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 2745 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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))) -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 1944 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 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) From: Hendursaga 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 Content-Transfer-Encoding: 8bit Content-Length: 3679 X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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+))) -- 2.41.0 From unknown Sun Aug 17 22:07:27 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Hendursaga Subject: bug#66037: closed (Re: [bug#66037] [PATCH v2 0/3] Update libosmium and dependents) Message-ID: References: <877cojwn4z.fsf@kitej> X-Gnu-PR-Message: they-closed 66037 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 66037@debbugs.gnu.org Date: Thu, 21 Sep 2023 15:41:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1695310861-1645-1" This is a multi-part message in MIME format... ------------=_1695310861-1645-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #66037: [PATCH 0/3] Update libosmium and dependents which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 66037@debbugs.gnu.org. --=20 66037: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D66037 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1695310861-1645-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 66037-done) by debbugs.gnu.org; 21 Sep 2023 15:40:31 +0000 Received: from localhost ([127.0.0.1]:34662 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjLn5-0000Pa-3a for submit@debbugs.gnu.org; Thu, 21 Sep 2023 11:40:31 -0400 Received: from mout01.posteo.de ([185.67.36.65]:58309) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjLn3-0000PJ-7x for 66037-done@debbugs.gnu.org; Thu, 21 Sep 2023 11:40:29 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 84FE3240028 for <66037-done@debbugs.gnu.org>; Thu, 21 Sep 2023 17:40:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1695310813; bh=ecS+oawbCfT/OZLIVYMg6lzYINs4r+kIhdWOyhxwm/k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:From; b=WHysiIaYKe+/QWMTXAfpcte5K9wQMO9HvEyascItuk+ol6j8RbBA8MMz7rByPRQhO +6ZUtFKJNGJiqr61xh1kDl9UiklQmjgTG1ClN1qsgrvT09sxCuTRtJC3OWx4V70BYx YYQsSrVzY+W336eyq6xezQJKhQLwxegQVCFxWlnk5zGESsYx5/PorxnhPNo3qneCaS BNS3ptiSc2jzVUGB5YXkUePQ5Zn7k9t1B7BNAn6dqNNrulHIc3sJ5rLzpMk+HRjFgI E3VkNYD+eymgJDqjwLggUCg7DtyYy3hztsJX3q+Rpjl9FoqxZVGDzUSTlCwZtm/yVQ 5/8u2miLr2j5Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Rs0306Gcrz6v42; Thu, 21 Sep 2023 17:40:12 +0200 (CEST) References: From: Guillaume Le Vaillant To: Hendursaga Subject: Re: [bug#66037] [PATCH v2 0/3] Update libosmium and dependents Date: Thu, 21 Sep 2023 15:39:14 +0000 In-reply-to: Message-ID: <877cojwn4z.fsf@kitej> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66037-done Cc: 66037-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain Patches applied as 84442d04235a615984667363c0f9b6b91d1ed0bf and following. Thanks. --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iIUEAREKAC0WIQTLxZxm7Ce5cXlAaz5r6CCK3yH+PwUCZQxj3A8cZ2x2QHBvc3Rl by5uZXQACgkQa+ggit8h/j/PKwD+PU83Y+9ARlGjdX9AYR3LYX5vjU3DfIYos/I8 5LhS20IA/jJ8qnuE1sEYxEJyzLJBaR8803scbnjHhIO8p8f4DF7N =YrVb -----END PGP SIGNATURE----- --=-=-=-- ------------=_1695310861-1645-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 16 Sep 2023 21:18:40 +0000 Received: from localhost ([127.0.0.1]:48631 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcgZ-0002gE-Qc for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:18:40 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60380) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qhcgV-0002fx-6W for submit@debbugs.gnu.org; Sat, 16 Sep 2023 17:18:38 -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 1qhcgF-0004FO-Pk for guix-patches@gnu.org; Sat, 16 Sep 2023 17:18:20 -0400 Received: from sonic314-21.consmr.mail.ne1.yahoo.com ([66.163.189.147]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhcgC-0004Co-74 for guix-patches@gnu.org; Sat, 16 Sep 2023 17:18:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aol.com; s=a2048; t=1694899091; bh=DUdRV2YWu3AOYWS5I7tXDXt3f0Sk0E39rNQtZH/9lVY=; h=From:To:Subject:Date:References:From:Subject:Reply-To; b=jqjrBxNRjxHeWWv+pU81+pSm6fr5UnSwL2fgCVagaastI8GpW974vnk06ggygJbutsHcp29ef2SgRHqdgxpCpkG3jqdqQQKuTY502DERAUMI29kamzbUvTXrKVNJ0aalyRsIttpctsv2DErQmU760RgjOxyK4fWYTH2AHutuHqhVdwtbj4gJFA6fbXEIKltOBu6exfpQZK7Tfp3KWF39zAw4UCeK1Bio61QA0etpLj/qnOkTYIe7XrHwKf3UB4DKfYZa0l+Hw3qcG00wkfGhhyZ5AjGsWKCY8+L4dSz7mWKN5Z+/oX7P5M9vL1JBLTGzAPpCe6h5nRQWpJnnYsvu5A== X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1694899091; bh=hnL4AhcRtOZJ0xzhpNZvEE11GXUCwCWEuqWymkt+oO7=; h=X-Sonic-MF:From:To:Subject:Date:From:Subject; b=sl3jS1InpoaHSGcWyfNtDKruXJGP+G+hmj0bFCwFvXbaAr+meHmu/1QkhYNt+gnUD2EZHse49jVzX1q4wcFac/kKbigLNq18uOd3lm+QMgRymxotFtNpyoEPpuZfrsboxVkYA+ejix6IQxNswsUoM80wVZwLwKPrO6QVXfCWM0wT7L1un5xQkqarMJNBzfPAgTNtp0K0/OuNGFJTmoU7PlaE2r/lssu7DnKjPzfTk4CZvXVg7amMGXcWBnDDLAfCAesxrGuG771/tXewmO776XSMO4stzjbEjGgFRt4ijO9W1FcYG5RHbU6GDNDFx1jM+bprJbUOE46BBD9kSj5dXg== X-YMail-OSG: .VCPFVAVM1lzl.itJbl2OsE3OaZGJsLHfWLgS2n6gl9nTF7AMjxLrJ3cCT4Oexa VrRLoS6yNxV9MulS4zAjLb_1RU_wTYnzBjaibvdXxGLEksBtPH0BRwR7xRRr.v5GxT9PwETI5LnS 2690dmKhEXSlv9JtssME_90W1H_URxHgvG71KXW5mdJDNoZYpaTQATyDQQmwvGMpIszDrewX6xkn 2Dq4Mm0JP9KPDnK2wq0l1NNCfZj_vWS4EWT6000JIa.1ZNiZVBS92VAG.Oe_OFNnBsTIjxfsgUmc SBUfO1EiYfzA6D7WKlV0Gj9NXKaof1JD6FMcB3w2h0UzLxqRVtju7aOi9g5n.lPW2H_wMXqrW_d3 PIHCC6SnESAR7A6ZbMaqAn4DzNJCmFBjwm8harKn7jCGcE7yS1FgReBePAQGGBdID.HIx6el8Dy. fawFDOPivHn205r8AfG0ddBz5lowxBX_hmj_U6Yba_6mgDrai5TQIMvIxlDg5YV8uyXDRjUaVYaK D0Y1ARtRh_R6JAQQHJocWTeytz5Y2UF_88wPP9EKwzcWCg47OJ_yujyy6vQzSCmiiGT4OBm7t2g8 MjZE9QiBRgmAH71Khr7bWyufCZQfaXPNvR7IgtfLsqn88GlIofuCiJwFdQg1LwSn_KTI4_gTTna_ GSGSO3k786S3yJB_LDpc9iHxf4Zt9yOslDy2da0lHP2e_lGHGxgxNuUbuJDN5TV7dMC6B5AU5F0N BbWXIcEvsmr3TcG3.3GO5gIBN74Yy4RGYJE3m1WSdWGyveP6NSwc49ckvz33zvGG5n_fhZ200VtO 5KLZJIcPMU6Tmyw.bBETvcrgwAytTuM4vZSY9pvR5nEkBKJRlUkROmu9P6PmzAJyTsjel2jL3O20 jQ2TOm7LgiVd4g2BYeqfNJ5EXIvExiPQEq8V2gxaKjEAt3DndOk3vz44AplAuoH6C8M1icY49LKV l5CDuO75l7Uw3wgucB9M5MKCUtFFrs.01XubeslPHgZr97RFnvnXGGvSg0aI5Os.vHJsKE3SV8Do ocBV5JvtQpi4LJHx8rJrUPARN5prKPeGw.0_kh8irvAtNjJpDwYFf5oO9VMOPxbffw9UkPprbI5e LuwIQ_Aqnq9ll9HwlVIS_4OEGzx8MZe29.pqiVdLPrw4togQFcaRTis8SSdCRibTR4LfnUxrZEly _qNQlfCc1n_mPDDfKEMSPRlMJt_W_xVYVysIa7WpijhYwW8L3UqMtN9H.ezaybzbWWtyL3mYqjeY YD4TpWe3oIP3dK7RxyAco5FZUeRGa4aQDiZp4SuJdZSCaLvRnmgt7uAmkHRd7uY..by50UYySgMX cprqJC0KyflEj4XxwhEzXHFGPSgSNpme1n_XXZWQXti7UeYi6isMTy582nSGJExc3xSzJQ91bju1 m09iuYI7ve8sHwEHqb4UeF9YQ5kIGdJlxFOdyKfFRs9wlt_RIzHiY9S6sc2cOliHXqNBNDWv1OLi iuLDybeGSa5F2oHOQyt2sNX.MyE3Z7Li_dBHY2ctAvOhjLmBqiNyHf_H9J69GyOHj4U6S4OBTslK L8zWil.Cs6c6so1tJaV9mPARwwM0vYR3bCAXa2m6RazBigllbDFSXho76G.gtJZWolyZTZaQcF0C yEmMK6Z9hrmQHxTzSWDLIJ07FWwKb6BruYaNi3RsEe7GKudMyxie7ejt.l_5Ba.m03sxzWOwfYW1 x3V8ycWUJS4wRYOTR7uW9ANZ4PBZ6qK2Tl5AtzoLlv0OQIFPofwdFWdClGVwy2UXPb2hBivP_Qpa Ih2TNSJZNKRYmGZUP4hh8kSMQu7EvGGS0Kknk3P3FbbjSVc7VCC6cikbWyCz5xB6bxIalFiZI6b8 CjFAvPr_tXleHcXxT9PhnnnLxJ4G9Ll3JAaamuZFExZL9nIV5zHxbc3jGM5c5hJ5gFLuci8C72w7 SzFxEt23PIaZ4cvBy5ZXcEUhEt7bWnDYaqCkEnWFZGOStzwAF_MHDRwn39pfk5pqD3scdRUx7O3M pmKw0M5EN9etwU5jhN2sVpShYLECynq2AKgypR0LQ7wlSU2R9Nh_FmVbQvkpPgNHlb0A7oUl0rb0 fdkCTh3ZZOdvSjEh7ccnWAyL9al51lrxnaBP3dGK9GSkve7kc6xSykSqU2qWI94BkqEf2Qup5tjD uXiXJ7qrK9K1vMpblbB14NWPGF9WO6NfEE9bazrkw2UbOO71aeCxbS4Ai6Y6pzUEJ X-Sonic-MF: X-Sonic-ID: f87d73bb-7625-4611-841d-8e482a8671e6 Received: from sonic.gate.mail.ne1.yahoo.com by sonic314.consmr.mail.ne1.yahoo.com with HTTP; Sat, 16 Sep 2023 21:18:11 +0000 Received: by hermes--production-bf1-678f64c47b-85tfq (Yahoo Inc. Hermes SMTP Server) with ESMTPA ID 456ea6bb104973ae15b677987f61fd9b; Sat, 16 Sep 2023 21:18:10 +0000 (UTC) From: Hendursaga To: guix-patches@gnu.org Subject: [PATCH 0/3] Update libosmium and dependents Date: Sat, 16 Sep 2023 17:18:08 -0400 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit References: Content-Length: 622 Received-SPF: pass client-ip=66.163.189.147; envelope-from=hendursaga@aol.com; helo=sonic314-21.consmr.mail.ne1.yahoo.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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) Hello Guixers! This is my first patch series in a few years, so I hope I got everything right! I updated libosmium to the latest stable release, but then osm2pgsql broke, due to API changes, so I updated it, and then I went ahead and updated osmium-tool for good measure, even though it did not break. Hendursaga (3): gnu: libosmium: Update to 2.19.0. gnu: osm2pgsql: Update to 1.9.2. gnu: osmium-tool: Update to 1.15.0. gnu/packages/geo.scm | 155 +++++++++++++++++++++---------------------- 1 file changed, 76 insertions(+), 79 deletions(-) base-commit: 0dc83ce53b8bad8473c80689ba212d9f9bb712b3 -- 2.41.0 ------------=_1695310861-1645-1--