From 1b974615aef597f25ca91ecf0019874382669040 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: Jan 17 2018 12:38:30 +0000 Subject: fixed build failure sip-4.19.5 --- diff --git a/pykde4-4.14.3-checkstate-sip-4.19.5.patch b/pykde4-4.14.3-checkstate-sip-4.19.5.patch new file mode 100644 index 0000000..ffc5384 --- /dev/null +++ b/pykde4-4.14.3-checkstate-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 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/pykde4.spec b/pykde4.spec index 460c0c0..fcb33f7 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -57,6 +57,7 @@ Patch209: kubuntu_kpythonpluginfactory_3.2support.diff # rhel patches Patch300: pykde4-4.8.3-webkit.patch Patch301: pykde4-dont-change-environment-cause-crash.patch +Patch302: pykde4-4.14.3-checkstate-sip-4.19.5.patch BuildRequires: kdelibs4-devel >= 4.14 %if 0%{?nepomuk} @@ -207,6 +208,7 @@ Requires: python3-pykde4%{?_isa} = %{version}-%{release} %patch300 -p1 -b .webkit %endif %patch301 -p1 -b .crash-with-other-python-module +%patch302 -p1 -b .checkstate-sip-4.19.5 %build %if 0%{?python3} @@ -352,6 +354,7 @@ rm -fv %{buildroot}%{python3_sitearch}/PyKDE4/nepomuk.so * Mon Jan 15 2018 Than Ngo - 4.14.3-21 - fixed bz#1456075, import error in PyKDE4 - fixed bz#1442464, segfault with other python module +- fixed build failure sip-4.19.5 * Thu Aug 03 2017 Fedora Release Engineering - 4.14.3-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild