Add a patch to fix a segmentation fault.

Package-Manager: portage-2.1.3.15

4 files changed, 57 insertions, 13 deletions

diff --git a/x11-misc/superswitcher/ChangeLog b/x11-misc/superswitcher/ChangeLog
index 3ba34ebda13a..ef2988c013d7 100644
--- a/x11-misc/superswitcher/ChangeLog
+++ b/x11-misc/superswitcher/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/superswitcher
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.3 2007/10/22 16:14:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.4 2007/10/22 16:56:11 swegener Exp $
+
+  22 Oct 2007; Sven Wegener <swegener@gentoo.org>
+  +files/superswitcher-0.6-wnck-workspace.patch, superswitcher-0.6.ebuild:
+  Add a patch to fix a segmentation fault.
 
 *superswitcher-0.6 (22 Oct 2007)
 
diff --git a/x11-misc/superswitcher/Manifest b/x11-misc/superswitcher/Manifest
index ca6ec118eefd..eb7c96878db3 100644
--- a/x11-misc/superswitcher/Manifest
+++ b/x11-misc/superswitcher/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX superswitcher-0.6-wnck-workspace.patch 735 RMD160 4795dc9d5eec1d04592af43a8aa695aeb534e161 SHA1 58cbefb6b6daf26a6ee92b8ec38079f16c8ca3d5 SHA256 22172feee65c23f9bc87beac3562131bf92ddd04244f1289aaedd31a7591ea1a
+MD5 375d326323c201ce4287f058e646237c files/superswitcher-0.6-wnck-workspace.patch 735
+RMD160 4795dc9d5eec1d04592af43a8aa695aeb534e161 files/superswitcher-0.6-wnck-workspace.patch 735
+SHA256 22172feee65c23f9bc87beac3562131bf92ddd04244f1289aaedd31a7591ea1a files/superswitcher-0.6-wnck-workspace.patch 735
 DIST superswitcher-0.6.tar.gz 183184 RMD160 073b6b165ac4a12c016ff2db76877c9e8f2c0919 SHA1 2cea24425acee2a07dbddfa33860d20d16d4d13c SHA256 232b98d1a9443fcf4f969cf4cf00df3908c3ccb55f36059391da68873d514599
-EBUILD superswitcher-0.6.ebuild 694 RMD160 88211f56da637db540aa73019cd02ce4dde989cc SHA1 17ad6637589745b05e1dcbdad32adb088722fc2f SHA256 1f260c720c3ec01f00663c7dec58f87eac63d246fc5916f3f1886d4f8bf6a83b
-MD5 e4e373e71e4770699866b7488f61e789 superswitcher-0.6.ebuild 694
-RMD160 88211f56da637db540aa73019cd02ce4dde989cc superswitcher-0.6.ebuild 694
-SHA256 1f260c720c3ec01f00663c7dec58f87eac63d246fc5916f3f1886d4f8bf6a83b superswitcher-0.6.ebuild 694
-MISC ChangeLog 806 RMD160 147d54c38013f8cfe92eb7d21fb1e59bb310951a SHA1 0c2fc030fb9fee99c6a10e7b16e226f8c732f6cd SHA256 0135799a9daebf749592646befc0a8af87bd48537810b3f2bc6c70892d95edfc
-MD5 a102e4e8cb915b9190817c637f7875f1 ChangeLog 806
-RMD160 147d54c38013f8cfe92eb7d21fb1e59bb310951a ChangeLog 806
-SHA256 0135799a9daebf749592646befc0a8af87bd48537810b3f2bc6c70892d95edfc ChangeLog 806
+EBUILD superswitcher-0.6.ebuild 801 RMD160 d9efab1579691c30bb1b145bc45b9861e0786091 SHA1 055fb03231b3c108970fbf42769c53314f49055d SHA256 13ad01638d97d433fb8e6fb599c7d1045453f84b4141558cefda8a31ba6ca378
+MD5 36c6e06c1daf94b23493e1b8ecdd4d2e superswitcher-0.6.ebuild 801
+RMD160 d9efab1579691c30bb1b145bc45b9861e0786091 superswitcher-0.6.ebuild 801
+SHA256 13ad01638d97d433fb8e6fb599c7d1045453f84b4141558cefda8a31ba6ca378 superswitcher-0.6.ebuild 801
+MISC ChangeLog 975 RMD160 304f4656fc30e64b72a944921c2e393680dbe4d8 SHA1 7fa3167616f7f611061ad07c8f6e4f13c9450a42 SHA256 53232e19538265ed5d8526f7c372f9308ce669e8035859012c35815175aefd52
+MD5 d03095d2c8eb4ec3ebd73b60222704b2 ChangeLog 975
+RMD160 304f4656fc30e64b72a944921c2e393680dbe4d8 ChangeLog 975
+SHA256 53232e19538265ed5d8526f7c372f9308ce669e8035859012c35815175aefd52 ChangeLog 975
 MISC metadata.xml 497 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be SHA1 934d789f9dc546eb32f8b5d775b48ae588aaa032 SHA256 177d65f1082f9f1cf5c1ab3e8916b829933b4b9b326ebc98d01e765a87efb86a
 MD5 e5661fe73fe276b39827a6991d4d3ed7 metadata.xml 497
 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be metadata.xml 497
@@ -20,7 +24,7 @@ SHA256 310daed77a552a0a2d09185cd53e1ceb8efb3a2f955248742a03f472e2194a38 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHHMyJI1lqEGTUzyQRAuO5AJ9YQKAzBMnOat2wpkR33R0P8gyn3gCbB+nD
-uS4OXU9UmHfGoRihHilKlTA=
-=YFqM
+iD8DBQFHHNYwI1lqEGTUzyQRAiYlAJ409xpIkHVZdVNnyns0aF66ja/1CwCeI1Ec
+Q18mTLAgTh1upFJ08X+i1Pk=
+=aagv
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
new file mode 100644
index 000000000000..94ac8c20991c
--- /dev/null
+++ b/x11-misc/superswitcher/files/superswitcher-0.6-wnck-workspace.patch
@@ -0,0 +1,27 @@
+It seems like wnck_window_is_skip_pager isn't all we need to check.
+
+--- superswitcher/src/screen.c
++++ superswitcher/src/screen.c
+@@ -505,6 +505,7 @@
+ static SSWindow *
+ add_window_to_screen (SSScreen *screen, WnckWindow *wnck_window)
+ {
++  WnckWorkspace *wnck_workspace;
+   SSWindow *window;
+   SSWorkspace *workspace;
+   int n;
+@@ -513,7 +514,13 @@
+     return NULL;
+   }
+ 
+-  n = wnck_workspace_get_number (wnck_window_get_workspace (wnck_window));
++  wnck_workspace = wnck_window_get_workspace (wnck_window);
++
++  if (wnck_workspace == NULL) {
++    return NULL;
++  }
++
++  n = wnck_workspace_get_number (wnck_workspace);
+   workspace = ss_screen_get_nth_workspace (screen, n);
+ 
+   window = ss_window_new (workspace, wnck_window);
diff --git a/x11-misc/superswitcher/superswitcher-0.6.ebuild b/x11-misc/superswitcher/superswitcher-0.6.ebuild
index 4acfa9587e73..6c87490581b6 100644
--- a/x11-misc/superswitcher/superswitcher-0.6.ebuild
+++ b/x11-misc/superswitcher/superswitcher-0.6.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/superswitcher-0.6.ebuild,v 1.1 2007/10/22 16:14:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/superswitcher-0.6.ebuild,v 1.2 2007/10/22 16:56:11 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="A more feature-full replacement of the Alt-Tab window switching behavior."
 HOMEPAGE="http://code.google.com/p/superswitcher/"
@@ -16,6 +18,13 @@ RDEPEND=">=dev-libs/glib-2
 	>=x11-libs/libwnck-2.10"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-wnck-workspace.patch
+}
+
 src_install() {
 	emake -j1 install DESTDIR="${D}" || die "emake install failed"
 	dodoc ChangeLog README