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 2C149138359 for ; Mon, 24 Aug 2020 22:34:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD275E08EF; Mon, 24 Aug 2020 22:33:59 +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 B0858E08E8 for ; Mon, 24 Aug 2020 22:33:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 256F2340D80 for ; Mon, 24 Aug 2020 22:33:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7D2C34A for ; Mon, 24 Aug 2020 22:33:54 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1598308379.f66e7565d64dc115843848fe50322778c2db2ec8.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/mugshot/files/, x11-misc/mugshot/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/mugshot/files/mugshot-0.4.2-python39.patch x11-misc/mugshot/mugshot-0.4.2-r1.ebuild X-VCS-Directories: x11-misc/mugshot/files/ x11-misc/mugshot/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: f66e7565d64dc115843848fe50322778c2db2ec8 X-VCS-Branch: master Date: Mon, 24 Aug 2020 22:33:54 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dfaf123d-775e-4be8-8c72-eaf2233fbb1e X-Archives-Hash: 85e14731e0c0279355cc9ba30978d08b commit: f66e7565d64dc115843848fe50322778c2db2ec8 Author: Conrad Kostecki gentoo org> AuthorDate: Mon Aug 24 22:03:22 2020 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Aug 24 22:32:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f66e7565 x11-misc/mugshot: add python3.9 support Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Conrad Kostecki gentoo.org> .../mugshot/files/mugshot-0.4.2-python39.patch | 36 ++++++++++++++++++++++ x11-misc/mugshot/mugshot-0.4.2-r1.ebuild | 4 ++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch new file mode 100644 index 00000000000..b0443f7a3d3 --- /dev/null +++ b/x11-misc/mugshot/files/mugshot-0.4.2-python39.patch @@ -0,0 +1,36 @@ +From 643b3d005a8865c961b836aeae4c1f76711646e9 Mon Sep 17 00:00:00 2001 +From: Conrad Kostecki +Date: Mon, 24 Aug 2020 23:58:10 +0200 +Subject: [PATCH] Add python3.9 compatiblity + +Starting with python3.9, launching of mugshot will fail, +as getiterator() been deprecated since Python 2.7, +and has been removed in Python 3.9. Using iter() will fix that. + +Signed-off-by: Conrad Kostecki +--- + mugshot_lib/Builder.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mugshot_lib/Builder.py b/mugshot_lib/Builder.py +index 7297541..6c08d70 100644 +--- a/mugshot_lib/Builder.py ++++ b/mugshot_lib/Builder.py +@@ -89,7 +89,7 @@ def add_from_file(self, filename): + tree = ElementTree() + tree.parse(filename) + +- ele_widgets = tree.getiterator("object") ++ ele_widgets = tree.iter("object") + for ele_widget in ele_widgets: + name = ele_widget.attrib['id'] + widget = self.get_object(name) +@@ -111,7 +111,7 @@ def add_from_file(self, filename): + if connections: + self.connections.extend(connections) + +- ele_signals = tree.getiterator("signal") ++ ele_signals = tree.iter("signal") + for ele_signal in ele_signals: + self.glade_handler_dict.update( + {ele_signal.attrib["handler"]: None}) diff --git a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild index c547ba1e953..a39fccdd02a 100644 --- a/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild +++ b/x11-misc/mugshot/mugshot-0.4.2-r1.ebuild @@ -4,7 +4,7 @@ EAPI=7 DISTUTILS_USE_SETUPTOOLS="no" -PYTHON_COMPAT=( python3_{6,7,8} ) +PYTHON_COMPAT=( python3_{6..9} ) inherit distutils-r1 gnome2-utils xdg-utils @@ -59,6 +59,8 @@ BDEPEND=" S="${WORKDIR}/${PN}-${P}" +PATCHES=( "${FILESDIR}/${PN}-0.4.2-python39.patch" ) + python_install() { distutils-r1_python_install