[packages/kde4-kdevelop-plugin-python] - fix building with python 3.5

baggins baggins at pld-linux.org
Sat Oct 3 10:05:19 CEST 2015


commit 815f3a796a474ba48dbdc867083af771b246b7fd
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 3 10:05:07 2015 +0200

    - fix building with python 3.5

 kde4-kdevelop-plugin-python.spec |  5 +++++
 python-3.5.patch                 | 22 ++++++++++++++++++++++
 2 files changed, 27 insertions(+)
---
diff --git a/kde4-kdevelop-plugin-python.spec b/kde4-kdevelop-plugin-python.spec
index 6941d14..c02546d 100644
--- a/kde4-kdevelop-plugin-python.spec
+++ b/kde4-kdevelop-plugin-python.spec
@@ -13,6 +13,7 @@ License:	GPL
 Group:		X11/Development/Tools
 Source0:	http://download.kde.org/%{_state}/kdevelop/%{_kdevelopver}/src/%{orgname}-%{version}-py3.tar.xz
 # Source0-md5:	f670af81e55bbc68fd3bd0443b0fc34e
+Patch0:		python-3.5.patch
 URL:		http://www.kdevelop.org/
 BuildRequires:	QtNetwork-devel >= %{qtver}
 BuildRequires:	automoc4
@@ -37,6 +38,10 @@ Wtyczki Python dla kdevelop.
 
 %prep
 %setup -q -n %{orgname}-%{version}-py3
+%patch0 -p1
+
+cd parser
+%{__python3} conversionGenerator.py > generated.h
 
 %build
 install -d build
diff --git a/python-3.5.patch b/python-3.5.patch
new file mode 100644
index 0000000..eee3a63
--- /dev/null
+++ b/python-3.5.patch
@@ -0,0 +1,22 @@
+--- kdev-python-1.7.1-py3/parser/CMakeLists.txt~	2015-02-02 15:44:29.000000000 +0100
++++ kdev-python-1.7.1-py3/parser/CMakeLists.txt	2015-10-02 22:14:04.075355827 +0200
+@@ -14,7 +14,7 @@
+ )
+ 
+ find_package(PythonLibs 3.4 REQUIRED)
+-if ( NOT ${PYTHONLIBS_FOUND} OR ${PYTHON_VERSION_MINOR} GREATER 4 )
++if ( NOT ${PYTHONLIBS_FOUND} OR ${PYTHON_VERSION_MINOR} GREATER 5 )
+     message(FATAL_ERROR "Python 3.4 with --enable-shared is required to build kdev-python")
+ endif()
+ 
+--- kdev-python-1.7.1-py3/parser/python34.sdef~	2015-02-02 15:44:29.000000000 +0100
++++ kdev-python-1.7.1-py3/parser/python34.sdef	2015-10-03 09:50:58.347896445 +0200
+@@ -46,7 +46,7 @@
+ RULE_FOR _expr;KIND Yield_kind;ACTIONS create|YieldAst set|value->ExpressionAst,value;;
+ RULE_FOR _expr;KIND Compare_kind;ACTIONS create|CompareAst set|leftmostElement->ExpressionAst,left set|operators#>ComparisonOperatorTypes,ops set|comparands=>ExpressionAst,comparators;;
+ RULE_FOR _expr;KIND Call_kind;ACTIONS create|CallAst set|function->ExpressionAst,func set|arguments=>ExpressionAst,args set|keywords=>KeywordAst,keywords
+-                                                     set|keywordArguments->ExpressionAst,kwargs set|starArguments->ExpressionAst,starargs;CODE v->function->belongsToCall = v;;
++                                                     ;CODE v->function->belongsToCall = v;;
+ RULE_FOR _expr;KIND Num_kind;ACTIONS create|NumberAst;CODE v->isInt = PyLong_Check(node->v.Num.n); v->value = PyLong_AsLong(node->v.Num.n);;
+ RULE_FOR _expr;KIND Str_kind;ACTIONS create|StringAst set|value$>s;;
+ RULE_FOR _expr;KIND Bytes_kind;ACTIONS create|BytesAst set|value$>s;;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kde4-kdevelop-plugin-python.git/commitdiff/815f3a796a474ba48dbdc867083af771b246b7fd



More information about the pld-cvs-commit mailing list