[pkgsrc/trunk]: pkgsrc/x11/gtk2 Avoid a crash on sparc64 (and "random" memory...

[martin <martin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b0112f360fe1
branches:  trunk
changeset: 650517:b0112f360fe1
user:      martin <martin%pkgsrc.org@localhost>
date:      Fri Apr 24 09:50:13 2015 +0000

description:
Avoid a crash on sparc64 (and "random" memory access on other 64bit
machines)

diffstat:

 x11/gtk2/Makefile                              |   3 ++-
 x11/gtk2/distinfo                              |   3 ++-
 x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diffs (52 lines):

diff -r 2bb6ba8fbe10 -r b0112f360fe1 x11/gtk2/Makefile
--- a/x11/gtk2/Makefile Fri Apr 24 06:45:28 2015 +0000
+++ b/x11/gtk2/Makefile Fri Apr 24 09:50:13 2015 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.266 2015/03/14 00:39:14 prlw1 Exp $
+# $NetBSD: Makefile,v 1.267 2015/04/24 09:50:13 martin Exp $
 
 DISTNAME=      gtk+-2.24.27
 PKGNAME=       ${DISTNAME:S/gtk/gtk2/}
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
 EXTRACT_SUFX=  .tar.xz
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.gtk.org/
diff -r 2bb6ba8fbe10 -r b0112f360fe1 x11/gtk2/distinfo
--- a/x11/gtk2/distinfo Fri Apr 24 06:45:28 2015 +0000
+++ b/x11/gtk2/distinfo Fri Apr 24 09:50:13 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.153 2015/03/14 00:39:14 prlw1 Exp $
+$NetBSD: distinfo,v 1.154 2015/04/24 09:50:13 martin Exp $
 
 SHA1 (gtk+-2.24.27.tar.xz) = dae8cbb37f318c9e7a299d4a8dfccaf13edd8e27
 RMD160 (gtk+-2.24.27.tar.xz) = 01f8917cd0dbc429c9295809209c64fe8ce38c48
@@ -6,4 +6,5 @@
 SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
 SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
+SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77
 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780
diff -r 2bb6ba8fbe10 -r b0112f360fe1 x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c    Fri Apr 24 09:50:13 2015 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-gdk_x11_gdkwindow-x11.c,v 1.1 2015/04/24 09:50:14 martin Exp $
+
+Avoid alignemnet issues on 64bit machines:
+XChangeProperty(... XA_CARDINAL, 32, ...) expects a long* (despite the 32
+suggesting otherwise).
+
+--- gdk/x11/gdkwindow-x11.c.orig       2015-04-24 10:58:43.000000000 +0200
++++ gdk/x11/gdkwindow-x11.c    2015-04-24 10:55:15.000000000 +0200
+@@ -5575,7 +5575,7 @@
+                       gdouble    opacity)
+ {
+   GdkDisplay *display;
+-  guint32 cardinal;
++  long cardinal;
+   
+   g_return_if_fail (GDK_IS_WINDOW (window));
+