libpoco: version bump 1.4.6p2 -> 1.6.1

See https://raw.githubusercontent.com/pocoproject/poco/poco-1.6.1-release/CHANGELOG for more information.

Signed-off-by: Tobias Schmidl <T.Schmidl@erhardt-leimer.com>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

6 files changed, 53 insertions, 43 deletions

diff --git a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch b/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
deleted file mode 100644
index fb15644c1..000000000
--- a/patches/poco-1.4.6p2/0001-make-Linux-configuration-crosscompile-aware.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Fri, 24 Jun 2011 21:21:27 +0200
-Subject: [PATCH] make Linux configuration crosscompile aware
-
-Currently, the "Linux" configuration cannot be cross compiled because
-the compiler is configured unconditionally. We add the CROSS_COMPILE
-prefix: this way it is easily possible to overwrite that variable from
-the commandline and use any cross compiler.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- build/config/Linux | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/build/config/Linux b/build/config/Linux
-index 4781a12..7612e59 100644
---- a/build/config/Linux
-+++ b/build/config/Linux
-@@ -15,14 +15,14 @@ LINKMODE ?= SHARED
- #
- # Define Tools
- #
--CC      = gcc
--CXX     = g++
-+CC      = $(CROSS_COMPILE)gcc
-+CXX     = $(CROSS_COMPILE)g++
- LINK    = $(CXX)
--LIB     = ar -cr
--RANLIB  = ranlib
-+LIB     = $(CROSS_COMPILE)ar -cr
-+RANLIB  = $(CROSS_COMPILE)ranlib
- SHLIB   = $(CXX) -shared -Wl,-soname,$(notdir $@) -o $@
- SHLIBLN = $(POCO_BASE)/build/script/shlibln
--STRIP   = strip
-+STRIP   = $(CROSS_COMPILE)strip
- DEP     = $(POCO_BASE)/build/script/makedepend.gcc 
- SHELL   = sh
- RM      = rm -rf
diff --git a/patches/poco-1.4.6p2/series b/patches/poco-1.4.6p2/series
deleted file mode 100644
index d5d1e3ba3..000000000
--- a/patches/poco-1.4.6p2/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-Linux-configuration-crosscompile-aware.patch
-0002-fix-parallel-building.patch
-# caa577b66d6611048eb3d4345dc8d6a4  - git-ptx-patches magic
diff --git a/patches/poco-1.6.1/0001-libpcre-bug.patch b/patches/poco-1.6.1/0001-libpcre-bug.patch
new file mode 100644
index 000000000..97d5d05d2
--- /dev/null
+++ b/patches/poco-1.6.1/0001-libpcre-bug.patch
@@ -0,0 +1,12 @@
+diff --git a/Foundation/Makefile b/Foundation/Makefile
+index 45ade1c..895b575 100644
+--- a/Foundation/Makefile
++++ b/Foundation/Makefile
+@@ -46,6 +46,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+ 	SYSLIBS += -lpcre -lz
++	objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
+ else
+ 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
+ endif
diff --git a/patches/poco-1.4.6p2/0002-fix-parallel-building.patch b/patches/poco-1.6.1/0002-fix-parallel-building.patch
index a961e5acb..a961e5acb 100644
--- a/patches/poco-1.4.6p2/0002-fix-parallel-building.patch
+++ b/patches/poco-1.6.1/0002-fix-parallel-building.patch
diff --git a/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
new file mode 100644
index 000000000..b5d6b35df
--- /dev/null
+++ b/patches/poco-1.6.1/0003-Include-pcre.h-for-an-unbundled-build.patch
@@ -0,0 +1,38 @@
+From 94bb16fdeea5cd804c586b282cdbdd1c45360718 Mon Sep 17 00:00:00 2001
+From: zosrothko <zosrothko@orange.fr>
+Date: Tue, 17 Nov 2015 18:45:44 +0100
+Subject: [PATCH] Include <pcre.h> for an unbundled build.
+
+---
+ Foundation/include/Poco/RegularExpression.h | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h
+index 9181d29..e2b3446 100644
+--- a/Foundation/include/Poco/RegularExpression.h
++++ b/Foundation/include/Poco/RegularExpression.h
+@@ -28,17 +28,19 @@
+ #include <map>
+ 
+ 
++#ifdef POCO_UNBUNDLED
++#include <pcre.h>
++#else
+ //
+ // Copy these definitions from pcre.h
+ // to avoid pulling in the entire header file
+ //
+ extern "C"
+ {
+-	struct real_pcre8_or_16;                 /* declaration; the definition is private  */
+ 	typedef struct real_pcre8_or_16 pcre;
+ 	struct pcre_extra;
+ }
+-
++#endif
+ 
+ namespace Poco {
+ 
+-- 
+2.1.4
+
diff --git a/patches/poco-1.6.1/series b/patches/poco-1.6.1/series
new file mode 100644
index 000000000..ff8ef985a
--- /dev/null
+++ b/patches/poco-1.6.1/series
@@ -0,0 +1,3 @@
+0001-libpcre-bug.patch
+0002-fix-parallel-building.patch
+0003-Include-pcre.h-for-an-unbundled-build.patch