From 3ddd9e43fd4f5cc6e53720df5b9fd1cd814b6187 Mon Sep 17 00:00:00 2001 From: Boris Pek 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 - #include --#if !defined (Q_OS_HAIKU) -+#if !defined (Q_OS_HAIKU) && defined (__GLIBC__) - #include - - #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 " 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