#5 Another patch for Python 3.6 compability
Merged 2 years ago by tdawson. Opened 2 years ago by kanarip.
rpms/ kanarip/blender epel7  into  epel7

Another patch for Python 3.6 compability
Jeroen van Meeuwen (Kolab Systems) • 2 years ago  
@@ -0,0 +1,13 @@ 

+ diff -ur blender-2.68a.py3-success/source/blender/python/generic/py_capi_utils.c blender-2.68a/source/blender/python/generic/py_capi_utils.c

+ --- blender-2.68a.py3-success/source/blender/python/generic/py_capi_utils.c	2019-03-08 22:30:02.407153492 +0100

+ +++ blender-2.68a/source/blender/python/generic/py_capi_utils.c	2019-03-08 22:32:16.228452644 +0100

+ @@ -601,7 +601,8 @@

+  

+  bool PyC_IsInterpreterActive(void)

+  {

+ -	return (((PyThreadState *)_Py_atomic_load_relaxed(&_PyThreadState_Current)) != NULL);

+ +	/* instead of PyThreadState_Get, which calls Py_FatalError */

+ +	return (PyThreadState_GetDict() != NULL);

+  }

+  

+  /* Would be nice if python had this built in

file modified
+5 -2
@@ -31,8 +31,10 @@ 

  Patch1:         blender-2.68a-syspath.patch

  Patch2:	        blender-2.68a-droid.patch

  

- # From upstream https://git.blender.org/gitweb/gitweb.cgi/blender.git/commit/4dd7d4110a06422b5a86a609b7cc7687bd570fef

+ # From upstream https://git.blender.org/gitweb/gitweb.cgi/blender.git/commit/4dd7d4110a06

  Patch3:         blender-2.68a-4dd7d4110a06.patch

+ # Partial, inspired by https://git.blender.org/gitweb/gitweb.cgi/blender.git/commit/4aad17c622da

+ Patch4:         blender-2.68a-4aad17c622da.patch

  

  BuildRequires:  desktop-file-utils

  BuildRequires:  gettext
@@ -150,7 +152,8 @@ 

   

  %patch1 -p1 -b .syspath

  %patch2 -p1 -b .droid

- %patch3 -p1 -b .py3

+ %patch3 -p1 -b .py3a

+ %patch4 -p1 -b .py3b

  

  find -name '.svn' -print | xargs rm -rf

  

Looks good, and the scratch build looks successfull.
Thank You

Pull-Request has been merged by tdawson

2 years ago