(conan-io#6110) bump poco 1.11.0

* poco new version

* Fix Linux build for poco 1.11

Signed-off-by: Uilian Ries <uilianries@gmail.com>

* poco new version

* poco new version

Co-authored-by: Uilian Ries <uilianries@gmail.com>

recipes/poco/all/CMakeLists.txt

@@ -18,4 +18,9 @@ endif()
 # Disable automatic linking on MSVC
 add_definitions(-DPOCO_NO_AUTOMATIC_LIBS)
 
+if ("${CONAN_PACKAGE_VERSION}" VERSION_GREATER "1.10")
+    add_definitions(-DXML_DTD)
+endif()
+
+
 add_subdirectory(source_subfolder)

recipes/poco/all/conandata.yml

@@ -14,6 +14,9 @@ sources:
   1.10.1:
     sha256: 44592a488d2830c0b4f3bfe4ae41f0c46abbfad49828d938714444e858a00818
     url: https://github.com/pocoproject/poco/archive/poco-1.10.1-release.tar.gz
+  1.11.0:
+    sha256: 8a7bfd0883ee95e223058edce8364c7d61026ac1882e29643822ce9b753f3602
+    url: https://github.com/pocoproject/poco/archive/poco-1.11.0-release.tar.gz
 patches:
   1.8.1:
     - patch_file: patches/1.8.1.patch
@@ -36,3 +39,8 @@ patches:
   1.10.1:
     - patch_file: patches/1.10.1.patch
       base_path: source_subfolder
+  1.11.0:
+    - patch_file: patches/1.11.0.patch
+      base_path: source_subfolder
+    - patch_file: patches/0002-mysql-include.patch
+      base_path: source_subfolder

recipes/poco/all/conanfile.py

@@ -58,6 +58,7 @@ class PocoConan(ConanFile):
         "PocoUtil": _PocoComponent("enable_util", True, ("PocoFoundation", "PocoXML", "PocoJSON", ), True),
         "PocoXML": _PocoComponent("enable_xml", True, ("PocoFoundation", ), True),
         "PocoZip": _PocoComponent("enable_zip", True, ("PocoUtil", "PocoXML", ), True),
+        "PocoActiveRecord": _PocoComponent("enable_active_record", True, ("PocoFoundation", "PocoData", ), True),
     }
 
     for comp in _poco_component_tree.values():
@@ -109,6 +110,8 @@ def config_options(self):
             del self.options.enable_data_mysql
             del self.options.enable_data_postgresql
             del self.options.enable_jwt
+        if tools.Version(self.version) < "1.11":
+            del self.options.enable_active_record
 
     def configure(self):
         if self.options.shared:

recipes/poco/all/patches/0002-mysql-include.patch

@@ -0,0 +1,156 @@
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+index 82fa617..dd7bf60 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h
+@@ -22,7 +22,7 @@
+ #include "Poco/Data/AbstractBinder.h"
+ #include "Poco/Data/LOB.h"
+ #include "Poco/Data/MySQL/MySQLException.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+index 6ddcd39..7f4cd22 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQL.h
+@@ -19,7 +19,7 @@
+
+
+ #include "Poco/Foundation.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ //
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+index 67692df..2d28da3 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h
+@@ -20,7 +20,7 @@
+
+ #include "Poco/Data/MySQL/MySQL.h"
+ #include "Poco/Data/DataException.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+ #include <typeinfo>
+ #include <string>
+
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+index 3a45387..9361dcf 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h
+@@ -19,7 +19,7 @@
+
+
+ #include "Poco/Data/MetaColumn.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+ #include <vector>
+
+
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+index 4f65ae5..f9df7ad 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h
+@@ -19,7 +19,7 @@
+
+
+ #include "Poco/Data/MySQL/MySQLException.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+index 6767b68..55f0991 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h
+@@ -19,7 +19,7 @@
+
+
+ #include "Poco/Data/MySQL/MySQLException.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
+index 79c13c3..4fba2c9 100644
+--- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h
++++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h
+@@ -20,7 +20,7 @@
+
+ #include "Poco/Data/MySQL/MySQL.h"
+ #include "Poco/Data/Session.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp
+index b90abab..43e2432 100644
+--- a/Data/MySQL/src/Connector.cpp
++++ b/Data/MySQL/src/Connector.cpp
+@@ -16,7 +16,7 @@
+ #include "Poco/Data/MySQL/SessionImpl.h"
+ #include "Poco/Data/SessionFactory.h"
+ #include "Poco/Exception.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp
+index bffdaae..d8fe137 100644
+--- a/Data/MySQL/src/MySQLException.cpp
++++ b/Data/MySQL/src/MySQLException.cpp
+@@ -18,7 +18,7 @@
+
+
+ #include "Poco/Data/MySQL/MySQLException.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+ #include <stdio.h>
+
+
+diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp
+index b7e8dbc..d1b512d 100644
+--- a/Data/MySQL/src/StatementExecutor.cpp
++++ b/Data/MySQL/src/StatementExecutor.cpp
+@@ -14,7 +14,7 @@
+
+ #include "Poco/Data/MySQL/StatementExecutor.h"
+ #include "Poco/Format.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp
+index 84e5cfc..b711901 100644
+--- a/Data/MySQL/src/Utility.cpp
++++ b/Data/MySQL/src/Utility.cpp
+@@ -15,7 +15,7 @@
+
+
+ #include "Poco/Data/MySQL/Utility.h"
+-#include <mysql/mysql.h>
++#include <mysql.h>
+
+
+ namespace Poco {
+diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp
+index 27beb6f..1987659 100644
+--- a/Data/MySQL/testsuite/src/SQLExecutor.cpp
++++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp
+@@ -29,7 +29,7 @@
+ #include <Winsock2.h>
+ #endif
+
+-#include <mysql/mysql.h>
++#include <mysql.h>
+ #include <iostream>
+ #include <limits>
+

recipes/poco/all/patches/1.11.0.patch

@@ -0,0 +1,42 @@
+--- cmake/PocoMacros.cmake
++++ cmake/PocoMacros.cmake
+@@ -40,7 +40,7 @@ if(WIN32)
+ 			endforeach()
+ 		endif(X64)
+ 	endif()
+-	find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir}
++	find_program(CMAKE_MC_COMPILER mc.exe windmc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir}
+ 		DOC "path to message compiler")
+ 	if(NOT CMAKE_MC_COMPILER)
+ 		message(FATAL_ERROR "message compiler not found: required to build")
+@@ -279,7 +279,7 @@
+
+ if(MSVC)
+ # install the targets pdb
+-	POCO_INSTALL_PDB(${target_name})
++	# POCO_INSTALL_PDB(${target_name})
+ endif()
+
+ endmacro()
+--- Foundation/CMakeLists.txt
++++ Foundation/CMakeLists.txt
+@@ -101,7 +101,7 @@
+ )
+
+ if(POCO_UNBUNDLED)
+-	target_link_libraries(Foundation PUBLIC Pcre::Pcre ZLIB::ZLIB)
++	target_link_libraries(Foundation PUBLIC PCRE::PCRE ZLIB::ZLIB)
+ 	target_compile_definitions(Foundation PUBLIC POCO_UNBUNDLED)
+ endif(POCO_UNBUNDLED)
+
+--- NetSSL_Win/CMakeLists.txt
++++ NetSSL_Win/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ 	DEFINE_SYMBOL NetSSL_Win_EXPORTS
+ )
+
+-target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util Crypt32.lib)
++target_link_libraries(NetSSLWin PUBLIC Poco::Net Poco::Util Crypt32.lib ws2_32 )
+ target_include_directories(NetSSLWin
+ 	PUBLIC
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>

recipes/poco/config.yml

@@ -1,4 +1,6 @@
 versions:
+  1.11.0:
+    folder: all
   1.10.1:
     folder: all
   1.10.0: