From a8e31487bf0a0a6364cb6f5c99d4421868358b56 Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Feb 19 2020 00:48:16 +0000 Subject: Update to new upstream release 1.10.1 (#1803758) --- diff --git a/.gitignore b/.gitignore index 2095b9d..5ae5994 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ poco-1.3.6p2-all.tar.bz2 /poco-1.9.3.tar.gz /poco-1.9.4.tar.gz /poco-1.10.0.tar.gz +/poco-1.10.1.tar.gz diff --git a/dont-install-cppunit.patch b/dont-install-cppunit.patch deleted file mode 100644 index 743c876..0000000 --- a/dont-install-cppunit.patch +++ /dev/null @@ -1,23 +0,0 @@ -From d9512077faff99b56855e9529f7887aeac01d556 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Thu, 6 Feb 2020 15:46:50 -0500 -Subject: [PATCH] Don't install CppUnit - ---- - CppUnit/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt -index e5d7f6523..2ef15c715 100644 ---- a/CppUnit/CMakeLists.txt -+++ b/CppUnit/CMakeLists.txt -@@ -33,6 +33,3 @@ elseif(MINGW) - PUBLIC - _DLL) - endif() -- --POCO_INSTALL(CppUnit) -- --- -2.24.1 - diff --git a/fix-sha2engine-big-endian.patch b/fix-sha2engine-big-endian.patch deleted file mode 100644 index 6d52533..0000000 --- a/fix-sha2engine-big-endian.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ed2f6b813eeabc9461fc307bd6213cfbb54d7f65 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= -Date: Sat, 8 Feb 2020 16:09:37 +0100 -Subject: [PATCH] GH #2909: fix SHA2Engine for big-endian architectures - ---- - Foundation/src/SHA2Engine.cpp | 47 ----------------------------------- - 1 file changed, 47 deletions(-) - -diff --git a/Foundation/src/SHA2Engine.cpp b/Foundation/src/SHA2Engine.cpp -index 7ab454218e..b09b30a796 100644 ---- a/Foundation/src/SHA2Engine.cpp -+++ b/Foundation/src/SHA2Engine.cpp -@@ -151,52 +151,6 @@ static const unsigned char padding[128] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - temp2 = S642(a) + F640(a,b,c); \ - d += temp1; h = temp1 + temp2; \ - } --#ifdef POCO_ARCH_BIG_ENDIAN --#ifndef GET_UINT32 --#define GET_UINT32(n,b,i) \ --do { \ -- (n) = ( (Poco::UInt32) (b)[(i) ] ) \ -- | ( (Poco::UInt32) (b)[(i) + 1] << 8 ) \ -- | ( (Poco::UInt32) (b)[(i) + 2] << 16 ) \ -- | ( (Poco::UInt32) (b)[(i) + 3] << 24 ); \ --} while( 0 ) --#endif --#ifndef PUT_UINT32 --#define PUT_UINT32(n,b,i) \ --do { \ -- (b)[(i) ] = (unsigned char) ( (n) ); \ -- (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ -- (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \ -- (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \ --} while( 0 ) --#endif --#ifndef GET_UINT64 --#define GET_UINT64(n,b,i) \ --{ \ -- (n) = ( (Poco::UInt64) (b)[(i) ] ) \ -- | ( (Poco::UInt64) (b)[(i) + 1] << 8 ) \ -- | ( (Poco::UInt64) (b)[(i) + 2] << 16 ) \ -- | ( (Poco::UInt64) (b)[(i) + 3] << 24 ) \ -- | ( (Poco::UInt64) (b)[(i) + 4] << 32 ) \ -- | ( (Poco::UInt64) (b)[(i) + 5] << 40 ) \ -- | ( (Poco::UInt64) (b)[(i) + 6] << 48 ) \ -- | ( (Poco::UInt64) (b)[(i) + 7] << 56 ); \ --} --#endif --#ifndef PUT_UINT64 --#define PUT_UINT64(n,b,i) \ --{ \ -- (b)[(i) ] = (unsigned char) ( (n) ); \ -- (b)[(i) + 1] = (unsigned char) ( (n) >> 8 ); \ -- (b)[(i) + 2] = (unsigned char) ( (n) >> 16 ); \ -- (b)[(i) + 3] = (unsigned char) ( (n) >> 24 ); \ -- (b)[(i) + 4] = (unsigned char) ( (n) >> 32 ); \ -- (b)[(i) + 5] = (unsigned char) ( (n) >> 40 ); \ -- (b)[(i) + 6] = (unsigned char) ( (n) >> 48 ); \ -- (b)[(i) + 7] = (unsigned char) ( (n) >> 56 ); \ --} --#endif --#else - #ifndef GET_UINT32 - #define GET_UINT32(n,b,i) \ - do { \ -@@ -241,7 +195,6 @@ do { \ - (b)[(i) + 7] = (unsigned char) ( (n) ); \ - } - #endif --#endif - - - SHA2Engine::SHA2Engine(ALGORITHM algorithm): diff --git a/fix-utf1632encoding-big-endian.patch b/fix-utf1632encoding-big-endian.patch deleted file mode 100644 index bb2426f..0000000 --- a/fix-utf1632encoding-big-endian.patch +++ /dev/null @@ -1,237 +0,0 @@ -From 40929842565a5c4cac4886317ef4ab9de64a3ba7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= -Date: Sat, 8 Feb 2020 20:25:00 +0100 -Subject: [PATCH] fix UTF16/UTF32Encoding wrong byte order handling on - bigendian - ---- - Foundation/src/UTF16Encoding.cpp | 58 +++++++++++++++++--------------- - Foundation/src/UTF32Encoding.cpp | 50 ++++++++++++++------------- - 2 files changed, 57 insertions(+), 51 deletions(-) - -diff --git a/Foundation/src/UTF16Encoding.cpp b/Foundation/src/UTF16Encoding.cpp -index ea2ee8fe4f..ae7ac88733 100644 ---- a/Foundation/src/UTF16Encoding.cpp -+++ b/Foundation/src/UTF16Encoding.cpp -@@ -28,24 +28,24 @@ const char* UTF16Encoding::_names[] = - }; - - --const TextEncoding::CharacterMap UTF16Encoding::_charMap = -+const TextEncoding::CharacterMap UTF16Encoding::_charMap = - { -- /* 00 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 10 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 20 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 30 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 40 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 50 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 60 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 70 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 80 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 90 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* a0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* b0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* e0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* f0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 00 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 10 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 20 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 30 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 40 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 50 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 60 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 70 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 80 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 90 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* a0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* b0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* e0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* f0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - }; - - -@@ -54,13 +54,13 @@ UTF16Encoding::UTF16Encoding(ByteOrderType byteOrder) - setByteOrder(byteOrder); - } - -- -+ - UTF16Encoding::UTF16Encoding(int byteOrderMark) - { - setByteOrder(byteOrderMark); - } - -- -+ - UTF16Encoding::~UTF16Encoding() - { - } -@@ -75,7 +75,7 @@ UTF16Encoding::ByteOrderType UTF16Encoding::getByteOrder() const - #endif - } - -- -+ - void UTF16Encoding::setByteOrder(ByteOrderType byteOrder) - { - #if defined(POCO_ARCH_BIG_ENDIAN) -@@ -85,7 +85,7 @@ void UTF16Encoding::setByteOrder(ByteOrderType byteOrder) - #endif - } - -- -+ - void UTF16Encoding::setByteOrder(int byteOrderMark) - { - _flipBytes = byteOrderMark != 0xFEFF; -@@ -124,7 +124,7 @@ int UTF16Encoding::convert(const unsigned char* bytes) const - - if (_flipBytes) - { -- ByteOrder::flipBytes(uc); -+ uc = ByteOrder::flipBytes(uc); - } - - if (uc >= 0xd800 && uc < 0xdc00) -@@ -136,7 +136,7 @@ int UTF16Encoding::convert(const unsigned char* bytes) const - - if (_flipBytes) - { -- ByteOrder::flipBytes(uc2); -+ uc2 = ByteOrder::flipBytes(uc2); - } - if (uc2 >= 0xdc00 && uc2 < 0xe000) - { -@@ -201,8 +201,10 @@ int UTF16Encoding::queryConvert(const unsigned char* bytes, int length) const - unsigned char* p = (unsigned char*) &uc; - *p++ = *bytes++; - *p++ = *bytes++; -- if (_flipBytes) -- ByteOrder::flipBytes(uc); -+ if (_flipBytes) -+ { -+ uc = ByteOrder::flipBytes(uc); -+ } - if (uc >= 0xd800 && uc < 0xdc00) - { - if (length >= 4) -@@ -211,8 +213,10 @@ int UTF16Encoding::queryConvert(const unsigned char* bytes, int length) const - p = (unsigned char*) &uc2; - *p++ = *bytes++; - *p++ = *bytes++; -- if (_flipBytes) -- ByteOrder::flipBytes(uc2); -+ if (_flipBytes) -+ { -+ uc2 = ByteOrder::flipBytes(uc2); -+ } - if (uc2 >= 0xdc00 && uc < 0xe000) - { - ret = ((uc & 0x3ff) << 10) + (uc2 & 0x3ff) + 0x10000; -diff --git a/Foundation/src/UTF32Encoding.cpp b/Foundation/src/UTF32Encoding.cpp -index ff07006a4f..47a0156b0e 100644 ---- a/Foundation/src/UTF32Encoding.cpp -+++ b/Foundation/src/UTF32Encoding.cpp -@@ -28,24 +28,24 @@ const char* UTF32Encoding::_names[] = - }; - - --const TextEncoding::CharacterMap UTF32Encoding::_charMap = -+const TextEncoding::CharacterMap UTF32Encoding::_charMap = - { -- /* 00 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 10 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 20 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 30 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 40 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 50 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 60 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 70 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 80 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* 90 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* a0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* b0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* e0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -- /* f0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 00 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 10 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 20 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 30 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 40 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 50 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 60 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 70 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 80 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* 90 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* a0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* b0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* c0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* d0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* e0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -+ /* f0 */ -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, -2, - }; - - -@@ -54,13 +54,13 @@ UTF32Encoding::UTF32Encoding(ByteOrderType byteOrder) - setByteOrder(byteOrder); - } - -- -+ - UTF32Encoding::UTF32Encoding(int byteOrderMark) - { - setByteOrder(byteOrderMark); - } - -- -+ - UTF32Encoding::~UTF32Encoding() - { - } -@@ -75,7 +75,7 @@ UTF32Encoding::ByteOrderType UTF32Encoding::getByteOrder() const - #endif - } - -- -+ - void UTF32Encoding::setByteOrder(ByteOrderType byteOrder) - { - #if defined(POCO_ARCH_BIG_ENDIAN) -@@ -85,7 +85,7 @@ void UTF32Encoding::setByteOrder(ByteOrderType byteOrder) - #endif - } - -- -+ - void UTF32Encoding::setByteOrder(int byteOrderMark) - { - _flipBytes = byteOrderMark != 0xFEFF; -@@ -126,7 +126,7 @@ int UTF32Encoding::convert(const unsigned char* bytes) const - - if (_flipBytes) - { -- ByteOrder::flipBytes(uc); -+ uc = ByteOrder::flipBytes(uc); - } - - return uc; -@@ -160,8 +160,10 @@ int UTF32Encoding::queryConvert(const unsigned char* bytes, int length) const - *p++ = *bytes++; - *p++ = *bytes++; - *p++ = *bytes++; -- if (_flipBytes) -- ByteOrder::flipBytes(uc); -+ if (_flipBytes) -+ { -+ uc = ByteOrder::flipBytes(uc); -+ } - return uc; - } - diff --git a/poco-1.10.0-fix-unbundled-build1.patch b/poco-1.10.0-fix-unbundled-build1.patch deleted file mode 100644 index 9263923..0000000 --- a/poco-1.10.0-fix-unbundled-build1.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 58e63be1620021a22601a26bed1e2861f5054970 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= -Date: Tue, 4 Feb 2020 11:05:21 +0100 -Subject: [PATCH] #2894: Poco 1.10.0 doesn't build with cmake & POCO_UNBUNDLED - ---- - cmake/PocoMacros.cmake | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake -index 4490b7b644..14ebbb6c7e 100644 ---- a/cmake/PocoMacros.cmake -+++ b/cmake/PocoMacros.cmake -@@ -233,20 +233,27 @@ configure_file("cmake/Poco${target_name}Config.cmake" - @ONLY - ) - --set(ConfigPackageLocation "lib/cmake/${PROJECT_NAME}") -+# 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 -+if (WIN32) -+ set(PocoConfigPackageLocation "cmake") -+else() -+ set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") -+endif() - - install( - EXPORT "${target_name}Targets" - FILE "${PROJECT_NAME}${target_name}Targets.cmake" - NAMESPACE "${PROJECT_NAME}::" -- DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}" -+ DESTINATION "${PocoConfigPackageLocation}" - ) - - install( - FILES - "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}Config.cmake" - "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}${target_name}ConfigVersion.cmake" -- DESTINATION "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}" -+ DESTINATION "${PocoConfigPackageLocation}" - COMPONENT Devel - ) - diff --git a/poco-1.10.0-fix-unbundled-build2.patch b/poco-1.10.0-fix-unbundled-build2.patch deleted file mode 100644 index c2609bc..0000000 --- a/poco-1.10.0-fix-unbundled-build2.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6ef3f95baf4d78f471b34334858febd95beb9c8d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= -Date: Wed, 5 Feb 2020 06:41:10 +0100 -Subject: [PATCH] fix POCO_UNBUNDLES - ---- - CMakeLists.txt | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bf22d25768..96c475828e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -437,6 +437,15 @@ write_basic_package_version_file( - COMPATIBILITY AnyNewerVersion - ) - -+# 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 -+if (WIN32) -+ set(PocoConfigPackageLocation "cmake") -+else() -+ set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") -+endif() -+ - configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY) - install( - FILES diff --git a/poco.spec b/poco.spec index 09371a1..bfbf271 100644 --- a/poco.spec +++ b/poco.spec @@ -22,7 +22,7 @@ %endif Name: poco -Version: 1.10.0 +Version: 1.10.1 Release: 1%{?dist} Summary: C++ class libraries for network-centric applications @@ -33,13 +33,6 @@ Source0: https://github.com/pocoproject/%{name}/archive/%{name}-%{versi # Disable the tests that will fail under Koji (mostly network) Patch0: disable-tests.patch -Patch1: poco-1.10.0-fix-unbundled-build1.patch -Patch2: poco-1.10.0-fix-unbundled-build2.patch -Patch3: set-sqlite-thread-mode.patch -Patch4: use-lib-suffix.patch -Patch5: dont-install-cppunit.patch -Patch6: fix-sha2engine-big-endian.patch -Patch7: fix-utf1632encoding-big-endian.patch BuildRequires: cmake BuildRequires: gcc-c++ @@ -464,6 +457,9 @@ HTML format. %doc README NEWS LICENSE CONTRIBUTORS CHANGELOG doc/* %changelog +* Tue Feb 18 2020 Scott Talbert - 1.10.1-1 +- Update to new upstream release 1.10.1 (#1803758) + * Thu Feb 06 2020 Scott Talbert - 1.10.0-1 - Update to new upstream release 1.10.0 (#1795299) diff --git a/set-sqlite-thread-mode.patch b/set-sqlite-thread-mode.patch deleted file mode 100644 index 3d95edf..0000000 --- a/set-sqlite-thread-mode.patch +++ /dev/null @@ -1,28 +0,0 @@ -From a84744326fc00f7136545e81856d2ca445bbf1f7 Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Thu, 6 Feb 2020 15:14:56 -0500 -Subject: [PATCH 1/2] Set SQLite thread safe mode when building unbundled - ---- - Data/SQLite/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt -index fcce2e0d6..ee7d2a177 100644 ---- a/Data/SQLite/CMakeLists.txt -+++ b/Data/SQLite/CMakeLists.txt -@@ -44,7 +44,10 @@ target_include_directories(DataSQLite - - if(POCO_UNBUNDLED) - target_link_libraries(DataSQLite PUBLIC SQLite::SQLite3) -- target_compile_definitions(DataSQLite PUBLIC POCO_UNBUNDLED) -+ target_compile_definitions(DataSQLite PUBLIC -+ POCO_UNBUNDLED -+ SQLITE_THREADSAFE=1 -+ ) - else() - if(WINCE) - target_compile_definitions(DataSQLite PRIVATE SQLITE_MSVC_LOCALTIME_API) --- -2.24.1 - diff --git a/sources b/sources index 41df237..8e63f4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (poco-1.10.0.tar.gz) = 9c4bd7cd04f58872d8d171af37708713e437408a9f837d5b56967694dded2a482a8c63d29fb0c5f5b9d544568584937f50d0c936b91cc0550e50fefeaa4d9493 +SHA512 (poco-1.10.1.tar.gz) = 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73 diff --git a/use-lib-suffix.patch b/use-lib-suffix.patch deleted file mode 100644 index ed30596..0000000 --- a/use-lib-suffix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 48cb7ba8a35dd658227824dd407ad0c31a318d0d Mon Sep 17 00:00:00 2001 -From: Scott Talbert -Date: Thu, 6 Feb 2020 15:17:57 -0500 -Subject: [PATCH 2/2] Use ${LIB_SUFFIX} when setting PocoConfigPackageLocation - ---- - CMakeLists.txt | 2 +- - cmake/PocoMacros.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 96c475828..d7ce6e512 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -443,7 +443,7 @@ write_basic_package_version_file( - if (WIN32) - set(PocoConfigPackageLocation "cmake") - else() -- set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") -+ set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") - endif() - - configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY) -diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake -index 14ebbb6c7..b99422dba 100644 ---- a/cmake/PocoMacros.cmake -+++ b/cmake/PocoMacros.cmake -@@ -239,7 +239,7 @@ configure_file("cmake/Poco${target_name}Config.cmake" - if (WIN32) - set(PocoConfigPackageLocation "cmake") - else() -- set(PocoConfigPackageLocation "lib/cmake/${PROJECT_NAME}") -+ set(PocoConfigPackageLocation "lib${LIB_SUFFIX}/cmake/${PROJECT_NAME}") - endif() - - install( --- -2.24.1 -