diff options
| author | gdt <gdt@pkgsrc.org> | 2020-03-11 23:09:09 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2020-03-11 23:09:09 +0000 |
| commit | bbb24253aedf69f195ff222932787c184db2c30a (patch) | |
| tree | 4ffc1e233323147f604194d6f1fc9ee0904dce78 /geography/geos | |
| parent | c0f9808ec247a6893a29d65e4f80ed963d595da6 (diff) | |
| download | pkgsrc-bbb24253aedf69f195ff222932787c184db2c30a.tar.gz | |
geography/geos: Add upstream bug URL to patch
Diffstat (limited to 'geography/geos')
| -rw-r--r-- | geography/geos/distinfo | 4 | ||||
| -rw-r--r-- | geography/geos/patches/patch-capi_geos__ts__c.cpp | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/geography/geos/distinfo b/geography/geos/distinfo index 44656e8c4d1..c449c115cf8 100644 --- a/geography/geos/distinfo +++ b/geography/geos/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.33 2020/03/11 22:55:48 gdt Exp $ +$NetBSD: distinfo,v 1.34 2020/03/11 23:09:09 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) = 513a5b4c40afacbe580cc3e5364a66ea9f98f3ee +SHA1 (patch-capi_geos__ts__c.cpp) = af53a9eec1bc97bff34a7a32c003fa34c0d2ba43 diff --git a/geography/geos/patches/patch-capi_geos__ts__c.cpp b/geography/geos/patches/patch-capi_geos__ts__c.cpp index 7f726ddf0b3..9b257e9a6a6 100644 --- a/geography/geos/patches/patch-capi_geos__ts__c.cpp +++ b/geography/geos/patches/patch-capi_geos__ts__c.cpp @@ -1,15 +1,14 @@ -$NetBSD: patch-capi_geos__ts__c.cpp,v 1.5 2020/03/11 22:55:48 gdt Exp $ +$NetBSD: patch-capi_geos__ts__c.cpp,v 1.6 2020/03/11 23:09:09 gdt Exp $ The geos code passes an object of type std::string to variadic functions - NOTICE_MESSAGE and ERROR_MESSAGE, which then pass them to va_start. Use of non-POD types with varargs is "conditionally supported", which without a fixed compiler becomes 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 + +https://trac.osgeo.org/geos/ticket/1021 --- capi/geos_ts_c.cpp.orig 2020-03-10 17:19:40.000000000 +0000 +++ capi/geos_ts_c.cpp |