diff options
| author | Leo Famulari <leo@famulari.name> | 2022-01-09 16:34:12 -0500 |
|---|---|---|
| committer | Leo Famulari <leo@famulari.name> | 2022-01-09 16:35:20 -0500 |
| commit | 1684ed6537fbd91ae5c14fb0314564e71799d390 (patch) | |
| tree | 083fc4af3ff417b1a00222ee0b5156a66d3f8152 /gnu/packages/patches/blender-2.79-python-3.7-fix.patch | |
| parent | 23da063ea3bb6a579f0fb87d2e5e00fed9962775 (diff) | |
| download | guix-1684ed6537fbd91ae5c14fb0314564e71799d390.tar guix-1684ed6537fbd91ae5c14fb0314564e71799d390.tar.gz | |
gnu: Remove leftover patches for Blender 2.79.
This is a followup to commit 23da063ea3bb6a579f0fb87d2e5e00fed9962775.
* gnu/packages/patches/blender-2.79-gcc8.patch,
gnu/packages/patches/blender-2.79-gcc9.patch,
gnu/packages/patches/blender-2.79-newer-ffmpeg.patch,
gnu/packages/patches/blender-2.79-oiio2.patch,
gnu/packages/patches/blender-2.79-python-3.7-fix.patch,
gnu/packages/patches/blender-2.79-python-3.8-fix.patch: Delete files.
* gnu/local.mk (dist_patch_DATA): Remove them.
Diffstat (limited to 'gnu/packages/patches/blender-2.79-python-3.7-fix.patch')
| -rw-r--r-- | gnu/packages/patches/blender-2.79-python-3.7-fix.patch | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/patches/blender-2.79-python-3.7-fix.patch b/gnu/packages/patches/blender-2.79-python-3.7-fix.patch deleted file mode 100644 index fd1d8ba437..0000000000 --- a/gnu/packages/patches/blender-2.79-python-3.7-fix.patch +++ /dev/null @@ -1,43 +0,0 @@ -Copied from https://git.blender.org/gitweb/gitweb.cgi/blender.git/patch/1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f -Fixes <https://bugs.gnu.org/33608>. - -From 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f Mon Sep 17 00:00:00 2001 -From: Campbell Barton <ideasman42@gmail.com> -Date: Thu, 12 Jul 2018 08:28:06 +0200 -Subject: [PATCH] Fix PyRNA class registration w/ Python 3.7 - -In Python3.7 this now raises an error. ---- - source/blender/python/intern/bpy_rna.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c -index 9052b6f580a..80b0aa7a51b 100644 ---- a/source/blender/python/intern/bpy_rna.c -+++ b/source/blender/python/intern/bpy_rna.c -@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v - if (!(flag & PROP_REGISTER)) - continue; - -+ /* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */ - identifier = RNA_property_identifier(prop); - item = PyObject_GetAttrString(py_class, identifier); - - if (item == NULL) { -+ PyErr_Clear(); - /* Sneaky workaround to use the class name as the bl_idname */ - - #define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \ -@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v - } \ - Py_DECREF(item); \ - } \ -+ else { \ -+ PyErr_Clear(); \ -+ } \ - } /* intentionally allow else here */ - - if (false) {} /* needed for macro */ --- -2.20.1 - |