diff -Nru blender-2.79.b+dfsg0/debian/changelog blender-2.79.b+dfsg0/debian/changelog --- blender-2.79.b+dfsg0/debian/changelog 2018-11-23 23:26:08.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/changelog 2018-12-02 21:33:26.000000000 +0000 @@ -1,14 +1,15 @@ -blender (2.79.b+dfsg0-4build2) disco; urgency=medium +blender (2.79.b+dfsg0-5) unstable; urgency=medium - * No-change reubild against latest glew + [ Ondřej Nový ] + * d/control: Remove ancient X-Python3-Version field - -- Jeremy Bicha Fri, 23 Nov 2018 18:26:08 -0500 + [ Matteo F. Vescovi ] + * debian/patches/: patchset updated + - 0010-fix_PyRNA_with_Python3.7.patch added (Closes: #915143) + * debian/control: S-V bump 4.1.5 -> 4.2.1 (no changes needed) + * debian/rules: drop useless get-orig-source target -blender (2.79.b+dfsg0-4build1) disco; urgency=medium - - * No-change rebuild to build for python3.7 as the default. - - -- Matthias Klose Wed, 31 Oct 2018 12:34:14 +0000 + -- Matteo F. Vescovi Sun, 02 Dec 2018 22:33:26 +0100 blender (2.79.b+dfsg0-4) unstable; urgency=medium diff -Nru blender-2.79.b+dfsg0/debian/control blender-2.79.b+dfsg0/debian/control --- blender-2.79.b+dfsg0/debian/control 2018-07-21 19:33:45.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/control 2018-12-02 21:31:23.000000000 +0000 @@ -5,8 +5,6 @@ Uploaders: Matteo F. Vescovi Build-Depends: cmake, debhelper (>= 11~), - gcc-8 (>= 8.1.0), - g++-8 (>= 8.1.0), gettext, libalut-dev, libavcodec-dev (>> 6:10), @@ -51,9 +49,8 @@ pkg-config, python3-dev, python3-requests -X-Python3-Version: >= 3.3 Build-Conflicts: nvidia-glx -Standards-Version: 4.1.5 +Standards-Version: 4.2.1 Homepage: http://www.blender.org/ Vcs-Git: https://salsa.debian.org/multimedia-team/blender.git Vcs-Browser: https://salsa.debian.org/multimedia-team/blender diff -Nru blender-2.79.b+dfsg0/debian/patches/0010-fix_PyRNA_with_Python3.7.patch blender-2.79.b+dfsg0/debian/patches/0010-fix_PyRNA_with_Python3.7.patch --- blender-2.79.b+dfsg0/debian/patches/0010-fix_PyRNA_with_Python3.7.patch 1970-01-01 00:00:00.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/patches/0010-fix_PyRNA_with_Python3.7.patch 2018-12-02 21:31:23.000000000 +0000 @@ -0,0 +1,38 @@ +From: Campbell Barton +Date: Sun, 2 Dec 2018 22:30:04 +0100 +Subject: fix_PyRNA_with_Python3.7 + +Upstream Tracker: https://developer.blender.org/T56969 + +Signed-off-by: Matteo F. Vescovi +--- + 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 0d3781c..4e0d19c 100644 +--- a/source/blender/python/intern/bpy_rna.c ++++ b/source/blender/python/intern/bpy_rna.c +@@ -7385,10 +7385,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) \ +@@ -7404,6 +7406,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 */ diff -Nru blender-2.79.b+dfsg0/debian/patches/series blender-2.79.b+dfsg0/debian/patches/series --- blender-2.79.b+dfsg0/debian/patches/series 2018-07-21 19:31:13.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/patches/series 2018-12-02 21:31:23.000000000 +0000 @@ -7,3 +7,4 @@ 0007-fix_OpenJPEG2_build.patch 0008-fix_building_with_latest_versions_of_FFmpeg.patch 0009-fix_gcc-8_ftbfs.patch +0010-fix_PyRNA_with_Python3.7.patch diff -Nru blender-2.79.b+dfsg0/debian/rules blender-2.79.b+dfsg0/debian/rules --- blender-2.79.b+dfsg0/debian/rules 2018-07-19 12:14:15.000000000 +0000 +++ blender-2.79.b+dfsg0/debian/rules 2018-12-02 21:31:23.000000000 +0000 @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export REPACK_SH=$(CURDIR)/debian/repack.sh - INSTDIR = debian/tmp PY3VERS = $(shell py3versions -dv) SRC_VER = $(shell uscan --report | grep blender-.* | sed 's/^.*-//' | sed 's/\.tar.*$$//') @@ -24,9 +22,6 @@ SETCOLLADA = ON endif -get-orig-source: - uscan --force-download --repack --compression xz - override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_INSTALL_PREFIX=/usr \