diff --git a/.gitignore b/.gitignore index 1ab5d16..9d2cad7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PyKDE-3.16.6.tar.bz2 +/PyKDE-3.16.7.tar.bz2 diff --git a/PyKDE-3.16.7-private-fix.patch b/PyKDE-3.16.7-private-fix.patch new file mode 100644 index 0000000..165d1ff --- /dev/null +++ b/PyKDE-3.16.7-private-fix.patch @@ -0,0 +1,63 @@ +diff -wruN PyKDE-3.16.7.orig/sip/kdecore/kconfigbase.sip PyKDE-3.16.7/sip/kdecore/kconfigbase.sip +--- PyKDE-3.16.7.orig/sip/kdecore/kconfigbase.sip 2009-06-12 16:32:05.000000000 +0400 ++++ PyKDE-3.16.7/sip/kdecore/kconfigbase.sip 2014-01-15 14:33:00.283274791 +0400 +@@ -153,10 +153,8 @@ + bool deleteGroup (const QString&, bool = 1, bool = 0); + void setDollarExpansion (bool = 1); + bool isDollarExpansion () const; +- virtual void rollback (bool = 1); + virtual void sync (); + bool isDirty () const; +- virtual void setReadOnly (bool); + bool isReadOnly () const; + bool hasKey (const QString&) const; + virtual QMap entryMap (const QString&) const = 0; +@@ -182,6 +180,9 @@ + bool hasDefault (const QString&) const; + %End + ++private: ++ virtual void setReadOnly (bool); ++ virtual void rollback (bool = 1); + + protected: + void setLocale (); +diff -wruN PyKDE-3.16.7.orig/sip/kdeui/kactivelabel.sip PyKDE-3.16.7/sip/kdeui/kactivelabel.sip +--- PyKDE-3.16.7.orig/sip/kdeui/kactivelabel.sip 2006-09-22 07:11:15.000000000 +0400 ++++ PyKDE-3.16.7/sip/kdeui/kactivelabel.sip 2014-01-15 18:00:21.244405286 +0400 +@@ -44,6 +44,9 @@ + public slots: + virtual void openLink (const QString&); + ++private: ++ virtual void setSource(const QString&); ++ + protected: + //igx virtual void virtual_hook (int, void*); + virtual void focusInEvent (QFocusEvent*); +diff -wruN PyKDE-3.16.7.orig/sip/kdeui/kpixmapregionselectorwidget.sip PyKDE-3.16.7/sip/kdeui/kpixmapregionselectorwidget.sip +--- PyKDE-3.16.7.orig/sip/kdeui/kpixmapregionselectorwidget.sip 2006-09-22 07:11:15.000000000 +0400 ++++ PyKDE-3.16.7/sip/kdeui/kpixmapregionselectorwidget.sip 2014-01-15 17:45:52.246466020 +0400 +@@ -51,6 +51,9 @@ + void rotateClockwise (); + void rotateCounterclockwise (); + ++private: ++ virtual bool eventFilter(QObject*, QEvent*); ++ + protected: + virtual KPopupMenu* createPopupMenu (); + +diff -wruN PyKDE-3.16.7.orig/sip/kfile/knotifydialog.sip PyKDE-3.16.7/sip/kfile/knotifydialog.sip +--- PyKDE-3.16.7.orig/sip/kfile/knotifydialog.sip 2009-06-10 23:40:41.000000000 +0400 ++++ PyKDE-3.16.7/sip/kfile/knotifydialog.sip 2014-01-15 18:22:05.300314144 +0400 +@@ -77,6 +77,9 @@ + virtual void addApplicationEvents (const QString&); + virtual void clearApplicationEvents (); + ++private: ++ virtual void slotDefault(); ++ + }; // class KNotifyDialog + + %End diff --git a/PyKDE-3.16.7.patch b/PyKDE-3.16.7.patch deleted file mode 100644 index 261cfe1..0000000 --- a/PyKDE-3.16.7.patch +++ /dev/null @@ -1,25 +0,0 @@ -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 1171c01..5c27367 100644 --- a/PyKDE.spec +++ b/PyKDE.spec @@ -12,12 +12,12 @@ BuildRequires: libutempter-devel Summary: Python bindings for KDE3 Name: PyKDE -Version: 3.16.6 -Release: 15%{?dist} +Version: 3.16.7 +Release: 1%{?dist} License: GPLv2 URL: http://www.riverbankcomputing.com/software/pykde/intro -Source0: http://www.riverbankcomputing.com/static/Downloads/PyKDE3/PyKDE-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/pyqt/PyKDE3/PyKDE-%{version}.tar.bz2 Group: Development/Languages BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -31,9 +31,11 @@ Patch1: PyKDE-3.16.6-gcc46.patch # for KGlobalAccel::isEnabled in kglobalaccel.sip) Patch2: PyKDE-3.16.6-gcc47.patch +# fix private functions being declared as public in the bindings +# (patch by Ilya Chernykh from KDE:KDE3 in OBS) +Patch3: PyKDE-3.16.7-private-fix.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)") @@ -71,7 +73,7 @@ Sip files and documentation needed for developing with %{name} %patch0 -p1 -b .kmimetype %patch1 -p1 -b .gcc46 %patch2 -p1 -b .gcc47 -%patch100 -p1 -b .sip4_10 +%patch3 -p1 -b .private-fix %build @@ -109,6 +111,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Feb 16 2014 Kevin Kofler - 3.16.7-1 +- update to 3.16.7 tarball, includes SIP 4.10 fix (but no other fixes) +- add OBS patch to fix private functions being declared public in the bindings + * Sat Feb 15 2014 Rex Dieter 3.16.6-15 - rebuild (sip) diff --git a/sources b/sources index a97871a..60bbffd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9613c2e70ba43520861910637145bff5 PyKDE-3.16.6.tar.bz2 +745562f0c06948c2fcb56a83c37dab9c PyKDE-3.16.7.tar.bz2