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.
This commit is contained in:
parent
fb6fc4bae1
commit
047ce40caa
2 changed files with 13 additions and 40 deletions
|
@ -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
|
||||
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue