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

Package-Manager: portage-2.1.5_rc3

4 files changed, 77 insertions, 3 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/Manifest b/x11-misc/netwmpager/Manifest
index 578daf1728d9..81b42ac2a2b5 100644
--- a/x11-misc/netwmpager/Manifest
+++ b/x11-misc/netwmpager/Manifest
@@ -1,6 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX netwmpager-1.11-desktop-switch.patch 395 RMD160 2aca070c9297946d651f9ad9cad23c5f718368fb SHA1 ac29e30ecfe650d4400d3026b66b0016612daa2b SHA256 f1e9b0047169a282a2291ce1a71f5ed0e2cd5da56f48883a00f1572b5bd3c0fd
 DIST netwmpager-1.11.tar.bz2 37190 RMD160 ca863b3266ef1321f7b5ee47d2fad7fc1e2c35a8 SHA1 eb435c5796f9713589f372be6111480a1b59ab82 SHA256 925a159f13724168b78ccac712e02c8eda1ac741bf78f1b04dbedd92f3549c74
 DIST netwmpager-1.6.tar.bz2 44407 RMD160 819ce9a79e4cd34780e48139b0daa0abd459ca95 SHA1 200cf461accfa213407e0e6f5a23cff713f052ce SHA256 972fbc3ef09ef34272e48da5da8cc5e71f92f175258e74d24aff13888057a3e5
+EBUILD netwmpager-1.11-r1.ebuild 1132 RMD160 e64a6845792fc7d35c5a432df9b81ef88eb58e86 SHA1 b330cda89517a2b8aa2a6554ef260231ba071146 SHA256 08156909d48a3a129eec15018fd0e29cb3e11d7a88ed84d209a002e05fb20564
 EBUILD netwmpager-1.11.ebuild 1026 RMD160 0a4d2703fe97e21f0166df07436ffe64813e68c8 SHA1 d8d3eb5d831566fa04f0f94fc1e36e7a8407fcf5 SHA256 cb8fc5763333403f1223f4037643706eace57fb92ec76610a4078cc30c160403
 EBUILD netwmpager-1.6.ebuild 926 RMD160 1eb80c8228c5d92b80ae9e4e5fa2007f95365b91 SHA1 20898c0e95e12d0c7313bc8841e921550bb3ac33 SHA256 31eae2ad815b7803d0c7f3b33f23a8fdcea2e4d709d3703e58c7b144f2b5db9e
-MISC ChangeLog 1230 RMD160 4ba13fcd7f00c0b4ea4e84600e936111d6e05f31 SHA1 873dbed266d337b09315946af24ca5fadac24205 SHA256 78797b605ba94c57fbfd003fd82de0f8da8e969479b1a684edc0c528e2b70dfb
+MISC ChangeLog 1460 RMD160 700aaf51d879e5774212629eccd5266f812688fd SHA1 c65f728cc794d4f81603c38677937e5453196782 SHA256 529c8bd773e99308091566383a49e84f5390a67c7345e5b6aa3bd38dcc412545
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkgQPBIACgkQvSApE0uP4UvLQwCfc15OPu48gjxQz8PlI07ysxkL
+T8QAnjCYUnKPSL9gbIIQYe7DA7qso02q
+=TT7H
+-----END PGP SIGNATURE-----
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/"
+}