commit: 0cb5d6c835151cab56df82ea438b08518fd4bd39 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue May 6 14:14:19 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue May 6 14:21:49 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb5d6c8
x11-misc/fbpanel: use patch rather than 2to3 + fix w/ gcc-15 Had forgot about this, and it worked by accident when tested it. The patch is smaller than was expecting, so tossing it in filesdir like the rest. Not that this package has a long life ahead of it, I only look at it now and then because I know someone on the forums that is using it (I don't). Next time there is a major issue I'd say it should be last-rited. Closes: https://bugs.gentoo.org/955505 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-misc/fbpanel/fbpanel-7.0-r4.ebuild | 11 +++---- x11-misc/fbpanel/files/fbpanel-7.0-2to3.patch | 41 +++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild index 5507cc7efa59..eb748238705b 100644 --- a/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild +++ b/x11-misc/fbpanel/fbpanel-7.0-r4.ebuild @@ -3,9 +3,9 @@ EAPI=8 -PYTHON_COMPAT=( python3_{10..13} ) +PYTHON_COMPAT=( python3_{11..13} ) -inherit edo python-any-r1 toolchain-funcs +inherit edo flag-o-matic python-any-r1 toolchain-funcs DESCRIPTION="Light-weight X11 desktop panel" HOMEPAGE="https://aanatoly.github.io/fbpanel/"; @@ -40,15 +40,12 @@ PATCHES=( "${FILESDIR}"/${PN}-7.0-python3-shebangs.patch "${FILESDIR}"/${PN}-7.0-remove-gdk-pixbuf-xlib.h.patch "${FILESDIR}"/${PN}-7.0-python3.10.patch + "${FILESDIR}"/${PN}-7.0-2to3.patch ) -src_prepare() { - default - 2to3 -n -w --no-diffs configure .config/*.py || die -} - src_configure() { tc-export CC + append-cflags -std=gnu17 # not autotools based local confargs=( diff --git a/x11-misc/fbpanel/files/fbpanel-7.0-2to3.patch b/x11-misc/fbpanel/files/fbpanel-7.0-2to3.patch new file mode 100644 index 000000000000..51f0fc03b98f --- /dev/null +++ b/x11-misc/fbpanel/files/fbpanel-7.0-2to3.patch @@ -0,0 +1,41 @@ +Generated with `2to3 -n -w --no-diffs configure .config/*.py`. +https://bugs.gentoo.org/955505 +--- a/.config/argparse.py ++++ b/.config/argparse.py +@@ -100 +100 @@ +- basestring ++ str +@@ -102 +102 @@ +- basestring = str ++ str = str +@@ -1724 +1724 @@ +- if isinstance(action.default, basestring): ++ if isinstance(action.default, str): +@@ -2202 +2202 @@ +- if isinstance(value, basestring): ++ if isinstance(value, str): +--- a/.config/options.py ++++ b/.config/options.py +@@ -99 +99 @@ +- print str, ++ print(str, end=' ') +--- a/.config/repl.py ++++ b/.config/repl.py +@@ -17 +17 @@ +-print re.sub('@\w+@', repl_func, sys.stdin.read()) ++print(re.sub('@\w+@', repl_func, sys.stdin.read())) +--- a/configure ++++ b/configure +@@ -117 +117 @@ +- self.help_names = self.help_groups.keys() ++ self.help_names = list(self.help_groups.keys()) +@@ -278,3 +278,3 @@ +- print(e.output) +- print("This usually means that '" + pname + \ +- "' development files are not installed") ++ print((e.output)) ++ print(("This usually means that '" + pname + \ ++ "' development files are not installed")) +@@ -333 +333 @@ +- if type(v) == str or type(v) == unicode: ++ if type(v) == str or type(v) == str:
