From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1099849-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36A8A138335 for <garchives@archives.gentoo.org>; Tue, 16 Jul 2019 09:40:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45709E0822; Tue, 16 Jul 2019 09:40:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0D0ABE0822 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 09:40:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB069347747 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 09:39:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 722A35F1 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Jul 2019 09:39:58 +0000 (UTC) From: "Andreas Sturmlechner" <asturm@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org> Message-ID: <1563269977.2ba34f12ffa132f756c19c43880f1a7b226f0be0.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/qbittorrent/files/, net-p2p/qbittorrent/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild X-VCS-Directories: net-p2p/qbittorrent/files/ net-p2p/qbittorrent/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 2ba34f12ffa132f756c19c43880f1a7b226f0be0 X-VCS-Branch: master Date: Tue, 16 Jul 2019 09:39:58 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0e9ad748-6014-41f7-9817-f337c0aa1cfb X-Archives-Hash: d899495a22b875b79d16fd0a996c3b36 commit: 2ba34f12ffa132f756c19c43880f1a7b226f0be0 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 09:36:07 2019 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Tue Jul 16 09:39:37 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ba34f12 net-p2p/qbittorrent: EAPI-7, drop gnome2-utils, fix bug w/ Qt-5.12.4 Upstream commit 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Reported-by: Nikos Chantziaras <realnc <AT> gmail.com> Bug: https://bugs.gentoo.org/689704 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> ...-4.1.6-no-screenblank-on-close-to-systray.patch | 25 ++++++++ net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild | 72 ++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch new file mode 100644 index 00000000000..361f7aa2255 --- /dev/null +++ b/net-p2p/qbittorrent/files/qbittorrent-4.1.6-no-screenblank-on-close-to-systray.patch @@ -0,0 +1,25 @@ +From 9a4dd3ea9d1fc2af0cc5724ebb19fc99297c2960 Mon Sep 17 00:00:00 2001 +From: Ekin Dursun <ekindursun@gmail.com> +Date: Tue, 7 May 2019 02:08:46 +0300 +Subject: [PATCH] Don't turn screen blank when closed to system tray + +Closes #9240 and possibly #9121, as @zeule suggested here: https://github.com/qbittorrent/qBittorrent/issues/9240#issuecomment-408025722. +--- + src/gui/mainwindow.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp +index 4c62ba5d90..0b8b41ebab 100644 +--- a/src/gui/mainwindow.cpp ++++ b/src/gui/mainwindow.cpp +@@ -1158,8 +1158,8 @@ void MainWindow::closeEvent(QCloseEvent *e) + #else + const bool goToSystrayOnExit = pref->closeToTray(); + if (!m_forceExit && m_systrayIcon && goToSystrayOnExit && !this->isHidden()) { +- hide(); +- e->accept(); ++ e->ignore(); ++ QTimer::singleShot(0, this, &QWidget::hide); + if (!pref->closeToTrayNotified()) { + showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); + pref->setCloseToTrayNotified(true); diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild new file mode 100644 index 00000000000..ae75d7415fa --- /dev/null +++ b/net-p2p/qbittorrent/qbittorrent-4.1.6-r1.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit xdg-utils + +DESCRIPTION="BitTorrent client in C++ and Qt" +HOMEPAGE="https://www.qbittorrent.org + https://github.com/qbittorrent" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/${PN}/qBittorrent.git" +else + SRC_URI="https://github.com/qbittorrent/qBittorrent/archive/release-${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~ppc64 ~x86" + S="${WORKDIR}/qBittorrent-release-${PV}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+dbus debug webui +X" +REQUIRED_USE="dbus? ( X )" + +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" +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.1*:0= + sys-libs/zlib + dbus? ( dev-qt/qtdbus:5 ) + X? ( + dev-libs/geoip + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + )" +DEPEND="${RDEPEND}" + +PATCHES=( "${FILESDIR}/${P}-no-screenblank-on-close-to-systray.patch" ) + +DOCS=( AUTHORS Changelog CONTRIBUTING.md README.md TODO ) + +src_configure() { + econf --with-qtsingleapplication=system \ + $(use_enable dbus qt-dbus) \ + $(use_enable debug) \ + $(use_enable webui) \ + $(use_enable X gui) +} + +src_install() { + emake STRIP="/bin/false" INSTALL_ROOT="${D}" install + einstalldocs +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update +}