# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1542808000 -3600
# Node ID 44a17a1f5aaff5e6ac3e3f5ff0a19e0280f14c2e
# Parent  b8182717ebb124af4f38f153f38950d70f9b644f
blender: fix for python 3.7

diff -r b8182717ebb1 -r 44a17a1f5aaf blender/receipt
--- a/blender/receipt	Tue Nov 20 08:27:43 2018 +0100
+++ b/blender/receipt	Wed Nov 21 14:46:40 2018 +0100
@@ -27,8 +27,14 @@
 compile_rules()
 {
 	sed -i 's|uname -m|echo i486|' GNUmakefile
+	sed -i -e 's|\(PyModule_GetFilename\)(mod|_PyUnicode_AsString(\1Object(mod)|' \
+		-e 's|(.*_Py_atomic_load_relaxed(.*t)|(PyThreadState_GetDict(|' \
+			$src/source/blender/python/generic/py_capi_utils.c
+	sed -i 's|char. chars = _PyUnicode_AsString|const &|' \
+		$src/source/gameengine/Ketsji/KX_FontObject.cpp
 	mkdir -p $WOK/$PACKAGE/source/build
 	cd $WOK/$PACKAGE/source/build
+	PY3K_VER=$(ls -d /usr/include/python3.?m | sed 's|.*python\(.*\)m|\1|')
 	cmake $src \
 		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
 		-DCMAKE_BUILD_TYPE:STRING=Release \
@@ -38,13 +44,13 @@
 		-DWITH_GAMEENGINE:BOOL=ON \
 		-DWITH_CYCLES:BOOL=OFF \
 		-DWITH_PLAYER:BOOL=ON \
-		-DPYTHON_VERSION:STRING=3.4 \
+		-DPYTHON_VERSION:STRING=$PY3K_VER \
 		-DPYTHON_LIBPATH:STRING=/usr/lib \
-		-DPYTHON_LIBRARY:STRING=python3.4m \
-		-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.4m
+		-DPYTHON_LIBRARY:STRING=python${PY3K_VER}m \
+		-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python${PY3K_VER}m
 	# build
-	make $MAKEFLAGS
-	make DESTDIR=$DESTDIR install
+	make $MAKEFLAGS &&
+	make DESTDIR=$DESTDIR install &&
 	python3 -m compileall "$DESTDIR/usr/share/blender"
 }
 
diff -r b8182717ebb1 -r 44a17a1f5aaf wireshark/receipt
--- a/wireshark/receipt	Tue Nov 20 08:27:43 2018 +0100
+++ b/wireshark/receipt	Wed Nov 21 14:46:40 2018 +0100
@@ -38,7 +38,6 @@
 		$fs/usr/share
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/lib/wireshark $fs/usr/lib
-	rm $fs/usr/lib/wireshark/plugins/$VERSION/*.la
 	cp -a $install/usr/bin $fs/usr
 	cp -a $install/usr/share/wireshark $fs/usr/share
 }
diff -r b8182717ebb1 -r 44a17a1f5aaf xpaint/receipt
--- a/xpaint/receipt	Tue Nov 20 08:27:43 2018 +0100
+++ b/xpaint/receipt	Wed Nov 21 14:46:40 2018 +0100
@@ -37,6 +37,5 @@
 	cp -a $install/usr/lib/*.so* $fs/usr/lib
 	cp -a $install/usr/share/xpaint $fs/usr/share
 	rm -r $fs/usr/share/xpaint/include
-	rm -r $fs/usr/share/xpaint/c-scripts
 	cp $stuff/xpaint.xpm $fs/usr/share/pixmaps
 }