Fix build issues

4 files changed, 47 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0416f0fff536..282875a0dbc8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -2,7 +2,7 @@ pkgbase = mapnik-git
 	pkgdesc = Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)
 	pkgver = 4.0.0.g123232ffd
 	pkgrel = 2
-	url = http://mapnik.org/
+	url = https://github.com/mapnik/mapnik
 	arch = i686
 	arch = x86_64
 	license = LGPL2.1
@@ -32,12 +32,16 @@ pkgbase = mapnik-git
 	source = git+https://github.com/mapnik/mapnik.git
 	source = mapnik-cmake-harfbuzz.patch
 	source = mapnik-datasource-ogr-test.patch
+	source = mapnik-include-mapnik-geometry-cstdint.patch
+	source = mapnik-plugins-input-csv_utils-trim_if.patch
 	source = git+https://github.com/mapnik/test-data.git
 	source = git+https://github.com/mapbox/geometry.hpp.git
 	source = git+https://github.com/mapbox/polylabel.git
 	sha256sums = SKIP
 	sha256sums = 90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638
 	sha256sums = 3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52
+	sha256sums = 88d8e9be1b6da2a96693a6dd4272588001d1df1ea1b34cdd9ceff081d9b79fce
+	sha256sums = ec3034bbfc06604aefdf4c2caec7e44aff9dda65d893f2829b89f29e0d9c9c1f
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index d07291968596..5af1822c2b07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ pkgver=4.0.0.g123232ffd
 pkgrel=2
 pkgdesc='Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)'
 arch=('i686' 'x86_64')
-url='http://mapnik.org/'
+url='https://github.com/mapnik/mapnik'
 license=('LGPL2.1')
 depends=('boost-libs'
          'cairo'
@@ -36,12 +36,16 @@ provides=('mapnik')
 source=('git+https://github.com/mapnik/mapnik.git'
         'mapnik-cmake-harfbuzz.patch'
         'mapnik-datasource-ogr-test.patch'
+        'mapnik-include-mapnik-geometry-cstdint.patch'
+        'mapnik-plugins-input-csv_utils-trim_if.patch'
         'git+https://github.com/mapnik/test-data.git'
         'git+https://github.com/mapbox/geometry.hpp.git'
         'git+https://github.com/mapbox/polylabel.git')
 sha256sums=('SKIP'
             '90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638'
             '3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52'
+            '88d8e9be1b6da2a96693a6dd4272588001d1df1ea1b34cdd9ceff081d9b79fce'
+            'ec3034bbfc06604aefdf4c2caec7e44aff9dda65d893f2829b89f29e0d9c9c1f'
             'SKIP'
             'SKIP'
             'SKIP')
@@ -55,6 +59,8 @@ prepare() {
   cd mapnik || exit
   patch -Np1 < ../mapnik-cmake-harfbuzz.patch
   patch -Np1 < ../mapnik-datasource-ogr-test.patch
+  patch -Np1 < ../mapnik-include-mapnik-geometry-cstdint.patch
+  patch -Np1 < ../mapnik-plugins-input-csv_utils-trim_if.patch
   git submodule init \
     test/data \
     deps/mapbox/geometry \
diff --git a/mapnik-include-mapnik-geometry-cstdint.patch b/mapnik-include-mapnik-geometry-cstdint.patch
new file mode 100644
index 000000000000..879b11e3f4ec
--- /dev/null
+++ b/mapnik-include-mapnik-geometry-cstdint.patch
@@ -0,0 +1,12 @@
+diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp
+index bd76b54e4..5b36f74cf 100644
+--- a/include/mapnik/geometry.hpp
++++ b/include/mapnik/geometry.hpp
+@@ -37,6 +37,7 @@
+ #include <deque>
+ #include <type_traits>
+ #include <cstddef>
++#include <cstdint>
+ 
+ namespace mapnik {
+ namespace geometry {
\ No newline at end of file
diff --git a/mapnik-plugins-input-csv_utils-trim_if.patch b/mapnik-plugins-input-csv_utils-trim_if.patch
new file mode 100644
index 000000000000..a20c1faaa5ba
--- /dev/null
+++ b/mapnik-plugins-input-csv_utils-trim_if.patch
@@ -0,0 +1,23 @@
+diff --git a/plugins/input/csv/csv_utils.cpp b/plugins/input/csv/csv_utils.cpp
+index 382b1ce2d..9bc887692 100644
+--- a/plugins/input/csv/csv_utils.cpp
++++ b/plugins/input/csv/csv_utils.cpp
+@@ -29,6 +29,9 @@
+ #include <mapnik/util/conversions.hpp>
+ #include <mapnik/util/trim.hpp>
+ #include <mapnik/datasource.hpp>
++
++#include <boost/algorithm/string.hpp>
++
+ // csv grammar
+ #include <mapnik/csv/csv_grammar_x3_def.hpp>
+ //
+@@ -381,7 +384,7 @@ void csv_file_parser::parse_csv_and_boxes(std::istream& csv_file, T& boxes)
+         if (record_size <= 10)
+         {
+             std::string trimmed = csv_line;
+-            boost::trim_if(trimmed, boost::algorithm::is_any_of("\",'\r\n "));
++            boost::algorithm::trim_if(trimmed, boost::algorithm::is_any_of("\",'\r\n "));
+             if (trimmed.empty())
+             {
+                 MAPNIK_LOG_DEBUG(csv) << "csv_datasource: empty row encountered at line: " << line_number;
\ No newline at end of file