diff mbox series

[meta-oe,35/36] poco: upgrade 1.12.5p2 -> 1.13.3

Message ID 1717664795-13902-35-git-send-email-wangmy@fujitsu.com
State Accepted
Headers show
Series [meta-oe,01/36] atkmm-2.36: upgrade 2.36.2 -> 2.36.3 | expand

Commit Message

Mingyu Wang (Fujitsu) June 6, 2024, 9:06 a.m. UTC 
From: Wang Mingyu <wangmy@fujitsu.com>

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>
---
 ...nx-Ignore-PKCS12-and-testLaunch-test.patch |  6 ++--
 ...l-cmake-files-with-resolved-ENABLE_J.patch | 32 -------------------
 .../poco/{poco_1.12.5p2.bb => poco_1.13.3.bb} |  5 ++-
 3 files changed, 5 insertions(+), 38 deletions(-)
 delete mode 100644 meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch
 rename meta-oe/recipes-support/poco/{poco_1.12.5p2.bb => poco_1.13.3.bb} (96%)
diff mbox series

Patch

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 f70e8bcc7..d172c8dbf 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 @@ 
-From 879ddb725823c78c9510cfd39786adb16f3726c8 Mon Sep 17 00:00:00 2001
+From 6b1123b313e439d8bfae3570a3e541b3aa26f3ad Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Sat, 16 Sep 2023 19:52:56 -0700
 Subject: [PATCH] cppignore.lnx: Ignore PKCS12 and testLaunch test
@@ -48,10 +48,10 @@  Signed-off-by: Patrick Wicki <patrick.wicki@siemens.com>
  1 file changed, 9 insertions(+)
 
 diff --git a/cppignore.lnx b/cppignore.lnx
-index 2c2376526..65df4af08 100644
+index b3288d474..9aad48ca5 100644
 --- a/cppignore.lnx
 +++ b/cppignore.lnx
-@@ -28,3 +28,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy
+@@ -30,3 +30,12 @@ CppUnit::TestCaller<HTTPSClientSessionTest>.testProxy
  CppUnit::TestCaller<HTTPSStreamFactoryTest>.testProxy
  CppUnit::TestCaller<DNSTest>.testHostByAddress
  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 427cb9723..000000000
--- a/meta-oe/recipes-support/poco/poco/0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch
+++ /dev/null
@@ -1,32 +0,0 @@ 
-From e54478c936493c0ed87e875f04127bd13642de44 Mon Sep 17 00:00:00 2001
-From: tyler92 <tyler92@inbox.ru>
-Date: Tue, 21 Nov 2023 05:07:24 +0300
-Subject: [PATCH] fix(build): Install cmake files with resolved ENABLE_JSON and
- ENABLE_XML (#4227)
-
-Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/4227]
-Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
-
----
- Util/cmake/PocoUtilConfig.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Util/cmake/PocoUtilConfig.cmake b/Util/cmake/PocoUtilConfig.cmake
-index 90c1eab1c..8186435e1 100644
---- a/Util/cmake/PocoUtilConfig.cmake
-+++ b/Util/cmake/PocoUtilConfig.cmake
-@@ -1,9 +1,9 @@
- include(CMakeFindDependencyMacro)
- find_dependency(PocoFoundation)
--if(ENABLE_XML)
-+if(@ENABLE_XML@)
- 	find_dependency(PocoXML)
- endif()
--if(ENABLE_JSON)
-+if(@ENABLE_JSON@)
- 	find_dependency(PocoJSON)
- endif()
- include("${CMAKE_CURRENT_LIST_DIR}/PocoUtilTargets.cmake")
--- 
-2.43.0
-
diff --git a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb
similarity index 96%
rename from meta-oe/recipes-support/poco/poco_1.12.5p2.bb
rename to meta-oe/recipes-support/poco/poco_1.13.3.bb
index a0bb0b5d9..6ad577b37 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"
 # These dependencies are required by Foundation
 DEPENDS = "libpcre2 zlib"
 
-SRC_URI = "git://github.com/pocoproject/poco.git;branch=master;protocol=https \
+SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \
            file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \
            file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
            file://run-ptest \
-           file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \
            "
-SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30"
+SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b"
 
 UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"