diff --git a/PyKDE-3.16.7.patch b/PyKDE-3.16.7.patch new file mode 100644 index 0000000..261cfe1 --- /dev/null +++ b/PyKDE-3.16.7.patch @@ -0,0 +1,25 @@ +diff -ru PyKDE-3.16.6/sip/kio/global.sip PyKDE-3.16.7/sip/kio/global.sip +--- PyKDE-3.16.6/sip/kio/global.sip 2009-06-10 22:44:48.000000000 +0100 ++++ PyKDE-3.16.7/sip/kio/global.sip 2010-01-25 09:47:39.410088826 +0000 +@@ -477,20 +477,7 @@ + %MethodCode + //takes dict | (KIO.MetaData) + //returns (KIO.MetaData) +- +- +- PyObject *dict; +- if (sipParseArgs(&sipArgsParsed,sipArgs,"T", &PyDict_Type, &dict)) +- { +- int isErr = 0; +- KIO::MetaData *map = (KIO::MetaData *)sipForceConvertToType(dict, sipType_KIO_MetaData, NULL, SIP_NO_CONVERTORS, NULL, &isErr); +- if (isErr) +- { +- Py_INCREF (Py_None); +- return Py_None; +- } +- return sipConvertFromType(map, sipType_KIO_MetaData, NULL); +- } ++ sipRes = a0; + %End + + //end diff --git a/PyKDE.spec b/PyKDE.spec index 582793e..346c50f 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -13,7 +13,7 @@ BuildRequires: libutempter-devel Summary: Python bindings for KDE3 Name: PyKDE Version: 3.16.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 URL: http://www.riverbankcomputing.com/software/pykde/intro @@ -25,6 +25,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch2: PyKDE-3.16.0-kmimetype.patch ## upstream patches +# candidate to fix build with latest sip +Patch100: PyKDE-3.16.7.patch BuildRequires: python-devel >= 2.3 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") @@ -60,6 +62,7 @@ Sip files and documentation needed for developing with %{name} %setup -q %{?snapshot:-n %{name}-snapshot%{snapshot}} %patch2 -p1 -b .kmimetype +%patch100 -p1 -b .sip4_10 %build @@ -97,6 +100,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 25 2010 Rex Dieter - 3.16.6-3 +- upstream patch to support newew sip + * Thu Jan 07 2010 Rex Dieter - 3.16.6-2 - rebuild (sip)