Remove no-longer-needed patch

3 files changed, 2 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4f17e27bf8ea..af6c467faf38 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,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.gf391178af
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/mapnik/mapnik
 	arch = i686
 	arch = x86_64
@@ -34,12 +34,10 @@ pkgbase = mapnik-git
 	source = git+https://github.com/mapnik/mapnik.git
 	source = mapnik-cmake-harfbuzz.patch
 	source = mapnik-datasource-ogr-test.patch
-	source = mapnik-plugins-input-csv_utils-trim_if.patch
 	source = git+https://github.com/mapnik/test-data.git
 	sha256sums = SKIP
 	sha256sums = 90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638
 	sha256sums = 3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52
-	sha256sums = ec3034bbfc06604aefdf4c2caec7e44aff9dda65d893f2829b89f29e0d9c9c1f
 	sha256sums = SKIP
 
 pkgname = mapnik-git
diff --git a/PKGBUILD b/PKGBUILD
index 3bf211dc3dc6..c7ac4b7d6600 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=mapnik-git
 pkgver=4.0.0.gf391178af
-pkgrel=1
+pkgrel=2
 pkgdesc='Free Toolkit for developing mapping applications. Above all Mapnik is about rendering beautiful maps (git version)'
 arch=('i686' 'x86_64')
 url='https://github.com/mapnik/mapnik'
@@ -40,12 +40,10 @@ provides=('mapnik')
 source=('git+https://github.com/mapnik/mapnik.git'
         'mapnik-cmake-harfbuzz.patch'
         'mapnik-datasource-ogr-test.patch'
-        'mapnik-plugins-input-csv_utils-trim_if.patch'
         'git+https://github.com/mapnik/test-data.git')
 sha256sums=('SKIP'
             '90f541c0845e3c7005564fa113771ce01cf2bcfd57662b7fa8849aabf4151638'
             '3fcf178e646df526e9a5c278f56ad16e4f75d2f27108e7b33419649a46b92f52'
-            'ec3034bbfc06604aefdf4c2caec7e44aff9dda65d893f2829b89f29e0d9c9c1f'
             'SKIP')
 
 pkgver() {
@@ -57,7 +55,6 @@ prepare() {
   cd mapnik || exit
   patch -Np1 < ../mapnik-cmake-harfbuzz.patch
   patch -Np1 < ../mapnik-datasource-ogr-test.patch
-  patch -Np1 < ../mapnik-plugins-input-csv_utils-trim_if.patch
   git submodule init \
     test/data
   git config submodule.test/data.url "$srcdir"/test-data
diff --git a/mapnik-plugins-input-csv_utils-trim_if.patch b/mapnik-plugins-input-csv_utils-trim_if.patch
deleted file mode 100644
index a20c1faaa5ba..000000000000
--- a/mapnik-plugins-input-csv_utils-trim_if.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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