From 8527bd0ef81b2e4d446afdf7edc86bb4365f54cb Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Mon, 20 Sep 2021 17:06:55 +0200 Subject: [PATCH] poco: update to 1.11.0 Signed-off-by: Pascal Bach Signed-off-by: Khem Raj --- .../0001-Add-support-of-arch-riscv32.patch | 47 ------------------- .../0001-fix-missing-expat-definition.patch | 27 +++++++++++ .../poco/{poco_1.10.1.bb => poco_1.11.0.bb} | 6 +-- 3 files changed, 30 insertions(+), 50 deletions(-) delete mode 100644 meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch create mode 100644 meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch rename meta-oe/recipes-support/poco/{poco_1.10.1.bb => poco_1.11.0.bb} (96%) diff --git a/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch b/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch deleted file mode 100644 index e6b673b11d2..00000000000 --- a/meta-oe/recipes-support/poco/poco/0001-Add-support-of-arch-riscv32.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 98d277655e411f56fba705c0bf2efc6562c23807 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 15 Nov 2020 11:37:33 -0800 -Subject: [PATCH] Add support of arch riscv32 - -Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3138] -Signed-off-by: Khem Raj ---- - Foundation/include/Poco/Platform.h | 13 +++++++++---- - 1 file changed, 9 insertions(+), 4 deletions(-) - -diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h -index 799db417e..b8506a248 100644 ---- a/Foundation/include/Poco/Platform.h -+++ b/Foundation/include/Poco/Platform.h -@@ -135,6 +135,7 @@ - #define POCO_ARCH_AARCH64 0x0f - #define POCO_ARCH_ARM64 0x0f // same as POCO_ARCH_AARCH64 - #define POCO_ARCH_RISCV64 0x10 -+#define POCO_ARCH_RISCV32 0x11 - - - #if defined(__ALPHA) || defined(__alpha) || defined(__alpha__) || defined(_M_ALPHA) -@@ -225,12 +226,16 @@ - #elif defined(__AARCH64EB__) - #define POCO_ARCH POCO_ARCH_AARCH64 - #define POCO_ARCH_BIG_ENDIAN 1 --#elif defined(__riscv) && (__riscv_xlen == 64) -- #define POCO_ARCH POCO_ARCH_RISCV64 -- #define POCO_ARCH_LITTLE_ENDIAN 1 -+#elif defined(__riscv) -+ #if (__riscv_xlen == 64) -+ #define POCO_ARCH POCO_ARCH_RISCV64 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 -+ #elif(__riscv_xlen == 32) -+ #define POCO_ARCH POCO_ARCH_RISCV32 -+ #define POCO_ARCH_LITTLE_ENDIAN 1 -+ #endif - #endif - -- - #if defined(__clang__) - #define POCO_COMPILER_CLANG - #elif defined(_MSC_VER) --- -2.29.2 - diff --git a/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch b/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch new file mode 100644 index 00000000000..625aa31911e --- /dev/null +++ b/meta-oe/recipes-support/poco/poco/0001-fix-missing-expat-definition.patch @@ -0,0 +1,27 @@ +From 3f288fefbd683d687bde3fc63964da64bc3c8a40 Mon Sep 17 00:00:00 2001 +From: Pascal Bach +Date: Wed, 11 Aug 2021 15:11:49 +0200 +Subject: [PATCH] fix missing expat definition + +Upstream-Status: Submitted [https://github.com/pocoproject/poco/pull/3414] +Signed-off-by: Pascal Bach +--- + XML/src/ParserEngine.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp +index 82d477478..6213e555b 100644 +--- a/XML/src/ParserEngine.cpp ++++ b/XML/src/ParserEngine.cpp +@@ -504,7 +504,7 @@ void ParserEngine::init() + XML_SetParamEntityParsing(_parser, _externalParameterEntities ? XML_PARAM_ENTITY_PARSING_ALWAYS : XML_PARAM_ENTITY_PARSING_NEVER); + XML_SetUnknownEncodingHandler(_parser, handleUnknownEncoding, this); + +-#if XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4) ++#if XML_DTD && (XML_MAJOR_VERSION > 2 || (XML_MAJOR_VERSION == 2 && XML_MINOR_VERSION >= 4)) + if (_maximumAmplificationFactor > 1.0) + { + XML_SetBillionLaughsAttackProtectionMaximumAmplification(_parser, _maximumAmplificationFactor); +-- +2.32.0 + diff --git a/meta-oe/recipes-support/poco/poco_1.10.1.bb b/meta-oe/recipes-support/poco/poco_1.11.0.bb similarity index 96% rename from meta-oe/recipes-support/poco/poco_1.10.1.bb rename to meta-oe/recipes-support/poco/poco_1.11.0.bb index 5db518cbba9..5f639109836 100644 --- a/meta-oe/recipes-support/poco/poco_1.10.1.bb +++ b/meta-oe/recipes-support/poco/poco_1.11.0.bb @@ -9,11 +9,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" DEPENDS = "libpcre zlib" SRC_URI = " \ - git://github.com/pocoproject/poco.git;branch=poco-${PV} \ - file://0001-Add-support-of-arch-riscv32.patch \ + git://github.com/pocoproject/poco.git;branch=master \ + file://0001-fix-missing-expat-definition.patch \ file://run-ptest \ " -SRCREV = "a3d827d80eb7f3329c58e73eb2906cb7ba829019" +SRCREV = "f81a38057f1d240fe7b7a069612776f788bc88ea" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P\d+(\.\d+)+)"