Fri Apr 24 09:50:14 2015 UTC ()
Avoid a crash on sparc64 (and "random" memory access on other 64bit
machines)


(martin)
diff -r1.266 -r1.267 pkgsrc/x11/gtk2/Makefile
diff -r1.153 -r1.154 pkgsrc/x11/gtk2/distinfo
diff -r0 -r1.1 pkgsrc/x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c
cvs diff -r1.266 -r1.267 pkgsrc/x11/gtk2/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/Makefile 2015/03/14 00:39:14 1.266
+++ pkgsrc/x11/gtk2/Makefile 2015/04/24 09:50:13 1.267
@@ -1,20 +1,21 @@ @@ -1,20 +1,21 @@
1# $NetBSD: Makefile,v 1.266 2015/03/14 00:39:14 prlw1 Exp $ 1# $NetBSD: Makefile,v 1.267 2015/04/24 09:50:13 martin Exp $
2 2
3DISTNAME= gtk+-2.24.27 3DISTNAME= gtk+-2.24.27
4PKGNAME= ${DISTNAME:S/gtk/gtk2/} 4PKGNAME= ${DISTNAME:S/gtk/gtk2/}
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/} 6MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtk+/2.24/}
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
 8PKGREVISION= 1
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.gtk.org/ 11HOMEPAGE= http://www.gtk.org/
11COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces 12COMMENT= GIMP Toolkit v2 - libraries for building X11 user interfaces
12LICENSE= gnu-lgpl-v2.1 13LICENSE= gnu-lgpl-v2.1
13 14
14# gtk-builder-convert uses minidom from xml.dom, which needs expat 15# gtk-builder-convert uses minidom from xml.dom, which needs expat
15DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat 16DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
16 17
17CONFLICTS= gtk2-engines<2.6.0 18CONFLICTS= gtk2-engines<2.6.0
18CONFLICTS+= gail-[0-9]* 19CONFLICTS+= gail-[0-9]*
19 20
20SUPERSEDES= gail-[0-9]* 21SUPERSEDES= gail-[0-9]*
cvs diff -r1.153 -r1.154 pkgsrc/x11/gtk2/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gtk2/distinfo 2015/03/14 00:39:14 1.153
+++ pkgsrc/x11/gtk2/distinfo 2015/04/24 09:50:13 1.154
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1$NetBSD: distinfo,v 1.153 2015/03/14 00:39:14 prlw1 Exp $ 1$NetBSD: distinfo,v 1.154 2015/04/24 09:50:13 martin Exp $
2 2
3SHA1 (gtk+-2.24.27.tar.xz) = dae8cbb37f318c9e7a299d4a8dfccaf13edd8e27 3SHA1 (gtk+-2.24.27.tar.xz) = dae8cbb37f318c9e7a299d4a8dfccaf13edd8e27
4RMD160 (gtk+-2.24.27.tar.xz) = 01f8917cd0dbc429c9295809209c64fe8ce38c48 4RMD160 (gtk+-2.24.27.tar.xz) = 01f8917cd0dbc429c9295809209c64fe8ce38c48
5Size (gtk+-2.24.27.tar.xz) = 13349252 bytes 5Size (gtk+-2.24.27.tar.xz) = 13349252 bytes
6SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 6SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3
7SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad 7SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad
8SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 8SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3
 9SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77
9SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780 10SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780
File Added: pkgsrc/x11/gtk2/patches/Attic/patch-gdk_x11_gdkwindow-x11.c
$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));