From 5c9de2b979e730cdb5274c5d1db3478b62858a8c Mon Sep 17 00:00:00 2001 From: Alexey Shvetsov Date: Tue, 5 May 2009 13:08:23 +0400 Subject: fix pykde4 bug #268576 (Portage version: 2.2_rc33/git/Linux x86_64) (Signed Manifest commit) --- .../files/pykde4-4.2.71-backendcapabilities.patch | 12 +++++++++++ .../pykde4/files/pykde4-4.2.71-kdatetime.patch | 23 +++++++++++++++++++++ .../files/pykde4-4.2.71-kencodingprober.patch | 14 +++++++++++++ .../pykde4/files/pykde4-4.2.71-ktcpsocket.patch | 24 ++++++++++++++++++++++ .../files/pykde4-4.2.71-ktcpsocket.sip.patch | 24 ---------------------- 5 files changed, 73 insertions(+), 24 deletions(-) create mode 100644 kde-base/pykde4/files/pykde4-4.2.71-backendcapabilities.patch create mode 100644 kde-base/pykde4/files/pykde4-4.2.71-kdatetime.patch create mode 100644 kde-base/pykde4/files/pykde4-4.2.71-kencodingprober.patch create mode 100644 kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.patch delete mode 100644 kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.sip.patch (limited to 'kde-base/pykde4/files') diff --git a/kde-base/pykde4/files/pykde4-4.2.71-backendcapabilities.patch b/kde-base/pykde4/files/pykde4-4.2.71-backendcapabilities.patch new file mode 100644 index 00000000000..06f4c444ba7 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.2.71-backendcapabilities.patch @@ -0,0 +1,12 @@ +diff -urN pykde4-4.2.71.old/python/pykde4/sip/phonon/backendcapabilities.sip pykde4-4.2.71/python/pykde4/sip/phonon/backendcapabilities.sip +--- pykde4-4.2.71.old/python/pykde4/sip/phonon/backendcapabilities.sip 2009-04-28 17:45:46.000000000 +0400 ++++ pykde4-4.2.71/python/pykde4/sip/phonon/backendcapabilities.sip 2009-05-05 12:13:55.998971700 +0400 +@@ -26,7 +26,7 @@ + { + namespace BackendCapabilities + { +-class Notifier : QObject /NoDefaultCtors,PyQt4NoQMetaObject/ ++class Notifier : QObject /NoDefaultCtors,NoQMetaObject/ + { + + signals: diff --git a/kde-base/pykde4/files/pykde4-4.2.71-kdatetime.patch b/kde-base/pykde4/files/pykde4-4.2.71-kdatetime.patch new file mode 100644 index 00000000000..d390497ad2a --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.2.71-kdatetime.patch @@ -0,0 +1,23 @@ +diff -urN pykde4-4.2.71.old/python/pykde4/sip/kdecore/kdatetime.sip pykde4-4.2.71/python/pykde4/sip/kdecore/kdatetime.sip +--- pykde4-4.2.71.old/python/pykde4/sip/kdecore/kdatetime.sip 2009-04-30 22:02:22.000000000 +0400 ++++ pykde4-4.2.71/python/pykde4/sip/kdecore/kdatetime.sip 2009-05-05 09:14:55.334924170 +0400 +@@ -161,19 +161,3 @@ + static void setSimulatedSystemTime (const KDateTime& newTime); + static KDateTime realCurrentLocalDateTime (); + }; // KDateTime +- +- +-class KSystemTimeZones_Simulated : KSystemTimeZones /Abstract/ +-{ +-%TypeHeaderCode +-#include +-%End +- +-public: +- static KTimeZone realLocalZone (); +- static KTimeZone local (); +- static void setLocalZone (const KTimeZone& tz); +- static bool isSimulated (); +-}; // KSystemTimeZones_Simulated +- +- diff --git a/kde-base/pykde4/files/pykde4-4.2.71-kencodingprober.patch b/kde-base/pykde4/files/pykde4-4.2.71-kencodingprober.patch new file mode 100644 index 00000000000..4b695bdd534 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.2.71-kencodingprober.patch @@ -0,0 +1,14 @@ +diff -urN pykde4-4.2.71.old/python/pykde4/sip/kdecore/kencodingprober.sip pykde4-4.2.71/python/pykde4/sip/kdecore/kencodingprober.sip +--- pykde4-4.2.71.old/python/pykde4/sip/kdecore/kencodingprober.sip 2009-04-30 22:02:22.000000000 +0400 ++++ pykde4-4.2.71/python/pykde4/sip/kdecore/kencodingprober.sip 2009-05-03 10:34:24.000000000 +0400 +@@ -71,6 +71,10 @@ + void setProberType (KEncodingProber::ProberType proberType); + static KEncodingProber::ProberType proberTypeForName (const QString& lang); + static QString nameForProberType (KEncodingProber::ProberType proberType); ++ ++private: ++ KEncodingProber(const KEncodingProber & other); ++ + }; // KEncodingProber + + diff --git a/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.patch b/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.patch new file mode 100644 index 00000000000..8509d897236 --- /dev/null +++ b/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.patch @@ -0,0 +1,24 @@ +--- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/ktcpsocket.sip 2009/05/01 15:50:58 962165 ++++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/ktcpsocket.sip 2009/05/01 15:56:01 962166 +@@ -247,16 +247,16 @@ + }; // KTcpSocket + + +-class SslErrorUiData ++class KSslErrorUiData + { + %TypeHeaderCode + #include + %End + + public: +- SslErrorUiData (); +- SslErrorUiData (const KTcpSocket* socket); +- SslErrorUiData (const SslErrorUiData& other); +-}; // SslErrorUiData ++ KSslErrorUiData (); ++ KSslErrorUiData (const KTcpSocket* socket); ++ KSslErrorUiData (const KSslErrorUiData& other); ++}; // KSslErrorUiData + + diff --git a/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.sip.patch b/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.sip.patch deleted file mode 100644 index 8509d897236..00000000000 --- a/kde-base/pykde4/files/pykde4-4.2.71-ktcpsocket.sip.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- trunk/KDE/kdebindings/python/pykde4/sip/kdecore/ktcpsocket.sip 2009/05/01 15:50:58 962165 -+++ trunk/KDE/kdebindings/python/pykde4/sip/kdecore/ktcpsocket.sip 2009/05/01 15:56:01 962166 -@@ -247,16 +247,16 @@ - }; // KTcpSocket - - --class SslErrorUiData -+class KSslErrorUiData - { - %TypeHeaderCode - #include - %End - - public: -- SslErrorUiData (); -- SslErrorUiData (const KTcpSocket* socket); -- SslErrorUiData (const SslErrorUiData& other); --}; // SslErrorUiData -+ KSslErrorUiData (); -+ KSslErrorUiData (const KTcpSocket* socket); -+ KSslErrorUiData (const KSslErrorUiData& other); -+}; // KSslErrorUiData - - -- cgit v1.2.3