diff options
author | Andreas Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
---|---|---|
committer | Andreas Hüttel <dilfridge@gentoo.org> | 2011-06-02 21:58:00 +0000 |
commit | 0613108b68fd0e56a2bd021bc73ba8251e25fc12 (patch) | |
tree | 5312bbd1b79501d30ee0dba82451de17ccd2af46 /kde-base/pykde4/files | |
parent | Memphis is also needed for libchamplain (diff) | |
download | historical-0613108b68fd0e56a2bd021bc73ba8251e25fc12.tar.gz historical-0613108b68fd0e56a2bd021bc73ba8251e25fc12.tar.bz2 historical-0613108b68fd0e56a2bd021bc73ba8251e25fc12.zip |
Drop KDE 4.4
Package-Manager: portage-2.1.9.49/cvs/Linux x86_64
RepoMan-Options: --force
Diffstat (limited to 'kde-base/pykde4/files')
-rw-r--r-- | kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch | 32 | ||||
-rw-r--r-- | kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch | 93 |
2 files changed, 0 insertions, 125 deletions
diff --git a/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch b/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch deleted file mode 100644 index c0ccdc071a62..000000000000 --- a/kde-base/pykde4/files/pykde4-4.4.5-PyQt4-4.7.5.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/show_bug.cgi?id=349453 -http://websvn.kde.org/?view=revision&revision=1209688 - ---- python/pykde4/tools/pykdeuic4/pykdeuic4.py -+++ python/pykde4/tools/pykdeuic4/pykdeuic4.py -@@ -39,7 +39,7 @@ - def __init__(self,string): - original_i18n_string.__init__(self,string) - def __str__(self): -- return "kdecore.i18n(\"%s\")" % (qtproxies.escape(self.string),) -+ return "kdecore.i18n(%s)" % (qtproxies.as_string(self.string),) - qtproxies.i18n_string = kde_i18n_string - - def kdeFilter(): -@@ -71,7 +71,7 @@ - indenter.indentwidth = indent - comp = compiler.UICompiler() - comp.factory._cwFilters.append(kdeFilter()) -- winfo = comp.compileUi(uifile, output) -+ winfo = comp.compileUi(uifile, output, None) - - if exe: - output.write(""" -@@ -104,7 +104,7 @@ - app = kdeui.KApplication() - mainWindow = MainWin(None, "main window") - mainWindow.show() -- app.connect (app, QtCore.SIGNAL ("lastWindowClosed ()"), app.quit) -+ app.lastWindowClosed.connect(app.quit) - app.exec_ () - """) - diff --git a/kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch b/kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch deleted file mode 100644 index 69129a186962..000000000000 --- a/kde-base/pykde4/files/pykde4-4.4.5-sip-4.12.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- python/pykde4/sip/kdecore/typedefs.sip -+++ python/pykde4/sip/kdecore/typedefs.sip -@@ -582,90 +582,6 @@ - %End - }; - --template <TYPE> --%MappedType QSet<TYPE> --{ --%TypeHeaderCode --#include <qset.h> --%End -- --%ConvertFromTypeCode -- // Create the list. -- PyObject *l; -- -- if ((l = PyList_New(sipCpp->size())) == NULL) -- return NULL; -- -- // Set the list elements. -- QSet<TYPE> set = *sipCpp; -- int i = 0; -- foreach (TYPE value, set) -- { -- PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj); -- if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0) -- { -- Py_DECREF(l); -- -- if (obj) -- Py_DECREF(obj); -- -- return NULL; -- } -- -- Py_DECREF(obj); -- i++; -- } -- -- return l; --%End -- --%ConvertToTypeCode -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- } -- -- // Check the type if that is all that is required. -- if (sipIsErr == NULL) -- { -- if (!PyList_Check(sipPy)) -- return 0; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE)) -- return 0; -- } -- -- QSet<TYPE> *qs = new QSet<TYPE>; -- -- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) -- { -- int state; -- -- TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr)); -- -- if (*sipIsErr) -- { -- sipReleaseType(t, sipType_TYPE, state); -- -- delete qs; -- return 0; -- } -- -- *qs << *t; -- -- sipReleaseType(t, sipType_TYPE, state); -- } -- -- *sipCppPtr = qs; -- -- return sipGetState(sipTransferObj); --%End --}; -- -- - template <TYPE1,TYPE2> - %MappedType QPair<TYPE1,TYPE2> - { |