* [PR PATCH] eiskaltdcpp-qt: update to 2.4.2
@ 2021-03-03 8:17 tehnick
2021-03-08 3:23 ` ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: tehnick @ 2021-03-03 8:17 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/29194
eiskaltdcpp-qt: update to 2.4.2
A patch file from https://github.com/void-linux/void-packages/pull/29194.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-29194.patch --]
[-- Type: text/x-diff, Size: 3029 bytes --]
From 2681156bf6669521d129be01cc4250010ab72e90 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Mar 2021 03:13:47 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.2
+ Remove patches accepted in upstream
+ Update package description
---
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 -----------------------
srcpkgs/eiskaltdcpp-qt/template | 6 ++---
2 files changed, 3 insertions(+), 36 deletions(-)
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/musl.patch
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
deleted file mode 100644
index 37914871c8b..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 (Q_OS_HAIKU)
-+#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
- #include <execinfo.h>
-
- #ifdef ENABLE_STACKTRACE
-@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
- return 0;
- }
-
--#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/template b/srcpkgs/eiskaltdcpp-qt/template
index 12b4a9aa465..6a938809a42 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,6 +1,6 @@
# Template file for 'eiskaltdcpp-qt'
pkgname=eiskaltdcpp-qt
-version=2.4.1
+version=2.4.2
revision=1
wrksrc="eiskaltdcpp-${version}"
build_style=cmake
@@ -9,12 +9,12 @@ hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
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"
+short_desc="EiskaltDC++ is a file sharing program using Direct Connect protocols"
maintainer="Boris Pek <tehnick-8@yandex.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
+checksum=2ed853a57c57aab0e87fdea273a01707184ee425a2aaf9fcd2e0a32c57a2de2c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: eiskaltdcpp-qt: update to 2.4.2
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
@ 2021-03-08 3:23 ` ericonr
2021-03-08 3:23 ` ericonr
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-03-08 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29194#issuecomment-792433825
Comment:
Hi! Would you mind rebasing the PR, please?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: eiskaltdcpp-qt: update to 2.4.2
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
2021-03-08 3:23 ` ericonr
@ 2021-03-08 3:23 ` ericonr
2021-03-08 3:24 ` [PR PATCH] [Updated] " ericonr
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-03-08 3:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 182 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/29194#issuecomment-792434070
Comment:
Hm, turns out I can do it locally easily.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.2
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
2021-03-08 3:23 ` ericonr
2021-03-08 3:23 ` ericonr
@ 2021-03-08 3:24 ` ericonr
2021-03-08 6:38 ` ericonr
2021-03-08 7:03 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-03-08 3:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/29194
eiskaltdcpp-qt: update to 2.4.2
A patch file from https://github.com/void-linux/void-packages/pull/29194.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-29194.patch --]
[-- Type: text/x-diff, Size: 3116 bytes --]
From 97ebc971774aad79c26e3953174e32d641e1c69b Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Mar 2021 03:13:47 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.2
+ Remove patches accepted in upstream
+ Update package description
---
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 -----------------------
srcpkgs/eiskaltdcpp-qt/template | 8 +++---
2 files changed, 4 insertions(+), 37 deletions(-)
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/musl.patch
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
deleted file mode 100644
index 37914871c8b..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 (Q_OS_HAIKU)
-+#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
- #include <execinfo.h>
-
- #ifdef ENABLE_STACKTRACE
-@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
- return 0;
- }
-
--#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/template b/srcpkgs/eiskaltdcpp-qt/template
index 618fa29772d..fb5009c985e 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,7 +1,7 @@
# Template file for 'eiskaltdcpp-qt'
pkgname=eiskaltdcpp-qt
-version=2.4.1
-revision=2
+version=2.4.2
+revision=1
wrksrc="eiskaltdcpp-${version}"
build_style=cmake
configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
@@ -9,12 +9,12 @@ hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
makedepends="bzip2-devel zlib-devel openssl-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"
+short_desc="EiskaltDC++ is a file sharing program using Direct Connect protocols"
maintainer="Boris Pek <tehnick-8@yandex.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
+checksum=2ed853a57c57aab0e87fdea273a01707184ee425a2aaf9fcd2e0a32c57a2de2c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] eiskaltdcpp-qt: update to 2.4.2
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
` (2 preceding siblings ...)
2021-03-08 3:24 ` [PR PATCH] [Updated] " ericonr
@ 2021-03-08 6:38 ` ericonr
2021-03-08 7:03 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-03-08 6:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 332 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/tehnick/void-packages update-eiskaltdcpp
https://github.com/void-linux/void-packages/pull/29194
eiskaltdcpp-qt: update to 2.4.2
A patch file from https://github.com/void-linux/void-packages/pull/29194.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-update-eiskaltdcpp-29194.patch --]
[-- Type: text/x-diff, Size: 3795 bytes --]
From 3ddd9e43fd4f5cc6e53720df5b9fd1cd814b6187 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Wed, 3 Mar 2021 03:13:47 +0300
Subject: [PATCH] eiskaltdcpp-qt: update to 2.4.2
+ Remove patches accepted in upstream
+ Update package description
By ericonr:
+ Use gettext-devel instead of -libs to link to libintl.
---
srcpkgs/eiskaltdcpp-qt/patches/musl.patch | 33 -----------------------
srcpkgs/eiskaltdcpp-qt/template | 20 +++++++++-----
2 files changed, 13 insertions(+), 40 deletions(-)
delete mode 100644 srcpkgs/eiskaltdcpp-qt/patches/musl.patch
diff --git a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch b/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
deleted file mode 100644
index 37914871c8b..00000000000
--- a/srcpkgs/eiskaltdcpp-qt/patches/musl.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 (Q_OS_HAIKU)
-+#if !defined (Q_OS_HAIKU) && defined (__GLIBC__)
- #include <execinfo.h>
-
- #ifdef ENABLE_STACKTRACE
-@@ -141,7 +141,7 @@ int main(int argc, char *argv[])
- return 0;
- }
-
--#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/template b/srcpkgs/eiskaltdcpp-qt/template
index 618fa29772d..df90ffeb777 100644
--- a/srcpkgs/eiskaltdcpp-qt/template
+++ b/srcpkgs/eiskaltdcpp-qt/template
@@ -1,7 +1,7 @@
# Template file for 'eiskaltdcpp-qt'
pkgname=eiskaltdcpp-qt
-version=2.4.1
-revision=2
+version=2.4.2
+revision=1
wrksrc="eiskaltdcpp-${version}"
build_style=cmake
configure_args="-DUSE_QT5=ON -DUSE_QT=OFF -DUSE_ASPELL=OFF -DLINK=STATIC"
@@ -9,19 +9,25 @@ hostmakedepends="gettext pkg-config qt5-tools-devel qt5-host-tools qt5-qmake"
makedepends="bzip2-devel zlib-devel openssl-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"
+short_desc="EiskaltDC++ is a file sharing program using Direct Connect protocols"
maintainer="Boris Pek <tehnick-8@yandex.ru>"
license="GPL-3.0-or-later"
homepage="https://github.com/eiskaltdcpp/eiskaltdcpp"
distfiles="https://github.com/eiskaltdcpp/eiskaltdcpp/archive/v${version}.tar.gz"
-checksum=818f9622ac28d3cf1ae58af0a01e25af702781822b6edeb99c9d05d408a4798f
+checksum=2ed853a57c57aab0e87fdea273a01707184ee425a2aaf9fcd2e0a32c57a2de2c
if [ "$CROSS_BUILD" ]; then
hostmakedepends+=" qt5-devel"
fi
case $XBPS_TARGET_MACHINE in
- *-musl) makedepends+=" gettext-libs"
- configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lintl"';;
- *) configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lpthread"';;
+ # links against libintl.so because it uses LANGUAGE as an env var
+ # and always messes with _nl_msg_cat_cntr (the latter could be patched out,
+ # the first is harder).
+ *-musl) makedepends+=" gettext-devel"
+ configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lintl"'
+ CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gettext"
+ ;;
+ *) configure_args+=' -DCMAKE_EXE_LINKER_FLAGS="-lpthread"'
+ ;;
esac
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: eiskaltdcpp-qt: update to 2.4.2
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
` (3 preceding siblings ...)
2021-03-08 6:38 ` ericonr
@ 2021-03-08 7:03 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2021-03-08 7:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 165 bytes --]
There's a merged pull request on the void-packages repository
eiskaltdcpp-qt: update to 2.4.2
https://github.com/void-linux/void-packages/pull/29194
Description:
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-03-08 7:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-03 8:17 [PR PATCH] eiskaltdcpp-qt: update to 2.4.2 tehnick
2021-03-08 3:23 ` ericonr
2021-03-08 3:23 ` ericonr
2021-03-08 3:24 ` [PR PATCH] [Updated] " ericonr
2021-03-08 6:38 ` ericonr
2021-03-08 7:03 ` [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).