From patchwork Sat Feb 24 15:15:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 60997 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 A387027BBE9; Sat, 24 Feb 2024 16:10:47 +0000 (GMT) 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,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 880FC27BBE2 for ; Sat, 24 Feb 2024 16:10:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdubp-0003qr-1h; Sat, 24 Feb 2024 11:10:41 -0500 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 1rdubm-0003qd-UH for guix-patches@gnu.org; Sat, 24 Feb 2024 11:10:39 -0500 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 1rdubm-0001F1-Ik for guix-patches@gnu.org; Sat, 24 Feb 2024 11:10:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rducA-0006cO-5l; Sat, 24 Feb 2024 11:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69359] [PATCH] gnu: osm2pgsql: Update to 1.11.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 16:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69359@debbugs.gnu.org Cc: Felix Gruber , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.170879102025328 (code B ref -1); Sat, 24 Feb 2024 16:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 24 Feb 2024 16:10:20 +0000 Received: from localhost ([127.0.0.1]:39373 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdubS-0006aJ-9T for submit@debbugs.gnu.org; Sat, 24 Feb 2024 11:10:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:36190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rduDE-0005MB-E1 for submit@debbugs.gnu.org; Sat, 24 Feb 2024 10:45:17 -0500 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 1rdtkB-0005LY-SD for guix-patches@gnu.org; Sat, 24 Feb 2024 10:15:20 -0500 Received: from mout02.posteo.de ([185.67.36.66]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rdtk9-0008OV-Kr for guix-patches@gnu.org; Sat, 24 Feb 2024 10:15:15 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id A1A52240101 for ; Sat, 24 Feb 2024 16:15:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1708787708; bh=8Gj7j05csiQ3s/5IoIHuHTDVQxwzihZlTsOOXdJMjy4=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=SBAz2Wl71KXP3xrwKcx9hHVgVgogJAkmBUEJrXecUbt90kY0VIP3P4/Fuy/YzuTkt xwQf/bVax7CvrKU8ZQlqC/YQ4ntbfenCtQoGO37Lvp7tY+pKBNxPm/1eiKNAoH3V8x q/GaUf5hfjA2a/391h+3TCEjku4O0Ihw/4VWvUu6i26/0OPAjS5ZY+eVrDdH7+aWlU GDDFAZht7Renb6qmCKsFCkuiqJebQxWobWR61WvxAZRUWDne9rjl37EpdY5Wesmy8Z Y/vhzyM9gQbJA5vK8wgaf/mMNN0EyWN/LpyRFpHdrqmH4ecAyVxFJ7jnxZOxC2TpCM BA21QILlTjOjg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Thr636Dy0z9rxP; Sat, 24 Feb 2024 16:15:07 +0100 (CET) From: Felix Gruber Date: Sat, 24 Feb 2024 15:15:01 +0000 Message-ID: MIME-Version: 1.0 Received-SPF: pass client-ip=185.67.36.66; envelope-from=felgru@posteo.net; helo=mout02.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 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, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , 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.11.0. [arguments]: Look for proj API version 6 to use recent proj versions. [inputs]: Remove proj-7; add cli11 and proj. Change-Id: If1f14e5c675865d4485b16aca6146f555cc16d5e --- gnu/packages/geo.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) base-commit: de24aaf13b17d6c019f3f240fd0eb0e1b8654970 diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index aeb3a9fbd2..687effcace 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1677,7 +1677,7 @@ (define-public osmium-tool (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.9.2") + (version "1.11.0") (source (origin (method git-fetch) (uri (git-reference @@ -1686,7 +1686,7 @@ (define-public osm2pgsql (file-name (git-file-name name version)) (sha256 (base32 - "198qcgl42pb8lk1bn41ncp8hc9gcg9k2p0ny42vak019w5l6jcj7")) + "135vqahlcrhwa3b9hfgbiqkzbbsjd4i79fp41cd0rp4zarcpi47p")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1694,20 +1694,21 @@ (define-public osm2pgsql (build-system cmake-build-system) (arguments (list #:tests? #f ;tests fail because we need to setup a database - #:configure-flags #~(list "-DUSE_PROJ_LIB=4" ;use API version 4 + #: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 + cli11 expat fmt-8 libosmium luajit nlohmann-json postgresql - proj-7 + proj protozero zlib)) (native-inputs (list pandoc python python-argparse-manpage))