Hey, I've been unable to push a new ratpoison release before lock, so here's a diff for: - a previous proposal which has been included by other distros. - an old but very annoying bug wrt X11 timestamps, which makes recent firefox versions nearly unusable under ratpoison. The code has changed upstream and has been cleaned up, I'm only proposing a minimal change for 5.5.
ok? Index: Makefile =================================================================== RCS file: /cvs/ports/x11/ratpoison/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile 7 Apr 2013 20:09:23 -0000 1.27 +++ Makefile 20 Feb 2014 01:47:23 -0000 @@ -3,6 +3,7 @@ COMMENT= minimal wm based on GNU screen DISTNAME= ratpoison-1.4.6 +REVISION= 0 CATEGORIES= x11 HOMEPAGE= http://www.nongnu.org/ratpoison/ Index: patches/patch-src_actions_c =================================================================== RCS file: patches/patch-src_actions_c diff -N patches/patch-src_actions_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_actions_c 20 Feb 2014 01:46:50 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +Bugfix for recent firefox versions. +Applied-Upstream: 782e5d0f60412682ca5facde2d566c02bd176902 +--- src/actions.c.orig Thu Feb 20 02:37:37 2014 ++++ src/actions.c Thu Feb 20 02:40:48 2014 +@@ -1168,6 +1168,8 @@ cmd_meta (int interactive UNUSED, struct cmdarg **args + if (current_window() == NULL) + return cmdret_new (RET_FAILURE, NULL); + ++ memset(&ev1, 0, sizeof(ev1)); ++ + ev1.xkey.type = KeyPress; + ev1.xkey.display = dpy; + ev1.xkey.window = current_window()->w; Index: patches/patch-src_manage_c =================================================================== RCS file: patches/patch-src_manage_c diff -N patches/patch-src_manage_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_manage_c 20 Feb 2014 01:47:12 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ +Erroneous change introduced in 1.4.6. +Applied-Upstream: 5201477cbcb276bd13ec07e3d57b8c6cefe8201a +--- src/manage.c.orig Thu Feb 20 02:41:38 2014 ++++ src/manage.c Thu Feb 20 02:41:13 2014 +@@ -233,7 +233,7 @@ get_wmname (Window w) + + if (XGetWMName (dpy, w, &text_prop) == 0) + { +- PRINT_ERROR (("XGetWMName failed\n")); ++ PRINT_DEBUG (("XGetWMName failed\n")); + return NULL; + } +
