diff options
| author | snj <snj@pkgsrc.org> | 2009-11-15 03:11:12 +0000 |
|---|---|---|
| committer | snj <snj@pkgsrc.org> | 2009-11-15 03:11:12 +0000 |
| commit | 565e9ab53958caa31671ea2cb4a3ab2beba614f6 (patch) | |
| tree | bfb9929ac035025da1402477ad302632daf2f7e9 /wm | |
| parent | 25e14ddb6ca2426bfbe17394237e3423c24888b0 (diff) | |
| download | pkgsrc-565e9ab53958caa31671ea2cb4a3ab2beba614f6.tar.gz | |
Add two packages to openbox, bringign us to nb2:
- Pull in upstream's 59eb52b7c6ccbe83742e5eb8b40b5e32bb6600cc, which
prevents windows from jumping to the current workspace when a
net_active_window message is received.
- Change an entry in the default menu file to use the Exit action instead
of SessionLogout, so as to not violate the POLA.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/openbox/Makefile | 4 | ||||
| -rw-r--r-- | wm/openbox/distinfo | 4 | ||||
| -rw-r--r-- | wm/openbox/patches/patch-ad | 25 | ||||
| -rw-r--r-- | wm/openbox/patches/patch-ae | 17 |
4 files changed, 47 insertions, 3 deletions
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index 2fdb0e178b2..dda31e04faa 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.53 2009/07/22 09:01:50 wiz Exp $ +# $NetBSD: Makefile,v 1.54 2009/11/15 03:11:12 snj Exp $ DISTNAME= openbox-3.4.7.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= wm x11 MASTER_SITES= http://icculus.org/openbox/releases/ # PR pkg/36489 diff --git a/wm/openbox/distinfo b/wm/openbox/distinfo index 78339d2d48f..a779a71e46d 100644 --- a/wm/openbox/distinfo +++ b/wm/openbox/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2009/02/16 12:04:01 wiz Exp $ +$NetBSD: distinfo,v 1.21 2009/11/15 03:11:12 snj Exp $ SHA1 (openbox-3.4.7.2.tar.gz) = f34c3ec43b7e39bf57d64dbef97c35b68fea5254 RMD160 (openbox-3.4.7.2.tar.gz) = a5ab5f4c3db81625d512da48189e34aeeec244d8 @@ -6,3 +6,5 @@ Size (openbox-3.4.7.2.tar.gz) = 828190 bytes SHA1 (patch-aa) = 343f54e1aa60dd9e0e69cb6e6a53c80dc8d071df SHA1 (patch-ab) = bb13ec5801c2e271f1e6b2dc4d0aa149c9e2dff1 SHA1 (patch-ac) = cd5d329332623b97435fd72cf2be1b52049c041f +SHA1 (patch-ad) = 86d624aa32e5de4835bec1db18896c65b0c24f3d +SHA1 (patch-ae) = 9ff91b6a23a322d11be49e7894c42f14efa859e5 diff --git a/wm/openbox/patches/patch-ad b/wm/openbox/patches/patch-ad new file mode 100644 index 00000000000..92a14ece072 --- /dev/null +++ b/wm/openbox/patches/patch-ad @@ -0,0 +1,25 @@ +$NetBSD: patch-ad,v 1.3 2009/11/15 03:11:12 snj Exp $ + +This is git revision 59eb52b7c6ccbe83742e5eb8b40b5e32bb6600cc upstream. + +--- openbox/client.c.orig 2008-04-13 16:22:11.000000000 -0700 ++++ openbox/client.c 2009-11-14 01:16:58.000000000 -0800 +@@ -3897,12 +3897,15 @@ static void client_present(ObClient *sel + client_focus(self); + } + +-/* this function exists to map to the client_activate message in the ewmh, +- the user arg is unused because nobody uses it correctly anyway. */ ++/* this function exists to map to the net_active_window message in the ewmh */ + void client_activate(ObClient *self, gboolean here, gboolean raise, + gboolean unshade, gboolean user) + { +- client_present(self, here, raise, unshade); ++ if (user || (self->desktop == DESKTOP_ALL || ++ self->desktop == screen_desktop)) ++ client_present(self, here, raise, unshade); ++ else ++ client_hilite(self, TRUE); + } + + static void client_bring_windows_recursive(ObClient *self, diff --git a/wm/openbox/patches/patch-ae b/wm/openbox/patches/patch-ae new file mode 100644 index 00000000000..f7ecc4ea2c0 --- /dev/null +++ b/wm/openbox/patches/patch-ae @@ -0,0 +1,17 @@ +$NetBSD: patch-ae,v 1.1 2009/11/15 03:11:12 snj Exp $ + +--- data/menu.xml.orig 2008-03-03 08:07:59.000000000 -0800 ++++ data/menu.xml 2009-11-14 17:41:32.000000000 -0800 +@@ -389,8 +389,10 @@ + <separator label="System" /> + <menu id="system-menu"/> + <separator /> +- <item label="Log Out"> +- <action name="SessionLogout"> ++ <!--<item label="Log Out"> ++ <action name="SessionLogout"> --> ++ <item label="Quit Openbox"> ++ <action name="Exit"> + <prompt>yes</prompt> + </action> + </item> |