From eb7a3cf0d3c1f849f74472b98b065958c8f2abdc Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Mar 05 2021 17:52:41 +0000 Subject: Drop already applied patch Signed-off-by: Igor Raits --- diff --git a/0001-Don-t-access-other-enum-members-from-self.patch b/0001-Don-t-access-other-enum-members-from-self.patch deleted file mode 100644 index 6664ced..0000000 --- a/0001-Don-t-access-other-enum-members-from-self.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 756ea32e068e60ece210561edc2dee523826f472 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Fri, 12 Feb 2021 12:22:20 +0100 -Subject: [PATCH] Don't access other enum members from self - -This is deprecated in Python 3.10. -Instead, acces them from the class. - -Fixes https://github.com/mesonbuild/meson/issues/8318 ---- - mesonbuild/backend/backends.py | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py -index ecd506789d..743574b110 100644 ---- a/mesonbuild/backend/backends.py -+++ b/mesonbuild/backend/backends.py -@@ -69,11 +69,12 @@ def from_str(cls, string: str) -> 'TestProtocol': - raise MesonException('unknown test format {}'.format(string)) - - def __str__(self) -> str: -- if self is self.EXITCODE: -+ cls = type(self) -+ if self is cls.EXITCODE: - return 'exitcode' -- elif self is self.GTEST: -+ elif self is cls.GTEST: - return 'gtest' -- elif self is self.RUST: -+ elif self is cls.RUST: - return 'rust' - return 'tap' - diff --git a/meson.spec b/meson.spec index 5a5fc90..b6f086d 100644 --- a/meson.spec +++ b/meson.spec @@ -13,7 +13,6 @@ Summary: High productivity build system License: ASL 2.0 URL: https://mesonbuild.com/ Source: https://github.com/mesonbuild/meson/releases/download/%{version_no_tilde .}/meson-%{version_no_tilde %{quote:}}.tar.gz -Patch0001: https://github.com/mesonbuild/meson/commit/756ea32e068e60ece210561edc2dee523826f472.patch#/0001-Don-t-access-other-enum-members-from-self.patch BuildArch: noarch