rpms/kdebindings/devel kdebindings-4.0.80-fix-pykde4.patch, NONE, 1.1 kdebindings.spec, 1.101, 1.102
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Tue May 27 19:34:52 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20787/devel
Modified Files:
kdebindings.spec
Added Files:
kdebindings-4.0.80-fix-pykde4.patch
Log Message:
* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
- disable php-qt for now
- apply PyKDE4 build fix from upstream
kdebindings-4.0.80-fix-pykde4.patch:
--- NEW FILE kdebindings-4.0.80-fix-pykde4.patch ---
Index: python/pykde4/sip/khtml/dom_element.sip
===================================================================
--- python/pykde4/sip/khtml/dom_element.sip (Revision 811887)
+++ python/pykde4/sip/khtml/dom_element.sip (Revision 811888)
@@ -73,8 +73,6 @@
bool hasAttribute (const DOM::DOMString& name);
bool hasAttributeNS (const DOM::DOMString& namespaceURI, const DOM::DOMString& localName);
DOM::CSSStyleDeclaration style ();
- bool contentEditable () const;
- void setContentEditable (bool enabled);
bool isHTMLElement () const;
DOM::Element form () const;
static bool khtmlValidAttrName (const DOM::DOMString& name);
Index: python/pykde4/sip/khtml/khtml_settings.sip
===================================================================
--- python/pykde4/sip/khtml/khtml_settings.sip (Revision 811887)
+++ python/pykde4/sip/khtml/khtml_settings.sip (Revision 811888)
@@ -83,7 +83,7 @@
};
KHTMLSettings ();
- KHTMLSettings (const KHTMLSettings& other);
+// KHTMLSettings (const KHTMLSettings& other);
void init ();
void init (KConfig* config, bool reset = 1);
bool changeCursor () const;
@@ -142,6 +142,9 @@
QList<QPair<QString,QChar>> fallbackAccessKeysAssignments () const;
void setJSPopupBlockerPassivePopup (bool enabled);
bool jsPopupBlockerPassivePopup () const;
+
+private:
+ KHTMLSettings(const KHTMLSettings &);
}; // KHTMLSettings
Index: python/pykde4/sip/kdeui/kiconeffect.sip
===================================================================
--- python/pykde4/sip/kdeui/kiconeffect.sip (Revision 811887)
+++ python/pykde4/sip/kdeui/kiconeffect.sip (Revision 811888)
@@ -27,6 +27,8 @@
#include <kiconeffect.h>
%End
+private:
+ KIconEffect (const KIconEffect &other);
public:
KIconEffect ();
Index: python/pykde4/sip/kdeui/kicontheme.sip
===================================================================
--- python/pykde4/sip/kdeui/kicontheme.sip (Revision 811887)
+++ python/pykde4/sip/kdeui/kicontheme.sip (Revision 811888)
@@ -26,8 +26,9 @@
%TypeHeaderCode
#include <kicontheme.h>
%End
+private:
+ KIconTheme (const KIconTheme &other);
-
public:
explicit KIconTheme (const QString& name, const QString& appName = QString());
QString name () const;
Index: python/pykde4/sip/kdeui/kxmlguibuilder.sip
===================================================================
--- python/pykde4/sip/kdeui/kxmlguibuilder.sip (Revision 811887)
+++ python/pykde4/sip/kdeui/kxmlguibuilder.sip (Revision 811888)
@@ -26,8 +26,9 @@
%TypeHeaderCode
#include <kxmlguibuilder.h>
%End
+private:
+ KXMLGUIBuilder (const KXMLGUIBuilder &other);
-
public:
explicit KXMLGUIBuilder (QWidget* widget);
KXMLGUIClient* builderClient () const;
Index: python/pykde4/sip/kdeui/kpixmapcache.sip
===================================================================
--- python/pykde4/sip/kdeui/kpixmapcache.sip (Revision 811887)
+++ python/pykde4/sip/kdeui/kpixmapcache.sip (Revision 811888)
@@ -27,6 +27,8 @@
#include <kpixmapcache.h>
%End
+private:
+ KPixmapCache (const KPixmapCache& other);
public:
explicit KPixmapCache (const QString& name);
Index: python/pykde4/sip/kdeui/kxmlguiclient.sip
===================================================================
--- python/pykde4/sip/kdeui/kxmlguiclient.sip (Revision 811887)
+++ python/pykde4/sip/kdeui/kxmlguiclient.sip (Revision 811888)
@@ -26,8 +26,9 @@
%TypeHeaderCode
#include <kxmlguiclient.h>
%End
+private:
+ KXMLGUIClient (const KXMLGUIClient &other);
-
public:
KXMLGUIClient ();
explicit KXMLGUIClient (KXMLGUIClient* parent);
Index: python/pykde4/sip/kio/karchive.sip
===================================================================
--- python/pykde4/sip/kio/karchive.sip (Revision 811887)
+++ python/pykde4/sip/kio/karchive.sip (Revision 811888)
@@ -38,6 +38,8 @@
protected:
KArchive (const QString& fileName);
KArchive (QIODevice* dev);
+private:
+ KArchive (const KArchive &other);
public:
virtual bool open (QIODevice::OpenMode mode);
@@ -100,6 +102,8 @@
protected:
KArchive* archive () const;
//ig virtual void virtual_hook (int id, void* data);
+private:
+ KArchiveEntry (const KArchiveEntry &other);
}; // KArchiveEntry
@@ -122,6 +126,8 @@
protected:
//ig virtual void virtual_hook (int id, void* data);
+private:
+ KArchiveFile (const KArchiveFile &other);
}; // KArchiveFile
@@ -160,7 +166,8 @@
sipClass = sipClass_KZipFileEntry;
}
%End
-
+private:
+ KArchiveDirectory (const KArchiveDirectory &other);
}; // KArchiveDirectory
Index: python/pykde4/sip/kio/ktar.sip
===================================================================
--- python/pykde4/sip/kio/ktar.sip (Revision 811887)
+++ python/pykde4/sip/kio/ktar.sip (Revision 811888)
@@ -42,6 +42,8 @@
virtual bool closeArchive ();
virtual bool createDevice (QIODevice::OpenMode mode);
//ig virtual void virtual_hook (int id, void* data);
+private:
+ KTar(const KTar &other);
}; // KTar
Index: python/pykde4/sip/kio/kzip.sip
===================================================================
--- python/pykde4/sip/kio/kzip.sip (Revision 811887)
+++ python/pykde4/sip/kio/kzip.sip (Revision 811888)
@@ -60,6 +60,8 @@
virtual bool closeArchive ();
virtual bool doWriteDir (const QString& name, const QString& user, const QString& group, mode_t perm, time_t atime, time_t mtime, time_t ctime);
//ig virtual void virtual_hook (int id, void* data);
+private:
+ KZip (const KZip &other);
}; // KZip
@@ -82,6 +84,9 @@
const QString& path () const;
virtual QByteArray data () const;
virtual QIODevice* createDevice () const;
+
+private:
+ KZipFileEntry (const KZipFileEntry &other);
}; // KZipFileEntry
Index: python/pykde4/sip/kio/slavebase.sip
===================================================================
--- python/pykde4/sip/kio/slavebase.sip (Revision 811887)
+++ python/pykde4/sip/kio/slavebase.sip (Revision 811888)
@@ -126,6 +126,8 @@
protected:
//ig virtual void virtual_hook (int id, void* data);
+private:
+ SlaveBase (const KIO::SlaveBase &other);
}; // SlaveBase
}; // KIO
Index: python/pykde4/sip/kio/kurlpixmapprovider.sip
===================================================================
--- python/pykde4/sip/kio/kurlpixmapprovider.sip (Revision 811887)
+++ python/pykde4/sip/kio/kurlpixmapprovider.sip (Revision 811888)
@@ -52,7 +52,8 @@
if (dynamic_cast<KUrlPixmapProvider*>(sipCpp))
sipClass = sipClass_KUrlPixmapProvider;
%End
-
+private:
+ KUrlPixmapProvider (const KUrlPixmapProvider &other);
}; // KUrlPixmapProvider
Index: python/pykde4/sip/kio/tcpslavebase.sip
===================================================================
--- python/pykde4/sip/kio/tcpslavebase.sip (Revision 811887)
+++ python/pykde4/sip/kio/tcpslavebase.sip (Revision 811888)
@@ -26,10 +26,9 @@
class TCPSlaveBase : KIO::SlaveBase
{
%TypeHeaderCode
-#include <tcpslavebase.h>
+#include <kio/tcpslavebase.h>
%End
-
public:
TCPSlaveBase (const QByteArray& protocol, const QByteArray& poolSocket, const QByteArray& appSocket, bool autoSsl = 0);
@@ -57,6 +56,8 @@
void setBlocking (bool b);
QIODevice* socket () const;
//ig virtual void virtual_hook (int id, void* data);
+private:
+ TCPSlaveBase (const KIO::TCPSlaveBase &other);
}; // TCPSlaveBase
}; // KIO
Index: python/pykde4/sip/kio/authinfo.sip
===================================================================
--- python/pykde4/sip/kio/authinfo.sip (Revision 811887)
+++ python/pykde4/sip/kio/authinfo.sip (Revision 811888)
@@ -94,6 +94,7 @@
private:
NetRC ();
~NetRC ();
+ NetRC (const KIO::NetRC &other);
}; // NetRC
}; // KIO
Index: python/pykde4/sip/kio/kar.sip
===================================================================
--- python/pykde4/sip/kio/kar.sip (Revision 811887)
+++ python/pykde4/sip/kio/kar.sip (Revision 811888)
@@ -48,6 +48,8 @@
virtual bool openArchive (QIODevice::OpenMode mode);
virtual bool closeArchive ();
//ig virtual void virtual_hook (int id, void* data);
+private:
+ KAr (const KAr &other);
public:
Index: python/pykde4/sip/kio/kemailsettings.sip
===================================================================
--- python/pykde4/sip/kio/kemailsettings.sip (Revision 811887)
+++ python/pykde4/sip/kio/kemailsettings.sip (Revision 811888)
@@ -68,6 +68,9 @@
void setDefault (const QString& def);
QString getSetting (KEMailSettings::Setting s) const;
void setSetting (KEMailSettings::Setting s, const QString& v);
+private:
+ KEMailSettings (const KEMailSettings &other);
+
}; // KEMailSettings
Index: python/pykde4/sip/kio/kmountpoint.sip
===================================================================
--- python/pykde4/sip/kio/kmountpoint.sip (Revision 811887)
+++ python/pykde4/sip/kio/kmountpoint.sip (Revision 811888)
@@ -75,6 +75,7 @@
private:
KMountPoint ();
+ KMountPoint (const KMountPoint &other);
}; // KMountPoint
Index: python/pykde4/sip/kio/renamedialogplugin.sip
===================================================================
--- python/pykde4/sip/kio/renamedialogplugin.sip (Revision 811887)
+++ python/pykde4/sip/kio/renamedialogplugin.sip (Revision 811888)
@@ -42,6 +42,8 @@
KIO::filesize_t fileSize () const;
time_t cTime () const;
time_t mTime () const;
+ private:
+ FileItem (const KIO::RenameDialogPlugin::FileItem &other);
}; // FileItem
@@ -49,6 +51,10 @@
RenameDialogPlugin (QDialog* dialog);
virtual bool wantToHandle (KIO::RenameDialog_Mode mode, const KIO::RenameDialogPlugin::FileItem& srcFile, const KIO::RenameDialogPlugin::FileItem& dstFile) const = 0;
virtual void handle (KIO::RenameDialog_Mode mode, const KIO::RenameDialogPlugin::FileItem& srcFile, const KIO::RenameDialogPlugin::FileItem& dstFile) = 0;
+
+//private:
+// RenameDialogPlugin (const KIO::RenameDialogPlugin &other);
+
}; // RenameDialogPlugin
}; // KIO
Index: python/pykde4/sip/kparts/event.sip
===================================================================
--- python/pykde4/sip/kparts/event.sip (Revision 811887)
+++ python/pykde4/sip/kparts/event.sip (Revision 811888)
@@ -64,7 +64,8 @@
sipClass = sipClass_KParts_PartSelectEvent;
}
%End
-
+private:
+ Event (const KParts::Event &other);
}; // Event
@@ -79,6 +80,8 @@
GUIActivateEvent (bool activated);
bool activated () const;
static bool test (const QEvent* event);
+private:
+ GUIActivateEvent (const KParts::GUIActivateEvent &other);
}; // GUIActivateEvent
@@ -95,6 +98,8 @@
KParts::Part* part () const;
QWidget* widget () const;
static bool test (const QEvent* event);
+private:
+ PartActivateEvent (const KParts::PartActivateEvent &other);
}; // PartActivateEvent
@@ -111,6 +116,8 @@
KParts::Part* part () const;
QWidget* widget () const;
static bool test (const QEvent* event);
+private:
+ PartSelectEvent (const KParts::PartSelectEvent &other);
}; // PartSelectEvent
}; // KParts
Index: python/pykde4/sip/ktexteditor/modificationinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/modificationinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/modificationinterface.sip (Revision 811888)
@@ -55,7 +55,8 @@
public:
virtual void modifiedOnDisk (KTextEditor::Document*, bool, KTextEditor::ModificationInterface::ModifiedOnDiskReason) = 0;
-
+private:
+ ModificationInterface (const KTextEditor::ModificationInterface &other);
}; // class ModificationInterface
}; // namespace KTextEditor
Index: python/pykde4/sip/ktexteditor/configinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/configinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/configinterface.sip (Revision 811888)
@@ -39,7 +39,8 @@
virtual QStringList configKeys () const = 0;
virtual QVariant configValue (const QString&) = 0;
virtual void setConfigValue (const QString&, const QVariant&) = 0;
-
+private:
+ ConfigInterface (const KTextEditor::ConfigInterface &other);
}; // class ConfigInterface
}; // namespace KTextEditor
Index: python/pykde4/sip/ktexteditor/searchinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/searchinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/searchinterface.sip (Revision 811888)
@@ -60,7 +60,8 @@
public:
virtual QVector<KTextEditor::Range> searchText (const KTextEditor::Range&, const QString&, const KTextEditor::Search::SearchOptions = KTextEditor::Search::Default ) = 0;
virtual KTextEditor::Search::SearchOptions supportedSearchOptions () const = 0;
-
+private:
+ SearchInterface (const KTextEditor::SearchInterface &other);
}; // class SearchInterface
}; // namespace KTextEditor
Index: python/pykde4/sip/ktexteditor/texthintinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/texthintinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/texthintinterface.sip (Revision 811888)
@@ -37,6 +37,8 @@
virtual void enableTextHints (int) = 0;
virtual void disableTextHints () = 0;
virtual void needTextHint (const KTextEditor::Cursor&, QString&) = 0;
+private:
+ TextHintInterface (const KTextEditor::TextHintInterface &other);
}; // class TextHintInterface
Index: python/pykde4/sip/ktexteditor/sessionconfiginterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/sessionconfiginterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/sessionconfiginterface.sip (Revision 811888)
@@ -38,6 +38,8 @@
public:
virtual void readSessionConfig (const KConfigGroup&) = 0;
virtual void writeSessionConfig (KConfigGroup&) = 0;
+private:
+ SessionConfigInterface (const KTextEditor::SessionConfigInterface &other);
}; // class SessionConfigInterface
Index: python/pykde4/sip/ktexteditor/templateinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/templateinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/templateinterface.sip (Revision 811888)
@@ -41,7 +41,8 @@
protected:
virtual bool insertTemplateTextImplementation (const KTextEditor::Cursor&, const QString&, const QMap<QString, QString>&) = 0;
-
+private:
+ TemplateInterface (const KTextEditor::TemplateInterface &other);
}; // class TemplateInterface
}; // namespace KTextEditor
Index: python/pykde4/sip/ktexteditor/variableinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/variableinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/variableinterface.sip (Revision 811888)
@@ -38,6 +38,8 @@
public:
virtual void variableChanged (KTextEditor::Document*, const QString&, const QString&) = 0;
+private:
+ VariableInterface (const KTextEditor::VariableInterface &other);
}; // class VariableInterface
Index: python/pykde4/sip/ktexteditor/smartinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/smartinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/smartinterface.sip (Revision 811888)
@@ -73,6 +73,8 @@
protected:
virtual void attributeDynamic (KTextEditor::Attribute::Ptr) = 0;
virtual void attributeNotDynamic (KTextEditor::Attribute::Ptr) = 0;
+private:
+ SmartInterface (const KTextEditor::SmartInterface &other);
}; // class SmartInterface
Index: python/pykde4/sip/ktexteditor/markinterface.sip
===================================================================
--- python/pykde4/sip/ktexteditor/markinterface.sip (Revision 811887)
+++ python/pykde4/sip/ktexteditor/markinterface.sip (Revision 811888)
@@ -123,7 +123,8 @@
public:
virtual void markChanged (KTextEditor::Document*, KTextEditor::Mark, KTextEditor::MarkInterface::MarkChangeAction) = 0;
-
+private:
+ MarkInterface (const KTextEditor::MarkInterface &other);
}; // class MarkInterface
}; // namespace KTextEditor
Index: python/pykde4/sip/kdecore/kcharsets.sip
===================================================================
--- python/pykde4/sip/kdecore/kcharsets.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kcharsets.sip (Revision 811888)
@@ -53,6 +53,9 @@
QString languageForEncoding (const QString& encoding) const;
QString descriptionForEncoding (const QString& encoding) const;
QString encodingForName (const QString& descriptiveName) const;
+
+private:
+ KCharsets(const KCharsets &other);
}; // KCharsets
Index: python/pykde4/sip/kdecore/ktimezone.sip
===================================================================
--- python/pykde4/sip/kdecore/ktimezone.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/ktimezone.sip (Revision 811888)
@@ -199,6 +199,9 @@
protected:
explicit KTimeZoneSource (bool useZoneParse);
+private:
+ KTimeZoneSource (const KTimeZoneSource &other);
+
}; // KTimeZoneSource
Index: python/pykde4/sip/kdecore/kencodingdetector.sip
===================================================================
--- python/pykde4/sip/kdecore/kencodingdetector.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kencodingdetector.sip (Revision 811888)
@@ -85,6 +85,8 @@
bool errorsIfUtf8 (const char* data, int length);
bool analyze (const char* data, int len);
QTextDecoder* decoder ();
+private:
+ KEncodingDetector (const KEncodingDetector &other);
}; // KEncodingDetector
Index: python/pykde4/sip/kdecore/kcoreconfigskeleton.sip
===================================================================
--- python/pykde4/sip/kdecore/kcoreconfigskeleton.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kcoreconfigskeleton.sip (Revision 811888)
@@ -137,7 +137,8 @@
#include <kcoreconfigskeleton.h>
%End
-
+private:
+ KConfigSkeletonItem (const KConfigSkeletonItem &other);
public:
typedef QList<KConfigSkeletonItem*> List;
@@ -315,7 +316,8 @@
ItemBool (const QString& _group, const QString& _key, bool reference, bool defaultValue = 1) [(const QString& _group, const QString& _key, bool& reference, bool defaultValue = 1)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemBool (PyItemBool (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemBool (PyItemBool (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemBool (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
@@ -404,7 +406,8 @@
ItemInt (const QString& _group, const QString& _key, qint32 reference, qint32 defaultValue = 0) [(const QString& _group, const QString& _key, qint32& reference, qint32 defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemInt (PyItemInt (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemInt (PyItemInt (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemInt (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
@@ -440,7 +443,8 @@
ItemLongLong (const QString& _group, const QString& _key, qint64 reference, qint64 defaultValue = 0) [(const QString& _group, const QString& _key, qint64& reference, qint64 defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemLongLong (PyItemLongLong (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemLongLong (PyItemLongLong (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemLongLong (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
@@ -489,7 +493,8 @@
ItemEnum (const QString& _group, const QString& _key, qint32 reference, const QList<KCoreConfigSkeleton::ItemEnum::Choice> choices, qint32 defaultValue = 0) [(const QString& _group, const QString& _key, qint32& reference, const QList<KCoreConfigSkeleton::ItemEnum::Choice>& choices, qint32 defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemEnum (PyItemEnum (*a0, *a1, a2, *a3, a4));
+ sipCpp = new sipKCoreConfigSkeleton_ItemEnum (*a0, *a1, a2, *a3, a4);
+// sipCpp = new sipKCoreConfigSkeleton_ItemEnum (PyItemEnum (*a0, *a1, a2, *a3, a4));
Py_END_ALLOW_THREADS
%End
@@ -517,7 +522,8 @@
ItemUInt (const QString& _group, const QString& _key, quint32 reference, quint32 defaultValue = 0) [(const QString& _group, const QString& _key, quint32& reference, quint32 defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemUInt (PyItemUInt (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemUInt (PyItemUInt (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemUInt (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
@@ -552,7 +558,8 @@
ItemULongLong (const QString& _group, const QString& _key, quint64 reference, quint64 defaultValue = 0) [(const QString& _group, const QString& _key, quint64& reference, quint64 defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemULongLong (PyItemULongLong (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemULongLong (PyItemULongLong (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemULongLong (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
@@ -589,7 +596,8 @@
ItemDouble (const QString& _group, const QString& _key, double reference, double defaultValue = 0) [(const QString& _group, const QString& _key, double& reference, double defaultValue = 0)];
%MethodCode
Py_BEGIN_ALLOW_THREADS
- sipCpp = new sipKCoreConfigSkeleton_ItemDouble (PyItemDouble (*a0, *a1, a2, a3));
+// sipCpp = new sipKCoreConfigSkeleton_ItemDouble (PyItemDouble (*a0, *a1, a2, a3));
+ sipCpp = new sipKCoreConfigSkeleton_ItemDouble (*a0, *a1, a2, a3);
Py_END_ALLOW_THREADS
%End
Index: python/pykde4/sip/kdecore/kmimetypetrader.sip
===================================================================
--- python/pykde4/sip/kdecore/kmimetypetrader.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kmimetypetrader.sip (Revision 811888)
@@ -35,6 +35,7 @@
private:
KMimeTypeTrader ();
+ KMimeTypeTrader (const KMimeTypeTrader &other);
}; // KMimeTypeTrader
Index: python/pykde4/sip/kdecore/typedefs.sip
===================================================================
--- python/pykde4/sip/kdecore/typedefs.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/typedefs.sip (Revision 811888)
@@ -258,7 +258,7 @@
%End
};
-
+/*
template <TYPE1,TYPE2>
%MappedType QHash<TYPE1,TYPE2>
{
@@ -361,8 +361,8 @@
return sipGetState(sipTransferObj);
%End
};
+*/
-
template <TYPE1,TYPE2*>
%MappedType QHash<TYPE1,TYPE2*>
{
Index: python/pykde4/sip/kdecore/kcmdlineargs.sip
===================================================================
--- python/pykde4/sip/kdecore/kcmdlineargs.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kcmdlineargs.sip (Revision 811888)
@@ -136,6 +136,9 @@
protected:
KCmdLineArgs (const KCmdLineOptions& _options, const KLocalizedString& _name, const QByteArray& _id);
~KCmdLineArgs ();
+
+private:
+ KCmdLineArgs (const KCmdLineArgs &other);
}; // KCmdLineArgs
Index: python/pykde4/sip/kdecore/klocalizedstring.sip
===================================================================
--- python/pykde4/sip/kdecore/klocalizedstring.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/klocalizedstring.sip (Revision 811888)
@@ -61,7 +61,25 @@
//ig class I18nTypeCheck;
-QString i18n (const char* text);
+//QString i18n (const char* text);
+QString i18n (const char* text,...);
+%MethodCode
+ KLocalizedString result = ki18n(a0);
+ QString arg;
+ int iserr = 0;
+ for (int i=0; i < PyTuple_Size(a1); i++) {
+ PyObject *pyarg = PyTuple_GET_ITEM (a1, i);
+ arg = *(QString *)sipForceConvertTo_QString (pyarg, &iserr);
+ if (iserr) {
+ sipIsErr = 1;
+ return 0;
+ }
+
+ result = result.subs(arg);
+ }
+ *sipRes = result.toString();
+%End
+
QString i18nc (const char* ctxt, const char* text);
%ModuleHeaderCode
#include <klocalizedstring.h>
Index: python/pykde4/sip/kdecore/kmacroexpander.sip
===================================================================
--- python/pykde4/sip/kdecore/kmacroexpander.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/kmacroexpander.sip (Revision 811888)
@@ -33,6 +33,8 @@
#include <kmacroexpander.h>
%End
+private:
+ KMacroExpanderBase (const KMacroExpanderBase &other);
public:
explicit KMacroExpanderBase (QChar c = QLatin1Char('%'));
@@ -45,6 +47,7 @@
protected:
virtual int expandPlainMacro (const QString& str, int pos, QStringList& ret);
virtual int expandEscapedMacro (const QString& str, int pos, QStringList& ret);
+
}; // KMacroExpanderBase
%ModuleHeaderCode
@@ -66,6 +69,9 @@
virtual int expandPlainMacro (const QString& str, int pos, QStringList& ret);
virtual int expandEscapedMacro (const QString& str, int pos, QStringList& ret);
virtual bool expandMacro (const QString& str, QStringList& ret) = 0;
+private:
+ KWordMacroExpander (const KWordMacroExpander &other);
+
}; // KWordMacroExpander
%ModuleHeaderCode
@@ -83,6 +89,9 @@
public:
explicit KCharMacroExpander (QChar c = QLatin1Char('%'));
+private:
+ KCharMacroExpander (const KCharMacroExpander &other);
+
protected:
virtual int expandPlainMacro (const QString& str, int pos, QStringList& ret);
virtual int expandEscapedMacro (const QString& str, int pos, QStringList& ret);
Index: python/pykde4/sip/kdecore/klockfile.sip
===================================================================
--- python/pykde4/sip/kdecore/klockfile.sip (Revision 811887)
+++ python/pykde4/sip/kdecore/klockfile.sip (Revision 811888)
@@ -56,6 +56,9 @@
int staleTime () const;
void setStaleTime (int _staleTime);
bool getLockInfo (int& pid /Out/, QString& hostname /Out/, QString& appname /Out/);
+
+private:
+ KLockFile (const KLockFile &other);
}; // KLockFile
Index: python/pykde4/INSTALL
===================================================================
--- python/pykde4/INSTALL (Revision 811887)
+++ python/pykde4/INSTALL (Revision 811888)
@@ -3,11 +3,11 @@
* A recent Python (2.5.1 is what I've been using)
-* SIP version 4.7.1 or later. Get the development snapshot
+* SIP version 4.7.6 or later. Get the development snapshot
from Riverbank Computing.
http://www.riverbankcomputing.co.uk/sip/index.php
-* PyQt 4.3.1 or later. Also available at Riverbank Computing.
+* PyQt 4.4.2 or later. Also available at Riverbank Computing.
* KDE 4 libs and development headers etc.
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- kdebindings.spec 27 May 2008 16:02:24 -0000 1.101
+++ kdebindings.spec 27 May 2008 19:34:10 -0000 1.102
@@ -10,13 +10,16 @@
Name: kdebindings
Version: 4.0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: KDE bindings to non-C++ languages
Group: User Interface/Desktops
License: GPLv2
URL: http://developer.kde.org/language-bindings/
Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/%{name}-%{version}.tar.bz2
+# upstream patch to fix PyKDE4 build:
+# http://websvn.kde.org/?view=rev&revision=811888
+Patch100: kdebindings-4.0.80-fix-pykde4.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: kde-filesystem >= 4
@@ -63,6 +66,7 @@
%prep
%setup -q
+%patch100 -p0 -b .fix-pykde4
# get rid of this because it breaks the build without PHP
# we don't want to build php-qt before we sorted out the dep explosion mess
rm -rf php
@@ -123,6 +127,10 @@
%changelog
+* Tue May 27 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.0.80-2
+- disable php-qt for now
+- apply PyKDE4 build fix from upstream
+
* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
- 4.1 beta1
More information about the fedora-extras-commits
mailing list