[Python-modules-commits] r25830 - in packages/shiboken/trunk/debian/patches (2 files)

[odyx at users.alioth.debian.org]

    Date: Wednesday, September 11, 2013 @ 18:45:22
  Author: odyx
Revision: 25830

Delete static-override-fix.patch as it was fixed differently by upstream

Modified:
  packages/shiboken/trunk/debian/patches/series
Deleted:
  packages/shiboken/trunk/debian/patches/static-override-fix.patch

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2013-09-11 18:45:11 UTC (rev 25829)
+++ packages/shiboken/trunk/debian/patches/series	2013-09-11 18:45:22 UTC (rev 25830)
@@ -4,6 +4,5 @@
 python3.3-and-multiarch.patch
 python3.3-nolong.patch
 memleak-instead-crash.patch
-static-override-fix.patch
 fix_py3_expect.patch
 pkg-config-depend-on-python.patch

Deleted: packages/shiboken/trunk/debian/patches/static-override-fix.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/static-override-fix.patch	2013-09-11 18:45:11 UTC (rev 25829)
+++ packages/shiboken/trunk/debian/patches/static-override-fix.patch	2013-09-11 18:45:22 UTC (rev 25830)
@@ -1,49 +0,0 @@
-Description: fix static/non-static override
- using a METH_STATIC function for non static does not work in python3 anymore.
- Hack around it by emitting a second PyMethodDef
-Bug: https://bugreports.qt-project.org/browse/PYSIDE-145
-Forwarded: yes
-Author: Julian Taylor <jtaylor at ubuntu.com>
---- a/generator/shiboken/cppgenerator.h
-+++ b/generator/shiboken/cppgenerator.h
-@@ -207,7 +207,7 @@
- 
-     void writeClassRegister(QTextStream& s, const AbstractMetaClass* metaClass);
-     void writeClassDefinition(QTextStream& s, const AbstractMetaClass* metaClass);
--    void writeMethodDefinitionEntry(QTextStream& s, const AbstractMetaFunctionList overloads);
-+    void writeMethodDefinitionEntry(QTextStream& s, const AbstractMetaFunctionList overloads, bool nostatic=false);
-     void writeMethodDefinition(QTextStream& s, const AbstractMetaFunctionList overloads);
- 
-     /// Writes the implementation of all methods part of python sequence protocol
---- a/generator/shiboken/cppgenerator.cpp
-+++ b/generator/shiboken/cppgenerator.cpp
-@@ -308,6 +308,11 @@
-                 smd << INDENT;
-                 writeMethodDefinitionEntry(smd, overloads);
-                 smd << endl << "};" << endl << endl;
-+                methDefName = cpythonMethodDefinitionName(rfunc) + "_nonstatic";
-+                smd << "static PyMethodDef " << methDefName << " = {" << endl;
-+                smd << INDENT;
-+                writeMethodDefinitionEntry(smd, overloads, true);
-+                smd << endl << "};" << endl << endl;
-             }
-             writeMethodDefinition(md, overloads);
-         }
-@@ -3902,7 +3907,7 @@
-     s << '}' << endl << endl;
- }
- 
--void CppGenerator::writeMethodDefinitionEntry(QTextStream& s, const AbstractMetaFunctionList overloads)
-+void CppGenerator::writeMethodDefinitionEntry(QTextStream& s, const AbstractMetaFunctionList overloads, bool nostatic)
- {
-     Q_ASSERT(!overloads.isEmpty());
-     OverloadData overloadData(overloads, this);
-@@ -3922,7 +3927,7 @@
-         if (overloadData.hasArgumentWithDefaultValue())
-             s << "|METH_KEYWORDS";
-     }
--    if (func->ownerClass() && overloadData.hasStaticFunction())
-+    if (!nostatic && func->ownerClass() && overloadData.hasStaticFunction())
-         s << "|METH_STATIC";
- }
-