[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/
commit: 73ce9e854e0ec71abf11e90aeac0354fa7f6473d Author: Alexey Lunev gmail com> AuthorDate: Mon Oct 16 20:29:57 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Oct 19 13:17:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ce9e85 net-p2p/qbittorrent: bump to 4.5.5, add openrc service & qt6 Closes: https://bugs.gentoo.org/914197 Closes: https://github.com/gentoo/gentoo/pull/33365 Signed-off-by: Alexey Lunev gmail.com> Signed-off-by: Florian Schmaus gentoo.org> net-p2p/qbittorrent/Manifest | 1 + net-p2p/qbittorrent/files/qbittorrent.confd| 20 net-p2p/qbittorrent/files/qbittorrent.initd| 27 ++ net-p2p/qbittorrent/metadata.xml | 24 --- ...orrent-.ebuild => qbittorrent-4.5.5.ebuild} | 14 --- net-p2p/qbittorrent/qbittorrent-.ebuild| 14 --- 6 files changed, 86 insertions(+), 14 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 6fd98e73cd6e..a71b8e8e1eaf 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,2 +1,3 @@ DIST qbittorrent-4.5.2.tar.gz 8890525 BLAKE2B 48585b703ce6edf862ea3c8cfad6cab2edcb65a138c6e8d232322b4f4fd682c87447ff11d29c04c26b5623e730ab9a1ce0496456b3ba6122f97913bd92b86790 SHA512 e900a1c5f0f70163463557aec3de0d31394fac56cfed91ea53ee5cf852cce4b2998bf79be60fc547c1c34a1658378f3ed9dbfb30aae5a772b85d819c7e7ce458 DIST qbittorrent-4.5.4.tar.gz 8791236 BLAKE2B 70b3194d6c4819655998406e0a13d22f3a5068e724048010daebd83d8b8db9e17daee943ca8dabaacd92a0fbc5249257de6d175b35287c748dc2d15395bd71fc SHA512 2e7988922137c9fade99e90236cc0c5b8b30f09021472f8ffc9048a7a2d989925eed7bfab4d79c93ca7d0f21acfde2e7feee5e6c43b557bf2c6f472fd52fbcea +DIST qbittorrent-4.5.5.tar.gz 8802492 BLAKE2B 1d20d7900b5b65603c5cf13452fb5aebe396473290d4904641b78867c5345d783482c46edc7042a2e86e79afd790e8c470df62131595eba288f195cc5e716eec SHA512 8b5c2654b3bc03c0b4de77e8388ee543c3892ef9453749ea737aaee999a16d50bd1b30ebe0519a86d7ab8ffc6224d7d9cf678464aebf96433cd71dd57b46dd53 diff --git a/net-p2p/qbittorrent/files/qbittorrent.confd b/net-p2p/qbittorrent/files/qbittorrent.confd new file mode 100644 index ..21e2e4200fef --- /dev/null +++ b/net-p2p/qbittorrent/files/qbittorrent.confd @@ -0,0 +1,20 @@ +# /etc/conf.d/qbittorrent: config file for /etc/init.d/qbittorrent + +# User and group as which to run +#QBITTORRENT_USER="qbittorrent" +#QBITTORRENT_GROUP="qbittorrent" + +# Directory where qBittorrent saves its logs (and maybe downloads) +#QBITTORRENT_DIRECTORY="/var/lib/qbittorrent" + +# umask used to create files +#QBITTORRENT_UMASK=0022 + +# I/O nice level of qBittorrent +#QBITTORRENT_IONICE=0 + +# Nice level of qBittorrent +#QBITTORRENT_NICE=0 + +# Extra opts given to qBittorrent +#QBITTORRENT_OPTS="" diff --git a/net-p2p/qbittorrent/files/qbittorrent.initd b/net-p2p/qbittorrent/files/qbittorrent.initd new file mode 100644 index ..7f800e640e76 --- /dev/null +++ b/net-p2p/qbittorrent/files/qbittorrent.initd @@ -0,0 +1,27 @@ +#!/sbin/openrc-run +# Copyright 2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +QBITTORRENT_USER=${QBITTORRENT_USER:-qbittorrent} +QBITTORRENT_GROUP=${QBITTORRENT_GROUP:-qbittorrent} +QBITTORRENT_DIRECTORY=${QBITTORRENT_DIRECTORY:-/var/lib/qbittorrent} +QBITTORRENT_UMASK=${QBITTORRENT_UMASK:-0022} +QBITTORRENT_IONICE=${QBITTORRENT_IONICE:-0} +QBITTORRENT_NICE=${QBITTORRENT_NICE:-0} + +description="BitTorrent client in C++ and Qt" +command="/usr/bin/qbittorrent-nox" +command_args="${QBITTORRENT_OPTS}" +pidfile="/run/${RC_SVCNAME}.pid" +command_background="yes" +command_user="${QBITTORRENT_USER}:${QBITTORRENT_USER}" +umask="${QBITTORRENT_UMASK}" +start_stop_daemon_args="--ionice ${QBITTORRENT_IONICE} --nicelevel ${QBITTORRENT_NICE}" + +depend() { +need localmount net +} + +start_pre() { +checkpath -q -d -o ${QBITTORRENT_USER}:${QBITTORRENT_GROUP} ${QBITTORRENT_DIRECTORY} +} diff --git a/net-p2p/qbittorrent/metadata.xml b/net-p2p/qbittorrent/metadata.xml index 7cd55c83f828..14e773c514d6 100644 --- a/net-p2p/qbittorrent/metadata.xml +++ b/net-p2p/qbittorrent/metadata.xml @@ -1,12 +1,20 @@ https://www.gentoo.org/dtd/metadata.dtd;> - - - Enable the Web UI - - - qbittorrent/qBittorrent - qbittorrent - + +cheembox...@gmail.com +Alexey Lunev + + +proxy-ma...@gentoo.org +Proxy Maintainers + + + +Install qBittorrent Web UI (qbittorrent-nox) and systemd/OpenRC service + + + +qbittorrent/qBittorrent + diff --git a/net-p2p/qbittorrent/qbittorrent-.ebuild b/net-p2p/qbittorrent/qbittorrent-4.5.5.ebuild similarity index 91% copy from net-p2p/qbittorrent/qbittorrent-.ebuild copy to
[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/
commit: 794b105782711d2b91da450fc25c83e666864af0 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Aug 30 20:04:11 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Aug 30 20:04:35 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=794b1057 net-p2p/qbittorrent: Drop old Package-Manager: Portage-2.3.40, Repoman-2.3.9 net-p2p/qbittorrent/Manifest | 1 - .../files/qbittorrent-4.0.4-werror.patch | 24 net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild | 66 -- net-p2p/qbittorrent/qbittorrent-.ebuild| 3 - 4 files changed, 94 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 5e42163e06f..3548714b95f 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,3 +1,2 @@ -DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969 DIST qbittorrent-4.1.1.tar.gz 7464014 BLAKE2B be005fbecd1d2c9ee977fbdc6782bbad9708e3c2c6d46deb5831ae4e7457954cb95ae87850b759e81e87e345ca682acfcd23684b7704c437c4261ebb5bb46f5d SHA512 700c084b97556ba85276b42e46f77d5f7896052ce02ba052cd4b3e6967c8a848c27bcf63a289bf8276b38841bb9a80b9ec16335c3feb30dce0851170f54d101e DIST qbittorrent-4.1.2.tar.gz 7697135 BLAKE2B 13e9456fd43395d597156519bdd665db898d462761dc5fe5f92e40994e8d0e214b0a1f9d8d327d44f8deb287c646c7013c17099bca193d85d1a3b2d851ada976 SHA512 25293378693cec875d1b52ea5aca8087a0d31021e6fbb4bd31f05c6979e36a5dc03983f2007a067942e1e119878b94a9e2b9622f324c7592f6630dcfe008b757 diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch deleted file mode 100644 index 6d02e31f9bc..000 --- a/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch +++ /dev/null @@ -1,24 +0,0 @@ -Bug: https://bugs.gentoo.org/641382 - a/cmake/Modules/MacroQbtCompilerSettings.cmake -+++ b/cmake/Modules/MacroQbtCompilerSettings.cmake -@@ -11,16 +11,15 @@ - #-Wshadow -Wconversion ? - set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra" - "-Wfloat-equal -Wcast-qual -Wcast-align" --"-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long" -+"-Wsign-conversion -Winvalid-pch -Wno-long-long" - # -fstack-protector-all --"-Werror -Wno-error=deprecated-declarations" -+"-Wno-error=deprecated-declarations" - ) - set (_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" - "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel" - "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align" --"-Werror=overloaded-virtual" - # "-Weffc++" --"-Werror -Wno-error=cpp" -+"-Wno-error=cpp" - # we should modify code to make these ones obsolete - "-Wno-error=sign-conversion -Wno-error=float-equal" - ) diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild deleted file mode 100644 index 0abafb22f1e..000 --- a/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils xdg-utils - -DESCRIPTION="BitTorrent client in C++ and Qt" -HOMEPAGE="https://www.qbittorrent.org - https://github.com/qbittorrent; - -if [[ ${PV} == * ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git; -else - MY_P=${P/_} - SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" - KEYWORDS="amd64 ~arm ~ppc64 x86" - S=${WORKDIR}/${MY_P} -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="+dbus debug webui +X" -REQUIRED_USE="dbus? ( X )" - -RDEPEND=" - >=dev-libs/boost-1.62.0-r1:= - dev-qt/qtcore:5 - dev-qt/qtnetwork:5[ssl] - >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] - dev-qt/qtxml:5 - >=net-libs/libtorrent-rasterbar-1.0.6:0= - sys-libs/zlib - dbus? ( dev-qt/qtdbus:5 ) - X? ( - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - )" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - virtual/pkgconfig" - -DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) -PATCHES=( "${FILESDIR}/${PN}-4.0.4-werror.patch" ) - -src_configure() { - local mycmakeargs=( - -DSYSTEM_QTSINGLEAPPLICATION=ON - -DDBUS=$(usex dbus) - -DGUI=$(usex X) - -DWEBUI=$(usex webui) - ) - cmake-utils_src_configure -} -
[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/
commit: 6b25a3cf2aeef995f871c862a41f73d665684a40 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 25 19:33:38 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Apr 26 03:29:32 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b25a3cf net-p2p/qbittorrent: Drop old Bug: https://bugs.gentoo.org/653976 Package-Manager: Portage-2.3.31, Repoman-2.3.9 net-p2p/qbittorrent/Manifest | 3 - .../files/qbittorrent-3.3.16-cmake.patch | 44 -- .../files/qbittorrent-4.0.1-nowebui.patch | 25 net-p2p/qbittorrent/qbittorrent-3.3.16.ebuild | 71 -- net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild | 66 net-p2p/qbittorrent/qbittorrent-4.0.3-r1.ebuild| 71 -- 6 files changed, 280 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index e6dfe68d41d..e7f74c0ceae 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,4 +1 @@ -DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 -DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80 -DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ada2f7cb0d2819dfbd41e57ddbcda8a077161c78bcf8210e3571572872c13aa2255973e842c07b6b538d94ac2501c841 SHA512 d439e5428ff43ec9317bfa70b365a912a33fa12eeaad72c6916514e7b04509bf3d2e35ef9c07a36e42e7fc80f4e019f6a299fd2f93df9ec10af4a95257096ecd DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969 diff --git a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch b/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch deleted file mode 100644 index 9f5b82b218e..000 --- a/net-p2p/qbittorrent/files/qbittorrent-3.3.16-cmake.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0ad52903890fe680307b46f4051bdd91d8aaffd5 Mon Sep 17 00:00:00 2001 -From: Eugene Shalygin-Date: Sat, 7 Oct 2017 21:48:52 +0200 -Subject: [PATCH] cmake: do not use Qt5Widgets when locating - QtSingleApplication. Closes #7551. - -This fixes cmake builds with GUI disabled and system -QtSingleApplication. We rely on Qt5::Core instead of Qt5::Widgets. - cmake/Modules/FindQtSingleApplication.cmake | 10 +- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/cmake/Modules/FindQtSingleApplication.cmake b/cmake/Modules/FindQtSingleApplication.cmake -index eb56607e94..9b526c9839 100644 a/cmake/Modules/FindQtSingleApplication.cmake -+++ b/cmake/Modules/FindQtSingleApplication.cmake -@@ -30,9 +30,9 @@ IF(QT4_FOUND) - NAMES ${QTSINGLEAPPLICATION_NAMES} - PATHS ${QT_LIBRARY_DIR} - ) --ELSEIF(Qt5Widgets_FOUND) -+ELSEIF(Qt5Core_FOUND) - message(STATUS "Looking for Qt5 single application library") --FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR}) -+FOREACH(TOP_INCLUDE_PATH in ${Qt5Core_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR}) - FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions) - - IF(QTSINGLEAPPLICATION_INCLUDE_DIR) -@@ -43,12 +43,12 @@ ELSEIF(Qt5Widgets_FOUND) - SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} - Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6 - QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) --GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION) --GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH) -+GET_TARGET_PROPERTY(_QT5_CORELIBRARY Qt5::Core LOCATION) -+GET_FILENAME_COMPONENT(_QT5_CORELIBRARYPATH ${_QT5_CORELIBRARY} PATH) - - FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY - NAMES ${QTSINGLEAPPLICATION_NAMES} --PATHS ${QT5_WIDGETSLIBRARYPATH} -+PATHS ${_QT5_CORELIBRARYPATH} - ) - ENDIF() - diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch deleted file mode 100644 index 2a7f5dbb47c..000 --- a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch +++ /dev/null @@ -1,25 +0,0 @@ -From
[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/
commit: 25253a5af117972cfb30dfc998b2f030554c0a3c Author: Michael Palimaka gentoo org> AuthorDate: Sat Mar 10 01:45:23 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Mar 10 01:51:31 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25253a5a net-p2p/qbittorrent: version bump 4.0.4 Closes: https://bugs.gentoo.org/649914 Closes: https://bugs.gentoo.org/641382 Package-Manager: Portage-2.3.19, Repoman-2.3.6 net-p2p/qbittorrent/Manifest | 1 + .../files/qbittorrent-4.0.4-werror.patch | 24 ++ ...orrent-.ebuild => qbittorrent-4.0.4.ebuild} | 10 ++--- net-p2p/qbittorrent/qbittorrent-.ebuild| 10 ++--- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 776312a9a56..e6dfe68d41d 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,3 +1,4 @@ DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80 DIST qbittorrent-4.0.3.tar.xz 4274292 BLAKE2B c6f6a87d26f01db318ac021a8ab9f8d1ada2f7cb0d2819dfbd41e57ddbcda8a077161c78bcf8210e3571572872c13aa2255973e842c07b6b538d94ac2501c841 SHA512 d439e5428ff43ec9317bfa70b365a912a33fa12eeaad72c6916514e7b04509bf3d2e35ef9c07a36e42e7fc80f4e019f6a299fd2f93df9ec10af4a95257096ecd +DIST qbittorrent-4.0.4.tar.xz 4279752 BLAKE2B 6385040d1179814e3290fb1c7b2d1e0b5782144663d12a067c43a2d8a47d0f0cfc0633c69f183db70eab2591ef100f39b07ea2d5e3cbca3a4d149ccb70e4d838 SHA512 ead0a306242d883673e13f9e6dc5ad83d4624c3d7ffb586aff78c03f7685e89b6a6c8640fff6a1b251565892178d37f4a64d45d0ce18935a212ca39302a28969 diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch new file mode 100644 index 000..6d02e31f9bc --- /dev/null +++ b/net-p2p/qbittorrent/files/qbittorrent-4.0.4-werror.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/641382 + +--- a/cmake/Modules/MacroQbtCompilerSettings.cmake b/cmake/Modules/MacroQbtCompilerSettings.cmake +@@ -11,16 +11,15 @@ + #-Wshadow -Wconversion ? + set(_GCC_COMMON_C_AND_CXX_FLAGS "-Wall -Wextra" + "-Wfloat-equal -Wcast-qual -Wcast-align" +-"-Wsign-conversion -Winvalid-pch -Werror=return-type -Wno-long-long" ++"-Wsign-conversion -Winvalid-pch -Wno-long-long" + # -fstack-protector-all +-"-Werror -Wno-error=deprecated-declarations" ++"-Wno-error=deprecated-declarations" + ) + set (_GCC_COMMON_CXX_FLAGS "-fexceptions -frtti" + "-Woverloaded-virtual -Wold-style-cast -Wstrict-null-sentinel" + "-Wnon-virtual-dtor -Wfloat-equal -Wcast-qual -Wcast-align" +-"-Werror=overloaded-virtual" + # "-Weffc++" +-"-Werror -Wno-error=cpp" ++"-Wno-error=cpp" + # we should modify code to make these ones obsolete + "-Wno-error=sign-conversion -Wno-error=float-equal" + ) diff --git a/net-p2p/qbittorrent/qbittorrent-.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild similarity index 87% copy from net-p2p/qbittorrent/qbittorrent-.ebuild copy to net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild index 21af49d18a4..1f76cf096f6 100644 --- a/net-p2p/qbittorrent/qbittorrent-.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-4.0.4.ebuild @@ -29,7 +29,7 @@ RDEPEND=" dev-qt/qtnetwork:5[ssl] >=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?] dev-qt/qtxml:5 - >=net-libs/libtorrent-rasterbar-1.0.6:= + >=net-libs/libtorrent-rasterbar-1.0.6:0= sys-libs/zlib dbus? ( dev-qt/qtdbus:5 ) X? ( @@ -42,13 +42,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) - -src_prepare() { - cmake-utils_src_prepare - - # bug 641382 - sed -i -e "s/-Werror //" cmake/Modules/MacroQbtCompilerSettings.cmake || die -} +PATCHES=( "${FILESDIR}/${PN}-4.0.4-werror.patch" ) src_configure() { local mycmakeargs=( diff --git a/net-p2p/qbittorrent/qbittorrent-.ebuild b/net-p2p/qbittorrent/qbittorrent-.ebuild index 21af49d18a4..1f76cf096f6 100644 --- a/net-p2p/qbittorrent/qbittorrent-.ebuild +++ b/net-p2p/qbittorrent/qbittorrent-.ebuild @@ -29,7 +29,7 @@
[gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/, net-p2p/qbittorrent/files/
commit: 75d47cad5a29e5175fbb2b0887850e372bd7b18c Author: Michael Palimaka gentoo org> AuthorDate: Sat Nov 25 10:49:45 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Nov 25 11:03:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75d47cad net-p2p/qbittorrent: version bump 4.0.1 Closes: https://bugs.gentoo.org/638430 Package-Manager: Portage-2.3.14, Repoman-2.3.6 net-p2p/qbittorrent/Manifest | 3 +- .../files/qbittorrent-4.0.1-nowebui.patch | 25 net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild | 66 ++ 3 files changed, 93 insertions(+), 1 deletion(-) diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest index 101ed3b9d0e..10b8fe7b35c 100644 --- a/net-p2p/qbittorrent/Manifest +++ b/net-p2p/qbittorrent/Manifest @@ -1,4 +1,5 @@ DIST qbittorrent-3.3.10.tar.xz 2959380 SHA256 2c657ceacdc84033da044a0a9ecba7e0fdb35858324dc097546f989166f1a8d2 SHA512 4f4e7071fa6db75ed2b5fbf5f17d5a9634aa5f2ed9fbcec52e6a0112967f5832e998384c7ff4962b1e00a0f847fa5d39bcdba36f997b5b895c7688e0dd247516 WHIRLPOOL 950b49d7a15aa7cf16dfe2bbfba72959e91f21f85ba589ce85be370b8b21c03fb389d404ed46ad2c802e3a57660094fe644b20df9bc3a0714cb5d9ea965e1b97 DIST qbittorrent-3.3.12-cmake-3.8.patch.gz 18330 SHA256 8172d04af3621ed0859ff541ae6c6e73f469125e0b7defd591191ab8c233e658 SHA512 e5aa6aa32f12c47a28658b2382faca88b64be1c198c69ad88f4fcd9f18d2db7a4e71c170dffd142b5af0184105b04dc2409417761db8859f622d42af7d25b060 WHIRLPOOL a68723a52858aed3e0474e0ccc3bcde7a451b388c8cd30ea5548f53e950902e234cb7e9cc32a86c75e367c4cad33a40beab52619de0a1f27442b89a10c25e67f DIST qbittorrent-3.3.12.tar.xz 2989604 SHA256 56528c47f09b316ecf682e3896157c76c18898ef996728b0c5186e05a711466f SHA512 537ded71c75b3ab3fe014d77b5c4f8069ebb7a1aa94b5190b16e9ee910bfb70d462e5a3a536ba9222a97d8cceac00af0d33a92b7414b17724694d364fc2374df WHIRLPOOL 9f3b7cb85885691ea747b2569690aa3d1189798be6000e9ec2c8af65ccd86010be877af10b540422233f5b8c253bf221fad0fea6fdc9a0b5dcbc3cedf50613bd -DIST qbittorrent-3.3.16.tar.xz 2961420 SHA256 ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 WHIRLPOOL dec3eab159c9f930d5c2a2f123b089c6ce84e7bcbd83d84f996c1a0167e4bbbdf468492a136a86485cc73611f044587e940910e34260535f2074e84680369ccb +DIST qbittorrent-3.3.16.tar.xz 2961420 BLAKE2B 3704e6575b1a321e04b0b9c1feee9acaf2e0ab5e0815c2cbb496265c8407c5b27111265e929ea3a516cba20acacc3b954579b5904de3411ae81726f2461dfbe0 SHA512 518ddbf8e657b3549800b5587924a8a34826895183f199b79aac72de81e6b5c009cb3b8d4fbb19151da0d96c21eb1c2f05d6ed061608cc8f589ec6fe62ce8117 +DIST qbittorrent-4.0.1.tar.xz 4256588 BLAKE2B 579e850c34c62f515807a3fb2619740442c275e9de74cd7338a9e2d72340c78a2b7f484a3ee911094cbb3b551d61a927be454466637eac2d2355e84ebec0dbd4 SHA512 76eae32ebe82953e3164a8a292132a33ccc93f5a33ce7e1ce3253f4697939b73d21e1823bada7d3b1fe7401538a7f407ebeb86c281a34e261aec0aa02d7bef80 diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch b/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch new file mode 100644 index 000..2a7f5dbb47c --- /dev/null +++ b/net-p2p/qbittorrent/files/qbittorrent-4.0.1-nowebui.patch @@ -0,0 +1,25 @@ +From af898e9117b475230e793fa4fd75274145ecf25d Mon Sep 17 00:00:00 2001 +From: Heiko Becker+Date: Wed, 22 Nov 2017 21:29:20 +0100 +Subject: [PATCH] Fix build with --disable-webui + +"app/application.cpp:108:7: error: class 'Application' does not have +any field named 'm_webui'" +--- + src/app/application.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/app/application.cpp b/src/app/application.cpp +index 3b0d4d78de..b3221efa88 100644 +--- a/src/app/application.cpp b/src/app/application.cpp +@@ -105,7 +105,9 @@ Application::Application(const QString , int , char **argv) + , m_running(false) + , m_shutdownAct(ShutdownDialogAction::Exit) + , m_commandLineArgs(parseCommandLine(this->arguments())) ++#ifndef DISABLE_WEBUI + , m_webui(nullptr) ++#endif + { + qRegisterMetaType("Log::Msg"); + diff --git a/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild new file mode 100644 index 000..a1573cc1deb --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-4.0.1.ebuild @@ -0,0 +1,66 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="https://www.qbittorrent.org/; + +if [[ ${PV} == * ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git; +else + MY_P=${P/_} + SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +