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

Package-Manager: portage-2.1.3.11

4 files changed, 102 insertions, 14 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/Manifest b/x11-misc/superswitcher/Manifest
index 9d690186dde3..625d58528f96 100644
--- a/x11-misc/superswitcher/Manifest
+++ b/x11-misc/superswitcher/Manifest
@@ -1,15 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX superswitcher-0.5-gtk-2.11.0.patch 2300 RMD160 53df2faca0b40bf4be7dc53fecbd9ad20be9f453 SHA1 17c9814edbeb6f134cbb7a1a457ff99ff879bc62 SHA256 1461f152b376193f166b629216ffca84b6712e99a646e83290ac519ad3167e8c
+MD5 a9bcc0a1f08340b32127d8d88cf2bad1 files/superswitcher-0.5-gtk-2.11.0.patch 2300
+RMD160 53df2faca0b40bf4be7dc53fecbd9ad20be9f453 files/superswitcher-0.5-gtk-2.11.0.patch 2300
+SHA256 1461f152b376193f166b629216ffca84b6712e99a646e83290ac519ad3167e8c files/superswitcher-0.5-gtk-2.11.0.patch 2300
 DIST superswitcher-0.5.tar.gz 179935 RMD160 ffecee2afebec67630b3831950b946b74df2c95c SHA1 fd4272a1b17ac6f7f6744d9f578bd403f4506dd3 SHA256 b41aa5f94d6eec3358bc08ffb6349d472cc85c54167fb3266fde6c9f96907fa1
-EBUILD superswitcher-0.5.ebuild 694 RMD160 c57598cb3b766e93c8e2ec3769afc28f433cdaa9 SHA1 d2b3e763028c37c0df6a2a5ac63cc890a1d2925c SHA256 f4fdc3987e0a689d2929e892133c24277baf0659a70ccedc520cdb2bfb812099
-MD5 a8cd731de7f90d03a40c12f8456eccc5 superswitcher-0.5.ebuild 694
-RMD160 c57598cb3b766e93c8e2ec3769afc28f433cdaa9 superswitcher-0.5.ebuild 694
-SHA256 f4fdc3987e0a689d2929e892133c24277baf0659a70ccedc520cdb2bfb812099 superswitcher-0.5.ebuild 694
-MISC ChangeLog 388 RMD160 ed78c5ac3d0b43b0c4185d828263d73c0b82a4a5 SHA1 193008f30a07896cc204b30b00410a5755acb62a SHA256 de8cdd8a5f3477c9f6c818366c15eecb052d61fa60e6041fa9d840baf67d2228
-MD5 06661703d0bdaad81e5c58f872702ef0 ChangeLog 388
-RMD160 ed78c5ac3d0b43b0c4185d828263d73c0b82a4a5 ChangeLog 388
-SHA256 de8cdd8a5f3477c9f6c818366c15eecb052d61fa60e6041fa9d840baf67d2228 ChangeLog 388
+EBUILD superswitcher-0.5.ebuild 797 RMD160 d2b29a1d29b1a975f3681f23b9c8d218f54f15e3 SHA1 24375c1634a353cc75e387b981c12278090ba37d SHA256 f5365e066c7438d95214aed9644272c57886acf913521756c19883a6318ee77f
+MD5 fee17bb8102feed770143f875b338c69 superswitcher-0.5.ebuild 797
+RMD160 d2b29a1d29b1a975f3681f23b9c8d218f54f15e3 superswitcher-0.5.ebuild 797
+SHA256 f5365e066c7438d95214aed9644272c57886acf913521756c19883a6318ee77f superswitcher-0.5.ebuild 797
+MISC ChangeLog 604 RMD160 629f68054dbde84eaa725ab6ef4f0a26aafed52a SHA1 19a4b2b3961459f8f9dca7a05dd616fed7fcdc00 SHA256 406a62350bb6a42b35804812dce518c07673cf6e6584f38060567b479c4a9f18
+MD5 3e0c4894bb5e3d19b473ef56549a59b1 ChangeLog 604
+RMD160 629f68054dbde84eaa725ab6ef4f0a26aafed52a ChangeLog 604
+SHA256 406a62350bb6a42b35804812dce518c07673cf6e6584f38060567b479c4a9f18 ChangeLog 604
 MISC metadata.xml 497 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be SHA1 934d789f9dc546eb32f8b5d775b48ae588aaa032 SHA256 177d65f1082f9f1cf5c1ab3e8916b829933b4b9b326ebc98d01e765a87efb86a
 MD5 e5661fe73fe276b39827a6991d4d3ed7 metadata.xml 497
 RMD160 e16d1cec2a516847390f8bac0f776ec75176b5be metadata.xml 497
@@ -18,9 +22,9 @@ MD5 d862c4f9a1c51449a5591fa0ea3a6694 files/digest-superswitcher-0.5 253
 RMD160 f81fa553b6d12c2af42d7265934dbec7bcca0410 files/digest-superswitcher-0.5 253
 SHA256 ef67c15332faa7c3e1792f5bf8d015a111bd8c518d7f8e2fa7391fbdc40d4128 files/digest-superswitcher-0.5 253
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGj3oxI1lqEGTUzyQRAvQ4AJ9ieznL+d0484wScvMoDiSIEoSZcQCglkeS
-8Y3dk4cqB1JvzhEaIxMZMyw=
-=jW3G
+iD8DBQFHAUzjI1lqEGTUzyQRAqF/AKCJhMS36I4NC3GLw0RKElh0qSsWXACfRnDq
+96QA9wdEdkD8DUjfD9POCyE=
+=Hssk
 -----END PGP SIGNATURE-----
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