[arch-commits] Commit in pdal/trunk (PKGBUILD gcc.patch)

[Sven-Hendrik Haase]

    Date: Sunday, January 28, 2018 @ 02:06:47
  Author: svenstaro
Revision: 287564

upgpkg: pdal 1.6.0-3

libjsoncpp.so.20 rebuild

Added:
  pdal/trunk/gcc.patch
Modified:
  pdal/trunk/PKGBUILD

-----------+
 PKGBUILD  |   10 +++++++---
 gcc.patch |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-27 21:15:26 UTC (rev 287563)
+++ PKGBUILD	2018-01-28 02:06:47 UTC (rev 287564)
@@ -2,7 +2,7 @@
 # Contributor: SaultDon <sault.don gmail>
 pkgname=pdal
 pkgver=1.6.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ library for translating and manipulating point cloud data"
 arch=('x86_64')
 url="http://www.pdal.io"
@@ -14,12 +14,16 @@
             'sqlite: for the sqlite plugin'
             'postgresql-libs: for the postgresql plugin')
 provides=('pdal')
-source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz")
-sha512sums=('2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32')
+source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz"
+        gcc.patch)
+sha512sums=('2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32'
+            '4f71629c8ade61ca8266911b1d4ed6dd740bdf32a27e08f3a87d1c7d184036702deb61dc500ca41f734af8025285d9c9c59055a21044c9b3248632aa50ef5f95')
 
 prepare() {
     cd "PDAL-$pkgver-src"
 
+    patch -Np1 < $srcdir/gcc.patch
+
     [[ -d build ]] || mkdir build
 }
 

Added: gcc.patch
===================================================================
--- gcc.patch	                        (rev 0)
+++ gcc.patch	2018-01-28 02:06:47 UTC (rev 287564)
@@ -0,0 +1,47 @@
+diff --git a/dimbuilder/DimBuilder.cpp b/dimbuilder/DimBuilder.cpp
+index dd2f4a4c7..96b978a67 100644
+--- a/dimbuilder/DimBuilder.cpp
++++ b/dimbuilder/DimBuilder.cpp
+@@ -174,9 +174,11 @@ bool DimBuilder::execute()
+ void DimBuilder::extractDim(Json::Value& dim)
+ {
+     DimSpec d;
++    Json::Value empty;
+ 
+     // Get dimension name.
+-    Json::Value name = dim.removeMember("name");
++    Json::Value name = dim.get("name", empty);
++    dim.removeMember("name");
+     if (name.isNull())
+         throw dimbuilder_error("Dimension missing name.");
+     if (!name.isString())
+@@ -185,7 +187,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+     validateDimension(d.m_name);
+ 
+     // Get dimension description.
+-    Json::Value description = dim.removeMember("description");
++    Json::Value description = dim.get("description", empty);
++    dim.removeMember("description");
+     if (description.isNull())
+     {
+         std::ostringstream oss;
+@@ -204,7 +207,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+     d.m_description = description.asString();
+ 
+     // Get dimension type
+-    Json::Value type = dim.removeMember("type");
++    Json::Value type = dim.get("type", empty);
++    dim.removeMember("type");
+     if (type.isNull())
+     {
+         std::ostringstream oss;
+@@ -222,7 +226,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+         throw dimbuilder_error(oss.str());
+     }
+ 
+-    Json::Value altNames = dim.removeMember("alt_names");
++    Json::Value altNames = dim.get("alt_names", empty);
++    dim.removeMember("alt_names");
+     if (!altNames.isNull())
+     {
+         if (!altNames.isString())