Hello community,
here is the log from the commit of package blender for openSUSE:Factory checked
in at 2019-02-13 10:07:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blender (Old)
and /work/SRC/openSUSE:Factory/.blender.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blender"
Wed Feb 13 10:07:29 2019 rev:111 rq:674131 version:2.79b
Changes:
--------
--- /work/SRC/openSUSE:Factory/blender/blender.changes 2019-02-01
11:44:42.084598335 +0100
+++ /work/SRC/openSUSE:Factory/.blender.new.28833/blender.changes
2019-02-13 10:07:38.865526930 +0100
@@ -1,0 +2,6 @@
+Tue Feb 12 14:13:51 UTC 2019 - davejpla...@gmail.com
+
+- Fix boo#1124964 with patch from blender git:
+ 0001-Fix-PyRNA-class-registration-w-Python-3.7.patch
+
+-------------------------------------------------------------------
New:
----
0001-Fix-PyRNA-class-registration-w-Python-3.7.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blender.spec ++++++
--- /var/tmp/diff_new_pack.imE3d0/_old 2019-02-13 10:07:40.485526519 +0100
+++ /var/tmp/diff_new_pack.imE3d0/_new 2019-02-13 10:07:40.489526518 +0100
@@ -50,6 +50,8 @@
Patch1: 0001-Cycles-Fix-bad-register-cast-in-sseb.patch
# The openvdb package is WIP
#Patch2 blender-2.78c-openvdb3-abi.patch
+# PATCH-FIX-UPSTREAM from commit 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f
fixes boo#1124964
+Patch3: 0001-Fix-PyRNA-class-registration-w-Python-3.7.patch
# libquicktime-devel
#!BuildIgnore: libGLwM1
BuildRequires: OpenEXR-devel
@@ -185,6 +187,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch3 -p1
rm -rf extern/glew
rm -rf extern/libopenjpeg
++++++ 0001-Fix-PyRNA-class-registration-w-Python-3.7.patch ++++++
>From 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasma...@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.16.4
