From 901bae0e20ec63eb11b57fb37c8b32af03ff1393 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Sun, 8 Dec 2024 01:16:39 +0100
Subject: [PATCH] objfw: Update to 1.2.2 & various fixes

---
 ...{objfw-1.2.1.recipe => objfw-1.2.2.recipe} | 24 +++++++------
 dev-libs/objfw/patches/objfw-1.2.1.patchset   | 36 -------------------
 2 files changed, 14 insertions(+), 46 deletions(-)
 rename dev-libs/objfw/{objfw-1.2.1.recipe => objfw-1.2.2.recipe} (90%)
 delete mode 100644 dev-libs/objfw/patches/objfw-1.2.1.patchset

diff --git a/dev-libs/objfw/objfw-1.2.1.recipe b/dev-libs/objfw/objfw-1.2.2.recipe
similarity index 90%
rename from dev-libs/objfw/objfw-1.2.1.recipe
rename to dev-libs/objfw/objfw-1.2.2.recipe
index 4969506a7..5645c8e67 100644
--- a/dev-libs/objfw/objfw-1.2.1.recipe
+++ b/dev-libs/objfw/objfw-1.2.2.recipe
@@ -7,19 +7,18 @@ you want to be portable."
 HOMEPAGE="https://objfw.nil.im/"
 COPYRIGHT="2008-2024 Jonathan Schleifer"
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="1"
 SOURCE_URI="https://objfw.nil.im/downloads/objfw-$portVersion.tar.gz"
-PATCHES="objfw-1.2.1.patchset"
-CHECKSUM_SHA256="637fdeccae149cec236e62c5289450afad542fe930343918856e76594ab3fcfd"
+CHECKSUM_SHA256="4fe0bed1ec21561a184d804aa577ff630f1e3d20b1c3b973073e23ce829294a1"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
-libobjfwVersion="1.2.1"
+libobjfwVersion="1.2.2"
 libobjfwVersionCompat="$libobjfwVersion compat >= 1.0"
 libobjfwrtVersion="1.2.1"
 libobjfwrtVersionCompat="$libobjfwrtVersion compat >= 1.0"
-libobjfwtlsVersion="1.0.2"
+libobjfwtlsVersion="1.0.3"
 libobjfwtlsVersionCompat="$libobjfwrtVersion compat >= 1.0"
 libobjfwhidVersion="1.0.1"
 libobjfwhidVersionCompat="$libobjfwrtVersion compat >= 1.0"
@@ -97,22 +96,22 @@ 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:libobjfwtest$secondaryArchSuffix
 	devel:libobjfwtls$secondaryArchSuffix = $libobjfwtlsVersionCompat
+	devel:libobjfwhid$secondaryArchSuffix = $libobjfwhidVersionCompat
 	"
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	lib:libobjfw$secondaryArchSuffix == $libobjfwVersionCompat
-	lib:libobjfwhid$secondaryArchSuffix == $libobjfwVersionCompat
+	lib:libobjfwhid$secondaryArchSuffix == $libobjfwhidVersionCompat
 	lib:libobjfwrt$secondaryArchSuffix == $libobjfwrtVersionCompat
 	lib:libobjfwtls$secondaryArchSuffix == $libobjfwtlsVersionCompat
 	"
 
 BUILD()
 {
-	# Force GCC, as Clang is currently broken on Haiku.
-	runConfigure ./configure OBJC=gcc
+	runConfigure ./configure OBJC=clang
 	make $jobArgs
 }
 
@@ -125,7 +124,12 @@ INSTALL()
 		binDir=$prefix/bin
 	fi
 
-	prepareInstalledDevelLibs libobjfw libobjfwrt libobjfwtls
+	prepareInstalledDevelLibs \
+		libobjfw \
+		libobjfwrt \
+		libobjfwtest \
+		libobjfwtls \
+		libobjfwhid
 
 	packageEntries libs \
 		$libDir/libobjfw.so.* \
diff --git a/dev-libs/objfw/patches/objfw-1.2.1.patchset b/dev-libs/objfw/patches/objfw-1.2.1.patchset
deleted file mode 100644
index 8191c765b..000000000
--- a/dev-libs/objfw/patches/objfw-1.2.1.patchset
+++ /dev/null
@@ -1,36 +0,0 @@
-From 1e20311ffd6870fa7ccc18e388abfb2cc671da91 Mon Sep 17 00:00:00 2001
-From: Jonathan Schleifer <js@nil.im>
-Date: Wed, 13 Nov 2024 00:18:50 +0000
-Subject: Fix compiling on r1beta5
-
-
-diff --git a/src/OFFileIRIHandler.m b/src/OFFileIRIHandler.m
-index 9df9e5d..3a58b85 100644
---- a/src/OFFileIRIHandler.m
-+++ b/src/OFFileIRIHandler.m
-@@ -43,6 +43,7 @@
- # include <sys/extattr.h>
- #endif
- #ifdef OF_HAIKU
-+# include <TypeConstants.h>
- # include <kernel/fs_attr.h>
- #endif
- #ifdef OF_DJGPP
-diff --git a/tests/OFFileManagerTests.m b/tests/OFFileManagerTests.m
-index 142060b..d9602b6 100644
---- a/tests/OFFileManagerTests.m
-+++ b/tests/OFFileManagerTests.m
-@@ -24,6 +24,10 @@
- #import "ObjFW.h"
- #import "ObjFWTest.h"
- 
-+#ifdef OF_HAIKU
-+# include <TypeConstants.h>
-+#endif
-+
- @interface OFFileManagerTests: OTTestCase
- {
- 	OFFileManager *_fileManager;
--- 
-2.45.2
-