[packages/shiboken] - up to 1.2.4 - fix building python3 support (tp_print is not used since 3.0 and removed in 3.9)

baggins baggins at pld-linux.org
Tue Mar 9 13:30:41 CET 2021


commit ab841884701bcb2dec29f2aa8970a74d019d2390
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Mar 9 13:29:40 2021 +0100

    - up to 1.2.4
    - fix building python3 support (tp_print is not used since 3.0 and removed in 3.9)

 python3.patch | 12 ++++++++++++
 shiboken.spec | 15 ++++++++-------
 2 files changed, 20 insertions(+), 7 deletions(-)
---
diff --git a/shiboken.spec b/shiboken.spec
index ef76588..0dd34f9 100644
--- a/shiboken.spec
+++ b/shiboken.spec
@@ -6,16 +6,16 @@
 Summary:	CPython bindings generator for C++ libraries
 Summary(pl.UTF-8):	Generator wiązań CPythona dla bibliotek C++
 Name:		shiboken
-Version:	1.2.2
-Release:	10
+Version:	1.2.4
+Release:	1
 License:	LGPL v2.1+ (libraries), GPL v2 (tools)
 Group:		Development/Tools
-#Source0Download: http://qt-project.org/wiki/category:LanguageBindings::PySide::Downloads
-Source0:	http://download.qt-project.org/official_releases/pyside/%{name}-%{version}.tar.bz2
-# Source0-md5:	9f5bee9d414ce51be07ff7a20054a48d
+Source0:	https://github.com/pyside/Shiboken/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5:	c284197d06ad25d78009ff55f18dd512
 Patch0:		%{name}-python.patch
 Patch1:		build.patch
-URL:		http://qt-project.org/PySide/
+Patch2:		python3.patch
+URL:		https://qt-project.org/PySide/
 BuildRequires:	QtCore-devel >= 4.5.0
 BuildRequires:	QtXml-devel >= 4.5.0
 BuildRequires:	QtXmlPatterns-devel >= 4.5.0
@@ -94,9 +94,10 @@ Shiboken runtime library for Python 3.x.
 Biblioteka uruchomieniowa shiboken dla Pythona 3.x.
 
 %prep
-%setup -q
+%setup -q -n Shiboken-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %if %{with python2}
diff --git a/python3.patch b/python3.patch
new file mode 100644
index 0000000..5acc433
--- /dev/null
+++ b/python3.patch
@@ -0,0 +1,12 @@
+--- shiboken-1.2.2/libshiboken/sbkenum.cpp~	2014-04-22 17:42:48.000000000 +0200
++++ shiboken-1.2.2/libshiboken/sbkenum.cpp	2021-03-09 13:15:03.509921155 +0100
+@@ -529,7 +531,9 @@
+     ::memset(type, 0, sizeof(SbkEnumType));
+     Py_TYPE(type) = &SbkEnumType_Type;
+     type->tp_basicsize = sizeof(SbkEnumObject);
++#ifndef IS_PY3K
+     type->tp_print = &SbkEnumObject_print;
++#endif
+     type->tp_repr = &SbkEnumObject_repr;
+     type->tp_str = &SbkEnumObject_repr;
+     type->tp_flags = Py_TPFLAGS_DEFAULT|Py_TPFLAGS_CHECKTYPES;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/shiboken.git/commitdiff/ab841884701bcb2dec29f2aa8970a74d019d2390



More information about the pld-cvs-commit mailing list