mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-29 08:52:56 +02:00
qbittorrent: update to 4.0.1
Fix cross compiling.
This commit is contained in:
parent
b71aff7a7e
commit
b8a7071cec
4 changed files with 37 additions and 41 deletions
|
@ -1,23 +0,0 @@
|
||||||
--- configure.ac 2016-09-11 21:24:45.000000000 +0200
|
|
||||||
+++ configure.ac 2016-10-28 19:25:11.753180214 +0200
|
|
||||||
@@ -121,20 +121,6 @@
|
|
||||||
[AC_MSG_RESULT([$enable_webui])
|
|
||||||
AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])])
|
|
||||||
|
|
||||||
-AC_MSG_CHECKING([whether Qt4 should be enabled])
|
|
||||||
-AS_CASE(["x$with_qt4"],
|
|
||||||
- ["xno"],
|
|
||||||
- [AC_MSG_RESULT([no])
|
|
||||||
- FIND_QT5()],
|
|
||||||
- ["xyes"],
|
|
||||||
- [AC_MSG_RESULT([yes])
|
|
||||||
- FIND_QT4()],
|
|
||||||
- [AC_MSG_RESULT([$with_qt4])
|
|
||||||
- AC_MSG_ERROR([Unknown option "$with_qt4". Use either "yes" or "no".])])
|
|
||||||
-AS_IF([test "x$QT_QMAKE" = "x"],
|
|
||||||
- [AC_MSG_ERROR([Could not find qmake])
|
|
||||||
- ])
|
|
||||||
-
|
|
||||||
AC_MSG_CHECKING([whether QtDBus should be enabled])
|
|
||||||
AS_CASE(["x$enable_qt_dbus"],
|
|
||||||
["xyes"],
|
|
12
srcpkgs/qbittorrent/patches/fix-disable_webui.patch
Normal file
12
srcpkgs/qbittorrent/patches/fix-disable_webui.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
--- src/app/application.cpp 2017-11-22 00:27:07.000000000 +0100
|
||||||
|
+++ src/app/application.cpp 2017-11-22 14:14:11.317317738 +0100
|
||||||
|
@@ -105,7 +105,9 @@
|
||||||
|
, m_running(false)
|
||||||
|
, m_shutdownAct(ShutdownDialogAction::Exit)
|
||||||
|
, m_commandLineArgs(parseCommandLine(this->arguments()))
|
||||||
|
+#ifndef DISABLE_WEBUI
|
||||||
|
, m_webui(nullptr)
|
||||||
|
+#endif
|
||||||
|
{
|
||||||
|
qRegisterMetaType<Log::Msg>("Log::Msg");
|
||||||
|
|
|
@ -11,10 +11,10 @@
|
||||||
#endif // Q_OS_UNIX
|
#endif // Q_OS_UNIX
|
||||||
|
|
||||||
#ifdef STACKTRACE_WIN
|
#ifdef STACKTRACE_WIN
|
||||||
@@ -395,7 +395,9 @@
|
@@ -306,7 +306,9 @@
|
||||||
reportToUser(str1);
|
reportToUser(msg);
|
||||||
reportToUser(sigName);
|
reportToUser(sigName);
|
||||||
reportToUser(str2);
|
reportToUser("\n");
|
||||||
+#if defined(__GLIBC__)
|
+#if defined(__GLIBC__)
|
||||||
print_stacktrace(); // unsafe
|
print_stacktrace(); // unsafe
|
||||||
+#endif
|
+#endif
|
||||||
|
|
|
@ -1,18 +1,20 @@
|
||||||
# Template file for 'qbittorrent'
|
# Template file for 'qbittorrent'
|
||||||
pkgname=qbittorrent
|
pkgname=qbittorrent
|
||||||
version=3.3.16
|
version=4.0.1
|
||||||
revision=1
|
revision=1
|
||||||
build_style=qmake
|
build_style=qmake
|
||||||
hostmakedepends="automake libtool pkg-config qt5-qmake qt5-tools
|
hostmakedepends="automake libtool pkg-config qt5-host-tools qt5-tools"
|
||||||
qt5-host-tools qt5-declarative-devel"
|
makedepends="libtorrent-rasterbar-devel qt5-declarative-devel qt5-svg-devel"
|
||||||
makedepends="libtorrent-rasterbar-devel qt5-declarative-devel"
|
|
||||||
short_desc="Free software alternative to µtorrent"
|
short_desc="Free software alternative to µtorrent"
|
||||||
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://www.qbittorrent.org/"
|
homepage="http://www.qbittorrent.org/"
|
||||||
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.xz"
|
||||||
checksum=ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57
|
checksum=e30ff8b5088861467490a16dcc5988e72e2dfbd2fc3a4fd1a43941a8ca411e4e
|
||||||
nocross=https://build.voidlinux.eu/builders/armv7l_builder/builds/1349/steps/shell_3/logs/stdio
|
|
||||||
|
if [ -n "$CROSS_BUILD" ]; then
|
||||||
|
hostmakedepends+=" qt5-declarative-devel qt5-svg-devel"
|
||||||
|
fi
|
||||||
|
|
||||||
build_options="gui webui"
|
build_options="gui webui"
|
||||||
desc_option_gui="Enable the graphical user interface"
|
desc_option_gui="Enable the graphical user interface"
|
||||||
|
@ -20,16 +22,21 @@ desc_option_webui="Enable the web user interface"
|
||||||
build_options_default="gui"
|
build_options_default="gui"
|
||||||
|
|
||||||
pre_configure() {
|
pre_configure() {
|
||||||
local _args
|
local conf="--prefix=/usr"
|
||||||
_args="--prefix=/usr"
|
conf+=" --with-qt4=no"
|
||||||
_args+=" --with-qt4=no"
|
conf+=" --disable-systemd"
|
||||||
_args+=" --disable-systemd"
|
|
||||||
if [ -n "$CROSS_BUILD" ]; then
|
if [ -n "$CROSS_BUILD" ]; then
|
||||||
_args+=" --host=${XBPS_CROSS_TRIPLET}"
|
conf+=" --host=${XBPS_CROSS_TRIPLET}"
|
||||||
_args+=" --with-boost=${XBPS_CROSS_BASE}/usr"
|
conf+=" --with-boost=${XBPS_CROSS_BASE}/usr"
|
||||||
patch -p0 < ${FILESDIR}/cross-configure_ac.patch
|
|
||||||
export QT_QMAKE=/usr/bin/qmake-qt5
|
|
||||||
fi
|
fi
|
||||||
./bootstrap.sh
|
./bootstrap.sh
|
||||||
./configure ${_args} $(vopt_enable gui) $(vopt_enable webui)
|
./configure ${conf} $(vopt_enable gui) $(vopt_enable webui)
|
||||||
|
}
|
||||||
|
|
||||||
|
post_configure() {
|
||||||
|
sed -i src/Makefile \
|
||||||
|
-e "s;^\(CC\\s*=\) .*;\1 $CC;" \
|
||||||
|
-e "s;^\(CXX\\s*=\) .*;\1 $CXX;" \
|
||||||
|
-e "s;^\(LINK\\s*=\) .*;\1 $CXX;" \
|
||||||
|
-e "s;@g++ ;@$CXX ;"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue