poco: Update to 1.11.6

2023-01-03 12:29:43 +01:00
parent 9bee3ea0ff
commit ab6d8cd102
7 changed files with 28 additions and 55 deletions
--- a/mingw-w64-poco/004-format-string-using-ostringstream.patch
+++ b/mingw-w64-poco/004-format-string-using-ostringstream.patch
@@ -11,7 +11,7 @@ diff --git a/Foundation/src/NumberFormatter.cpp b/Foundation/src/NumberFormatter
 index b7b27e7..714acab 100644
 --- a/Foundation/src/NumberFormatter.cpp
 +++ b/Foundation/src/NumberFormatter.cpp
-@@ -36,6 +36,8 @@
+@@ -19,6 +19,8 @@
 
 #include "Poco/NumberFormatter.h"
 #include "Poco/MemoryStream.h"
@@ -20,7 +20,7 @@ index b7b27e7..714acab 100644
 #include <iomanip>
 #if !defined(POCO_NO_LOCALE)
 #include <locale>
-@@ -43,15 +45,6 @@
+@@ -27,16 +29,6 @@
 #include <cinttypes>
 
 
@@ -32,19 +32,20 @@ index b7b27e7..714acab 100644
 -	#define I64_FMT "ll"
 -#endif
 -
+-
 -
 namespace Poco {
 
 
-@@ -384,13 +377,15 @@ void NumberFormatter::append(std::string& str, double value, int width, int prec
+@@ -475,13 +467,15 @@
 
 void NumberFormatter::append(std::string& str, const void* ptr)
 {
 -	char buffer[24];
 -#if defined(POCO_PTR_IS_64_BIT)
-	std::sprintf(buffer, "%016" PRIXPTR, (UIntPtr) ptr);
+-	std::snprintf(buffer, sizeof(buffer), "%016" PRIXPTR, (UIntPtr) ptr);
 -#else
-	std::sprintf(buffer, "%08" PRIXPTR, (UIntPtr) ptr);
+-	std::snprintf(buffer, sizeof(buffer), "%08" PRIXPTR, (UIntPtr) ptr);
 -#endif
 -	str.append(buffer);
 +	std::ostringstream os;
--- a/mingw-w64-poco/005-dont-compare-signed-unsigned.patch
+++ b/mingw-w64-poco/005-dont-compare-signed-unsigned.patch
@@ -11,7 +11,7 @@ diff --git a/Foundation/src/Logger.cpp b/Foundation/src/Logger.cpp
 index 6037bf9..78afdfc 100644
 --- a/Foundation/src/Logger.cpp
 +++ b/Foundation/src/Logger.cpp
-@@ -273,7 +273,7 @@ void Logger::formatDump(std::string& message, const void* buffer, std::size_t le
+@@ -245,7 +245,7 @@ void Logger::formatDump(std::string& message, const void* buffer, std::size_t le
 	message.reserve(message.size() + length*6);
 	if (!message.empty()) message.append("\n");
 	unsigned char* base = (unsigned char*) buffer;
--- a/mingw-w64-poco/010-remove-warnings.patch
+++ b/mingw-w64-poco/010-remove-warnings.patch
@@ -57,31 +57,3 @@ index 37ecf7f..e5dc939 100644
 -	if (width && (str.length() < width)) str.insert(str.begin(), width - str.length(), prefix);
 +	if (width && (str.length() < width)) str.insert(str.begin(), _width - str.length(), prefix);
 }
- 
- 
-diff --git a/Foundation/src/utils.h b/Foundation/src/utils.h
-index 767094b..6465e84 100644
--- a/Foundation/src/utils.h
-+++ b/Foundation/src/utils.h
-@@ -35,6 +35,11 @@
- #ifndef ASSERT
- #define ASSERT(condition)      (assert(condition))
- #endif
-+#if __cplusplus >= 201103L
-+#define STATIC_ASSERT(b, str) static_assert(b, str)
-+#else
-+#define STATIC_ASSERT(b, str) typedef char __StaticAssertCheck[b ? 1 : -1]
-+#endif
- #ifndef UNIMPLEMENTED
- #define UNIMPLEMENTED() (abort())
- #endif
-@@ -296,8 +301,7 @@ template <class Dest, class Source>
- inline Dest BitCast(const Source& source) {
-   // Compile time assertion: sizeof(Dest) == sizeof(Source)
-   // A compile error here means your Dest and Source have different sizes.
-  DOUBLE_CONVERSION_UNUSED
-      typedef char VerifySizesAreEqual[sizeof(Dest) == sizeof(Source) ? 1 : -1];
-+      STATIC_ASSERT(sizeof(Dest) == sizeof(Source), "Dest and Source must have the same size");
- 
-   Dest dest;
-   memmove(&dest, &source, sizeof(dest));
--- a/mingw-w64-poco/011-cmake-mingw.patch
+++ b/mingw-w64-poco/011-cmake-mingw.patch
@@ -1,6 +1,6 @@
--- poco-poco-1.10.1-release/CMakeLists.txt.orig	2014-11-17 12:31:47.705800000 +0300
-+++ poco-poco-1.10.1-release/CMakeLists.txt	2014-11-17 12:32:39.209200000 +0300
-@@ -440,7 +440,7 @@
+--- poco-poco-1.11.6-release/CMakeLists.txt.orig	2014-11-17 12:31:47.705800000 +0300
+++ poco-poco-1.11.6-release/CMakeLists.txt	2014-11-17 12:32:39.209200000 +0300
+@@ -459,7 +459,7 @@
 # Set config script install location in a location that find_package() will
 # look for, which is different on MS Windows than for UNIX
 # Note: also set in POCO_GENERATE_PACKAGE macro in cmake/PocoMacros.cmake
@@ -9,8 +9,8 @@
 	set(PocoConfigPackageLocation "cmake")
 else()
 	set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
--- poco-poco-1.10.1-release/cmake/PocoMacros.cmake.orig	2014-11-17 12:31:47.705800000 +0300
-+++ poco-poco-1.10.1-release/cmake/PocoMacros.cmake	2014-11-17 12:32:39.209200000 +0300
+--- poco-poco-1.11.6-release/cmake/PocoMacros.cmake.orig	2014-11-17 12:31:47.705800000 +0300
+++ poco-poco-1.11.6-release/cmake/PocoMacros.cmake	2014-11-17 12:32:39.209200000 +0300
@@ -40,8 +40,13 @@
 			endforeach()
 		endif(X64)
@@ -25,7 +25,7 @@
 	if(NOT CMAKE_MC_COMPILER)
 		message(FATAL_ERROR "message compiler not found: required to build")
 	endif(NOT CMAKE_MC_COMPILER)
-@@ -235,7 +235,7 @@
+@@ -230,7 +230,7 @@
 # Set config script install location in a location that find_package() will
 # look for, which is different on MS Windows than for UNIX
 # Note: also set in root CMakeLists.txt
@@ -34,8 +34,8 @@
 	set(PocoConfigPackageLocation "cmake")
 else()
 	set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}")
--- poco-poco-1.10.1-release/Foundation/CMakeLists.txt.orig	2014-11-17 12:31:47.705800000 +0300
-+++ poco-poco-1.10.1-release/Foundation/CMakeLists.txt	2014-11-17 12:32:39.209200000 +0300
+--- poco-poco-1.11.6-release/Foundation/CMakeLists.txt.orig	2014-11-17 12:31:47.705800000 +0300
+++ poco-poco-1.11.6-release/Foundation/CMakeLists.txt	2014-11-17 12:32:39.209200000 +0300
@@ -187,7 +187,9 @@
 			POCO_WIN32_UTF8
 			_WIN32
--- a/mingw-w64-poco/012-fix-mingw-redefinition.patch
+++ b/mingw-w64-poco/012-fix-mingw-redefinition.patch
@@ -1,5 +1,5 @@
--- poco-1.10.1-all/Net/include/Poco/Net/ICMPv4PacketImpl.h.orig	2020-02-21 09:50:46.432846900 +0300
-+++ poco-1.10.1-all/Net/include/Poco/Net/ICMPv4PacketImpl.h	2020-02-21 09:50:49.308908100 +0300
+--- poco-1.11.6-all/Net/include/Poco/Net/ICMPv4PacketImpl.h.orig	2020-02-21 09:50:46.432846900 +0300
+++ poco-1.11.6-all/Net/include/Poco/Net/ICMPv4PacketImpl.h	2020-02-21 09:50:49.308908100 +0300
@@ -23,6 +23,9 @@
 #include "Poco/Net/ICMPPacketImpl.h"
 #include <cstddef>
--- a/mingw-w64-poco/100-fix-mingw-config.patch
+++ b/mingw-w64-poco/100-fix-mingw-config.patch
@@ -1,5 +1,5 @@
--- poco-poco-1.10.1-release/build/config/MinGW.orig	2014-11-16 23:36:56.214400000 +0300
-+++ poco-poco-1.10.1-release/build/config/MinGW	2014-11-16 23:37:56.180800000 +0300
+--- poco-poco-1.11.6-release/build/config/MinGW.orig	2014-11-16 23:36:56.214400000 +0300
+++ poco-poco-1.11.6-release/build/config/MinGW	2014-11-16 23:37:56.180800000 +0300
@@ -65,9 +65,9 @@
 #
 # System Specific Flags
--- a/mingw-w64-poco/PKGBUILD
+++ b/mingw-w64-poco/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=poco
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=1.10.1
-pkgrel=8
+pkgver=1.11.6
+pkgrel=1
 pkgdesc="POrtable COmponents C++ Libraries (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -34,15 +34,15 @@ source=(https://pocoproject.org/releases/${_realname}-${pkgver}/${_realname}-${p
        011-cmake-mingw.patch
        012-fix-mingw-redefinition.patch
        100-fix-mingw-config.patch)
-sha256sums=('7f5931e0bb06bc2880a0f3867053a2fddf6c0d3e5dd96342a665460301fc34ca'
-            '9b44fa4af54808d1d1e938d4a7d405d2c61ce3f56c31648a4e30812905001e96'
-            'ac05804b1c90d682333cb18dbc4aedc9e12508779e93edbd59d9b82d353b0013'
+sha256sums=('f1f8004a3d304861d78b3341458d298d37c7d3d84938fb019e0ce3002dde951d'
+            '94bf2a9ddfa00d0ec804283d6fd4cd0c13c9001e0beb44f16ac5250b5b90845e'
+            'ec37e78bd3f57403b9e4d69a4ad016c451c8552c88b4e3b319e61b015190206c'
            '8c89571920fb5d0ecaae1b890854335fb5d310243baa4723233fe46544cf4f1b'
            '61979c75b5577b9b0bf3fb96045b3c299a38c5dfc5048895ade73400831eb975'
-            '6428620c4e24f4b1d7a81821e46b737a9dfc2ce7cfd4d57187243fb12f17a7ce'
-            '028889a3bcd9a7886153e9ffc7058a8e91654f6dc4a821b6d53deb3dc9870318'
-            'ea527ad21e3cf31140136a037add87610cd8cdbcdd96ba2aaf5d7b35d46786ce'
-            'c12fc09a0fa925bf3912fbc98e297104f09630212fd027b818290df7ef157a6f')
+            '542abadbead21f4539a3aad118bfb08f63e531a70db6f17bc08da1b171c4563e'
+            'a566cdc7cbeedb1666f108d0e339b9c3d7d3b1fb8e9b99c1c2f2566548e6ffbf'
+            '6ba1dcf47a6976496467965bb9eafd1453ae373d0fc52997c1c32ff799372ad2'
+            '861cc9dfae04c1843ac7d1010eb7f31596b123624bcd3cee5dbef0ac4394f9b1')

 case ${MSYSTEM} in
  CLANG*)