From 48d7317787402a30e1f46829a7aa7e16477058b5 Mon Sep 17 00:00:00 2001 From: Boris Pek Date: Sat, 30 Jan 2021 11:59:27 +0300 Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1 Drop patches which came from upstream. --- srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch | 65 ------------------- srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch | 36 ---------- srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 31 ++++++--- .../eiskaltdcpp-qt/patches/upnpc.cpp.patch | 30 --------- srcpkgs/eiskaltdcpp-qt/template | 17 ++--- 5 files changed, 31 insertions(+), 148 deletions(-) delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch deleted file mode 100644 index 50603313aeb..00000000000 --- a/srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- dcpp/Util.cpp 2015-04-20 02:57:16.000000000 +0500 -+++ dcpp/Util.cpp.new 2017-10-09 15:00:00.000000000 +0500 -@@ -171,8 +171,8 @@ - ::GetShortPathName(localePath_.c_str(), buf, sizeof(buf)/sizeof(TCHAR)); - if (Util::getPath(Util::PATH_LOCALE).empty()) - paths[PATH_LOCALE] = Text::fromT(buf); -- if (Util::getPath(Util::PATH_DOWNLOADS).empty()) -- paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]); -+ //if (Util::getPath(Util::PATH_DOWNLOADS).empty()) -+ // paths[PATH_DOWNLOADS] = getDownloadsPath(paths[PATH_USER_CONFIG]); - - #else - if (Util::getPath(Util::PATH_GLOBAL_CONFIG).empty()) -@@ -704,7 +704,7 @@ - #endif - } - --vector Util::getLocalIPs() { -+vector Util::getLocalIPs(unsigned short sa_family) { - vector addresses; - - #ifdef HAVE_IFADDRS_H -@@ -712,6 +712,9 @@ - - if (getifaddrs(&ifap) == 0) - { -+ bool ipv4 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET); -+ bool ipv6 = (sa_family == AF_UNSPEC) || (sa_family == AF_INET6); -+ - for (struct ifaddrs *i = ifap; i != NULL; i = i->ifa_next) - { - struct sockaddr *sa = i->ifa_addr; -@@ -723,14 +726,14 @@ - socklen_t len; - - // IPv4 address -- if (sa->sa_family == AF_INET) -+ if (ipv4 && (sa->sa_family == AF_INET)) - { - struct sockaddr_in* sai = (struct sockaddr_in*)sa; - src = (void*) &(sai->sin_addr); - len = INET_ADDRSTRLEN; - } - // IPv6 address -- else if (sa->sa_family == AF_INET6) -+ else if (ipv6 && (sa->sa_family == AF_INET6)) - { - struct sockaddr_in6* sai6 = (struct sockaddr_in6*)sa; - src = (void*) &(sai6->sin6_addr); -@@ -752,9 +755,13 @@ - - return addresses; - } --string Util::getLocalIp() { -+string Util::getLocalIp(unsigned short as_family) { - #ifdef HAVE_IFADDRS_H -- return getLocalIPs().empty() ? "0.0.0.0" : getLocalIPs()[0]; -+ vector addresses = getLocalIPs(as_family); -+ if (addresses.empty()) -+ return (((as_family == AF_UNSPEC) || (as_family == AF_INET)) ? "0.0.0.0" : "::"); -+ -+ return addresses[0]; - #else - string tmp; - diff --git a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch b/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch deleted file mode 100644 index 615f1b11aa3..00000000000 --- a/srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- dcpp/Util.h 2015-04-20 02:57:16.000000000 +0500 -+++ dcpp/Util.h.new 2017-10-09 15:00:00.000000000 +0500 -@@ -28,6 +28,13 @@ - - #include - #include -+ -+#ifdef _WIN32 -+#include -+#else -+#include -+#endif -+ - #include - #include - #include -@@ -270,7 +270,7 @@ - #ifdef _WIN32 - return _atoi64(aString.c_str()); - #else -- #ifndef __HAIKU__ -+ #if !defined(__HAIKU__) && defined(__GLIBC__) - return strtoq(aString.c_str(), (char **)NULL, 10); - #else - return strtoll(aString.c_str(), (char **)NULL, 10); -@@ -403,8 +410,8 @@ - } - - static string encodeURI(const string& /*aString*/, bool reverse = false); -- static string getLocalIp(); -- static std::vector getLocalIPs(); -+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC); -+ static std::vector getLocalIPs(unsigned short sa_family = AF_UNSPEC); - static bool isPrivateIp(string const& ip); - static string formatAdditionalInfo(const std::string& aIp, bool sIp, bool sCC); - /** diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch index b26b453b382..37914871c8b 100644 --- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch +++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch @@ -1,20 +1,33 @@ ---- eiskaltdcpp-qt/src/main.cpp 2015-04-20 02:57:16.000000000 +0500 -+++ eiskaltdcpp-qt/src/main.cpp.new 2018-01-07 08:47:19.501488838 +0500 -@@ -72,7 +72,7 @@ - #if !defined(Q_WS_WIN) +https://github.com/eiskaltdcpp/eiskaltdcpp/commit/fc9bc0c2 + +--- dcpp/Util.h ++++ dcpp/Util.h.new +@@ -243,7 +243,7 @@ public: + static int64_t toInt64(const string& aString) { + #ifdef _WIN32 + return _atoi64(aString.c_str()); +-#elif defined(__HAIKU__) ++#elif defined(__HAIKU__) || !defined(__GLIBC__) + return strtoll(aString.c_str(), (char **)NULL, 10); + #else + return strtoq(aString.c_str(), (char **)NULL, 10); +--- eiskaltdcpp-qt/src/main.cpp ++++ eiskaltdcpp-qt/src/main.cpp.new +@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &); + #if !defined(Q_OS_WIN) #include #include --#if !defined (__HAIKU__) -+#if !defined (__HAIKU__) && defined (__GLIBC__) +-#if !defined (Q_OS_HAIKU) ++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__) #include #ifdef ENABLE_STACKTRACE -@@ -127,7 +127,7 @@ +@@ -141,7 +141,7 @@ int main(int argc, char *argv[]) return 0; } --#if !defined (Q_WS_WIN) && !defined (__HAIKU__) -+#if !defined (Q_WS_WIN) && !defined (__HAIKU__) && defined (__GLIBC__) +-#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU) ++#if !defined (Q_OS_WIN) && !defined (Q_OS_HAIKU) && defined (__GLIBC__) installHandlers(); #endif diff --git a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch b/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch deleted file mode 100644 index fa4cd62247a..00000000000 --- a/srcpkgs/eiskaltdcpp-qt/patches/upnpc.cpp.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- extra/upnpc.cpp 2015-04-20 02:57:16.000000000 +0500 -+++ extra/upnpc.new 2017-10-09 15:00:00.000000000 +0500 -@@ -41,9 +41,13 @@ - - bool UPnPc::init() - { -- UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), 0, 0 --#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16)) -- , 0, 0); -+ UPNPDev *devices = upnpDiscover(5000, SettingsManager::getInstance()->isDefault(SettingsManager::BIND_ADDRESS) ? 0 : SETTING(BIND_ADDRESS).c_str(), NULL, 0 -+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16)) -+ , 0 -+#if (MINIUPNPC_API_VERSION >= 14) -+ , 2 -+#endif -+ , NULL); - #else - ); - #endif -@@ -63,8 +67,8 @@ - const string port_ = Util::toString(port); - - return UPNP_AddPortMapping(urls.controlURL, data.first.servicetype, port_.c_str(), port_.c_str(), -- Util::getLocalIp().c_str(), description.c_str(), protocols[protocol], NULL --#if (MINIUPNPC_API_VERSION == 8 || defined(MINIUPNPC16)) -+ Util::getLocalIp(AF_INET).c_str(), description.c_str(), protocols[protocol], NULL -+#if (MINIUPNPC_API_VERSION >= 8 || defined(MINIUPNPC16)) - , 0) == UPNPCOMMAND_SUCCESS; - #else - ) == UPNPCOMMAND_SUCCESS; diff --git a/srcpkgs/eiskaltdcpp-qt/template b/srcpkgs/eiskaltdcpp-qt/template index 39e5a8ad398..8ff28190aaf 100644 --- a/srcpkgs/eiskaltdcpp-qt/template +++ b/srcpkgs/eiskaltdcpp-qt/template @@ -1,19 +1,20 @@ # Template file for 'eiskaltdcpp-qt' pkgname=eiskaltdcpp-qt -version=2.2.10 -revision=11 +version=2.4.1 +revision=1 wrksrc="eiskaltdcpp-${version}" build_style=cmake configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF" hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake" -makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel boost-devel - qt5-devel miniupnpc-devel qt5-multimedia-devel" -short_desc="EiskaltDC++ is a cross-platform Direct Connect and ADC clent" -maintainer="samsky72 " +makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua51-devel + miniupnpc-devel qt5-devel qt5-multimedia-devel qt5-plugin-sqlite + qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-tds" +short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols" +maintainer="Boris Pek " license="GPL-3.0-or-later" -homepage="https://sourceforge.net/projects/eiskaltdcpp" +homepage="https://github.com/eiskaltdcpp/eiskaltdcpp" distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz" -checksum=e461c8c499e459651d6382a6ded6788e5ac9a9c4ff26386c3cf073d94d606127 +checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f if [ "$CROSS_BUILD" ]; then hostmakedepends+=" qt5-devel"