From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id MNQmORXAv2W/UgEAqHPOHw:P1 (envelope-from ) for ; Sun, 04 Feb 2024 17:49:26 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id MNQmORXAv2W/UgEAqHPOHw (envelope-from ) for ; Sun, 04 Feb 2024 17:49:26 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="J/1NYiSe"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1707065365; a=rsa-sha256; cv=none; b=YsrBiFLILeOQMWNb2fcHdtCnZUTgG1jMLF95+aI/tlTAljgDGeVszSFF6UtqMZHZWQnyns fuvnuM9IZqdOJEqsfo6wORHw2gg0iJAXkYjMM7ZsoTjg/xsaLXI2pzVC8vYwKO5uRR9MiN 0Yve9YcvnpZV83+cJC3EoAmUfSqyA0pI538fXoPZ7i4D4Qq/V5xbMR+axlEbeokyTc3/3p HwEtbyYfhr1ty92TvbkiESTSaPfRsJUCE1ghelydAgIYpNQDbpmqrpGoYmZaQE7dYte5OO Hoo2p7mI68dXE1BeSjidRThajonQDHbZ9mmDUNRaYHXs0TBxNk6wv/a8cD8+Mg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b="J/1NYiSe"; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1707065365; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=CFUyUs/JfrhKCbeEUbjORCUPaxwdC4f8rg1s29qwn8I=; b=PiuNbK/15gReMQT6L24xPgNxcc5gfrMXNP3pkV9O+IM2mgrR1YIg/1L73w7L0htVrR+csV kEq7m2HNGWFjSxMGYPo3nKQN6OTcsUMljbN1aY2Dmvfq8kLpIfA/q4rXmpBFLn+9ChfXgl 94q02P31W3YQOOnOv+TPbQG/G2y/wOcv+PKbLRmbY38i3+9aowSJh/iubfkYrbjIjMz/0p fxksujnXbYAnO5S+qmUK3o2af2LiAdV/6OEjx6ETJufbj7kmUi/9/tr0mm9hSsR5aYNMIM Ct7xpVLeQKBJcUPdzDduFjQp5+kxwImYfPi3Y6rAUEcFNGLXO3TZliiGXxvwVA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9D1046BA8B for ; Sun, 4 Feb 2024 17:49:25 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWffq-0002aK-GK; Sun, 04 Feb 2024 11:48:54 -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 1rWffn-0002Zq-Ml for guix-patches@gnu.org; Sun, 04 Feb 2024 11:48:51 -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 1rWffn-0005dy-Ed for guix-patches@gnu.org; Sun, 04 Feb 2024 11:48:51 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWffz-0008Km-AE; Sun, 04 Feb 2024 11:49:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68925] [PATCH 3/8] gnu: libgeotiff: Fix build with proj 9.3.1. 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: Sun, 04 Feb 2024 16:49:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68925 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68925@debbugs.gnu.org Cc: Felix Gruber , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 68925-submit@debbugs.gnu.org id=B68925.170706533531970 (code B ref 68925); Sun, 04 Feb 2024 16:49:03 +0000 Received: (at 68925) by debbugs.gnu.org; 4 Feb 2024 16:48:55 +0000 Received: from localhost ([127.0.0.1]:49914 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffq-0008JX-1M for submit@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:46557) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWffn-0008IN-Dl for 68925@debbugs.gnu.org; Sun, 04 Feb 2024 11:48:52 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id B99DE240027 for <68925@debbugs.gnu.org>; Sun, 4 Feb 2024 17:48:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1707065313; bh=kX6rmTDoL5SgAPdkoKPJTylpNNOVJsOeik+Mw7YdZ5I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version: Content-Transfer-Encoding:From; b=J/1NYiSeVXtkextOzbJWUkQU2mkLkyUw27HS79amlyArnq6ODIQt1jWsO5/XWliyC AmHvzb9FRXXU2106WK89ibgtle8IyLatE1uvpnAJ6/HOL/RGG5VGINMeicTc5tNSeB mWxjY2CKnf3nkefK1O0f5kOfdZ0bk6D4zc5jbDZ0uQv2kGO/zezaooQv0zHQygwQi0 EezjulwWQ4nKuuPVk2OHnS94OpsVVZcO2aXzQ6PxEmlFbY8h/Ewrl2Za8M6a/5OJ37 +ZoHt2rWhlao1C1nqv6JQh/f92pPq2U3j6ppv8Ee2zL6g9XOAi4pw3CLcHRgj193Fv uayqGfyL6mUzQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4TSb75256Nz6tv5; Sun, 4 Feb 2024 17:48:33 +0100 (CET) From: Felix Gruber Date: Sun, 4 Feb 2024 16:47:13 +0000 Message-ID: <211fa5ea43e32825f49e130ca30adcac5e49401b.1707064733.git.felgru@posteo.net> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -4.27 X-Migadu-Queue-Id: 9D1046BA8B X-Migadu-Spam-Score: -4.27 X-TUID: OBaOW3lKcKfT * gnu/packages/geo.scm (libgeotiff): [source]: Add patches to fix build with proj 9.3.1. * gnu/local.mk: Add patch files. * gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch: New file. * gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch: New file. * gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch: New file. Change-Id: I5f09e793698b0b137888faa0f595ef06850c6160 --- gnu/local.mk | 3 ++ gnu/packages/geo.scm | 6 ++- .../libgeotiff-fix-tests-on-i386.patch | 35 +++++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.0.patch | 51 +++++++++++++++++++ ...libgeotiff-fix-tests-with-proj-9.3.1.patch | 40 +++++++++++++++ 5 files changed, 134 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch create mode 100644 gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch diff --git a/gnu/local.mk b/gnu/local.mk index fbdb285695..591445a7ac 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1507,6 +1507,9 @@ dist_patch_DATA = \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ + %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch \ + %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch \ + %D%/packages/patches/libgeotiff-fix-tests-on-i386.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ %D%/packages/patches/librime-fix-build-with-gcc10.patch \ %D%/packages/patches/libvirt-add-install-prefix.patch \ diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 5882271174..3171efa0dc 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -548,7 +548,11 @@ (define-public libgeotiff (method url-fetch) (uri (string-append "http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-" version ".tar.gz")) - (patches (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch")) + (patches + (search-patches "libgeotiff-fix-tests-with-proj-9.1.1.patch" + "libgeotiff-fix-tests-with-proj-9.3.0.patch" + "libgeotiff-fix-tests-with-proj-9.3.1.patch" + "libgeotiff-fix-tests-on-i386.patch")) (sha256 (base32 "1mjmgv48x51ppax5dnb6lq7z600czxll53bx6jbzqwd4m93i7aq5")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch b/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch new file mode 100644 index 0000000000..e84f726a3d --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-on-i386.patch @@ -0,0 +1,35 @@ +From 9990160268fafb71751d4f3a9ad724df70cb9451 Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg +Date: Fri, 1 Dec 2023 10:35:46 +0100 +Subject: [PATCH] Fix test failure on i386. + +--- +https://github.com/OSGeo/libgeotiff/pull/107 + + test/testlistgeo | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 48e92eb..ceec2e6 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,6 +218,9 @@ echo "" >>${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp + mv ${OUT}.tmp ${OUT} + ++sed "s/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.02\"E)/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.03\"E)/" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ + sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized + + sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp +@@ -230,6 +233,9 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp + mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + ++sed "s/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.02\"E)/ProjCenterLongGeoKey: 46.437229 ( 46d26'14.03\"E)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++ + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir diff --git a/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch new file mode 100644 index 0000000000..5d381d78e2 --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.0.patch @@ -0,0 +1,51 @@ +From 3806fdab4a17f44641a2113faec778e756e2be3d Mon Sep 17 00:00:00 2001 +From: Even Rouault +Date: Tue, 29 Aug 2023 19:04:25 +0200 +Subject: [PATCH] Fix 'make check' to pass with PROJ 9.3 (fixes #89) + +--- +https://github.com/OSGeo/libgeotiff/pull/90 + + test/testlistgeo | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 9a41e74..48e92eb 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,14 +218,24 @@ echo "" >>${OUT} + 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 ++sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized ++ ++sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ ++sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir + sed -e "s/Testing listgeo .*test/Testing listgeo ..\/test/" -i ${OUT} + echo "diff ${OUT} with testlistgeo_out.dist" +-diff -u ${OUT} testlistgeo_out.dist.tmp ++diff -u ${OUT} testlistgeo_out.dist.normalized + if [ $? -ne 0 ] ; then + echo "" + echo "PROBLEMS HAVE OCCURRED" +@@ -236,7 +246,7 @@ else + echo "TEST OK" + echo "test file ${OUT} removed" + echo +- rm testlistgeo_out.dist.tmp ++ rm testlistgeo_out.dist.normalized + /bin/rm -f ${OUT} + exit 0 + fi diff --git a/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch new file mode 100644 index 0000000000..e9a28d1fcd --- /dev/null +++ b/gnu/packages/patches/libgeotiff-fix-tests-with-proj-9.3.1.patch @@ -0,0 +1,40 @@ +From 4f90e57fa1cac7afdd57e5f649775cb24aa15612 Mon Sep 17 00:00:00 2001 +From: Bas Couwenberg +Date: Fri, 1 Dec 2023 08:23:20 +0100 +Subject: [PATCH] Fix test failure with PROJ 9.3.1. + +Closes: #104 +--- +https://github.com/OSGeo/libgeotiff/pull/105 + + test/testlistgeo | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/test/testlistgeo b/test/testlistgeo +index 48e92eb..4331cc3 100755 +--- a/test/testlistgeo ++++ b/test/testlistgeo +@@ -218,6 +218,11 @@ echo "" >>${OUT} + sed "s/ETRS89-extended/ETRS89/g" < ${OUT} > ${OUT}.tmp + mv ${OUT}.tmp ${OUT} + ++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/g" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < ${OUT} > ${OUT}.tmp ++mv ${OUT}.tmp ${OUT} ++ + sed "s/ETRS89-extended/ETRS89/g" < ${TEST_CLI_DIR}/testlistgeo_out.dist > testlistgeo_out.dist.normalized + + sed "s/GCS: 4053\/Unspecified datum based upon the International 1924 Authalic Sphere/GCS: 10346\/NSIDC Authalic Sphere/g" < ${OUT} > ${OUT}.tmp +@@ -230,6 +235,11 @@ mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + sed "s/Datum: 6053\/Not specified (based on International 1924 Authalic Sphere)/Datum: 1360\/NSIDC International 1924 Authalic Sphere/g" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp + mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized + ++sed "s/Projection = 15914 (BLM zone 14N (US survey .*))/Projection = 15914 (BLM zone 14N)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++sed "s/Projection = 6753 (Oregon Columbia River West zone (.*))/Projection = 6753 (Oregon Columbia River West zone)/" < testlistgeo_out.dist.normalized > testlistgeo_out.dist.normalized.tmp ++mv testlistgeo_out.dist.normalized.tmp testlistgeo_out.dist.normalized ++ + # do 'diff' with distribution results + # after cleaning for avoid spurios result due + # to different build dir -- 2.41.0