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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6F4C415808B for ; Fri, 11 Feb 2022 23:17:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2C218E086C; Fri, 11 Feb 2022 23:17:02 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0EF88E086C for ; Fri, 11 Feb 2022 23:17:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCA27342D5D for ; Fri, 11 Feb 2022 23:17:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 35D012D3 for ; Fri, 11 Feb 2022 23:16:59 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1644621235.3f19d64e7302ed98bc86c9e464c5b2e3b6a306a4.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-misc/fbpanel/files/, x11-misc/fbpanel/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-misc/fbpanel/fbpanel-7.0-r2.ebuild x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch X-VCS-Directories: x11-misc/fbpanel/ x11-misc/fbpanel/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 3f19d64e7302ed98bc86c9e464c5b2e3b6a306a4 X-VCS-Branch: master Date: Fri, 11 Feb 2022 23:16:59 +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: 5787c837-e70d-489c-8c48-db37b06b3ecb X-Archives-Hash: c7e87f9ba7f3650e71ffbf7ec361fbb3 commit: 3f19d64e7302ed98bc86c9e464c5b2e3b6a306a4 Author: Ionen Wolkens gentoo org> AuthorDate: Fri Feb 11 17:39:05 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Feb 11 23:13:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f19d64e x11-misc/fbpanel: enable py3.10 With a very trivial (straight-to-stable) build script patch. Signed-off-by: Ionen Wolkens gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r2.ebuild | 5 +++-- x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch | 9 +++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild index bec7e0e0220b..94e70477e409 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 toolchain-funcs @@ -39,6 +39,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-images.patch "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch + "${FILESDIR}"/${PN}-7.0-python3.10.patch ) src_prepare() { diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch new file mode 100644 index 000000000000..1c7a5c0ac38e --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch @@ -0,0 +1,9 @@ +python3.10 does not allow concatenating a string with None and +this shouldn't be ran either way if None. +--- a/configure ++++ b/configure +@@ -75,3 +75,3 @@ + self).add_argument_group(title, description) +- if name != 'help' and len(name.split()) == 1: ++ if name != 'help' and len(name.split()) == 1 and title is not None: + self.add_argument("--help-" + name, group = 'help',