[Python-modules-commits] r3847 - in packages/pyicu/trunk/debian (3 files)

[bzed at users.alioth.debian.org]

    Date: Wednesday, December 5, 2007 @ 23:54:38
  Author: bzed
Revision: 3847

* debian/patches: 
  - Adding 64bit-crash-fix.dpatch to fix random crashes on 64bit
    architectures.

Added:
  packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch
Modified:
  packages/pyicu/trunk/debian/changelog
  packages/pyicu/trunk/debian/patches/00list

Modified: packages/pyicu/trunk/debian/changelog
===================================================================
--- packages/pyicu/trunk/debian/changelog	2007-12-05 23:48:40 UTC (rev 3846)
+++ packages/pyicu/trunk/debian/changelog	2007-12-05 23:54:38 UTC (rev 3847)
@@ -1,8 +1,10 @@
-pyicu (0.8-2) UNRELEASED; urgency=low
+pyicu (0.8-2) unstable; urgency=low
 
-  * NOT RELEASED YET
+  * debian/patches: 
+    - Adding 64bit-crash-fix.dpatch to fix random crashes on 64bit
+      architectures.
 
- -- Bernd Zeimetz <bzed at debian.org>  Wed, 05 Dec 2007 14:40:03 +0100
+ -- Bernd Zeimetz <bzed at debian.org>  Thu, 06 Dec 2007 00:51:29 +0100
 
 pyicu (0.8-1) unstable; urgency=low
 

Modified: packages/pyicu/trunk/debian/patches/00list
===================================================================
--- packages/pyicu/trunk/debian/patches/00list	2007-12-05 23:48:40 UTC (rev 3846)
+++ packages/pyicu/trunk/debian/patches/00list	2007-12-05 23:54:38 UTC (rev 3847)
@@ -1 +1,2 @@
 no-setuptools-please
+64bit-crash-fix

Added: packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch
===================================================================
--- packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	                        (rev 0)
+++ packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch	2007-12-05 23:54:38 UTC (rev 3847)
@@ -0,0 +1,48 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 64bit-crash-fix.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## DP: Bug fixes for 64bit related crashes.
+## DP: https://bugzilla.osafoundation.org/show_bug.cgi?id=11394
+## DP: r90 of http://svn.osafoundation.org/pyicu/trunk/common.cpp
+
+ at DPATCH@
+diff -urNad pyicu~/common.cpp pyicu/common.cpp
+--- pyicu~/common.cpp	2007-11-24 20:57:20.000000000 +0100
++++ pyicu/common.cpp	2007-12-06 00:39:59.000000000 +0100
+@@ -409,7 +409,13 @@
+ 
+ void registerType(PyTypeObject *type, UClassID id)
+ {
+-    PyObject *n = PyInt_FromLong((long) id);
++    PyObject *n;
++
++    if (sizeof(void *) == sizeof(int))
++        n = PyInt_FromLong((Py_intptr_t) id);
++    else
++        n = PyLong_FromLongLong((Py_intptr_t) id);
++
+     PyObject *list = PyList_New(0);
+     PyObject *bn;
+ 
+@@ -435,8 +441,19 @@
+         if (id == oid)
+             return 1;
+ 
+-        PyObject *bn = PyInt_FromLong((long) id);
+-        PyObject *n = PyInt_FromLong((long) oid);
++	PyObject *bn, *n;
++
++	if (sizeof(void *) == sizeof(int))
++	{
++	    bn = PyInt_FromLong((Py_intptr_t) id);
++	    n = PyInt_FromLong((Py_intptr_t) oid);
++	}
++	else
++	{
++	    bn = PyLong_FromLongLong((Py_intptr_t) id);
++	    n = PyLong_FromLongLong((Py_intptr_t) oid);
++	}
++
+         PyObject *list = PyDict_GetItem(types, bn);
+         int b = PySequence_Contains(list, n);
+         


Property changes on: packages/pyicu/trunk/debian/patches/64bit-crash-fix.dpatch
___________________________________________________________________
Name: svn:executable
   + *