summaryrefslogtreecommitdiff
path: root/x11-misc/fbpanel
diff options
context:
space:
mode:
Diffstat (limited to 'x11-misc/fbpanel')
-rw-r--r--x11-misc/fbpanel/Manifest3
-rw-r--r--x11-misc/fbpanel/fbpanel-7.0-r2.ebuild5
-rw-r--r--x11-misc/fbpanel/files/fbpanel-7.0-python3.10.patch9
3 files changed, 14 insertions, 3 deletions
diff --git a/x11-misc/fbpanel/Manifest b/x11-misc/fbpanel/Manifest
index 5b1a72c8c05a..feba2f70335d 100644
--- a/x11-misc/fbpanel/Manifest
+++ b/x11-misc/fbpanel/Manifest
@@ -3,7 +3,8 @@ AUX fbpanel-7.0-clang.patch 2596 BLAKE2B cb9e42fb7afaf007d49c54270ee6e09a551ee5c
AUX fbpanel-7.0-fno-common.patch 440 BLAKE2B ef20f4055b21b77f15e1946a3c94eb7dd1a74f85922ebd0059b74b7503467930b352888768948f0ca46c2966103b65b746bd2c095c03f77af7859d27bcaf3013 SHA512 a62c4514749d26bd2e77d5d0ed1eae3f83af765957ec5d5e94679f9787db3eadf192eccadfcb67dc087688d6d59303cd1f6ff0448dbca11dc8524cd3079c1d4c
AUX fbpanel-7.0-images.patch 274 BLAKE2B f587453d0e66c5fb8c93ad936dbf1cd1291d6dd652dde29f6e995947663eae8f20da3f022e494bbc6406db48ed3acdc71a38d973638b6ec11fb63e7117efd41a SHA512 432884c3d397c24e28e909bb3626ebd29ce3023c4e1aa68ccc9defdd81b59e29f72e8d090b54a04e501852b6cda91b1e8157e49092c7562184d787c8085f3ec0
AUX fbpanel-7.0-python3-shebangs.patch 2348 BLAKE2B 84c05bb718b5754d2679fa2b1807c9a0207058d5338dc59eb65643797d6aecc31f52eaf0134b26a3a4fa5364337fa577a641f05d58401441e14faca7ce83b0c5 SHA512 6791c1cd963f40db8df88b4758464fe99f308990ab86ee2e91c6e36c2e4f8ccf935275074352d432078ab4c3f8fb07f3535af43fb2627e0904153be087a5992e
+AUX fbpanel-7.0-python3.10.patch 410 BLAKE2B cd4c57ea9677062a127e698d248b9ec15b30a71c5c72ff953f40239ec63584d6011bf11cc441a75234a5b20188ef52ffc678296a952e7071dc6efc6975be42e8 SHA512 7a1ac51db1aa62ca7e49819e1dcadfe00e082692cb3c8662d6b0a218a011982b0a6731edd2118d7ddcd8fa58529d35bd63d6a4412067f535faa554127b40fd19
AUX fbpanel-7.0-remove-gdk-pixbuf-xlib.h.patch 801 BLAKE2B 49a0d7217b5e44c902200d9fc4cee57d245386cbf400e21a24672b2c121578d09dd440d56f05483afbe3e6083bbe65fdafb162e35624d7bd0f7f34b1639d2737 SHA512 d4fc104faf4bc4c9ead54530c3e00e82d9ab3c356d635c824d206dd2fa64c64b8ff57594cb6fbbef9725df30f10994de3a213aff8f1eb7fc8b59cd08498e3148
DIST fbpanel-7.0.tar.gz 3746477 BLAKE2B 6bc8ef39d44768b5fc9fc4c58ea0b89c723f0e5239198d3b1a5f6fe27252bf22c87fec5beb13fa3371af6c218e592d67d04644bd82cc62f357def610680fc2d2 SHA512 9706a96569c41241de4dbd250c9d6a473b53a5e26e880f4c782041b2b91c7570046e1bee3070059fd2d333fb7159490732ef397b86701c72d4c65c0784948874
-EBUILD fbpanel-7.0-r2.ebuild 1582 BLAKE2B 141f8eed5167071306306a67bc542cd43417576def9a8022a98fff0e6dcf8641d6557946305c7b8c8392eadffb12a706fa6cbe62029fdc965ef4f61ebb3f0a73 SHA512 be28ced7e4bc1b75e4601d700ef784b857fb66eb054dda8990d76baea73e793bfa35d381b05e8f23575c10705787504afe67dfa5310eec669124a8073aba1677
+EBUILD fbpanel-7.0-r2.ebuild 1626 BLAKE2B e5598c81a3e771ac8d70ab2c8fd040491dda30c2ad2ca49c4774b76c6e11f202d7d799b3dc34e667aae66f1955ee6d476aaf43070af0b18ef0bfbf7671f6f697 SHA512 569d8c9a7ab00e405351389ff934d146cce2d5cbbf566056209d375eabe6e6e0a6f9feefb03e988f921fa1ee2bd42b01abe7dc7f8488933893d09f157522576a
MISC metadata.xml 252 BLAKE2B cc4fe64f3e9531d55a19098705558d2e02a395279ba605d6c598ef6b9a13cb0a17cc9cdae4f9e2ea30f34abb58f0591b3c4f11a6e42b385ee7c0855251b37f20 SHA512 22086ac1bc91a06382f92625473824dd26f60fd00cf691ad3b587f45b75aadb9f0c66bb4af93ab02fe059b00f504770c642342d81dee9f01b950b99c1f85ea9d
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',