Bug#839867: pygtk: diff for NMU version 2.24.0-5.1

[James Clarke]

Control: tags 839867 + pending

Dear maintainer,

I've prepared an NMU for pygtk (versioned as 2.24.0-5.1) and
uploaded it directly (as agreed with pochu on IRC).

Regards,
James
-------------- next part --------------
diff -Nru pygtk-2.24.0/debian/changelog pygtk-2.24.0/debian/changelog
--- pygtk-2.24.0/debian/changelog	2016-07-22 18:24:42.000000000 +0100
+++ pygtk-2.24.0/debian/changelog	2016-10-07 14:49:52.000000000 +0100
@@ -1,3 +1,11 @@
+pygtk (2.24.0-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * 05_Fix_GdkColor_pixel_parse.patch: Fix bus error on sparc64.
+    Closes: #839867.
+
+ -- James Clarke <jrtc27 at jrtc27.com>  Fri, 07 Oct 2016 14:49:35 +0100
+
 pygtk (2.24.0-5) unstable; urgency=medium
 
   * Add build-indep and build-arch targets. Closes: #831945.
diff -Nru pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch
--- pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch	1970-01-01 01:00:00.000000000 +0100
+++ pygtk-2.24.0/debian/patches/05_Fix_GdkColor_pixel_parse.patch	2016-10-07 14:46:42.000000000 +0100
@@ -0,0 +1,31 @@
+Description: Fix bus error on sparc64
+ Since GdkColor.pixel is a guint32, but "k" in the format string means unsigned
+ long, a temporary local needs to be used to get the right alignment and size
+ on platforms where unsigned long is not 32-bit.
+Author: James Clarke <jrtc27 at jrtc27.com>
+Bug-Debian: https://bugs.debian.org/839867
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: pygtk-2.24.0/gtk/gdkcolor.override
+===================================================================
+--- pygtk-2.24.0.orig/gtk/gdkcolor.override
++++ pygtk-2.24.0/gtk/gdkcolor.override
+@@ -33,6 +33,7 @@ _wrap_gdk_color_new(PyGBoxed *self,
+     static char *kwlist1[] = {"red", "green", "blue", "pixel", NULL };
+     static char *kwlist2[] = { "spec", NULL };
+     PyObject *red = Py_None, *green = Py_None, *blue = Py_None;
++    unsigned long pixel;
+     const char *spec = NULL;
+     GdkColor colour;
+ 
+@@ -56,7 +57,9 @@ _wrap_gdk_color_new(PyGBoxed *self,
+     PyErr_Clear();
+ 
+     if (PyArg_ParseTupleAndKeywords(args, kwargs, "|OOOk:gdk.Color", kwlist1,
+-                                    &red, &green, &blue, &colour.pixel)) {
++                                    &red, &green, &blue, &pixel)) {
++        colour.pixel = pixel;
++
+         /* We don't allow mixing floats and non-floats as that is too
+          * error-prone.  All non-floats are deemed integers in case
+          * they have __int__() method. */
diff -Nru pygtk-2.24.0/debian/patches/series pygtk-2.24.0/debian/patches/series
--- pygtk-2.24.0/debian/patches/series	2015-02-07 04:49:14.000000000 +0000
+++ pygtk-2.24.0/debian/patches/series	2016-10-07 14:36:11.000000000 +0100
@@ -1,3 +1,4 @@
 01_pygtk-demo.patch
 03_testsuite_filechooser.patch
 04_Fix_leaks_of_Pango_objects.patch
+05_Fix_GdkColor_pixel_parse.patch