From patchwork Mon Nov 30 19:42:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 25486 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 6F5AD27BBF8; Mon, 30 Nov 2020 19:44:30 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D846027BBF9 for ; Mon, 30 Nov 2020 19:44:26 +0000 (GMT) Received: from localhost ([::1]:43472 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjp61-0002nR-Ux for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 14:44:25 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53660) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjp5g-0002m6-DD for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45198) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjp5f-0003tN-DE for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjp5f-0000x1-8l for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44967] [PATCH 1/2] gnu: Add librttopo. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 19:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44967 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44967@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 44967-submit@debbugs.gnu.org id=B44967.16067654063572 (code B ref 44967); Mon, 30 Nov 2020 19:44:03 +0000 Received: (at 44967) by debbugs.gnu.org; 30 Nov 2020 19:43:26 +0000 Received: from localhost ([127.0.0.1]:56736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjp50-0000vM-0x for submit@debbugs.gnu.org; Mon, 30 Nov 2020 14:43:26 -0500 Received: from mout01.posteo.de ([185.67.36.65]:45394) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjp4w-0000v5-NI for 44967@debbugs.gnu.org; Mon, 30 Nov 2020 14:43:21 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 134A8160063 for <44967@debbugs.gnu.org>; Mon, 30 Nov 2020 20:43:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1606765392; bh=pb8HjbitqtxC4OORfmyEABDyP4stUTE8JTVYu7cbong=; h=From:To:Cc:Subject:Date:From; b=H6gtkcA7voJdqAcUrcaFRMNR2HBD6J9qMXJlywCcViiGbSOQNsuzktagMpw74d+5I y82pbsKWrYdr9rSR25R8cJj7tdH95GUOcnbMg5dIrYNkUccm9PwEAxvimT3q77W3Nc dADPqHyvuG3LiytXwredrh5/TwiPTjRThew0t4Qp+4uxEQ6V/Blmgzk0hmt9JQX007 wE3odtKsOLgk1JlZGWbomATTTdGjKSafA4fRkIjuVB0QgbwUDCwSJMhNPqzLxW7/wm ftuw1X9yZ9srqvadQ5g5FQWpd00LUTKP1HzM1Wgd/i5BkD1or96CFcPHi3roY8BLVH GiE1tG/8bq34g== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4ClFyR1yNdz6tmG; Mon, 30 Nov 2020 20:43:11 +0100 (CET) From: Felix Gruber Date: Mon, 30 Nov 2020 20:42:33 +0100 Message-Id: <20201130194234.5676-1-felgru@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130193703.5514-1-felgru@posteo.net> References: <20201130193703.5514-1-felgru@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (librttopo): New variable. --- gnu/packages/geo.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5908ef4b66..1c8e6c8cfa 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2019 Hartmut Goebel ;;; Copyright © 2020 Marius Bakke ;;; Copyright © 2020 Christopher Baines +;;; Copyright © 2020 Felix Gruber ;;; ;;; This file is part of GNU Guix. ;;; @@ -365,6 +366,55 @@ writing GeoTIFF information tags.") (license:non-copyleft "file://LICENSE" "See LICENSE in the distribution."))))) +(define-public librttopo + (package + (name "librttopo") + (version "1.1.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://git.osgeo.org/gitea/rttopo/librttopo") + (commit (string-append "librttopo-" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0h7lzlkn9g4xky6h81ndy0aa6dxz8wb6rnl8v3987jy1i6pr072p")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-autogen + (lambda _ + (let ((autoconf (which "autoconf")) + (autoheader (which "autoheader")) + (aclocal (which "aclocal")) + (automake (which "automake")) + (libtoolize (which "libtoolize")) + ) + (substitute* "autogen.sh" + (("`which autoconf 2>/dev/null`") autoconf) + (("`which autoheader 2>/dev/null`") autoheader) + (("ACLOCAL=.*$") + (string-append "ACLOCAL=" aclocal "\n")) + (("AUTOMAKE=.*$") + (string-append "AUTOMAKE=" automake "\n")) + (("LIBTOOLIZE=.*$") + (string-append "LIBTOOLIZE=" libtoolize "\n")))) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool) + ("pkg-config" ,pkg-config))) + (inputs + `(("geos" ,geos))) + (synopsis "Library to handle SQL/MM topologies") + (description + "The RT Topology Library exposes an API to create and manage standard +(ISO 13249 aka SQL/MM) topologies using user-provided data stores.") + (home-page "https://git.osgeo.org/gitea/rttopo/librttopo") + (license license:gpl2+))) + (define-public libspatialite (package (name "libspatialite") From patchwork Mon Nov 30 19:42:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 25485 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 83DC327BBF8; Mon, 30 Nov 2020 19:44:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10CDD27BBFA for ; Mon, 30 Nov 2020 19:44:27 +0000 (GMT) Received: from localhost ([::1]:43464 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kjp62-0002n7-4Q for patchwork@mira.cbaines.net; Mon, 30 Nov 2020 14:44:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53664) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kjp5g-0002m9-DT for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45199) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kjp5f-0003tU-Nn for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kjp5f-0000x8-Lf for guix-patches@gnu.org; Mon, 30 Nov 2020 14:44:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#44967] [PATCH 2/2] gnu: libspatialite: Update to 5.0.0. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 30 Nov 2020 19:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44967 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 44967@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 44967-submit@debbugs.gnu.org id=B44967.16067654073579 (code B ref 44967); Mon, 30 Nov 2020 19:44:03 +0000 Received: (at 44967) by debbugs.gnu.org; 30 Nov 2020 19:43:27 +0000 Received: from localhost ([127.0.0.1]:56739 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjp54-0000vZ-Ov for submit@debbugs.gnu.org; Mon, 30 Nov 2020 14:43:26 -0500 Received: from mout02.posteo.de ([185.67.36.66]:60127) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kjp53-0000vE-Jr for 44967@debbugs.gnu.org; Mon, 30 Nov 2020 14:43:26 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 47B1D2400FF for <44967@debbugs.gnu.org>; Mon, 30 Nov 2020 20:43:19 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1606765399; bh=CSK5VDeun85LdUhrqx5KKSXoyhr6fbd/sTKKaTfYQ00=; h=From:To:Cc:Subject:Date:From; b=J87O8fB5rfFqwH8n0DThS018fc6Gj5n1+ZAAqBNxknfxu5HUto/no2fenD2w773jo 7gfK7ozpCZnyH0t9x8stDp42Xu9PzCYB76Bv9XR0wtlLAZRO+gm7mCjqV3JmhLhvKU YmHsh432tCmG+w0wvZs0NdiWp31Phq3WVwB2ql6A4LiE3DQWZRt4XsrzB3oGeBNdEk DuuTEOQROCltPNpPGzODtx8d3nG3VkOMlFYMMP5mIYFRxa7ssRIe03Co0YMuAqssC3 XYVg1OaEHd69uXGIiQxvLRJ0CGJgMO/9tQw6GPMo+Llsz3egEPm/sqFFcXDadL0tWm P5I/mBGRjZziw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4ClFyZ4v13z6tmG; Mon, 30 Nov 2020 20:43:18 +0100 (CET) From: Felix Gruber Date: Mon, 30 Nov 2020 20:42:34 +0100 Message-Id: <20201130194234.5676-2-felgru@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201130193703.5514-1-felgru@posteo.net> References: <20201130193703.5514-1-felgru@posteo.net> 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/geo.scm (libspatialite, spatialite-tools): Update to 5.0.0. [inputs]: Add new required dependencies minizip and librttopo. --- gnu/packages/geo.scm | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 1c8e6c8cfa..30e63a9eb6 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -418,7 +418,7 @@ writing GeoTIFF information tags.") (define-public libspatialite (package (name "libspatialite") - (version "4.3.0a") + (version "5.0.0") (source (origin (method url-fetch) @@ -426,19 +426,23 @@ writing GeoTIFF information tags.") version ".tar.gz")) (sha256 (base32 - "16d4lpl7xrm9zy4gphy6nwanpjp8wn9g4wq2i2kh8abnlhq01448")))) + "1b3dmkgwbfi43hj3jzy2mh707khavrnw91vdd5sv387m8c1dfzvv")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) (inputs `(("freexl" ,freexl) ("geos" ,geos) + ("librttopo" ,librttopo) ("libxml2" ,libxml2) + ("minizip" ,minizip) ("proj.4" ,proj.4) ("sqlite" ,sqlite) ("zlib" ,zlib))) (arguments - `(#:phases + `(#:configure-flags + '("--enable-rttopo=yes") + #:phases (modify-phases %standard-phases ;; 3 tests are failing, ignore them: (add-after 'unpack 'ignore-broken-tests @@ -1688,14 +1692,14 @@ input file (in @code{.osm} or @code{.osm.pbf} format).") (define-public spatialite-tools (package (name "spatialite-tools") - (version "4.3.0") + (version "5.0.0") (source (origin (method url-fetch) (uri (string-append "https://www.gaia-gis.it/gaia-sins/" "spatialite-tools-" version ".tar.gz")) (sha256 - (base32 "12fggjhi8cgwvw8f6nk76f83b8lqkc07abxyj5ap6f2gq2dqafgp")))) + (base32 "0ckddgdpxhy6vkpr9q2hnx5qmanrd8g4pqnifbrq1i5jrj82s2dd")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) @@ -1703,8 +1707,10 @@ input file (in @code{.osm} or @code{.osm.pbf} format).") `(("expat" ,expat) ("freexl" ,freexl) ("geos" ,geos) + ("librttopo" ,librttopo) ("libspatialite" ,libspatialite) ("libxml2" ,libxml2) + ("minizip" ,minizip) ("proj.4" ,proj.4) ("readosm" ,readosm) ("sqlite" ,sqlite)