Add patch based on upstream subversion commit to compile with gtk >= 2.11.0, bug #190489.

(Portage version: 2.1.3.11)

3 files changed, 86 insertions, 2 deletions

diff --git a/x11-misc/superswitcher/ChangeLog b/x11-misc/superswitcher/ChangeLog
index 4a74b3420248..ed9abd37854c 100644
--- a/x11-misc/superswitcher/ChangeLog
+++ b/x11-misc/superswitcher/ChangeLog
@@ -1,6 +1,11 @@
 # 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.1 2007/07/07 11:34:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/ChangeLog,v 1.2 2007/10/01 19:39:07 swegener Exp $
+
+  01 Oct 2007; Sven Wegener <swegener@gentoo.org>
+  +files/superswitcher-0.5-gtk-2.11.0.patch, superswitcher-0.5.ebuild:
+  Add patch based on upstream subversion commit to compile with gtk >=
+  2.11.0, bug #190489.
 
 *superswitcher-0.5 (07 Jul 2007)
 
diff --git a/x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch b/x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch
new file mode 100644
index 000000000000..1c72de76f0d7
--- /dev/null
+++ b/x11-misc/superswitcher/files/superswitcher-0.5-gtk-2.11.0.patch
@@ -0,0 +1,70 @@
+This patch is based on upstream Subversion commit 28, modified to use
+GTK_CHECK_VERSION to avoid patching configure.in.
+
+--- superswitcher/src/popup.c
++++ superswitcher/src/popup.c
+@@ -682,8 +682,12 @@
+   gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+   image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_MENU);
+   gtk_container_add (GTK_CONTAINER (button), image);
++#if GTK_CHECK_VERSION(2, 11, 0)
++  gtk_widget_set_tooltip_text (GTK_WIDGET (button), tooltip);
++#else
+   gtk_tooltips_set_tip (GTK_TOOLTIPS (popup->screen->tooltips),
+     button, tooltip, "");
++#endif
+   g_signal_connect (G_OBJECT (button), "clicked", callback, popup);
+ 
+   return button;
+--- superswitcher/src/screen.c
++++ superswitcher/src/screen.c
+@@ -906,7 +906,9 @@
+   screen->label_max_width_chars = 256;
+   update_window_label_width (screen);
+ 
++#if !GTK_CHECK_VERSION(2, 11, 0) 
+   screen->tooltips = gtk_tooltips_new ();
++#endif
+ 
+   screen->pointer_needs_recentering_on_focus_change = FALSE;
+ #ifdef HAVE_GCONF
+--- superswitcher/src/screen.h
++++ superswitcher/src/screen.h
+@@ -47,7 +47,9 @@
+ 
+   int   label_max_width_chars;
+ 
++#if !GTK_CHECK_VERSION(2, 11, 0) 
+   GtkTooltips *   tooltips;
++#endif
+ 
+   gboolean   pointer_needs_recentering_on_focus_change;
+ };
+--- superswitcher/src/window.c
++++ superswitcher/src/window.c
+@@ -215,8 +215,12 @@
+   window = (SSWindow *) data;
+   gtk_label_set_text (GTK_LABEL (window->label),
+     wnck_window_get_name (window->wnck_window));
++#if GTK_CHECK_VERSION(2, 11, 0) 
++  gtk_widget_set_tooltip_text (window->widget, wnck_window_get_name (wnck_window));
++#else
+   gtk_tooltips_set_tip (GTK_TOOLTIPS (window->workspace->screen->tooltips),
+     window->widget, wnck_window_get_name (wnck_window), "");
++#endif
+   gtk_widget_queue_draw (gtk_widget_get_toplevel (window->widget));
+ }
+ 
+@@ -301,8 +305,12 @@
+ 
+   eventbox = gtk_event_box_new ();
+   gtk_event_box_set_visible_window (GTK_EVENT_BOX (eventbox), FALSE);
++#if GTK_CHECK_VERSION(2, 11, 0) 
++  gtk_widget_set_tooltip_text (eventbox, wnck_window_get_name (wnck_window));
++#else
+   gtk_tooltips_set_tip (GTK_TOOLTIPS (workspace->screen->tooltips),
+     eventbox, wnck_window_get_name (wnck_window), "");
++#endif
+ 
+   hbox = gtk_hbox_new (FALSE, 3);
+   gtk_container_add (GTK_CONTAINER (eventbox), hbox);
diff --git a/x11-misc/superswitcher/superswitcher-0.5.ebuild b/x11-misc/superswitcher/superswitcher-0.5.ebuild
index e5204f6332d6..9471770ca389 100644
--- a/x11-misc/superswitcher/superswitcher-0.5.ebuild
+++ b/x11-misc/superswitcher/superswitcher-0.5.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.5.ebuild,v 1.1 2007/07/07 11:34:04 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/superswitcher/superswitcher-0.5.ebuild,v 1.2 2007/10/01 19:39:07 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}-gtk-2.11.0.patch
+}
+
 src_install() {
 	emake -j1 install DESTDIR="${D}" || die "emake install failed"
 	dodoc ChangeLog README