poco, revbump, fix libVersion (#10107)

2026-04-09 05:10:05 +02:00 · 2024-02-14 14:11:53 +00:00
parent 7bd01a9264
commit 118f466571
2 changed files with 88 additions and 82 deletions
--- a/dev-libs/poco/patches/poco-1.12.4.patchset
+++ b/dev-libs/poco/patches/poco-1.12.4.patchset
@@ -1,4 +1,4 @@
-From 56e2e849bae47cd3b9b0ab53a0752fb40a1f683d Mon Sep 17 00:00:00 2001
+From f436eed91214a54fa923c754765c49776af28906 Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Thu, 22 Dec 2022 13:36:46 +0100
 Subject: poco: add a plattform identifier
@@ -27,10 +27,10 @@ index 192d6c7..ac21e57 100644
 
 
 -- 
-2.37.3
+2.42.1


-From 6fa110e9759d2742668a5d9c3f5d405f3060d108 Mon Sep 17 00:00:00 2001
+From 2d7d9c9764c93469200949e10c0014104ac4ce76 Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Thu, 22 Dec 2022 13:47:56 +0100
 Subject: poco: implemented debugger for haiku
@@ -70,10 +70,10 @@ index f50a7f7..17ddbe1 100644
 	if (isAvailable())
 	{
 -- 
-2.37.3
+2.42.1


-From 71376c7ba420e6dd17cac4b53a8b0283d86f7a54 Mon Sep 17 00:00:00 2001
+From bdbde563ef5e67fc5d1fef2160eeee4f1f8b99e3 Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Sat, 18 Mar 2023 09:42:24 +0100
 Subject: libpoco: initial porting to Haiku
@@ -665,10 +665,10 @@ index fe61ddd..82ebed7 100644
     if (ioctl(0, TIOCGWINSZ , &winsz) != -1)
     {
 -- 
-2.37.3
+2.42.1


-From d2bd3826ac4fa92ce1d3784b8ef9306408259e7f Mon Sep 17 00:00:00 2001
+From 43bac2b573c7092d6572e568bef449082d3def85 Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Sat, 25 Mar 2023 07:03:07 +0100
 Subject: poco: try to use GNUInstallDirs
@@ -819,26 +819,26 @@ index 0ef354e..71a2078 100644
             OPTIONAL
         )
 -- 
-2.37.3
+2.42.1


-From 94afd3b0a7c51253177bbba826773dfeb29d4c75 Mon Sep 17 00:00:00 2001
+From 6550b90bcf0f7aa5be83dc6d38b68f024b8da1bd Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Wed, 19 Apr 2023 22:01:07 +0200
 Subject: poco: hopefully make networking work somewhat


 diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
-index 237df1c..753c976 100644
+index 237df1c..c893385 100644
 --- a/Net/CMakeLists.txt
 +++ b/Net/CMakeLists.txt
@@ -36,6 +36,10 @@ if(WIN32)
 	endif()
 endif(WIN32)
 
-+if("${CMAKE_SYSTEM_NAME}" STREQUAL "Haiku")
+if(HAIKU)
 +	target_link_libraries(Net PUBLIC network)
-+endif(WIN32)
+endif(HAIKU)
 +
 target_include_directories(Net
 	PUBLIC
@@ -1292,10 +1292,10 @@ index 71c91f7..65c9a3f 100644
 #endif
 						{
 -- 
-2.37.3
+2.42.1


-From a43e3d5eb34455d2fe3f5f5057a26d4864205071 Mon Sep 17 00:00:00 2001
+From 7c44f86c1f5a117ee920feeb0b6821d3afe1936b Mon Sep 17 00:00:00 2001
 From: Maite Gamper <victor@wenzeslaus.de>
 Date: Fri, 28 Apr 2023 22:33:11 +0200
 Subject: change an include for the debugger
@@ -1320,5 +1320,5 @@ index 17ddbe1..1f9cf61 100644
 #include "Poco/UnicodeConverter.h"
 
 -- 
-2.37.3
+2.42.1

--- a/dev-libs/poco/poco-1.12.4.recipe
+++ b/dev-libs/poco/poco-1.12.4.recipe
@@ -5,7 +5,7 @@ and embedded systems."
 HOMEPAGE="https://pocoproject.org/"
 COPYRIGHT="pocoproject"
 LICENSE="Boost v1.0"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/pocoproject/poco/archive/refs/tags/poco-1.12.4-release.tar.gz"
 CHECKSUM_SHA256="71ef96c35fced367d6da74da294510ad2c912563f12cd716ab02b6ed10a733ef"
 SOURCE_DIR="poco-poco-1.12.4-release/"
@@ -14,32 +14,30 @@ PATCHES="poco-$portVersion.patchset"
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"

-libVersion=$portVersion
-libVersionCompat="$portVersion compat >= 94"
-soSuffix="94"
+libVersion="94"

 PROVIDES="
 	poco$secondaryArchSuffix = $portVersion
 	cmd:arc$secondaryArchSuffix = $portVersion
 	cmd:cpspc$secondaryArchSuffix = $portVersion
 	cmd:f2cpsp$secondaryArchSuffix = $portVersion
-	lib:libPocoActiveRecord$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoCrypto$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoData$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoDataSQLite$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoEncodings$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoFoundation$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoJSON$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoJWT$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoMongoDB$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoNet$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoNetSSL$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoRedis$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoUtil$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoPrometheus$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoXML$secondaryArchSuffix = $libVersionCompat
-	lib:libPocoZip$secondaryArchSuffix = $libVersionCompat
-	lib:poco$secondaryArchSuffix = $libVersionCompat
+	lib:libPocoActiveRecord$secondaryArchSuffix = $libVersion
+	lib:libPocoCrypto$secondaryArchSuffix = $libVersion
+	lib:libPocoData$secondaryArchSuffix = $libVersion
+	lib:libPocoDataSQLite$secondaryArchSuffix = $libVersion
+	lib:libPocoEncodings$secondaryArchSuffix = $libVersion
+	lib:libPocoFoundation$secondaryArchSuffix = $libVersion
+	lib:libPocoJSON$secondaryArchSuffix = $libVersion
+	lib:libPocoJWT$secondaryArchSuffix = $libVersion
+	lib:libPocoMongoDB$secondaryArchSuffix = $libVersion
+	lib:libPocoNet$secondaryArchSuffix = $libVersion
+	lib:libPocoNetSSL$secondaryArchSuffix = $libVersion
+	lib:libPocoRedis$secondaryArchSuffix = $libVersion
+	lib:libPocoUtil$secondaryArchSuffix = $libVersion
+	lib:libPocoPrometheus$secondaryArchSuffix = $libVersion
+	lib:libPocoXML$secondaryArchSuffix = $libVersion
+	lib:libPocoZip$secondaryArchSuffix = $libVersion
+	lib:poco$secondaryArchSuffix = $libVersion
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -52,22 +50,22 @@ REQUIRES="

 PROVIDES_devel="
 	poco${secondaryArchSuffix}_devel = $portVersion
-	devel:libPocoActiveRecord$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoCrypto$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoData$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoDataSQLite$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoEncodings$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoFoundation$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoJSON$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoJWT$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoMongoDB$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoNet$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoNetSSL$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoRedis$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoUtil$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoPrometheus$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoXML$secondaryArchSuffix = $libVersionCompat
-	devel:libPocoZip$secondaryArchSuffix = $libVersionCompat
+	devel:libPocoActiveRecord$secondaryArchSuffix = $libVersion
+	devel:libPocoCrypto$secondaryArchSuffix = $libVersion
+	devel:libPocoData$secondaryArchSuffix = $libVersion
+	devel:libPocoDataSQLite$secondaryArchSuffix = $libVersion
+	devel:libPocoEncodings$secondaryArchSuffix = $libVersion
+	devel:libPocoFoundation$secondaryArchSuffix = $libVersion
+	devel:libPocoJSON$secondaryArchSuffix = $libVersion
+	devel:libPocoJWT$secondaryArchSuffix = $libVersion
+	devel:libPocoMongoDB$secondaryArchSuffix = $libVersion
+	devel:libPocoNet$secondaryArchSuffix = $libVersion
+	devel:libPocoNetSSL$secondaryArchSuffix = $libVersion
+	devel:libPocoRedis$secondaryArchSuffix = $libVersion
+	devel:libPocoUtil$secondaryArchSuffix = $libVersion
+	devel:libPocoPrometheus$secondaryArchSuffix = $libVersion
+	devel:libPocoXML$secondaryArchSuffix = $libVersion
+	devel:libPocoZip$secondaryArchSuffix = $libVersion
 	"
 REQUIRES_devel="
 	poco$secondaryArchSuffix == $portVersion base
@@ -95,52 +93,60 @@ defineDebugInfoPackage poco$secondaryArchSuffix \
 	$binDir/arc \
 	$binDir/cpspc \
 	$binDir/f2cpsp \
-	$libDir/libPocoActiveRecord.so.$soSuffix \
-	$libDir/libPocoCrypto.so.$soSuffix \
-	$libDir/libPocoData.so.$soSuffix \
-	$libDir/libPocoDataSQLite.so.$soSuffix \
-	$libDir/libPocoEncodings.so.$soSuffix \
-	$libDir/libPocoFoundation.so.$soSuffix \
-	$libDir/libPocoJSON.so.$soSuffix \
-	$libDir/libPocoJWT.so.$soSuffix \
-	$libDir/libPocoMongoDB.so.$soSuffix \
-	$libDir/libPocoNet.so.$soSuffix \
-	$libDir/libPocoNetSSL.so.$soSuffix \
-	$libDir/libPocoPrometheus.so.$soSuffix \
-	$libDir/libPocoRedis.so.$soSuffix \
-	$libDir/libPocoUtil.so.$soSuffix \
-	$libDir/libPocoXML.so.$soSuffix \
-	$libDir/libPocoZip.so.$soSuffix
+	$libDir/libPocoActiveRecord.so.$libVersion \
+	$libDir/libPocoCrypto.so.$libVersion \
+	$libDir/libPocoData.so.$libVersion \
+	$libDir/libPocoDataSQLite.so.$libVersion \
+	$libDir/libPocoEncodings.so.$libVersion \
+	$libDir/libPocoFoundation.so.$libVersion \
+	$libDir/libPocoJSON.so.$libVersion \
+	$libDir/libPocoJWT.so.$libVersion \
+	$libDir/libPocoMongoDB.so.$libVersion \
+	$libDir/libPocoNet.so.$libVersion \
+	$libDir/libPocoNetSSL.so.$libVersion \
+	$libDir/libPocoPrometheus.so.$libVersion \
+	$libDir/libPocoRedis.so.$libVersion \
+	$libDir/libPocoUtil.so.$libVersion \
+	$libDir/libPocoXML.so.$libVersion \
+	$libDir/libPocoZip.so.$libVersion

-BUILD() {
+BUILD()
+{
 	cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-		-DENABLE_TESTS=ON \
-		-DCMAKE_INSTALL_INCLUDEDIR=$includeDir \
-		-DCMAKE_INSTALL_LIBDIR=$libDir \
-		-DCMAKE_INSTALL_BINDIR=$binDir \
 		$cmakeDirArgs \
+		-DENABLE_TESTS=ON \
 		-DPOCO_UNBUNDLED=ON
 #		-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-g3" \
 	make -C build $jobArgs
 }

-INSTALL() {
-	mkdir -p $includeDir
+INSTALL()
+{
 	make -C build install

-	prepareInstalledDevelLibs libPocoActiveRecord libPocoCrypto \
-		libPocoData libPocoDataSQLite libPocoEncodings libPocoFoundation \
-		libPocoJSON libPocoJWT libPocoMongoDB libPocoNet \
-		libPocoNetSSL libPocoRedis libPocoUtil libPocoPrometheus \
-		libPocoXML libPocoZip
-	fixPkgconfig
+	prepareInstalledDevelLibs libPocoActiveRecord \
+		libPocoCrypto \
+		libPocoData \libPocoDataSQLite \
+		libPocoEncodings \
+		libPocoFoundation \
+		libPocoJSON \
+		libPocoJWT \
+		libPocoMongoDB \
+		libPocoNet \
+		libPocoNetSSL \
+		libPocoRedis \
+		libPocoUtil \
+		libPocoPrometheus \
+		libPocoXML \
+		libPocoZip

 	packageEntries devel \
 		$developDir \
 		$libDir/cmake
 }

-TEST() {
+TEST()
+{
 	mkdir -p /home
 	# for some reason, the test library is in the bin folder
 	# a test assumes that $HOME is set, which it is not for build environments