CVS commit: pkgsrc/geography/geos

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Wed Mar 11 22:15:16 UTC 2020

Modified Files:
        pkgsrc/geography/geos: distinfo
        pkgsrc/geography/geos/patches: patch-capi_geos__ts__c.cpp

Log Message:
geography/geos: Adjust patch comment text


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/geography/geos/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/geography/geos/distinfo
diff -u pkgsrc/geography/geos/distinfo:1.31 pkgsrc/geography/geos/distinfo:1.32
--- pkgsrc/geography/geos/distinfo:1.31 Wed Mar 11 12:52:06 2020
+++ pkgsrc/geography/geos/distinfo      Wed Mar 11 22:15:16 2020
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.31 2020/03/11 12:52:06 gdt Exp $
+$NetBSD: distinfo,v 1.32 2020/03/11 22:15:16 gdt Exp $
 
 SHA1 (geos-3.8.1.tar.bz2) = dbd165752dd4c48d81a84aa51c99d04410d96c67
 RMD160 (geos-3.8.1.tar.bz2) = 16b9b4dba1c772c561bace8e3e7c514f78fd4037
 SHA512 (geos-3.8.1.tar.bz2) = 1d8d8b3ece70eb388ea128f4135c7455899f01828223b23890ad3a2401e27104efce03987676794273a9b9d4907c0add2be381ff14b8420aaa9a858cc5941056
 Size (geos-3.8.1.tar.bz2) = 2505407 bytes
 SHA1 (patch-ae) = d566a7cc7fdbb29cb7f39d6e0e4adf525213f62c
-SHA1 (patch-capi_geos__ts__c.cpp) = ca838fe4a0897739f700c5d1e3ccb231df794705
+SHA1 (patch-capi_geos__ts__c.cpp) = 72328164bbb870d51b4acfc81838f99c393d30c1

Index: pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp
diff -u pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp:1.3 pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp:1.4
--- pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp:1.3        Wed Mar 11 12:52:07 2020
+++ pkgsrc/geography/geos/patches/patch-capi_geos__ts__c.cpp    Wed Mar 11 22:15:16 2020
@@ -1,10 +1,12 @@
-$NetBSD: patch-capi_geos__ts__c.cpp,v 1.3 2020/03/11 12:52:07 gdt Exp $
+$NetBSD: patch-capi_geos__ts__c.cpp,v 1.4 2020/03/11 22:15:16 gdt Exp $
 
-Passing non-POD types like std::string to variadic functions is UB.
-To avoid this, change functions to take const char * rather than
-std::string.
+The geos code passes an object of type std::string to variadic functions
+NOTICE_MESSAGE and ERROR_MESSAGE.  Passing non-POD types is UB.
+
+To avoid this, change the functions to take const char * rather than
+std::string (and adjust the use of the variables in the functions).
   
-\todo File a bug upstream
+\TODO File a bug upstream
 
 --- capi/geos_ts_c.cpp.orig    2020-03-10 17:19:40.000000000 +0000
 +++ capi/geos_ts_c.cpp