diff options
| author | martin <martin> | 2015-04-24 09:50:13 +0000 |
|---|---|---|
| committer | martin <martin> | 2015-04-24 09:50:13 +0000 |
| commit | 82759d4b0d7c9aab0dd8551371a48351b303edbe (patch) | |
| tree | 92aaf3da59e483cb344c9612dc0688ae8c152767 /x11 | |
| parent | f6e53998f394dab73b4b612773e31bd576fc3afc (diff) | |
| download | pkgsrc-82759d4b0d7c9aab0dd8551371a48351b303edbe.tar.gz | |
Avoid a crash on sparc64 (and "random" memory access on other 64bit
machines)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/gtk2/Makefile | 3 | ||||
| -rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
| -rw-r--r-- | x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c | 17 |
3 files changed, 21 insertions, 2 deletions
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile index 9303fc47838..2bcbf8fe791 100644 --- a/x11/gtk2/Makefile +++ b/x11/gtk2/Makefile @@ -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 HOMEPAGE= http://www.gtk.org/ diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index cf889766aff..dbd0e833074 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -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 @@ Size (gtk+-2.24.27.tar.xz) = 13349252 bytes 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 --git a/x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c b/x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c new file mode 100644 index 00000000000..07fcad94241 --- /dev/null +++ b/x11/gtk2/patches/patch-gdk_x11_gdkwindow-x11.c @@ -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)); + |