From patchwork Wed Jul 6 18:14:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felix Gruber X-Patchwork-Id: 40588 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 8603B27BBEA; Wed, 6 Jul 2022 19:18:25 +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 E8C3C27BBE9 for ; Wed, 6 Jul 2022 19:18:24 +0100 (BST) Received: from localhost ([::1]:34040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o99bU-0005Dy-4q for patchwork@mira.cbaines.net; Wed, 06 Jul 2022 14:18:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39440) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o99YF-0002mp-0I for guix-patches@gnu.org; Wed, 06 Jul 2022 14:15:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32996) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o99YE-0008Dz-OL for guix-patches@gnu.org; Wed, 06 Jul 2022 14:15:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o99YE-0008WE-K2 for guix-patches@gnu.org; Wed, 06 Jul 2022 14:15:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56427] [PATCH 1/6] gnu: libgeotiff: Update to 1.7.1. Resent-From: Felix Gruber Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 06 Jul 2022 18:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56427 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56427@debbugs.gnu.org Cc: Felix Gruber Received: via spool by 56427-submit@debbugs.gnu.org id=B56427.165713126832618 (code B ref 56427); Wed, 06 Jul 2022 18:15:02 +0000 Received: (at 56427) by debbugs.gnu.org; 6 Jul 2022 18:14:28 +0000 Received: from localhost ([127.0.0.1]:55111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o99Xg-0008Tz-5f for submit@debbugs.gnu.org; Wed, 06 Jul 2022 14:14:28 -0400 Received: from mout01.posteo.de ([185.67.36.65]:39565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o99Xe-0008Tf-0G for 56427@debbugs.gnu.org; Wed, 06 Jul 2022 14:14:26 -0400 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 7485D240026 for <56427@debbugs.gnu.org>; Wed, 6 Jul 2022 20:14:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1657131260; bh=2lzP4UFdXKNmyt98S3ta99Fbhzvgyw3V0UV+HDTlYp4=; h=From:To:Cc:Subject:Date:From; b=ooyMjrs7bIxQd60gTtq8FDbmQGwuECXbovxdmbBWiHPCb0+fmCtNylZpjroHq6fkZ BL4/fGCWQfajeiYipmgbD5i/al3EauCVhbdoJTiBhUtenvwYO6ceMBS9Gz+1xebbyk O/4MuZSP4c0EjX7PVZucE8bCXX062HamxBHaInHp4snXUBkLe5C6VWW6JlLzn3Gm0T MVgtcTpyBZU2aBb3/hhU8NaTvGvXVyarddel+48a8VIG1ShPOklZ+yyPNT2ozIvJmI ZVcjt8hFp4/mRXyDUeKxWtiZosUiNXAeJKdSOKHXORizXsXD0aWCGbCD9NjuuE9tIu FfoPVQxDdyC7Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4LdSNq4lMHz9rxR; Wed, 6 Jul 2022 20:14:19 +0200 (CEST) From: Felix Gruber Date: Wed, 6 Jul 2022 18:14:04 +0000 Message-Id: <20220706181409.133687-1-felgru@posteo.net> In-Reply-To: <20220706181139.133223-1-felgru@posteo.net> References: <20220706181139.133223-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 (libgeotiff): Update to 1.7.1. --- gnu/local.mk | 1 - gnu/packages/geo.scm | 8 +-- ...otiff-adapt-test-script-for-proj-6.2.patch | 63 ------------------- 3 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch diff --git a/gnu/local.mk b/gnu/local.mk index faad6cc6b2..7a6769fa2f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1390,7 +1390,6 @@ dist_patch_DATA = \ %D%/packages/patches/libcroco-CVE-2020-12825.patch \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-nofetch.patch \ - %D%/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch \ %D%/packages/patches/libgit2-mtime-0.patch \ %D%/packages/patches/libgnome-encoding.patch \ %D%/packages/patches/libgnomeui-utf8.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index d8e642f349..2310100c09 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -342,18 +342,14 @@ and driving.") (define-public libgeotiff (package (name "libgeotiff") - (version "1.5.1") + (version "1.7.1") (source (origin (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) - (patches (search-patches - ;; See libgeotiff 1.5.1 issue - ;; https://github.com/OSGeo/libgeotiff/issues/22 - "libgeotiff-adapt-test-script-for-proj-6.2.patch")) (sha256 - (base32 "0b31mlzcv5b1y7jdvb7p0pa3xradrg3x5g32ym911lbhq4rrgsgr")) + (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5")) (modules '((guix build utils))) (snippet '(begin diff --git a/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch b/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch deleted file mode 100644 index 746610c095..0000000000 --- a/gnu/packages/patches/libgeotiff-adapt-test-script-for-proj-6.2.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 678ffd97db2d63cf6856428bea65a93e069f812f Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Wed, 4 Sep 2019 16:11:37 +0200 -Subject: [PATCH 1/2] Adapt test script for PROJ 6.2 EPSG database (fixes #22) - ---- - libgeotiff/test/testlistgeo | 8 +++++++- - libgeotiff/test/testlistgeo_out.dist | 4 ++-- - 2 files changed, 9 insertions(+), 3 deletions(-) - -diff --git a/libgeotiff/test/testlistgeo b/libgeotiff/test/testlistgeo -index 7fb4a2f..571f5d0 100755 ---- a/test/testlistgeo -+++ b/test/testlistgeo -@@ -210,10 +210,15 @@ echo "Testing listgeo equidistant_cylindrical.tif" >> ${OUT} - $EXE ${DATA_DIR}/equidistant_cylindrical.tif >>${OUT} - echo "" >>${OUT} - -+# Normalize for results depending on the exact version of PROJ / EPSG database -+sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp -+mv ${OUT}.tmp ${OUT} -+ -+sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.tmp - - # do 'diff' with distribution results - echo "diff ${OUT} with testlistgeo_out.dist" --diff -u ${OUT} ${TEST_CLI_DIR}/testlistgeo_out.dist -+diff -u ${OUT} testlistgeo_out.dist.tmp - if [ $? -ne 0 ] ; then - echo "" - echo "PROBLEMS HAVE OCCURRED" -@@ -224,6 +229,7 @@ else - echo "TEST OK" - echo "test file ${OUT} removed" - echo -+ rm testlistgeo_out.dist.tmp - /bin/rm -f ${OUT} - exit 0 - fi -diff --git a/libgeotiff/test/testlistgeo_out.dist b/libgeotiff/test/testlistgeo_out.dist -index 68a948c..c157f00 100644 ---- a/test/testlistgeo_out.dist -+++ b/test/testlistgeo_out.dist -@@ -1738,11 +1738,11 @@ Geotiff_Information: - Keyed_Information: - GTModelTypeGeoKey (Short,1): ModelTypeProjected - GTRasterTypeGeoKey (Short,1): RasterPixelIsArea -- ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89 / LAEA Europe) -+ ProjectedCSTypeGeoKey (Short,1): Code-3035 (ETRS89-extended / LAEA Europe) - End_Of_Keys. - End_Of_Geotiff. - --PCS = 3035 (ETRS89 / LAEA Europe) -+PCS = 3035 (ETRS89-extended / LAEA Europe) - Projection = 19986 (Europe Equal Area 2001) - Projection Method: CT_LambertAzimEqualArea - ProjCenterLatGeoKey: 52.000000 ( 52d 0' 0.00"N) - -From 15af10648c4cb7b4c55cbe08caaf9884c1d156d9 Mon Sep 17 00:00:00 2001 -From: Even Rouault -Date: Wed, 4 Sep 2019 19:13:11 +0200 -Subject: [PATCH 2/2] appveyor.yml: build vcpkg from source to fix issue with - VS2015