From 59cd2cbe58220027a997afdba4a216e03599c284 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Tue, 19 Feb 2019 16:59:46 +0300
Subject: [PATCH] EiskaltDC++: bump version

---
 .../eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe  | 17 +++++---
 .../patches/eiskaltdcpp-2.3.0~git.patchset    | 40 -------------------
 2 files changed, 12 insertions(+), 45 deletions(-)
 delete mode 100644 net-p2p/eiskaltdcpp/patches/eiskaltdcpp-2.3.0~git.patchset

diff --git a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe
index 8c26381f9..45404aadf 100644
--- a/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe
+++ b/net-p2p/eiskaltdcpp/eiskaltdcpp-2.3.0~git.recipe
@@ -7,12 +7,11 @@ software."
 HOMEPAGE="https://sourceforge.net/projects/eiskaltdcpp/"
 COPYRIGHT="EiskaltDC++ team"
 LICENSE="GNU GPL v3"
-REVISION="3"
-srcGitRev="1e72256ac5e8fe6735f81bfbc3f9d90514ada578"
+REVISION="4"
+srcGitRev="e3791e20daa9a878f79684ed54e1564088306025"
 SOURCE_URI="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/$srcGitRev.tar.gz"
-CHECKSUM_SHA256="712088e14bdaa659e819656cd07b040651197e25ff63e82453d7fec601251fca"
+CHECKSUM_SHA256="cadea7afe0caf5bd45af777ec2a1ac5f8afd0c38fcdca7bb072e2936f9015a2e"
 SOURCE_DIR="eiskaltdcpp-$srcGitRev"
-PATCHES="eiskaltdcpp-$portVersion.patchset"
 ADDITIONAL_FILES="eiskaltdcpp.rdef.in"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -25,6 +24,7 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libaspell$secondaryArchSuffix
 	lib:libboost_system$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
@@ -44,6 +44,7 @@ REQUIRES="
 
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
+	devel:libaspell$secondaryArchSuffix
 	devel:libboost_system$secondaryArchSuffix
 	devel:libbz2$secondaryArchSuffix
 	devel:libcrypto$secondaryArchSuffix
@@ -51,6 +52,9 @@ BUILD_REQUIRES="
 	devel:libiconv$secondaryArchSuffix
 	devel:libidn$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
+	devel:liblua$secondaryArchSuffix
+	devel:libminiupnpc$secondaryArchSuffix
+	devel:libpcre$secondaryArchSuffix
 	devel:libQt5Concurrent$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Network$secondaryArchSuffix
@@ -63,6 +67,7 @@ BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:gcc$secondaryArchSuffix
 	cmd:ld$secondaryArchSuffix
+	cmd:lrelease$secondaryArchSuffix
 	cmd:make
 	cmd:pkg_config$secondaryArchSuffix
 	"
@@ -71,7 +76,9 @@ BUILD()
 {
 	mkdir -p build
 	cd build
-	cmake .. -DCMAKE_BUILD_TYPE=Release $cmakeDirArgs 
+	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release $cmakeDirArgs \
+		-DLUA_INCLUDE_DIR="`pkg-config --variable=includedir lua`"
 	make $jobArgs
 }
 
diff --git a/net-p2p/eiskaltdcpp/patches/eiskaltdcpp-2.3.0~git.patchset b/net-p2p/eiskaltdcpp/patches/eiskaltdcpp-2.3.0~git.patchset
deleted file mode 100644
index ffae217f1..000000000
--- a/net-p2p/eiskaltdcpp/patches/eiskaltdcpp-2.3.0~git.patchset
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6492da0593087ad287d8e9c5823908fd5a2ddffb Mon Sep 17 00:00:00 2001
-From: Sergei Reznikov <diver@gelios.net>
-Date: Tue, 11 Jul 2017 12:48:10 +0300
-Subject: Disable HAVE_IFADDRS_H on Haiku
-
-
-diff --git a/dcpp/Util.cpp b/dcpp/Util.cpp
-index 6c26321..53ae041 100644
---- a/dcpp/Util.cpp
-+++ b/dcpp/Util.cpp
-@@ -45,6 +45,11 @@
- #include <ifaddrs.h>
- #include <net/if.h>
- #endif
-+
-+#ifdef __HAIKU__
-+#undef HAVE_IFADDRS_H
-+#endif
-+
- #include <locale.h>
- 
- #include "CID.h"
-diff --git a/eiskaltdcpp-qt/src/WulforUtil.cpp b/eiskaltdcpp-qt/src/WulforUtil.cpp
-index 66b91ec..00a3826 100644
---- a/eiskaltdcpp-qt/src/WulforUtil.cpp
-+++ b/eiskaltdcpp-qt/src/WulforUtil.cpp
-@@ -903,6 +903,10 @@ bool WulforUtil::getUserCommandParams(const UserCommand& uc, StringMap& params)
- QStringList WulforUtil::getLocalIfaces(){
-     QStringList ifaces;
- 
-+#ifdef __HAIKU__
-+#undef HAVE_IFADDRS_H
-+#endif
-+
- #ifdef HAVE_IFADDRS_H
-     struct ifaddrs *ifap;
- 
--- 
-2.13.1
-