branch master updated: gnu: proj-7: Add upstream patch.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 52e0a77a1b gnu: proj-7: Add upstream patch.
52e0a77a1b is described below

commit 52e0a77a1b66e2ba5fa0dbac2f1dad35856d0586
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Mon Jun 5 17:55:38 2023 +0200

    gnu: proj-7: Add upstream patch.
    
    * gnu/packages/patches/proj-7-initialize-memory.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Add it.
    * gnu/packages/geo.scm (proj-7)[source]: Add it.
---
 gnu/local.mk                                       |  1 +
 gnu/packages/geo.scm                               |  4 +-
 .../patches/proj-7-initialize-memory.patch         | 98 ++++++++++++++++++++++
 3 files changed, 102 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 9adf593318..f9afb433e6 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1754,6 +1754,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/procmail-ambiguous-getline-debian.patch  \
   %D%/packages/patches/procmail-CVE-2014-3618.patch            \
   %D%/packages/patches/procmail-CVE-2017-16844.patch           \
+  %D%/packages/patches/proj-7-initialize-memory.patch          \
   %D%/packages/patches/proot-add-clone3.patch                  \
   %D%/packages/patches/protobuf-fix-build-on-32bit.patch       \
   %D%/packages/patches/psm-arch.patch                          \
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 25805fe2e5..6ad3c87ff1 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -738,7 +738,9 @@ lets developers use the functionality of Proj in their own 
software.")
                            version ".tar.gz"))
        (sha256
         (base32
-         "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k"))))
+         "050apzdn0isxpsblys1shrl9ccli5vd32kgswlgx1imrbwpg915k"))
+       (patches
+        (search-patches "proj-7-initialize-memory.patch"))))
     (arguments
      `(#:configure-flags '("-DUSE_EXTERNAL_GTEST=ON")
        #:phases
diff --git a/gnu/packages/patches/proj-7-initialize-memory.patch 
b/gnu/packages/patches/proj-7-initialize-memory.patch
new file mode 100644
index 0000000000..81481f9a46
--- /dev/null
+++ b/gnu/packages/patches/proj-7-initialize-memory.patch
@@ -0,0 +1,98 @@
+From 6f1a3c4648bf06862dca0b3725cbb3b7ee0284e3 Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 6 Mar 2021 22:12:27 +0100
+Subject: [PATCH] =?UTF-8?q?gie=5Fself=5Ftests:=20fix=20use=20of=20uninitia?=
+ =?UTF-8?q?lized=20memory=20(fixes=C2=A0#2557)?=
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+---
+ test/unit/gie_self_tests.cpp | 39 ++++++++++++++++++++++--------------
+ 1 file changed, 24 insertions(+), 15 deletions(-)
+
+diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp
+index 4244766ebf..92f1c758dc 100644
+--- a/test/unit/gie_self_tests.cpp
++++ b/test/unit/gie_self_tests.cpp
+@@ -268,8 +268,10 @@ TEST_F(gieTest, proj_create_crs_to_crs) {
+     ASSERT_TRUE(P != nullptr);
+     PJ_COORD a, b;
+ 
+-    a.xy.x = 700000.0;
+-    a.xy.y = 6000000.0;
++    a.xyzt.x = 700000.0;
++    a.xyzt.y = 6000000.0;
++    a.xyzt.z = 0;
++    a.xyzt.t = HUGE_VAL;
+     b.xy.x = 307788.8761171057;
+     b.xy.y = 5999669.3036037628;
+ 
+@@ -306,8 +308,10 @@ TEST_F(gieTest, proj_create_crs_to_crs_EPSG_4326) {
+     PJ_COORD a, b;
+ 
+     // Lat, long degrees
+-    a.xy.x = 0.0;
+-    a.xy.y = 3.0;
++    a.xyzt.x = 0.0;
++    a.xyzt.y = 3.0;
++    a.xyzt.z = 0;
++    a.xyzt.t = HUGE_VAL;
+ 
+     b.xy.x = 500000.0;
+     b.xy.y = 0.0;
+@@ -328,8 +332,10 @@ TEST_F(gieTest, proj_create_crs_to_crs_proj_longlat) {
+     PJ_COORD a, b;
+ 
+     // Long, lat degrees
+-    a.xy.x = 3.0;
+-    a.xy.y = 0;
++    a.xyzt.x = 3.0;
++    a.xyzt.y = 0;
++    a.xyzt.z = 0;
++    a.xyzt.t = HUGE_VAL;
+ 
+     b.xy.x = 500000.0;
+     b.xy.y = 0.0;
+@@ -718,9 +724,10 @@ TEST(gie, proj_create_crs_to_crs_PULKOVO42_ETRS89) {
+     proj_destroy(target_crs);
+ 
+     // Romania
+-    c.xyz.x = 45; // Lat
+-    c.xyz.y = 25; // Long
+-    c.xyz.z = 0;
++    c.xyzt.x = 45; // Lat
++    c.xyzt.y = 25; // Long
++    c.xyzt.z = 0;
++    c.xyzt.t = HUGE_VAL;
+     c = proj_trans(P, PJ_FWD, c);
+     EXPECT_NEAR(c.xy.x, 44.999701238, 1e-9);
+     EXPECT_NEAR(c.xy.y, 24.998474948, 1e-9);
+@@ -740,9 +747,10 @@ TEST(gie, proj_create_crs_to_crs_PULKOVO42_ETRS89) {
+     EXPECT_NEAR(c.xy.x, 45, 1e-8);
+     EXPECT_NEAR(c.xy.y, 25, 1e-8);
+ 
+-    c.xyz.x = 45; // Lat
+-    c.xyz.y = 25; // Long
+-    c.xyz.z = 0;
++    c.xyzt.x = 45; // Lat
++    c.xyzt.y = 25; // Long
++    c.xyzt.z = 0;
++    c.xyzt.t = HUGE_VAL;
+     proj_trans_generic(P, PJ_FWD, &(c.xyz.x), sizeof(double), 1, &(c.xyz.y),
+                        sizeof(double), 1, &(c.xyz.z), sizeof(double), 1,
+                        nullptr, 0, 0);
+@@ -783,9 +791,10 @@ TEST(gie, proj_create_crs_to_crs_outside_area_of_use) {
+     EXPECT_EQ(P->fwd, nullptr);
+ 
+     // Test point outside area of use of both candidate coordinate operations
+-    c.xyz.x = 58; // Lat in deg
+-    c.xyz.y = 5;  // Long in deg
+-    c.xyz.z = 0;
++    c.xyzt.x = 58; // Lat in deg
++    c.xyzt.y = 5;  // Long in deg
++    c.xyzt.z = 0;
++    c.xyzt.t = HUGE_VAL;
+     c = proj_trans(P, PJ_FWD, c);
+     EXPECT_NEAR(c.xy.x, 64.44444444444444, 1e-9); // Lat in grad
+     EXPECT_NEAR(c.xy.y, 2.958634259259258, 1e-9); // Long in grad