From 37840478f10597eec5734ad8bee5ff4dd1445d19 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 12 Dec 2023 09:16:39 +1000
Subject: [PATCH] qtwebengine_bin: add bin packages for x86_gcc2 arch, enable
 build

---
 .../qtwebengine_bin-5.15.16.recipe            | 38 +++++++++++++------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe b/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe
index aac7de14c..fefd3a0d6 100644
--- a/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe
+++ b/dev-qt/qtwebengine/qtwebengine_bin-5.15.16.recipe
@@ -5,23 +5,27 @@ HOMEPAGE="https://www.qt.io"
 COPYRIGHT="2015-2023 The Qt Company Ltd."
 LICENSE="BSD (3-clause)
 	GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 hpkgHOME="https://github.com/threedeyes/qtwebengine-haiku"
 SOURCE_URI="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine-${portVersion}-1-x86_64.hpkg#noarchive"
 CHECKSUM_SHA256="eb8b96aa3b10208008e19b96c2a4d4c431f78fb9952d2080d8eed7373423ee66"
 SOURCE_URI_2="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_devel-${portVersion}-1-x86_64.hpkg#noarchive"
 CHECKSUM_SHA256_2="98c61dcd4946c22845878656ec16d77dac0fcf6403d893083ad056c5572cbf33"
+SOURCE_URI_3="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_x86-${portVersion}-1-x86_gcc2.hpkg#noarchive"
+CHECKSUM_SHA256_3="503c850056058346512fe6a595270d33613dc2a443064936e3c788aa2180f3dc"
+SOURCE_URI_4="$hpkgHOME/releases/download/v${portVersion}-1/qtwebengine_x86_devel-${portVersion}-1-x86_gcc2.hpkg#noarchive"
+CHECKSUM_SHA256_4="f1677abbfe807509eb3c35a458e00b9aca5303fa8232c4089b21a9de9eec3daf"
 DISABLE_SOURCE_PACKAGE="yes"
 
 ARCHITECTURES="x86_64"
-SECONDARY_ARCHITECTURES="!x86"
+SECONDARY_ARCHITECTURES="x86"
 
 libVersion="$portVersion"
 libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
 
 PROVIDES="
 	qtwebengine_bin$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qwebengine_convert_dict
+	cmd:qwebengine_convert_dict = $portVersion compat >= 5
 	lib:libQt5Pdf$secondaryArchSuffix = $libVersionCompat
 	lib:libQt5PdfWidgets$secondaryArchSuffix = $libVersionCompat
 	lib:libQt5WebEngine$secondaryArchSuffix = $libVersionCompat
@@ -52,7 +56,6 @@ REQUIRES="
 	lib:libplds4$secondaryArchSuffix
 	lib:libpng16$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Designer$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5Positioning$secondaryArchSuffix
@@ -63,6 +66,7 @@ REQUIRES="
 	lib:libQt5QuickWidgets$secondaryArchSuffix
 	lib:libQt5WebChannel$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libre2$secondaryArchSuffix
 	lib:libsmime3$secondaryArchSuffix
 	lib:libsnappy$secondaryArchSuffix
 	lib:libvpx$secondaryArchSuffix
@@ -87,6 +91,7 @@ PROVIDES_devel="
 REQUIRES_devel="
 	haiku$secondaryArchSuffix
 	qtwebengine_bin$secondaryArchSuffix == $portVersion base
+	devel:libQt5Designer$secondaryArchSuffix
 	"
 CONFLICTS_devel="
 	qtwebengine${secondaryArchSuffix}_devel
@@ -101,20 +106,29 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mv qtwebengine*.hpkg ../qtwebengine.hpkg
-	mv ../../sources-2/qtwebengine_devel*.hpkg ../qtwebengine_devel.hpkg
+	mkdir -p $prefix
 
-	package extract ../qtwebengine.hpkg
-	package extract ../qtwebengine_devel.hpkg
-	rm .PackageInfo
+	if [ "$targetArchitecture" = x86_64 ]; then
+		package extract -C $prefix $sourceDir/*.hpkg
+		package extract -C $prefix $sourceDir2/*.hpkg
+	fi
+
+	if [ "$targetArchitecture" = x86_gcc2 ]; then
+		package extract -C $prefix $sourceDir3/*.hpkg
+		package extract -C $prefix $sourceDir4/*.hpkg
+		rm $prefix/bin/qwebengine_convert_dict-x86
+		mv $binDir/* $prefix/bin
+		rm -rf $binDir
+	fi
+
+	rm "$prefix/.PackageInfo"
 }
 
 INSTALL()
 {
-	cp -r * $prefix
-
 	packageEntries devel \
 		$developDir \
 		$libDir/cmake \
-		$dataDir/Qt5/mkspecs
+		$dataDir/Qt5/mkspecs \
+		$addOnsDir/Qt5/designer
 }