Strict alignment. Upstream issue #273

4 files changed, 35 insertions, 3 deletions

diff --git a/x11/tint2/Makefile b/x11/tint2/Makefile
index 93f92a3fb46..1fac1bfd12f 100644
--- a/x11/tint2/Makefile
+++ b/x11/tint2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.32 2014/05/09 07:37:28 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2015/02/08 18:06:10 tnn Exp $
 
 DISTNAME=		tint2-0.11
-PKGREVISION=		22
+PKGREVISION=		23
 CATEGORIES=		x11
 MASTER_SITES=		http://tint2.googlecode.com/files/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/x11/tint2/distinfo b/x11/tint2/distinfo
index c06ef95338c..20e597db7bf 100644
--- a/x11/tint2/distinfo
+++ b/x11/tint2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2010/07/05 08:14:42 tnn Exp $
+$NetBSD: distinfo,v 1.5 2015/02/08 18:06:10 tnn Exp $
 
 SHA1 (tint2-0.11.tar.bz2) = 9752255529673dabf13e7437afd1cd0b39d9c92b
 RMD160 (tint2-0.11.tar.bz2) = f094e81aec1fae98a88e8392c4c9e6b5fecb6120
@@ -6,3 +6,5 @@ Size (tint2-0.11.tar.bz2) = 91716 bytes
 SHA1 (patch-aa) = 2865cdb561d856615c607d589af9040bfc95e14b
 SHA1 (patch-ab) = 41d3059bc5d329a2f8ad55e05a43ef3e2e199fec
 SHA1 (patch-ac) = 3f95a80eabb16e6417fc843f9fef1a697487426d
+SHA1 (patch-src_panel.c) = 4eee14b11eb7b5c01b852ec13ee0ce216e20eefe
+SHA1 (patch-src_systray_systraybar.c) = 3bcd5e9749cc8943115eae9bb32cd5d6a9a7b1a0
diff --git a/x11/tint2/patches/patch-src_panel.c b/x11/tint2/patches/patch-src_panel.c
new file mode 100644
index 00000000000..800d8c1102a
--- /dev/null
+++ b/x11/tint2/patches/patch-src_panel.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_panel.c,v 1.1 2015/02/08 18:06:10 tnn Exp $
+
+Strict alignment. Upstream issue #273
+
+--- src/panel.c.orig	2010-06-26 12:35:35.000000000 +0000
++++ src/panel.c
+@@ -493,7 +493,7 @@ void set_panel_properties(Panel *p)
+ 	XChangeProperty(server.dsp, p->main_win, server.atom._MOTIF_WM_HINTS, server.atom._MOTIF_WM_HINTS, 32, PropModeReplace, (unsigned char *) prop, 5);
+ 
+ 	// XdndAware - Register for Xdnd events
+-	int version=5;
++	long version=5;
+ 	XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
+ 
+ 	update_strut(p);
diff --git a/x11/tint2/patches/patch-src_systray_systraybar.c b/x11/tint2/patches/patch-src_systray_systraybar.c
new file mode 100644
index 00000000000..016aeb58033
--- /dev/null
+++ b/x11/tint2/patches/patch-src_systray_systraybar.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_systray_systraybar.c,v 1.1 2015/02/08 18:06:10 tnn Exp $
+
+Strict alignment. Upstream issue #273
+
+--- src/systray/systraybar.c.orig	2010-06-09 15:31:18.000000000 +0000
++++ src/systray/systraybar.c
+@@ -277,7 +277,7 @@ void start_net()
+ 
+ 	// v0.3 trayer specification. tint2 always horizontal.
+ 	// Vertical panel will draw the systray horizontal.
+-	int orient = 0;
++	long orient = 0;
+ 	XChangeProperty(server.dsp, net_sel_win, server.atom._NET_SYSTEM_TRAY_ORIENTATION, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &orient, 1);
+ 	VisualID vid;
+ 	if (server.visual32 && (systray.alpha != 100 || systray.brightness != 0 || systray.saturation != 0))