diff --git a/dev-libs/objfw/objfw-1.1.7.recipe b/dev-libs/objfw/objfw-1.2.recipe similarity index 83% rename from dev-libs/objfw/objfw-1.1.7.recipe rename to dev-libs/objfw/objfw-1.2.recipe index ee9704ba6..f08bba2b9 100644 --- a/dev-libs/objfw/objfw-1.1.7.recipe +++ b/dev-libs/objfw/objfw-1.2.recipe @@ -9,20 +9,24 @@ COPYRIGHT="2008-2024 Jonathan Schleifer" LICENSE="GNU LGPL v3" REVISION="1" SOURCE_URI="https://objfw.nil.im/downloads/objfw-$portVersion.tar.gz" -CHECKSUM_SHA256="5107d8a0627e2270d211abf1b4f6c50fd89c8d672d2179b50daa7d3b66d68a70" +CHECKSUM_SHA256="f1d92b64f524a1aaf8e8b572a0edf5817d589c3d3c60cab9bb182ccbac3ee405" +PATCHES="objfw-1.2.patchset" ARCHITECTURES="all !x86_gcc2" SECONDARY_ARCHITECTURES="x86" -libobjfwVersion="1.1.4" +libobjfwVersion="1.2.0" libobjfwVersionCompat="$libobjfwVersion compat >= 1.0" -libobjfwrtVersion="1.1.4" +libobjfwrtVersion="1.2.0" libobjfwrtVersionCompat="$libobjfwrtVersion compat >= 1.0" libobjfwtlsVersion="1.0.2" libobjfwtlsVersionCompat="$libobjfwrtVersion compat >= 1.0" +libobjfwhidVersion="1.0.2" +libobjfwhidVersionCompat="$libobjfwrtVersion compat >= 1.0" PROVIDES="objfw$secondaryArchSuffix = $portVersion" REQUIRES=" + objfw${secondaryArchSuffix}_hid == $portVersion objfw${secondaryArchSuffix}_libs == $portVersion objfw${secondaryArchSuffix}_tls == $portVersion objfw${secondaryArchSuffix}_utils == $portVersion @@ -59,6 +63,16 @@ REQUIRES_tls=" lib:libssl$secondaryArchSuffix " +PROVIDES_hid=" + objfw${secondaryArchSuffix}_hid = $portVersion + lib:libobjfwhid$secondaryArchSuffix = $libobjfwhidVersionCompat + " +REQUIRES_hid=" + haiku$secondaryArchSuffix + lib:libobjfw$secondaryArchSuffix == $libobjfwVersionCompat + lib:libobjfwrt$secondaryArchSuffix == $libobjfwrtVersionCompat + " + PROVIDES_utils=" objfw${secondaryArchSuffix}_utils = $portVersion cmd:ofarc = $portVersion compat >= 1.0 @@ -82,12 +96,14 @@ PROVIDES_devel=" cmd:objfw_embed = $portVersion compat >= 1.0 cmd:objfw_new = $portVersion compat >= 1.0 devel:libobjfw$secondaryArchSuffix = $libobjfwVersionCompat + devel:libobjfwhid$secondaryArchSuffix = $libobjfwVersionCompat devel:libobjfwrt$secondaryArchSuffix = $libobjfwrtVersionCompat devel:libobjfwtls$secondaryArchSuffix = $libobjfwtlsVersionCompat " REQUIRES_devel=" haiku$secondaryArchSuffix lib:libobjfw$secondaryArchSuffix == $libobjfwVersionCompat + lib:libobjfwhid$secondaryArchSuffix == $libobjfwVersionCompat lib:libobjfwrt$secondaryArchSuffix == $libobjfwrtVersionCompat lib:libobjfwtls$secondaryArchSuffix == $libobjfwtlsVersionCompat " @@ -114,6 +130,7 @@ INSTALL() $libDir/libobjfw.so.* \ $libDir/libobjfwrt.so.* packageEntries tls $libDir/libobjfwtls.so.* + packageEntries hid $libDir/libobjfwhid.so.* packageEntries utils \ $binDir/ofarc $dataDir/ofarc \ $binDir/ofdns $dataDir/ofdns \ diff --git a/dev-libs/objfw/patches/objfw-1.2.patchset b/dev-libs/objfw/patches/objfw-1.2.patchset new file mode 100644 index 000000000..3de849f9b --- /dev/null +++ b/dev-libs/objfw/patches/objfw-1.2.patchset @@ -0,0 +1,23 @@ +From 83911edfeeffbf2ffeb5e02a8282c452859d53c8 Mon Sep 17 00:00:00 2001 +From: Jonathan Schleifer +Date: Sat, 2 Nov 2024 23:17:28 +0000 +Subject: Don't require ESOCKTNOSUPPORT + + +diff --git a/tests/OFUNIXSequencedPacketSocketTests.m b/tests/OFUNIXSequencedPacketSocketTests.m +index 60c815e..f99833b 100644 +--- a/tests/OFUNIXSequencedPacketSocketTests.m ++++ b/tests/OFUNIXSequencedPacketSocketTests.m +@@ -61,7 +61,9 @@ + case EAFNOSUPPORT: + case EPERM: + case EPROTONOSUPPORT: ++#ifdef ESOCKTNOSUPPORT + case ESOCKTNOSUPPORT: ++#endif + OTSkip(@"UNIX sequenced packet sockets unsupported"); + default: + @throw e; +-- +2.43.2 +