From b8e92c5048d249613efdb87bd5109cb9989daf3c Mon Sep 17 00:00:00 2001
From: davidkaroly <92124087+davidkaroly@users.noreply.github.com>
Date: Sun, 19 Dec 2021 13:50:43 +0000
Subject: [PATCH] libfilezilla: bump to version 0.30.0 (#6480)

---
 ...11.1.recipe => libfilezilla-0.30.0.recipe} | 23 +++++++++++++++----
 .../patches/libfilezilla-0.30.0.patchset      | 22 ++++++++++++++++++
 2 files changed, 40 insertions(+), 5 deletions(-)
 rename dev-libs/libfilezilla/{libfilezilla-0.11.1.recipe => libfilezilla-0.30.0.recipe} (67%)
 create mode 100644 dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset

diff --git a/dev-libs/libfilezilla/libfilezilla-0.11.1.recipe b/dev-libs/libfilezilla/libfilezilla-0.30.0.recipe
similarity index 67%
rename from dev-libs/libfilezilla/libfilezilla-0.11.1.recipe
rename to dev-libs/libfilezilla/libfilezilla-0.30.0.recipe
index 2168fdb5c..b7a5a3ba9 100644
--- a/dev-libs/libfilezilla/libfilezilla-0.11.1.recipe
+++ b/dev-libs/libfilezilla/libfilezilla-0.30.0.recipe
@@ -8,27 +8,33 @@ extremely efficient
 which simplifies dealing with timestamps originating from different sources
 - Simple process handling for spawning child processes with redirected I/O"
 HOMEPAGE="https://lib.filezilla-project.org/"
-COPYRIGHT="2015-2017 Tim Kosse"
+COPYRIGHT="2015-2021 Tim Kosse"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="http://download.filezilla-project.org/libfilezilla/libfilezilla-$portVersion.tar.bz2"
-CHECKSUM_SHA256="ecbaa674c0ad0b63df842b8cde17935a497dd58c3749baa281c67cf5878e64f7"
+SOURCE_URI="https://download.filezilla-project.org/libfilezilla/libfilezilla-$portVersion.tar.bz2"
+CHECKSUM_SHA256="c16df6dacdb2ded4f6e05141b4681eda91a5a1ba052900a24a9f84e65a50dc40"
+PATCHES="libfilezilla-$portVersion.patchset"
 
 ARCHITECTURES="all ?x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="15.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	libfilezilla$secondaryArchSuffix = $portVersion
-	lib:libfilezilla$secondaryArchSuffix = 0.0.0 compat >= 0
+	lib:libfilezilla$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libgnutls$secondaryArchSuffix
 	lib:libiconv$secondaryArchSuffix
+	lib:libnettle$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
 	libfilezilla${secondaryArchSuffix}_devel = $portVersion
-	devel:libfilezilla$secondaryArchSuffix = 0.0.0 compat >= 0
+	devel:libfilezilla$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	libfilezilla$secondaryArchSuffix == $portVersion base
@@ -37,7 +43,10 @@ REQUIRES_devel="
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libcppunit$secondaryArchSuffix
+	devel:libgmp$secondaryArchSuffix
+	devel:libgnutls$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
+	devel:libnettle$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:aclocal
@@ -49,8 +58,12 @@ BUILD_PREREQUIRES="
 	cmd:libtoolize$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
+	cmd:xgettext
 	"
 
+defineDebugInfoPackage libfilezilla$secondaryArchSuffix \
+	"$libDir"/libfilezilla.so.$libVersion
+
 BUILD()
 {
 	export CPPFLAGS="-D_BSD_SOURCE"
diff --git a/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset b/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset
new file mode 100644
index 000000000..ba7715ba5
--- /dev/null
+++ b/dev-libs/libfilezilla/patches/libfilezilla-0.30.0.patchset
@@ -0,0 +1,22 @@
+From a271486149b4bcec752fa10f58c50399be2ac82b Mon Sep 17 00:00:00 2001
+From: David Karoly <david.karoly@outlook.com>
+Date: Fri, 12 Nov 2021 16:18:06 +0000
+Subject: fix include fcntl.h
+
+
+diff --git a/lib/local_filesys.cpp b/lib/local_filesys.cpp
+index 5ec962d..ba7d583 100644
+--- a/lib/local_filesys.cpp
++++ b/lib/local_filesys.cpp
+@@ -7,7 +7,7 @@
+ #include "windows/security_descriptor_builder.hpp"
+ #else
+ #include <errno.h>
+-#include <sys/fcntl.h>
++#include <posix/fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+-- 
+2.30.2
+