Fix incorrect desktop switching; patch by Tobias Klausmann (bug #216012)

(Portage version: 2.1.5_rc3)

3 files changed, 64 insertions, 2 deletions

diff --git a/x11-misc/netwmpager/ChangeLog b/x11-misc/netwmpager/ChangeLog
index 7497cde0cf38..4adf8c446b71 100644
--- a/x11-misc/netwmpager/ChangeLog
+++ b/x11-misc/netwmpager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/netwmpager
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.8 2007/04/22 09:58:56 corsair Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/ChangeLog,v 1.9 2008/04/24 07:51:29 omp Exp $
+
+*netwmpager-1.11-r1 (24 Apr 2008)
+
+  24 Apr 2008; David Shakaryan <omp@gentoo.org>
+  +files/netwmpager-1.11-desktop-switch.patch, +netwmpager-1.11-r1.ebuild:
+  Fix incorrect desktop switching; patch by Tobias Klausmann (bug #216012)
 
   22 Apr 2007; Markus Rothe <corsair@gentoo.org> netwmpager-1.11.ebuild:
   Added ~ppc64
diff --git a/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch b/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
new file mode 100644
index 000000000000..bc4abda5a0ea
--- /dev/null
+++ b/x11-misc/netwmpager/files/netwmpager-1.11-desktop-switch.patch
@@ -0,0 +1,10 @@
+--- pager.c	2006-04-15 21:14:55.000000000 +0200
++++ pager.c	2008-04-02 18:10:43.000000000 +0200
+@@ -1137,6 +1137,7 @@
+ 		if (pager->mouse.window_idx == -1) {
+ 			x_set_current_desktop(desk);
+ 		} else if (!pager->mouse.dragging) {
++			x_set_current_desktop(desk);
+ 			x_set_active_window(pager->windows[pager->mouse.window_idx].window, SOURCE_INDICATION_PAGER);
+ 		}
+ 	} else if (button == 2) {
diff --git a/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild b/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild
new file mode 100644
index 000000000000..3bd1dfab1757
--- /dev/null
+++ b/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/netwmpager/netwmpager-1.11-r1.ebuild,v 1.1 2008/04/24 07:51:29 omp Exp $
+
+inherit eutils
+
+DESCRIPTION="EWMH (NetWM) compatible pager. Works with Openbox and other EWMH
+compliant window managers."
+HOMEPAGE="http://onion.dynserv.net/~timo/netwmpager.html"
+SRC_URI="http://onion.dynserv.net/~timo/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXrender
+	x11-libs/libXft
+	x11-libs/libXdmcp
+	x11-libs/libXau"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	virtual/xft
+	x11-proto/xproto"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-desktop-switch.patch"
+}
+
+src_compile() {
+	# econf does not work.
+	./configure --prefix=/usr || die "configure failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc config-example README
+
+	# Don't install duplicate ungzipped config-example.
+	rm -rf "${D}/usr/share/netwmpager/"
+}