From d9e308f8e57d0d49e39e47fe5f36cb8d88032d5b Mon Sep 17 00:00:00 2001
From: David Karoly <david.karoly@outlook.com>
Date: Sun, 4 Dec 2022 21:25:52 +0000
Subject: [PATCH] filezilla: enable x86 secondary architecture

---
 net-ftp/filezilla/filezilla-3.62.2.recipe | 81 ++++++++++++-----------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/net-ftp/filezilla/filezilla-3.62.2.recipe b/net-ftp/filezilla/filezilla-3.62.2.recipe
index c9f007e84..a82fbb161 100644
--- a/net-ftp/filezilla/filezilla-3.62.2.recipe
+++ b/net-ftp/filezilla/filezilla-3.62.2.recipe
@@ -12,67 +12,68 @@ CHECKSUM_SHA256="a76709635ca0ea474f691f6c60b191334af3079ef192c07c346504baab738c1
 PATCHES="filezilla-$portVersion.patchset"
 
 ARCHITECTURES="?all !x86_gcc2"
+SECONDARY_ARCHITECTURES="?x86"
 
 PROVIDES="
-	filezilla = $portVersion
+	filezilla$secondaryArchSuffix = $portVersion
 	app:FileZilla = $portVersion
 	cmd:filezilla
 	cmd:fzputtygen
 	cmd:fzsftp
-	lib:libfzclient_commonui_private
-	lib:libfzclient_commonui_private_$portVersion
-	lib:libfzclient_private
-	lib:libfzclient_private_$portVersion
+	lib:libfzclient_commonui_private$secondaryArchSuffix
+	lib:libfzclient_commonui_private_$portVersion$secondaryArchSuffix
+	lib:libfzclient_private$secondaryArchSuffix
+	lib:libfzclient_private_$portVersion$secondaryArchSuffix
 	"
 
 REQUIRES="
-	haiku
-	wxgtk
-	lib:libatk_1.0
-	lib:libcairo
-	lib:libfilezilla
-	lib:libgdk_pixbuf_2.0
-	lib:libglib_2.0
-	lib:libgtk_3
-	lib:libharfbuzz
-	lib:libiconv
-	lib:libidn
-	lib:libintl
-	lib:libnettle
-	lib:libpango_1.0
-	lib:libpugixml
-	lib:libsqlite3
+	haiku$secondaryArchSuffix
+	wxgtk$secondaryArchSuffix
+	lib:libatk_1.0$secondaryArchSuffix
+	lib:libcairo$secondaryArchSuffix
+	lib:libfilezilla$secondaryArchSuffix
+	lib:libgdk_pixbuf_2.0$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgtk_3$secondaryArchSuffix
+	lib:libharfbuzz$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libidn$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libnettle$secondaryArchSuffix
+	lib:libpango_1.0$secondaryArchSuffix
+	lib:libpugixml$secondaryArchSuffix
+	lib:libsqlite3$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
-	haiku_devel
-	wxgtk_Devel
+	haiku${secondaryArchSuffix}_devel
+	wxgtk${secondaryArchSuffix}_devel
 	xdg_utils
-	xz_utils_devel
-	devel:libfilezilla
-	devel:libgnutls
-	devel:libiconv
-	devel:libidn
-	devel:libnettle
-	devel:libpugixml
-	devel:libsqlite3
+	xz_utils${secondaryArchSuffix}_devel
+	devel:libfilezilla$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libidn$secondaryArchSuffix
+	devel:libnettle$secondaryArchSuffix
+	devel:libpugixml$secondaryArchSuffix
+	devel:libsqlite3$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
 	cmd:autoconf
 	cmd:awk
 	cmd:diff
-	cmd:gcc
+	cmd:gcc$secondaryArchSuffix
 	cmd:make
-	cmd:pkg_config
-	cmd:wx_config
-	cmd:xgettext
+	cmd:pkg_config$secondaryArchSuffix
+	cmd:wx_config$secondaryArchSuffix
+	cmd:xgettext$secondaryArchSuffix
 	"
 
-defineDebugInfoPackage filezilla \
+defineDebugInfoPackage filezilla$secondaryArchSuffix \
 	"$libDir"/libfzclient-commonui-private.so \
 	"$libDir"/libfzclient-private.so \
-	"$binDir"/filezilla
+	"$prefix"/bin/filezilla
 
 BUILD()
 {
@@ -93,7 +94,11 @@ INSTALL()
 	mkdir -p $developLibDir
 	mv $libDir/*.la $developLibDir/
 
+	if [ $effectiveTargetArchitecture = x86 ]; then
+		mv $binDir/* $prefix/bin/
+	fi
+
 	mkdir -p $appsDir
-	ln -s $binDir/filezilla $appsDir/FileZilla
+	ln -s $prefix/bin/filezilla $appsDir/FileZilla
 	addAppDeskbarSymlink $appsDir/FileZilla
 }