wok rev 20531

blender: fix for python 3.7
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Nov 21 14:46:40 2018 +0100 (2018-11-21)
parents b8182717ebb1
children 64042ecea7ad
files blender/receipt wireshark/receipt xpaint/receipt
line diff
     1.1 --- a/blender/receipt	Tue Nov 20 08:27:43 2018 +0100
     1.2 +++ b/blender/receipt	Wed Nov 21 14:46:40 2018 +0100
     1.3 @@ -27,8 +27,14 @@
     1.4  compile_rules()
     1.5  {
     1.6  	sed -i 's|uname -m|echo i486|' GNUmakefile
     1.7 +	sed -i -e 's|\(PyModule_GetFilename\)(mod|_PyUnicode_AsString(\1Object(mod)|' \
     1.8 +		-e 's|(.*_Py_atomic_load_relaxed(.*t)|(PyThreadState_GetDict(|' \
     1.9 +			$src/source/blender/python/generic/py_capi_utils.c
    1.10 +	sed -i 's|char. chars = _PyUnicode_AsString|const &|' \
    1.11 +		$src/source/gameengine/Ketsji/KX_FontObject.cpp
    1.12  	mkdir -p $WOK/$PACKAGE/source/build
    1.13  	cd $WOK/$PACKAGE/source/build
    1.14 +	PY3K_VER=$(ls -d /usr/include/python3.?m | sed 's|.*python\(.*\)m|\1|')
    1.15  	cmake $src \
    1.16  		-DCMAKE_INSTALL_PREFIX:PATH=/usr \
    1.17  		-DCMAKE_BUILD_TYPE:STRING=Release \
    1.18 @@ -38,13 +44,13 @@
    1.19  		-DWITH_GAMEENGINE:BOOL=ON \
    1.20  		-DWITH_CYCLES:BOOL=OFF \
    1.21  		-DWITH_PLAYER:BOOL=ON \
    1.22 -		-DPYTHON_VERSION:STRING=3.4 \
    1.23 +		-DPYTHON_VERSION:STRING=$PY3K_VER \
    1.24  		-DPYTHON_LIBPATH:STRING=/usr/lib \
    1.25 -		-DPYTHON_LIBRARY:STRING=python3.4m \
    1.26 -		-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.4m
    1.27 +		-DPYTHON_LIBRARY:STRING=python${PY3K_VER}m \
    1.28 +		-DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python${PY3K_VER}m
    1.29  	# build
    1.30 -	make $MAKEFLAGS
    1.31 -	make DESTDIR=$DESTDIR install
    1.32 +	make $MAKEFLAGS &&
    1.33 +	make DESTDIR=$DESTDIR install &&
    1.34  	python3 -m compileall "$DESTDIR/usr/share/blender"
    1.35  }
    1.36  
     2.1 --- a/wireshark/receipt	Tue Nov 20 08:27:43 2018 +0100
     2.2 +++ b/wireshark/receipt	Wed Nov 21 14:46:40 2018 +0100
     2.3 @@ -38,7 +38,6 @@
     2.4  		$fs/usr/share
     2.5  	cp -a $install/usr/lib/*.so* $fs/usr/lib
     2.6  	cp -a $install/usr/lib/wireshark $fs/usr/lib
     2.7 -	rm $fs/usr/lib/wireshark/plugins/$VERSION/*.la
     2.8  	cp -a $install/usr/bin $fs/usr
     2.9  	cp -a $install/usr/share/wireshark $fs/usr/share
    2.10  }
     3.1 --- a/xpaint/receipt	Tue Nov 20 08:27:43 2018 +0100
     3.2 +++ b/xpaint/receipt	Wed Nov 21 14:46:40 2018 +0100
     3.3 @@ -37,6 +37,5 @@
     3.4  	cp -a $install/usr/lib/*.so* $fs/usr/lib
     3.5  	cp -a $install/usr/share/xpaint $fs/usr/share
     3.6  	rm -r $fs/usr/share/xpaint/include
     3.7 -	rm -r $fs/usr/share/xpaint/c-scripts
     3.8  	cp $stuff/xpaint.xpm $fs/usr/share/pixmaps
     3.9  }