summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/poco
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/poco')
-rw-r--r--meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch59
-rw-r--r--meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch60
-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-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch53
-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)9
6 files changed, 119 insertions, 100 deletions
diff --git a/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
new file mode 100644
index 0000000000..d976a1f83b
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
@@ -0,0 +1,59 @@
1From 03c35cff930e421199b586c33a00eb6cc537ba28 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Thu, 19 Sep 2024 09:36:48 +0100
4Subject: [PATCH] SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied
5 `noexcept`)
6
7On today's `gcc-15` poco fails to build as:
8
9 In file included from /build/source/Data/include/Poco/Data/Statement.h:27,
10 from /build/source/Data/include/Poco/Data/Session.h:23,
11 from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:22,
12 from /build/source/Data/src/ArchiveStrategy.cpp:15:
13 /build/source/Data/include/Poco/Data/SimpleRowFormatter.h:114:21: error: declaration of 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_construc
14 tible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' has a different exception specifier
15 114 | inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
16 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17 In file included from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/new_allocator.h:36,
18 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33,
19 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/allocator.h:46,
20 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/string:43,
21 from /build/source/Foundation/include/Poco/Foundation.h:94,
22 from /build/source/Data/include/Poco/Data/Data.h:23,
23 from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:21:
24 /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/move.h:214:5: note: from previous declaration 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_constructible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept (false) [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]'
25 214 | swap(_Tp& __a, _Tp& __b)
26 | ^~~~
27
28Possibly because `SimpleRowFormatter` does not have constructors and
29assignment operators that involve rvalue references?
30
31Updated `noexcept` condition. Fixes the build on` gcc-15`. Still
32compiles on `gcc-13`.
33
34Upstream-Status: Backport [03c35cf SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied `noexcept`)]
35Signed-off-by: mark.yang <mark.yang@lge.com>
36---
37 Data/include/Poco/Data/SimpleRowFormatter.h | 5 +----
38 1 file changed, 1 insertion(+), 4 deletions(-)
39
40diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
41index 0dcb43b0b..c8417b3a7 100644
42--- a/Data/include/Poco/Data/SimpleRowFormatter.h
43+++ b/Data/include/Poco/Data/SimpleRowFormatter.h
44@@ -109,13 +109,10 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const
45
46 namespace std
47 {
48- // Note: for an unknown reason, clang refuses to compile this function as noexcept
49 template<>
50 inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
51 Poco::Data::SimpleRowFormatter& s2)
52-#ifndef POCO_COMPILER_CLANG
53- noexcept
54-#endif
55+ noexcept(std::is_nothrow_swappable_v<Poco::Data::SimpleRowFormatter>)
56 /// Full template specalization of std:::swap for SimpleRowFormatter
57 {
58 s1.swap(s2);
59
diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
deleted file mode 100644
index b06135222a..0000000000
--- a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Jan 2023 14:56:36 -0800
4Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool>
5
6GCC on RISCV does not yet support inline subword atomics [1]
7Therefore avoid them until fixed
8
9Upstream-Status: Pending
10
11[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Foundation/include/Poco/AsyncChannel.h | 2 +-
16 Foundation/src/AsyncChannel.cpp | 5 ++---
17 2 files changed, 3 insertions(+), 4 deletions(-)
18
19diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h
20index 190bae7dd..d73ea6c72 100644
21--- a/Foundation/include/Poco/AsyncChannel.h
22+++ b/Foundation/include/Poco/AsyncChannel.h
23@@ -111,7 +111,7 @@ private:
24 NotificationQueue _queue;
25 std::size_t _queueSize = 0;
26 std::size_t _dropCount = 0;
27- std::atomic<bool> _closed;
28+ std::atomic<int> _closed;
29 };
30
31
32diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp
33index 37cdec477..e829b180c 100644
34--- a/Foundation/src/AsyncChannel.cpp
35+++ b/Foundation/src/AsyncChannel.cpp
36@@ -48,11 +48,10 @@ private:
37 Message _msg;
38 };
39
40-
41 AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio):
42 _pChannel(pChannel),
43 _thread("AsyncChannel"),
44- _closed(false)
45+ _closed(0)
46 {
47 _thread.setPriority(prio);
48 }
49@@ -95,7 +94,7 @@ void AsyncChannel::open()
50
51 void AsyncChannel::close()
52 {
53- if (!_closed.exchange(true))
54+ if (!_closed.exchange(1))
55 {
56 if (_thread.isRunning())
57 {
58--
592.39.1
60
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-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
new file mode 100644
index 0000000000..e607063d58
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
@@ -0,0 +1,53 @@
1From 6faf90773a7327e54342a5d3caee151623b5caf0 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
3Date: Fri, 27 Sep 2024 08:53:18 +0200
4Subject: [PATCH] =?UTF-8?q?fix(Foundation):=20Build=20error=20with=20GCC-1?=
5 =?UTF-8?q?5=20(class=20Poco::PriorityDelegate<TObj,=20void,=20true>?=
6 =?UTF-8?q?=E2=80=99=20has=20no=20member=20named=20=E2=80=98=5FpTarget?=
7 =?UTF-8?q?=E2=80=99)=20(#4695)?=
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Upstream-Status: Backport [6faf907 fix(Foundation): Build error with GCC-15 (class Poco::PriorityDelegate<TObj, void, true>’ has no member named ‘_pTarget’) (#4695)]
13Signed-off-by: mark.yang <mark.yang@lge.com>
14---
15 Foundation/include/Poco/PriorityDelegate.h | 4 ----
16 1 file changed, 4 deletions(-)
17
18diff --git a/Foundation/include/Poco/PriorityDelegate.h b/Foundation/include/Poco/PriorityDelegate.h
19index 4cd664aab..cac9cf25e 100644
20--- a/Foundation/include/Poco/PriorityDelegate.h
21+++ b/Foundation/include/Poco/PriorityDelegate.h
22@@ -52,7 +52,6 @@ public:
23 {
24 if (&delegate != this)
25 {
26- this->_pTarget = delegate._pTarget;
27 this->_receiverObject = delegate._receiverObject;
28 this->_receiverMethod = delegate._receiverMethod;
29 this->_priority = delegate._priority;
30@@ -126,7 +125,6 @@ public:
31 {
32 if (&delegate != this)
33 {
34- this->_pTarget = delegate._pTarget;
35 this->_receiverObject = delegate._receiverObject;
36 this->_receiverMethod = delegate._receiverMethod;
37 this->_priority = delegate._priority;
38@@ -200,7 +198,6 @@ public:
39 {
40 if (&delegate != this)
41 {
42- this->_pTarget = delegate._pTarget;
43 this->_receiverObject = delegate._receiverObject;
44 this->_receiverMethod = delegate._receiverMethod;
45 this->_priority = delegate._priority;
46@@ -274,7 +271,6 @@ public:
47 {
48 if (&delegate != this)
49 {
50- this->_pTarget = delegate._pTarget;
51 this->_receiverObject = delegate._receiverObject;
52 this->_receiverMethod = delegate._receiverMethod;
53 this->_priority = delegate._priority;
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..e0f6c4169e 100644
--- a/meta-oe/recipes-support/poco/poco_1.12.5p2.bb
+++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb
@@ -8,17 +8,16 @@ 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=poco-1.13.3;protocol=https \
12 file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \
13 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ 12 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
14 file://run-ptest \ 13 file://run-ptest \
15 file://0002-fix-build-Install-cmake-files-with-resolved-ENABLE_J.patch \ 14 file://0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch \
15 file://0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch \
16 " 16 "
17SRCREV = "1d6fb3e1383e559cacbada5e3f861c0dafaf5d30" 17SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4"
18 18
19UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" 19UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
20 20
21S = "${WORKDIR}/git"
22 21
23inherit cmake ptest 22inherit cmake ptest
24 23
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-09 07:15:36 +0000