From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 8841A1396D9 for ; Mon, 16 Oct 2017 20:38:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBEA02BC06F; Mon, 16 Oct 2017 20:38:43 +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 89D7E2BC06F for ; Mon, 16 Oct 2017 20:38:43 +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 4550033BEBE for ; Mon, 16 Oct 2017 20:38:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C912F313 for ; Mon, 16 Oct 2017 20:38:40 +0000 (UTC) From: "Kristian Fiskerstrand" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kristian Fiskerstrand" Message-ID: <1508186205.9180e836c5fbd22c5aecde178597faa0bcaaf30e.k_f@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/deluge/files/, net-p2p/deluge/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/deluge/deluge-1.3.15-r1.ebuild net-p2p/deluge/files/deluge-1.3.15-r1-fix-preferences-ui.patch X-VCS-Directories: net-p2p/deluge/files/ net-p2p/deluge/ X-VCS-Committer: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 9180e836c5fbd22c5aecde178597faa0bcaaf30e X-VCS-Branch: master Date: Mon, 16 Oct 2017 20:38:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7161b527-0988-47a8-b349-ccc7ed1d833f X-Archives-Hash: 4751a1152327fdefa726725b7693b159 commit: 9180e836c5fbd22c5aecde178597faa0bcaaf30e Author: PPed72 iol it> AuthorDate: Wed Aug 30 14:38:06 2017 +0000 Commit: Kristian Fiskerstrand gentoo org> CommitDate: Mon Oct 16 20:36:45 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9180e836 net-p2p/deluge: fix to preferences ui Bug: https://bugs.gentoo.org/623650 net-p2p/deluge/deluge-1.3.15-r1.ebuild | 144 +++++++++++++++++++++ .../deluge-1.3.15-r1-fix-preferences-ui.patch | 32 +++++ 2 files changed, 176 insertions(+) diff --git a/net-p2p/deluge/deluge-1.3.15-r1.ebuild b/net-p2p/deluge/deluge-1.3.15-r1.ebuild new file mode 100644 index 00000000000..e76bbab1485 --- /dev/null +++ b/net-p2p/deluge/deluge-1.3.15-r1.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +PYTHON_COMPAT=( python2_7 ) +DISTUTILS_SINGLE_IMPL=1 +PLOCALES="af ar ast be bg bn bs ca cs cy da de el en_AU en_CA en_GB eo es et eu fa fi fo fr fy ga gl he hi hr hu id is it iu ja ka kk km kn ko ku ky la lb lt lv mk ml ms nap nb nds nl nn oc pl pms pt pt_BR ro ru si sk sl sr sv ta te th tl tlh tr uk ur vi zh_CN zh_HK zh_TW" +inherit distutils-r1 eutils systemd user l10n + +DESCRIPTION="BitTorrent client with a client/server model" +HOMEPAGE="http://deluge-torrent.org/" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="git://deluge-torrent.org/${PN}.git + http://git.deluge-torrent.org/${PN}" + SRC_URI="" + KEYWORDS="~amd64 ~x86" +else + SRC_URI="http://download.deluge-torrent.org/source/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="console geoip gtk libnotify sound webinterface" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + sound? ( gtk ) + libnotify? ( gtk ) +" +PATCHES=( + "${FILESDIR}/${PN}-1.3.5-disable_libtorrent_internal_copy.patch" + "${FILESDIR}/${PN}-1.3.15-r1-fix-preferences-ui.patch" +) + +CDEPEND=" +Date: Sat, 13 May 2017 00:05:48 +0100 +Subject: [GTKUI] Fix keyerror showing prefs + + * Fix the single_proxy ui to True as unlikely any users using <=0.15 + and need to have different proxy type settings. +--- + deluge/ui/gtkui/preferences.py | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/deluge/ui/gtkui/preferences.py b/deluge/ui/gtkui/preferences.py +index 645ad26..efcd93d 100644 +--- a/deluge/ui/gtkui/preferences.py ++++ b/deluge/ui/gtkui/preferences.py +@@ -318,11 +318,8 @@ class Preferences(component.Component): + } + # Add proxy stuff + +- # Display workaround for single proxy in libtorrent >v0.16 +- try: +- lt_single_proxy = component.get("PreferencesManager").LT_SINGLE_PROXY +- except AttributeError: +- lt_single_proxy = False ++ # Display workaround for single proxy in libtorrent >= v0.16 ++ lt_single_proxy = True + + for t in ("peer", "web_seed", "tracker", "dht"): + if lt_single_proxy and not t == "peer": +-- +cgit v1.1 +