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

[odyx at users.alioth.debian.org]

    Date: Thursday, December 8, 2011 @ 18:32:05
  Author: odyx
Revision: 19549

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

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

Added: packages/shiboken/trunk/debian/patches/fix_i386_build.patch
===================================================================
--- packages/shiboken/trunk/debian/patches/fix_i386_build.patch	                        (rev 0)
+++ packages/shiboken/trunk/debian/patches/fix_i386_build.patch	2011-12-08 18:32:05 UTC (rev 19549)
@@ -0,0 +1,15 @@
+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:31:50 UTC (rev 19548)
+++ packages/shiboken/trunk/debian/patches/series	2011-12-08 18:32:05 UTC (rev 19549)
@@ -1,2 +1,3 @@
 cmake_selectDefaultPython.patch
 pythonversionindep.patch
+fix_i386_build.patch