mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-08 23:51:08 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/poco: bump version to 1.12.4

Browse Source 
For change log, see:
https://github.com/pocoproject/poco/blob/poco-1.12.4-release/CHANGELOG

This commit also drop the package patch, which was included upstream in
version 1.12.3:
3884c734c2

The file .checkpackageignore is also updated to reflect this patch
removal.

Signed-off-by: Julien Olivain <ju.o@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 50ef6a6f59)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Julien Olivain
2023-07-24 22:48:35 +02:00
committed by Peter Korsgaard
parent be4b55ea52
commit 85dba7acde
4 changed files with 2 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -139,7 +139,6 @@ package/owfs/S55owserver Shellcheck Variables
package/owfs/S60owfs Shellcheck Variables
package/pigpio/S50pigpio Shellcheck Variables
package/pkgconf/pkg-config.in Shellcheck
package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch Sob
package/postgresql/S50postgresql Variables
package/procps-ng/S02sysctl Variables
package/proftpd/S50proftpd Indent Shellcheck Variables

45
package/poco/0001-Fix-optional-JSON-support-for-MySQL-3753.patch
View File

@@ -1,45 +0,0 @@
From 3884c734c261231c34f59e56cde7ae02945b4dae Mon Sep 17 00:00:00 2001
From: Hernan Martinez <hernan.c.martinez@gmail.com>
Date: Tue, 16 Aug 2022 23:07:25 -0500
Subject: [PATCH] Fix optional JSON support for MySQL (#3753)
* Fix optional JSON support for MySQL
* Fix optional JSON support for MySQLTest
---
Data/MySQL/src/ResultMetadata.cpp | 2 ++
Data/MySQL/testsuite/src/MySQLTest.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp
index 61b49dd54..adb5dae84 100644
--- a/Data/MySQL/src/ResultMetadata.cpp
+++ b/Data/MySQL/src/ResultMetadata.cpp
@@ -133,8 +133,10 @@ namespace
case MYSQL_TYPE_LONG_BLOB:
case MYSQL_TYPE_BLOB:
return Poco::Data::MetaColumn::FDT_BLOB;
+#ifdef POCO_MYSQL_JSON
case MYSQL_TYPE_JSON:
return Poco::Data::MetaColumn::FDT_JSON;
+#endif
default:
return Poco::Data::MetaColumn::FDT_UNKNOWN;
}
diff --git a/Data/MySQL/testsuite/src/MySQLTest.cpp b/Data/MySQL/testsuite/src/MySQLTest.cpp
index 80a3683b1..2a286d35e 100644
--- a/Data/MySQL/testsuite/src/MySQLTest.cpp
+++ b/Data/MySQL/testsuite/src/MySQLTest.cpp
@@ -976,7 +976,9 @@ CppUnit::Test* MySQLTest::suite()
CppUnit_addTest(pSuite, MySQLTest, testBLOBStmt);
CppUnit_addTest(pSuite, MySQLTest, testLongBLOB);
CppUnit_addTest(pSuite, MySQLTest, testLongTEXT);
+#ifdef POCO_MYSQL_JSON
CppUnit_addTest(pSuite, MySQLTest, testJSON);
+#endif
CppUnit_addTest(pSuite, MySQLTest, testUnsignedInts);
CppUnit_addTest(pSuite, MySQLTest, testFloat);
CppUnit_addTest(pSuite, MySQLTest, testDouble);
--
2.37.2

2
package/poco/poco.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 30442ccb097a0074133f699213a59d6f8c77db5b2c98a7c1ad9c5eeb3a2b06f3 poco-1.12.2.tar.gz
sha256 71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef poco-1.12.4.tar.gz
sha256 c4b1e1e5f36d8331737231fefcc30f5714326aec7c387ad59a8115eb0ba7d6b5 LICENSE

2
package/poco/poco.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
POCO_VERSION = 1.12.2
POCO_VERSION = 1.12.4
POCO_SITE = $(call github,pocoproject,poco,poco-$(POCO_VERSION)-release)
POCO_LICENSE = BSL-1.0
POCO_LICENSE_FILES = LICENSE