CVS commit: pkgsrc/geography/gdal-lib

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

Module Name:    pkgsrc
Committed By:   gdt
Date:           Tue Apr 28 00:24:49 UTC 2020

Modified Files:
        pkgsrc/geography/gdal-lib: distinfo
        pkgsrc/geography/gdal-lib/patches: patch-port_cpl__conv.cpp

Log Message:
gdal: Simplify patch dealing with visibility defines

Rather than adding a definition of _NETBSD_SOURCE, avoiding defining
_XOPEN_SOURCE in the first place.  What used to be extra is now
normal, and these defines hide rather than expose symbols.


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 pkgsrc/geography/gdal-lib/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.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/gdal-lib/distinfo
diff -u pkgsrc/geography/gdal-lib/distinfo:1.41 pkgsrc/geography/gdal-lib/distinfo:1.42
--- pkgsrc/geography/gdal-lib/distinfo:1.41     Mon Apr 27 23:53:38 2020
+++ pkgsrc/geography/gdal-lib/distinfo  Tue Apr 28 00:24:48 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.41 2020/04/27 23:53:38 gdt Exp $
+$NetBSD: distinfo,v 1.42 2020/04/28 00:24:48 gdt Exp $
 
 SHA1 (gdal-2.4.4.tar.gz) = 23f7420bd8cdfabf7ea9259d46d463ca7914ab4a
 RMD160 (gdal-2.4.4.tar.gz) = 1290d382cd601b632e61bc28001bff1dd3d72730
@@ -7,4 +7,4 @@ Size (gdal-2.4.4.tar.gz) = 14748072 byte
 SHA1 (patch-apps_gdalserver.cpp) = 4a2b8bac29582c8fc02920840ee498026d87acca
 SHA1 (patch-frmts_grib_degrib_degrib_myutil.c) = 0e046afa236d7e0d6186fe392cb2da05fa5b42c5
 SHA1 (patch-ogr_ogrsf__frmts_geojson_libjson_GNUmakefile) = 6a5061b6dd8c3a4fa1ad7c10ddc0b815b41a637d
-SHA1 (patch-port_cpl__conv.cpp) = e0c9d2dac25bc6f69f0af13a2c86ab5f0f521445
+SHA1 (patch-port_cpl__conv.cpp) = dd309911e85512d2a477d55f33f77f79e62482eb

Index: pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp
diff -u pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.2 pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.3
--- pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp:1.2      Sat Mar  9 01:54:59 2019
+++ pkgsrc/geography/gdal-lib/patches/patch-port_cpl__conv.cpp  Tue Apr 28 00:24:48 2020
@@ -1,17 +1,23 @@
-$NetBSD: patch-port_cpl__conv.cpp,v 1.2 2019/03/09 01:54:59 gdt Exp $
+$NetBSD: patch-port_cpl__conv.cpp,v 1.3 2020/04/28 00:24:48 gdt Exp $
 
-Fix build under NetBSD
-\todo Explain what is wrong.
-\todo File ticket and get this fixed upstream.
+Avoid visibility define that masks usage that is apparently beyond XOPEN or C99.
 
---- port/cpl_conv.cpp.orig     2017-11-20 10:45:32.000000000 +0000
+Not yet net upstream; waiting until we are caught up.
+
+--- port/cpl_conv.cpp.orig     2020-01-08 11:49:05.000000000 +0000
 +++ port/cpl_conv.cpp
-@@ -45,7 +45,7 @@
+@@ -38,14 +38,7 @@
+ #define _XOPEN_SOURCE 600
  #endif
- 
- // For atoll (at least for NetBSD)
+ #else
+-#ifdef _XOPEN_SOURCE
+-#undef _XOPEN_SOURCE
+ #endif
+-#define _XOPEN_SOURCE 700
+-#endif
+-
+-// For atoll (at least for NetBSD)
 -#define _ISOC99_SOURCE
-+#define _NETBSD_SOURCE
  
  #ifdef MSVC_USE_VLD
  #include <vld.h>