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

[odyx at users.alioth.debian.org]

    Date: Thursday, December 8, 2011 @ 18:32:35
  Author: odyx
Revision: 19552

Drop obsolete patch from upstream #1037 to fix build on !64bits architectures.

This reverts commit 5010de7a9e93fbb33307da998b6e86c24a54927d.

Modified:
  packages/shiboken/trunk/debian/patches/series
Deleted:
  packages/shiboken/trunk/debian/patches/fix_i386_build.patch

Deleted: packages/shiboken/trunk/debian/patches/fix_i386_build.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/fix_i386_build.patch	2011-12-08 18:32:25 UTC (rev 19551)
+++ packages/shiboken/trunk/debian/patches/fix_i386_build.patch	2011-12-08 18:32:35 UTC (rev 19552)
@@ -1,15 +0,0 @@
-Description: Fix FTBFS on !64bits architectures.
-Author: Hugo Parente Lima <hugo.lima at openbossa.org>
-Origin: upstream <http://bugs.pyside.org/show_bug.cgi?id=1037>
-Last-Update: 2011-10-31
---- a/generator/cppgenerator.cpp
-+++ b/generator/cppgenerator.cpp
-@@ -4201,7 +4201,7 @@
- 
- void CppGenerator::writeHashFunction(QTextStream& s, const AbstractMetaClass* metaClass)
- {
--    s << "static long " << cpythonBaseName(metaClass) << "_HashFunc(PyObject* self) {" << endl;
-+    s << "static Py_hash_t " << cpythonBaseName(metaClass) << "_HashFunc(PyObject* self) {" << endl;
-     writeCppSelfDefinition(s, metaClass);
-     s << INDENT << "return " << metaClass->typeEntry()->hashFunction() << '(';
-     s << (isObjectType(metaClass) ? "" : "*") << CPP_SELF_VAR << ");" << endl;

Modified: packages/shiboken/trunk/debian/patches/series
===================================================================
--- packages/shiboken/trunk/debian/patches/series	2011-12-08 18:32:25 UTC (rev 19551)
+++ packages/shiboken/trunk/debian/patches/series	2011-12-08 18:32:35 UTC (rev 19552)
@@ -1,3 +1,2 @@
 cmake_selectDefaultPython.patch
 pythonversionindep.patch
-fix_i386_build.patch