[arch-commits] Commit in pdal/trunk (PKGBUILD gcc.patch)
Sven-Hendrik Haase
svenstaro at archlinux.org
Mon May 28 22:41:49 UTC 2018
Date: Monday, May 28, 2018 @ 22:41:48
Author: svenstaro
Revision: 333091
upgpkg: pdal 1.7.2-1
Modified:
pdal/trunk/PKGBUILD
Deleted:
pdal/trunk/gcc.patch
-----------+
PKGBUILD | 12 ++++--------
gcc.patch | 47 -----------------------------------------------
2 files changed, 4 insertions(+), 55 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-05-28 22:18:22 UTC (rev 333090)
+++ PKGBUILD 2018-05-28 22:41:48 UTC (rev 333091)
@@ -1,8 +1,8 @@
# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
# Contributor: SaultDon <sault.don gmail>
pkgname=pdal
-pkgver=1.6.0
-pkgrel=4
+pkgver=1.7.2
+pkgrel=1
pkgdesc="A C++ library for translating and manipulating point cloud data"
arch=('x86_64')
url="http://www.pdal.io"
@@ -13,16 +13,12 @@
'sqlite: for the sqlite plugin'
'postgresql-libs: for the postgresql plugin')
provides=('pdal')
-source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz"
- gcc.patch)
-sha512sums=('2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32'
- '4f71629c8ade61ca8266911b1d4ed6dd740bdf32a27e08f3a87d1c7d184036702deb61dc500ca41f734af8025285d9c9c59055a21044c9b3248632aa50ef5f95')
+source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz")
+sha512sums=('0996b32176f158517db89109afab2ff41c8eaaa0991d3486f036bdf9de91d8829d879f06b8ffd36ada5db2f272bcd69a9043dd683c7dc0e169a074de1896b90b')
prepare() {
cd "PDAL-$pkgver-src"
- patch -Np1 < $srcdir/gcc.patch
-
[[ -d build ]] || mkdir build
}
Deleted: gcc.patch
===================================================================
--- gcc.patch 2018-05-28 22:18:22 UTC (rev 333090)
+++ gcc.patch 2018-05-28 22:41:48 UTC (rev 333091)
@@ -1,47 +0,0 @@
-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())
More information about the arch-commits
mailing list