From patchwork Sat Feb 11 10:10:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 46835 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 CFA9516615; Sat, 11 Feb 2023 10:11:15 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 6D9181661A for ; Sat, 11 Feb 2023 10:11:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pQmqd-0006yQ-76; Sat, 11 Feb 2023 05:11:11 -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 1pQmqV-0006wl-1m for guix-patches@gnu.org; Sat, 11 Feb 2023 05:11:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pQmqU-00016E-QI for guix-patches@gnu.org; Sat, 11 Feb 2023 05:11:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pQmqU-0004IJ-Ll for guix-patches@gnu.org; Sat, 11 Feb 2023 05:11:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61422] [PATCH] gnu: osm2pgsql: Update to 1.8.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 11 Feb 2023 10:11:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 61422 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61422@debbugs.gnu.org Cc: Felix Gruber X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167611024416479 (code B ref -1); Sat, 11 Feb 2023 10:11:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 Feb 2023 10:10:44 +0000 Received: from localhost ([127.0.0.1]:38934 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmqC-0004Hi-E3 for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:10:44 -0500 Received: from lists.gnu.org ([209.51.188.17]:57610) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pQmqA-0004Hb-Ao for submit@debbugs.gnu.org; Sat, 11 Feb 2023 05:10:42 -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 1pQmq9-0006E4-RP for guix-patches@gnu.org; Sat, 11 Feb 2023 05:10:42 -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 1pQmq8-0000po-1J for guix-patches@gnu.org; Sat, 11 Feb 2023 05:10:41 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id 252A22407D5 for ; Sat, 11 Feb 2023 11:10:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1676110237; bh=/O0uQGkjWTO4YZAknpahUUogS2xftzqtpTlTCNmcjA4=; h=From:To:Cc:Subject:Date:From; b=CTS3Z4e4D/jJiaqU10RgytoWOuCjxaE/yguaIMaKF5FLQXXyCGZAC/Mi7RD7RwYet 66l/CREjfrHTpK6J+EkBvSgcU0KtLLRvm8bf6+Q7Wekl3+8JvDbuDaDtjLSs8l/thF AM+F1e4F2Z7Q38C00HOigyh7zA/2/svDWFmk+3CKg2+7u9iriGONnUUOqSPDbN2BN2 6EM3sNeN4MhgJoTjQmaOIw40NCGiEnbzWkXj50d8gGRAtVblhtH4u3XWi6n464Wxrg DHBao5fKclMHBiBaLBMOkKSXusLH+O2Vw++0103rjiVdJgRet74indATNkhs4ODtFf HidRVWViZ1cTg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4PDRF82zxcz9rxH; Sat, 11 Feb 2023 11:10:36 +0100 (CET) From: Felix Gruber Date: Sat, 11 Feb 2023 10:10:25 +0000 Message-Id: <20230211101025.72409-1-felgru@posteo.net> 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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.8.0. [arguments]: Remove -DEXTERNAL_RAPIDJSON configure-flag, since osm2pgsql 1.8.0 does not use rapidjson anymore. [inputs]: Remove rapidjson. --- gnu/packages/geo.scm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 097ced33e1..b9a617c009 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -1415,7 +1415,7 @@ (define-public osmium-tool (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.7.0") + (version "1.8.0") (source (origin (method git-fetch) @@ -1424,7 +1424,7 @@ (define-public osm2pgsql (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii")) + (base32 "0ssz7ny4wx8dzl3027p37xc5h7m1aj6bzxzdc6g8fbp7q57ykvxz")) (modules '((guix build utils))) (snippet ;; Remove bundled libraries. @@ -1435,8 +1435,7 @@ (define-public osm2pgsql #:configure-flags (list "-DEXTERNAL_LIBOSMIUM=ON" "-DEXTERNAL_PROTOZERO=ON" - "-DEXTERNAL_FMT=ON" - "-DEXTERNAL_RAPIDJSON=ON"))) + "-DEXTERNAL_FMT=ON"))) (inputs (list boost bzip2 @@ -1447,7 +1446,6 @@ (define-public osm2pgsql postgresql proj protozero - rapidjson zlib)) (native-inputs (list python python-psycopg2))