[arch-commits] Commit in pdal/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Tuesday, July 24, 2018 @ 14:43:08
  Author: svenstaro
Revision: 363295

upgpkg: pdal 1.7.2-3

python 3.7 rebuild

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

------------------------------------------------+
 PKGBUILD                                       |   10 +++-
 ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch |   49 +++++++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-24 14:15:06 UTC (rev 363294)
+++ PKGBUILD	2018-07-24 14:43:08 UTC (rev 363295)
@@ -2,7 +2,7 @@
 # Contributor: SaultDon <sault.don gmail>
 pkgname=pdal
 pkgver=1.7.2
-pkgrel=2
+pkgrel=3
 pkgdesc="A C++ library for translating and manipulating point cloud data"
 arch=('x86_64')
 url="http://www.pdal.io"
@@ -13,12 +13,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=('0996b32176f158517db89109afab2ff41c8eaaa0991d3486f036bdf9de91d8829d879f06b8ffd36ada5db2f272bcd69a9043dd683c7dc0e169a074de1896b90b')
+source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz"
+        ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch)
+sha512sums=('0996b32176f158517db89109afab2ff41c8eaaa0991d3486f036bdf9de91d8829d879f06b8ffd36ada5db2f272bcd69a9043dd683c7dc0e169a074de1896b90b'
+            '0b4793a292819ee3dcac5da252e0064e75a06a9c28be0d76cf38e2ebc9742b03a208f7f722a299ceab42417f39e05f56a3f2fbb9b7170fc184cd2c830d12e320')
 
 prepare() {
     cd "PDAL-$pkgver-src"
 
+    patch -Np1 -i "$srcdir"/ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch
+
     [[ -d build ]] || mkdir build
 }
 

Added: ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch
===================================================================
--- ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch	                        (rev 0)
+++ ff6875f6e45ca2fca7a21feaa537eb3fa715ea37.patch	2018-07-24 14:43:08 UTC (rev 363295)
@@ -0,0 +1,49 @@
+From ff6875f6e45ca2fca7a21feaa537eb3fa715ea37 Mon Sep 17 00:00:00 2001
+From: Andrew Bell <andrew.bell.ia at gmail.com>
+Date: Tue, 24 Jul 2018 08:49:40 -0400
+Subject: [PATCH] Constify python strings. Close #2099
+
+---
+ plugins/python/plang/Environment.cpp | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/plugins/python/plang/Environment.cpp b/plugins/python/plang/Environment.cpp
+index 19f5c1ae7..0bbcf2d70 100644
+--- a/plugins/python/plang/Environment.cpp
++++ b/plugins/python/plang/Environment.cpp
+@@ -190,9 +190,9 @@ std::string getTraceback()
+                 throw pdal::pdal_error("unable to get repr in getTraceback");
+ #if PY_MAJOR_VERSION >= 3
+             Py_ssize_t size;
+-            char *d = PyUnicode_AsUTF8AndSize(r, &size);
++            const char *d = PyUnicode_AsUTF8AndSize(r, &size);
+ #else
+-            char *d = PyString_AsString(r);
++            const char *d = PyString_AsString(r);
+ #endif
+             mssg << d;
+         }
+@@ -208,9 +208,9 @@ std::string getTraceback()
+             throw pdal::pdal_error("couldn't make string representation of traceback value");
+ #if PY_MAJOR_VERSION >= 3
+         Py_ssize_t size;
+-        char *d = PyUnicode_AsUTF8AndSize(r, &size);
++        const char *d = PyUnicode_AsUTF8AndSize(r, &size);
+ #else
+-        char *d = PyString_AsString(r);
++        const char *d = PyString_AsString(r);
+ #endif
+         mssg << d;
+     }
+@@ -266,9 +266,9 @@ std::string readPythonString(PyObject* dict, const std::string& key)
+         throw pdal::pdal_error("unable to get repr in readPythonString");
+ #if PY_MAJOR_VERSION >= 3
+     Py_ssize_t size;
+-    char *d = PyUnicode_AsUTF8AndSize(r, &size);
++    const char *d = PyUnicode_AsUTF8AndSize(r, &size);
+ #else
+-    char *d = PyString_AsString(r);
++    const char *d = PyString_AsString(r);
+ #endif
+     ss << d;
+