- fix building with sip 4.19.5

- size_t definition is causing sip syntax errors
- rel 9

diff --git a/python-PyKDE4.spec b/python-PyKDE4.spec
index 20ee5c7a218150168143b9882ea75e12b6ce6812..124df5d2468a8d5ce6b4589f768d6c9f506a9812 100644 (file)
--- a/python-PyKDE4.spec
+++ b/python-PyKDE4.spec
@@ -10,7 +10,7 @@ Summary:      PyKDE4 - Python bindings for KDE 4
 Summary(pl.UTF-8):     PyKDE4 - dowiązania KDE 4 dla Pythona
 Name:          python-PyKDE4
 Version:       4.14.3
-Release:       8
+Release:       9
 License:       GPL
 Group:         Libraries/Python
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.xz
@@ -19,6 +19,8 @@ Source0:      ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version
 Patch1:                0001-use-LIB_PYTHON-realpath.patch
 Patch2:                0002-Add-some-missing-link-libraries.patch
 Patch3:                0003-Fix-build-with-sip-4.19.patch
+Patch4:                sip-4.19.5.patch
+Patch5:                size_t.patch
 BuildConflicts:        kde4-kdepimlibs-devel
 BuildConflicts:        libdom-devel
 BuildRequires: cmake >= 2.8.0
@@ -91,6 +93,8 @@ Przykłady dla PyKDE4.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 install -d build

diff --git a/sip-4.19.5.patch b/sip-4.19.5.patch
new file mode 100644 (file)
index 0000000..ffc5384
--- /dev/null
+++ b/sip-4.19.5.patch
@@ -0,0 +1,24 @@
+diff -up pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me pykde4-4.14.3/sip/kdeui/kfontchooser.sip
+--- pykde4-4.14.3/sip/kdeui/kfontchooser.sip.me        2018-01-17 13:16:50.738465947 +0100
++++ pykde4-4.14.3/sip/kdeui/kfontchooser.sip   2018-01-17 13:28:24.665226258 +0100
+@@ -59,7 +59,7 @@ public:
+ 
+     typedef QFlags<KFontChooser::DisplayFlag> DisplayFlags;
+ 
+-    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
++    explicit                KFontChooser (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::DisplayFrame, const QStringList& fontList = QStringList(), int visibleListSize = 8, Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::DisplayFrame, const QStringList& = QStringList(), int = 8, Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+     sipCpp = new sipKFontChooser (a0, *a1, *a2, a3, &a4);
+diff -up pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me pykde4-4.14.3/sip/kdeui/kfontdialog.sip
+--- pykde4-4.14.3/sip/kdeui/kfontdialog.sip.me 2018-01-17 13:18:31.112670465 +0100
++++ pykde4-4.14.3/sip/kdeui/kfontdialog.sip    2018-01-17 13:28:00.121154351 +0100
+@@ -28,7 +28,7 @@ class KFontDialog : KDialog
+ 
+ 
+ public:
+-    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState* sizeIsRelativeState = 0) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
++    explicit                KFontDialog (QWidget* parent /TransferThis/ = 0, const KFontChooser::DisplayFlags& flags = KFontChooser::NoDisplayFlags, const QStringList& fontlist = QStringList(), Qt::CheckState sizeIsRelativeState = Qt::Unchecked) [(QWidget* = 0, const KFontChooser::DisplayFlags& = KFontChooser::NoDisplayFlags, const QStringList& = QStringList(), Qt::CheckState* = 0)];
+ %MethodCode
+ Py_BEGIN_ALLOW_THREADS
+     sipCpp= new sipKFontDialog (a0, *a1, *a2, &a3);

diff --git a/size_t.patch b/size_t.patch
new file mode 100644 (file)
index 0000000..bb6f020
--- /dev/null
+++ b/size_t.patch
@@ -0,0 +1,11 @@
+--- pykde4-4.14.3/sip/kdecore/typedefs.sip~    2019-10-05 22:38:28.000000000 +0200
++++ pykde4-4.14.3/sip/kdecore/typedefs.sip     2019-10-05 22:40:34.553534986 +0200
+@@ -23,7 +23,7 @@
+ 
+ typedef long time_t;
+ 
+-typedef ulong size_t;
++//typedef ulong size_t;
+ 
+ typedef int ssize_t;
+