* [PR PATCH] eiskaltdcpp-qt: update to 2.4.1
@ 2021-01-30 9:37 tehnick
2021-01-30 9:45 ` [PR PATCH] [Updated] " tehnick
` (21 more replies)
0 siblings, 22 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 9:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 327 bytes --]
There is a new pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9902 bytes --]
From 5efb42587ef4614aa7c835dbff54f5a7a5640b84 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1
Drop patches which come from upstream.
---
srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch | 65 -------------------
srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch | 36 ----------
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 +++++++---
.../eiskaltdcpp-qt/patches/upnpc.cpp.patch | 30 ---------
srcpkgs/eiskaltdcpp-qt/template | 15 ++---
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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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..42fc3ba03fd 100644
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
@@ -1,20 +1,35 @@
---- 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
+
+--- a/dcpp/Util.h
++++ b/dcpp/Util.h
+@@ -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);
+diff --git a/eiskaltdcpp-qt/src/main.cpp b/eiskaltdcpp-qt/src/main.cpp
+index ab5c9fe3..6ff08eca 100644
+--- a/eiskaltdcpp-qt/src/main.cpp
++++ b/eiskaltdcpp-qt/src/main.cpp
+@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &);
+ #if !defined(Q_OS_WIN)
#include <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..d6108722135 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel"
+short_desc="EiskaltDC++ is a file sharing program using Direct Connect and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
@ 2021-01-30 9:45 ` tehnick
2021-01-30 9:46 ` tehnick
` (20 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 9:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9890 bytes --]
From e91b04b6062b98fa4b5a1e04a33775809194ca89 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1
Drop patches which come from upstream.
---
srcpkgs/eiskaltdcpp-qt/patches/Util.cpp.patch | 65 -------------------
srcpkgs/eiskaltdcpp-qt/patches/Util.h.patch | 36 ----------
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 +++++++---
.../eiskaltdcpp-qt/patches/upnpc.cpp.patch | 30 ---------
srcpkgs/eiskaltdcpp-qt/template | 15 ++---
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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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..42fc3ba03fd 100644
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
@@ -1,20 +1,35 @@
---- 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
+
+--- a/dcpp/Util.h
++++ b/dcpp/Util.h
+@@ -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);
+diff --git a/eiskaltdcpp-qt/src/main.cpp b/eiskaltdcpp-qt/src/main.cpp
+index ab5c9fe3..6ff08eca 100644
+--- a/eiskaltdcpp-qt/src/main.cpp
++++ b/eiskaltdcpp-qt/src/main.cpp
+@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &);
+ #if !defined(Q_OS_WIN)
#include <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..eca1b6f2036 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
2021-01-30 9:45 ` [PR PATCH] [Updated] " tehnick
@ 2021-01-30 9:46 ` tehnick
2021-01-30 10:02 ` tehnick
` (19 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 9:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9890 bytes --]
From e398d8014ba88865b02a07e390454ac1969f215c Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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 | 33 +++++++---
.../eiskaltdcpp-qt/patches/upnpc.cpp.patch | 30 ---------
srcpkgs/eiskaltdcpp-qt/template | 15 ++---
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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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..42fc3ba03fd 100644
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
@@ -1,20 +1,35 @@
---- 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
+
+--- a/dcpp/Util.h
++++ b/dcpp/Util.h
+@@ -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);
+diff --git a/eiskaltdcpp-qt/src/main.cpp b/eiskaltdcpp-qt/src/main.cpp
+index ab5c9fe3..6ff08eca 100644
+--- a/eiskaltdcpp-qt/src/main.cpp
++++ b/eiskaltdcpp-qt/src/main.cpp
+@@ -86,7 +86,7 @@ void parseCmdLine(const QStringList &);
+ #if !defined(Q_OS_WIN)
#include <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..eca1b6f2036 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
2021-01-30 9:45 ` [PR PATCH] [Updated] " tehnick
2021-01-30 9:46 ` tehnick
@ 2021-01-30 10:02 ` tehnick
2021-01-30 10:07 ` tehnick
` (18 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 10:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9784 bytes --]
From 88ffa0d9e7bdadafc59cf75be0cc4710921f425c Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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 | 15 ++---
5 files changed, 29 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..eca1b6f2036 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (2 preceding siblings ...)
2021-01-30 10:02 ` tehnick
@ 2021-01-30 10:07 ` tehnick
2021-01-30 12:40 ` tehnick
` (17 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 10:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9863 bytes --]
From 999794c0d44ea64c035156be93bc2ad942b31f12 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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, 30 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..514a368b81a 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DLUA_SCRIPT=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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (3 preceding siblings ...)
2021-01-30 10:07 ` tehnick
@ 2021-01-30 12:40 ` tehnick
2021-01-30 13:18 ` tehnick
` (16 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9881 bytes --]
From 2ad82b33baf1e1075c717046437fdb30d3263744 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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, 30 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..58b2c97a992 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DLUA_SCRIPT=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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel qt5-plugin-sqlite"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (4 preceding siblings ...)
2021-01-30 12:40 ` tehnick
@ 2021-01-30 13:18 ` tehnick
2021-01-30 13:29 ` tehnick
` (15 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 13:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9898 bytes --]
From d29a5a6e76a4fe144c58421e3c853bcf1d1f1464 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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, 30 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..d89aa6e975a 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,19 +1,18 @@
# 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DLUA_SCRIPT=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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel qt5-devel miniupnpc-devel qt5-multimedia-devel qt5-plugin-mysql qt5-plugin-sqlite"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (5 preceding siblings ...)
2021-01-30 13:18 ` tehnick
@ 2021-01-30 13:29 ` tehnick
2021-01-30 13:37 ` tehnick
` (14 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 13:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9869 bytes --]
From fed9fdbcfb39089e792ae3250fc1285e3f56b5e6 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..13443de74a5 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 <samsky72@gmail.com>"
+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"
+short_desc="EiskaltDC++ is a file sharing program using DC and ADC protocols"
+maintainer="Boris Pek <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (6 preceding siblings ...)
2021-01-30 13:29 ` tehnick
@ 2021-01-30 13:37 ` tehnick
2021-01-30 13:44 ` tehnick
` (13 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 13:37 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9883 bytes --]
From 48d7317787402a30e1f46829a7aa7e16477058b5 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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 <samsky72@gmail.com>"
+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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (7 preceding siblings ...)
2021-01-30 13:37 ` tehnick
@ 2021-01-30 13:44 ` tehnick
2021-01-31 3:38 ` [PR REVIEW] " ericonr
` (12 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-30 13:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9963 bytes --]
From f095e2cfdccfb0b8827581cd9ef7f31b94773ace Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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 | 19 +++---
5 files changed, 32 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..0c70fd57ac5 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=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 <samsky72@gmail.com>"
+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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (8 preceding siblings ...)
2021-01-30 13:44 ` tehnick
@ 2021-01-31 3:38 ` ericonr
2021-01-31 3:46 ` ericonr
` (11 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ericonr @ 2021-01-31 3:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 641 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#discussion_r567359352
Comment:
For the record, when dealing with execinfo.h, it's a bit more correct to check for glibc, since execinfo.h is not a standard. You will have to add any new platform you port this to the list of conditionals you check, instead of just potentially missing some functionality there. Even better would be to see if the function exists, which should be reaasonably simple, given that you are using CMake. I have an example of checking for a function here: https://github.com/MediaArea/ZenLib/pull/126
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (9 preceding siblings ...)
2021-01-31 3:38 ` [PR REVIEW] " ericonr
@ 2021-01-31 3:46 ` ericonr
2021-01-31 9:26 ` tehnick
` (10 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: ericonr @ 2021-01-31 3:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 176 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#discussion_r567359941
Comment:
Can we try and use newer lua?
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (10 preceding siblings ...)
2021-01-31 3:46 ` ericonr
@ 2021-01-31 9:26 ` tehnick
2021-01-31 9:26 ` [PR PATCH] [Updated] " tehnick
` (9 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 210 bytes --]
New review comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#discussion_r567395624
Comment:
`lua52` is the latest supported/tested version now in upstream.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (11 preceding siblings ...)
2021-01-31 9:26 ` tehnick
@ 2021-01-31 9:26 ` tehnick
2021-01-31 9:26 ` tehnick
` (8 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
Update package + new maintainer.
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9963 bytes --]
From 966005ec9730386f5f71f1a41ed732a0148903c8 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
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 | 19 +++---
5 files changed, 32 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..81349f0d76f 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (12 preceding siblings ...)
2021-01-31 9:26 ` [PR PATCH] [Updated] " tehnick
@ 2021-01-31 9:26 ` tehnick
2021-01-31 9:27 ` tehnick
` (7 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:26 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#issuecomment-770352755
Comment:
Updated build dependency to `lua52`.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (13 preceding siblings ...)
2021-01-31 9:26 ` tehnick
@ 2021-01-31 9:27 ` tehnick
2021-01-31 9:27 ` [PR REVIEW] " tehnick
` (6 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 177 bytes --]
New comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#issuecomment-770352755
Comment:
Updated build dependency to `lua52`.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (14 preceding siblings ...)
2021-01-31 9:27 ` tehnick
@ 2021-01-31 9:27 ` tehnick
2021-01-31 9:28 ` tehnick
` (5 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 183 bytes --]
New review comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#discussion_r567395803
Comment:
Updated build dependency to `lua52`.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR REVIEW] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (15 preceding siblings ...)
2021-01-31 9:27 ` [PR REVIEW] " tehnick
@ 2021-01-31 9:28 ` tehnick
2021-01-31 13:42 ` [PR PATCH] [Updated] " tehnick
` (4 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 9:28 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 193 bytes --]
New review comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#discussion_r567396144
Comment:
Maybe in the future versions. But not for now.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (16 preceding siblings ...)
2021-01-31 9:28 ` tehnick
@ 2021-01-31 13:42 ` tehnick
2021-01-31 13:52 ` tehnick
` (3 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 13:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
Update package + new maintainer.
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 9994 bytes --]
From b1cfafd9f7060320f6f21261592a93429b1ac116 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1
+ Drop patches which came from upstream.
+ New maintainer of package.
---
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 | 19 +++---
5 files changed, 32 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..81349f0d76f 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"
+configure_args="-DUSE_MINIUPNP=ON -DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (17 preceding siblings ...)
2021-01-31 13:42 ` [PR PATCH] [Updated] " tehnick
@ 2021-01-31 13:52 ` tehnick
2021-01-31 13:52 ` tehnick
` (2 subsequent siblings)
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 13:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
Update package + new maintainer.
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 10179 bytes --]
From c38dcd61456c95d96493f0c6af01ad31f0122945 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1
+ Drop patches which came from upstream.
+ Static linking with libeiskaltdcpp.
+ Remove build dependency from Boost libraries
+ Disable usage of Aspell libraries
+ Enable support of Lua scripts
+ Enable support of SQLite database
+ New maintainer of package.
---
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 | 19 +++---
5 files changed, 32 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..12b4a9aa465 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"
+configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (18 preceding siblings ...)
2021-01-31 13:52 ` tehnick
@ 2021-01-31 13:52 ` tehnick
2021-01-31 13:54 ` [PR PATCH] [Updated] " tehnick
2021-01-31 18:34 ` [PR PATCH] [Merged]: " ericonr
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 13:52 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 160 bytes --]
New comment by tehnick on void-packages repository
https://github.com/void-linux/void-packages/pull/28328#issuecomment-770385817
Comment:
Comment is updated.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (19 preceding siblings ...)
2021-01-31 13:52 ` tehnick
@ 2021-01-31 13:54 ` tehnick
2021-01-31 18:34 ` [PR PATCH] [Merged]: " ericonr
21 siblings, 0 replies; 23+ messages in thread
From: tehnick @ 2021-01-31 13:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
There is an updated pull request by tehnick against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/28328
eiskaltdcpp-qt: update to 2.4.1
Update package + new maintainer.
A patch file from https://github.com/void-linux/void-packages/pull/28328.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-28328.patch --]
[-- Type: text/x-diff, Size: 10183 bytes --]
From 46db72adbbb5127c381fedd0c1709f3c71eb50b2 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Sat, 30 Jan 2021 11:59:27 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.1
+ Drop patches which came from upstream.
+ Static linking with libeiskaltdcpp.
+ Remove build dependency from Boost libraries.
+ Disable usage of Aspell libraries.
+ Enable support of Lua scripts.
+ Enable support of SQLite database.
+ New maintainer of package.
---
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 | 19 +++---
5 files changed, 32 insertions(+), 149 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<string> Util::getLocalIPs() {
-+vector<string> Util::getLocalIPs(unsigned short sa_family) {
- vector<string> 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<string> 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 <sys/stat.h>
- #include <sys/types.h>
-+
-+#ifdef _WIN32
-+#include <winsock2.h>
-+#else
-+#include <sys/socket.h>
-+#endif
-+
- #include <unistd.h>
- #include <cstdlib>
- #include <vector>
-@@ -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<string> getLocalIPs();
-+ static string getLocalIp(unsigned short sa_family = AF_UNSPEC);
-+ static std::vector<string> 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 <unistd.h>
#include <signal.h>
--#if !defined (__HAIKU__)
-+#if !defined (__HAIKU__) && defined (__GLIBC__)
+-#if !defined (Q_OS_HAIKU)
++#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
#include <execinfo.h>
#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..12b4a9aa465 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"
+configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
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 <samsky72@gmail.com>"
+makedepends="bzip2-devel zlib-devel libressl-devel libidn-devel lua52-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 <tehnick-8@yandex.ru>"
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"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PR PATCH] [Merged]: eiskaltdcpp-qt: update to 2.4.1
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
` (20 preceding siblings ...)
2021-01-31 13:54 ` [PR PATCH] [Updated] " tehnick
@ 2021-01-31 18:34 ` ericonr
21 siblings, 0 replies; 23+ messages in thread
From: ericonr @ 2021-01-31 18:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 197 bytes --]
There's a merged pull request on the void-packages repository
eiskaltdcpp-qt: update to 2.4.1
https://github.com/void-linux/void-packages/pull/28328
Description:
Update package + new maintainer.
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2021-01-31 18:34 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-30 9:37 [PR PATCH] eiskaltdcpp-qt: update to 2.4.1 tehnick
2021-01-30 9:45 ` [PR PATCH] [Updated] " tehnick
2021-01-30 9:46 ` tehnick
2021-01-30 10:02 ` tehnick
2021-01-30 10:07 ` tehnick
2021-01-30 12:40 ` tehnick
2021-01-30 13:18 ` tehnick
2021-01-30 13:29 ` tehnick
2021-01-30 13:37 ` tehnick
2021-01-30 13:44 ` tehnick
2021-01-31 3:38 ` [PR REVIEW] " ericonr
2021-01-31 3:46 ` ericonr
2021-01-31 9:26 ` tehnick
2021-01-31 9:26 ` [PR PATCH] [Updated] " tehnick
2021-01-31 9:26 ` tehnick
2021-01-31 9:27 ` tehnick
2021-01-31 9:27 ` [PR REVIEW] " tehnick
2021-01-31 9:28 ` tehnick
2021-01-31 13:42 ` [PR PATCH] [Updated] " tehnick
2021-01-31 13:52 ` tehnick
2021-01-31 13:52 ` tehnick
2021-01-31 13:54 ` [PR PATCH] [Updated] " tehnick
2021-01-31 18:34 ` [PR PATCH] [Merged]: " ericonr
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).