summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-06-06 17:06:34 +0800
committerKhem Raj <raj.khem@gmail.com>2024-06-07 09:12:00 -0700
commit2ccaf19c5ba8dcd269d9528b7d86c0de35f3d21c (patch)
tree79372b7f68bc3d4cb508055cf3e5d4c9c1ac724a
parent9bd2f756777663eeff1d6008e3da207a4c0e105a (diff)
downloadmeta-openembedded-2ccaf19c5ba8dcd269d9528b7d86c0de35f3d21c.tar.gz
poco: upgrade 1.12.5p2 -> 1.13.3
0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch removed since it's included in 1.13.3 0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch refreshed for 1.13.3 Changelog: ============ - GH #4496 Upgrade bundled libexpat to 2.6.2 - GH #4488 Add Poco::Util::Timer::idle() method to check if timer has any tasks scheduled - GH #3807 DNS.resolve() should not be sorted in HostEntry::removeDuplicates() - GH #4515 Upgrade bundled SQLite to 3.45.2 - PR #4517 Optimize Net module for Android - GH #4505 ODBC Unicode wrappers do not check for null length pointers - GH #4492 Poco::BasicMemoryStreamBuf is missing seekpos() - GH #4486 DateTimeFormat RFC1036 Sunday name is short (should be long) - GH #4468 Poco::URI: don't lowercase host part if it's a Unix domain socket - GH #4450 Error between Poco::ActiveRecord and Poco::Data::PostgreSQL - GH #4435 SecureStreamSocket is not thread-safe - GH #4415 SecureSocketImpl::reset shouldn't close socket - GH #3857 Thread_POSIX.cpp shouldn't convert thread IDs to long - GH #3725 secure socket receiveTimeout throwing after configured timeout * 2 Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch6
-rw-r--r--meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch32
-rw-r--r--meta-oe/recipes-support/poco/poco_1.13.3.bb (renamed from meta-oe/recipes-support/poco/poco_1.12.5p2.bb)5
3 files changed, 5 insertions, 38 deletions
diff --git a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch
index f70e8bcc74..d172c8dbf2 100644
--- a/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch
+++ b/meta-oe/recipes-support/poco/poco/0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch
@@ -1,4 +1,4 @@
1From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001 1From 6b1123b313e439d8bfae3570a3e541b3aa26f3ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 16 Sep 2023 19:52:56 -0700 3Date: Sat, 16 Sep 2023 19:52:56 -0700
4Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test 4Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test
@@ -48,10 +48,10 @@ Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
48 1 file changed, 9 insertions(+) 48 1 file changed, 9 insertions(+)
49 49
50diff --git a/cppignore.lnx b/cppignore.lnx 50diff --git a/cppignore.lnx b/cppignore.lnx
51index 2c2376526..65df4af08 100644 51index b3288d474..9aad48ca5 100644
52--- a/cppignore.lnx 52--- a/cppignore.lnx
53+++ b/cppignore.lnx 53+++ b/cppignore.lnx
54@@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy 54@@ -30,3 +30,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy
55 CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy 55 CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy
56 CppUnit::TestCaller<DNSTest>.testHostByAddress 56 CppUnit::TestCaller<DNSTest>.testHostByAddress
57 CppUnit::TestCaller<DNSTest>.testHostByName 57 CppUnit::TestCaller<DNSTest>.testHostByName
diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch b/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch
deleted file mode 100644
index 427cb9723a..0000000000
--- a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001
2From: tyler92 <tyler92@inbox.ru>
3Date: Tue, 21 Nov 2023 05:07:24 +0300
4Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and
5 ENABLE_XML (#4227)
6
7Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227]
8Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
9
10---
11 Util/cmake/PocoUtilConfig.cmake | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake
15index 90c1eab1c..8186435e1 100644
16--- a/Util/cmake/PocoUtilConfig.cmake
17+++ b/Util/cmake/PocoUtilConfig.cmake
18@@ -1,9 +1,9 @@
19 include(CMakeFindDependencyMacro)
20 find_dependency(PocoFoundation)
21-if(ENABLE_XML)
22+if(@ENABLE_XML@)
23 find_dependency(PocoXML)
24 endif()
25-if(ENABLE_JSON)
26+if(@ENABLE_JSON@)
27 find_dependency(PocoJSON)
28 endif()
29 include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake")
30--
312.43.0
32
diff --git a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb
index a0bb0b5d96..6ad577b37b 100644
--- a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb
+++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
8# These dependencies are required by Foundation 8# These dependencies are required by Foundation
9DEPENDS = "libpcre2 zlib" 9DEPENDS = "libpcre2 zlib"
10 10
11SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \ 11SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \
12 file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ 12 file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \
13 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ 13 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
14 file://run-ptest \ 14 file://run-ptest \
15 file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \
16 " 15 "
17SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" 16SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b"
18 17
19UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" 18UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
20 19