From patchwork Mon Aug 15 23:38:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikolay Korotkiy X-Patchwork-Id: 41700 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 7494D27BBEA; Tue, 16 Aug 2022 00:40:43 +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,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 2F94B27BBE9 for ; Tue, 16 Aug 2022 00:40:43 +0100 (BST) Received: from localhost ([::1]:53650 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oNjhK-0002sH-BO for patchwork@mira.cbaines.net; Mon, 15 Aug 2022 19:40:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjgg-0002qz-91 for guix-patches@gnu.org; Mon, 15 Aug 2022 19:40:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54587) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oNjgf-0005DQ-SL for guix-patches@gnu.org; Mon, 15 Aug 2022 19:40:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oNjgf-0002bV-OF for guix-patches@gnu.org; Mon, 15 Aug 2022 19:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57233] [PATCH] gnu: osm2pgsql: Update to 1.7.0. Resent-From: Nikolay Korotkiy Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Aug 2022 23:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 57233 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57233@debbugs.gnu.org Cc: Nikolay Korotkiy X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16606067479941 (code B ref -1); Mon, 15 Aug 2022 23:40:01 +0000 Received: (at submit) by debbugs.gnu.org; 15 Aug 2022 23:39:07 +0000 Received: from localhost ([127.0.0.1]:44336 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNjfn-0002aH-Ad for submit@debbugs.gnu.org; Mon, 15 Aug 2022 19:39:07 -0400 Received: from lists.gnu.org ([209.51.188.17]:33398) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oNjfl-0002a9-8N for submit@debbugs.gnu.org; Mon, 15 Aug 2022 19:39:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58230) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjfl-0002Ow-2y for guix-patches@gnu.org; Mon, 15 Aug 2022 19:39:05 -0400 Received: from knopi.disroot.org ([178.21.23.139]:56372) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oNjfj-0005A3-25 for guix-patches@gnu.org; Mon, 15 Aug 2022 19:39:04 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 2044440070; Tue, 16 Aug 2022 01:38:56 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id h5QiatHTO1Jm; Tue, 16 Aug 2022 01:38:55 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660606735; bh=3jwdpl34DsIlh8EIeNJAkzP2dcsoa9iZnRAhD2yr8Os=; h=From:To:Cc:Subject:Date; b=Ada43QxEh3xVtXe4UJTN7mpNwK6I23MtPh+83w1BxKyuMYIWTnRkjZ0PVF21pr9LK R9YSomdGR4G96Fq3Ihtof/0IM9QC+0VfqABGyf7pohhqB5aI9lQmvfGKmv86guNLcF vjooKdgIN+X/rsbzspmX7tdT6uP1eaNmJ4pJojsmLBLYWSi1QtOH7vCH4bBuZsKSz8 C130PuohTz16NIOhyPDA29cWy5HYLgO9/cHEfsLsPn9zxk1BR4oXY/CEEM8RZgMeJT FZndtfb69P4n2jd9uj2KFOiT2nm7glesLV394qZCI1c4jzyUjy6ikUI3xfe1P9K5W3 B6vcPvwkwHNIg== Date: Tue, 16 Aug 2022 02:38:30 +0300 Message-Id: Mime-Version: 1.0 Received-SPF: pass client-ip=178.21.23.139; envelope-from=sikmir@disroot.org; helo=knopi.disroot.org 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, 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" Reply-to: Nikolay Korotkiy X-ACL-Warn: , Nikolay Korotkiy via Guix-patches X-Patchwork-Original-From: Nikolay Korotkiy via Guix-patches via From: Nikolay Korotkiy X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (osm2pgsql): Update to 1.7.0. --- gnu/packages/geo.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index fe2174b106..274beb0524 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -100,6 +100,7 @@ (define-module (gnu packages geo) #:use-module (gnu packages perl) #:use-module (gnu packages photo) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages pretty-print) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) @@ -1322,7 +1323,7 @@ (define-public osmium-tool (define-public osm2pgsql (package (name "osm2pgsql") - (version "1.5.1") + (version "1.7.0") (source (origin (method git-fetch) @@ -1331,32 +1332,30 @@ (define-public osm2pgsql (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0i18mskcs087dn3f3h9n7j0wafn8502m0h13mrjwin38xsz0crfj")) + (base32 "15fxr4xq7siy237763l7nswx7v0swr3qzs2h3zkjzgvajw4p6qii")) (modules '((guix build utils))) (snippet - '(begin - (delete-file-recursively "contrib/protozero") - (delete-file-recursively "contrib/libosmium") - #t)))) + ;; 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 (string-append "-DOSMIUM_INCLUDE_DIR=" - (assoc-ref %build-inputs "libosmium") - "/include") - (string-append "-DPROTOZERO_INCLUDE_DIR=" - (assoc-ref %build-inputs "protozero") - "/include")))) + (list "-DEXTERNAL_LIBOSMIUM=ON" + "-DEXTERNAL_PROTOZERO=ON" + "-DEXTERNAL_FMT=ON" + "-DEXTERNAL_RAPIDJSON=ON"))) (inputs (list boost bzip2 expat + fmt libosmium lua postgresql proj protozero + rapidjson zlib)) (native-inputs (list python python-psycopg2))