[Python-modules-commits] r19460 - in packages/gamera/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Monday, November 28, 2011 @ 23:12:30
  Author: jwilk
Revision: 19460

Fix type mismatch in graph initialization code, hopefully fixing FTBFS on big-endian 64-bit architectures.

Added:
  packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-11-28 22:23:17 UTC (rev 19459)
+++ packages/gamera/trunk/debian/changelog	2011-11-28 23:12:30 UTC (rev 19460)
@@ -8,8 +8,10 @@
   * Create namespace package ‘gamera.toolkit’. This allows
     python-gamera.toolkit.* packages, both those using dh_python2 and those
     using python-support, to be co-importable. (namespace-package.diff)
+  * Fix type mismatch in graph initialization code, hopefully fixing FTBFS on
+    big-endian 64-bit architectures. (graphmodule-fix-type-mismatch.diff)
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 24 Nov 2011 21:52:44 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 29 Nov 2011 00:06:01 +0100
 
 gamera (3.3.2-1) unstable; urgency=low
 

Added: packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff
===================================================================
--- packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/graphmodule-fix-type-mismatch.diff	2011-11-28 23:12:30 UTC (rev 19460)
@@ -0,0 +1,28 @@
+Description: Fix type mismatch in graph initialization code.
+ Fix type mismatch in graph_new() and graph_copy() functions. The ‘i’ format
+ unit represents an ‘int’, not an ‘unsigned long’. Use the ‘k’ format unit
+ instead.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: no
+Last-Update: 2011-11-28
+
+--- a/src/graph/graphmodule/graphobject.cpp
++++ b/src/graph/graphmodule/graphobject.cpp
+@@ -419,7 +419,7 @@
+ PyObject* graph_new(PyTypeObject* pytype, PyObject* args,
+ 		    PyObject* kwds) {
+    unsigned long flags = FLAG_FREE;
+-   if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|i:Graph.__init__", &flags) <= 0)
++   if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|k:Graph.__init__", &flags) <= 0)
+       return NULL;
+ 
+    return (PyObject*)graph_new(flags);
+@@ -479,7 +479,7 @@
+ PyObject* graph_copy(PyObject* self, PyObject* args) {
+    INIT_SELF_GRAPH();
+    unsigned long flags = FLAG_FREE;
+-   if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|i:Graph.copy", &flags) <= 0)
++   if (PyArg_ParseTuple(args, CHAR_PTR_CAST "|k:Graph.copy", &flags) <= 0)
+       return NULL;
+ 
+    return (PyObject*)graph_copy(so, flags);

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2011-11-28 22:23:17 UTC (rev 19459)
+++ packages/gamera/trunk/debian/patches/series	2011-11-28 23:12:30 UTC (rev 19460)
@@ -6,3 +6,4 @@
 use-system-python-modules.diff
 setup-no-import-wx.diff
 namespace-package.diff
+graphmodule-fix-type-mismatch.diff