Fix compilation against gtk+-2.22 by replacing eel_gdk_window_focus() with gdk_window_focus()

Package-Manager: portage-2.1.9.10/cvs/Linux x86_64

4 files changed, 162 insertions, 12 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index a1d80b87ce7c..128f8b3ef8b2 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.355 2010/09/11 18:43:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.356 2010/09/26 17:10:20 nirbheek Exp $
+
+*nautilus-2.30.1-r2 (26 Sep 2010)
+
+  26 Sep 2010; <nirbheek@gentoo.org> +nautilus-2.30.1-r2.ebuild,
+  +files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch:
+  Fix compilation against gtk+-2.22 by replacing eel_gdk_window_focus() with
+  gdk_window_focus()
 
   11 Sep 2010; Joseph Jezak <josejx@gentoo.org> nautilus-2.30.1-r1.ebuild:
   Marked ppc for bug #324077.
diff --git a/gnome-base/nautilus/Manifest b/gnome-base/nautilus/Manifest
index 5ab476cefb10..cb6dade82975 100644
--- a/gnome-base/nautilus/Manifest
+++ b/gnome-base/nautilus/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX nautilus-2.24.2-filechooser-icon.patch 1630 RMD160 8f7fc892670a5b85f0a176bff89199c5a09e1a69 SHA1 defb885cbe8ba014d8787a08b3c703ed54ee829b SHA256 e86ac2512ae66ba3b4ec285f0a88b58387e64d3490c4172f03fd846881ebcb2f
 AUX nautilus-2.24.2-playlist-preview.patch 1036 RMD160 16e9a0239f1f162cb9683cf08f0d9e1b2c46230f SHA1 31ddf4cb3a1eb940aebedbbed9b4822759d361f5 SHA256 cddf52194fc6ae542dbb58b047fd5b65f20eb874f0468ec448b35ec0a6bd498a
 AUX nautilus-2.24.2-scrollbars.patch 732 RMD160 6856d895ec70d6e24f3bd3f112141dceb25eb896 SHA1 62570bad726066dd0238aee0a203fa3895f3a556 SHA256 93f5dacec1a88fbbdb32fe75fde52301053f5c29aadb483ad1d59fb7c107b344
@@ -9,6 +6,7 @@ AUX nautilus-2.26.2-change-reg-desktop-file-with-no-desktop.patch 1421 RMD160 e4
 AUX nautilus-2.26.3-thumbnail-zoom-level.patch 3411 RMD160 296a997116f96100d067c6dfd7a6e936c2946d90 SHA1 e2477c779e182f6609e08167ceafab54d081fd79 SHA256 400d809f16d0dd470ea287cd288ed378c2afcbf45ead48639d7b5b1b0a71828c
 AUX nautilus-2.26.4-file-roller-drag-n-drop.patch 2746 RMD160 0c2d7bc4627c840a167db6b3f852c7d19996647d SHA1 9bcb0b677714c924b3c31b6d22c7581dd7fac4a5 SHA256 b107464ef573c7d1036eb10562b5d62faf015d8ced9fb335d4639fdcb8c93b33
 AUX nautilus-2.27.4-change-reg-desktop-file-with-no-desktop.patch 1396 RMD160 7efbc47c5f4ac647a15a56a26f80898e8ec896d0 SHA1 24f5281406066fc7fd5ffda23a061144c3667fe1 SHA256 ae9f91dddbbe2d562f5f21786daec6468b8788ece48419cce438d13201eef251
+AUX nautilus-2.30.1-remove-eel-gdk-window-focus.patch 2138 RMD160 7e10b009e6b137e99fac1566d5b51bc26ab8b88d SHA1 4fc6911c5060fd38d0b8958e734a1d511fc66439 SHA256 3ee7e7152e9a6fda1604c1eccaf8f5c5a1bd638e0f109f669c7d476d7f1c825c
 AUX nautilus-2.30.1-unmount-entries.patch 3048 RMD160 06ff25300206c097e7589221b0875847a63ac454 SHA1 b4090aecb652825b36a860fcd70583225489b934 SHA256 95a60074602cfb5c3855474c4f7c35e3814fe1c536a2d8a404ef1211fa0e85c3
 DIST nautilus-2.26.4.tar.bz2 5815912 RMD160 4af723021ece1fb9a37bd3bcc2de903b6c7dca61 SHA1 7eab587e0b88e3eab8196f64596207a1dc1c4b33 SHA256 63dc4f76925f73bf17aafcffbac87f272ac2a13fb098c8ddf5bd70cd80a6ab58
 DIST nautilus-2.28.4.tar.bz2 6045403 RMD160 8960342fa3a6f976e283f338c060896d67a4c028 SHA1 f6db915e725e6f45cd2d3f933eb251499dccf038 SHA256 3aceda1c36acda20a0f9ce75165a31b1285a7aca2097d0583e340ccb2b01ea87
@@ -17,12 +15,6 @@ EBUILD nautilus-2.26.4-r1.ebuild 2831 RMD160 a80a223d7cd31e3793a9d5e3964be86d6d6
 EBUILD nautilus-2.28.4-r1.ebuild 2718 RMD160 737f27cea2f968dbff43c41c68f71dd39285c59e SHA1 c894791185f958272c5878e524bd9c5e2c9c2f44 SHA256 6054f88481878b70ab5af9f6d80cc2fc6d14c02d469638ac479339bfbeec51a5
 EBUILD nautilus-2.28.4-r2.ebuild 2771 RMD160 608c3666d66fc6d13cf0515d013f1f306d99f121 SHA1 6cad9d3b579b73442badf56d2772d430fdf442c6 SHA256 b118ba1358d77712b7176f831b8512deb39b746cc4604a62575e5126f7d04b48
 EBUILD nautilus-2.30.1-r1.ebuild 2231 RMD160 3230f5fea957d2b2384412e3074c56d87a6794ec SHA1 0eaf78cac9a7e9dc5324decbd8030561e063fda5 SHA256 6d9a28dc5991f0bcda61339fd55d436b8467b99065c01e68dc9b15cc562c227b
-MISC ChangeLog 51416 RMD160 b7738f8990fb11141091aa48685807de57256686 SHA1 6b7a0864b9dfc9efd2d9d20733373604180c25fb SHA256 a71e1ff67ba3b55f26cad9978edfb5ea8bc223a5e633c60fcf8d28df5922e840
+EBUILD nautilus-2.30.1-r2.ebuild 2342 RMD160 6f0f3fc776e210a41abcfa0e597728b93c83c1d1 SHA1 b7ad8bd886849c0b1cae1cea0a4d6aea25751f59 SHA256 e199e71ae5dc43560f4c0542d8e5097d78ed437bed98889bd80d5b91ca34212f
+MISC ChangeLog 51677 RMD160 ce7ee3d4683d9a78ef4767f3b81da56a30b197cc SHA1 7baa7a84b5307804c7483bffb65b84c717b72954 SHA256 b7e708abb6c1ea00fdc06ff19e5335d7239bf4086e85d40b56e51dad7f4db0ab
 MISC metadata.xml 418 RMD160 950ac903bccee9717bb2aa3ab8b1269ad96d7fb2 SHA1 b8c46a622a2725f2860557b2a1c2ffee0ff000ff SHA256 eecdd5e524b283e5cf158c17c89828a17f67cdd64e2c552a7c5ae9a4dd977ebc
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkyLzMoACgkQcsIHjyDViGRP+QCgvLXsQVOsiDJKaZgWxYMhrBql
-zlMAn1ty8c5GJse7+1o0UraALZgQlb2Y
-=ogCM
------END PGP SIGNATURE-----
diff --git a/gnome-base/nautilus/files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch b/gnome-base/nautilus/files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch
new file mode 100644
index 000000000000..969d38b96f9b
--- /dev/null
+++ b/gnome-base/nautilus/files/nautilus-2.30.1-remove-eel-gdk-window-focus.patch
@@ -0,0 +1,62 @@
+Fix compile failure with gtk+-2.22 by removing eel_gdk_window_focus.
+ * Patches **ported** from master repository, not needed 2.90 onwards
+ * Might be needed in 2.32
+
+--
+From 7e8d1dfa6a17fe9189bf2489b735cd6462f03571 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Sat, 21 Aug 2010 16:57:15 +0000
+Subject: [eel] remove eel_gdk_window_focus
+
+---
+From 6b06e0e27ca1cf29afd4fac716c58e15928a8ff8 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc@gnome.org>
+Date: Sat, 21 Aug 2010 16:56:57 +0000
+Subject: icon-container: use gdk_window_focus
+
+---
+--- eel/eel-gdk-extensions.c
++++ eel/eel-gdk-extensions.c
+@@ -585,19 +585,7 @@
+ 	 * the focus at this point. Do a little X trickery to
+ 	 * ensure it is focused.
+ 	 */
+-	eel_gdk_window_focus (window, GDK_CURRENT_TIME);
+-}
+-
+-void
+-eel_gdk_window_focus (GdkWindow *window, guint32 timestamp)
+-{
+-	gdk_error_trap_push ();
+-	XSetInputFocus (GDK_DISPLAY (),
+-			GDK_WINDOW_XWINDOW (window),
+-			RevertToParent,
+-			timestamp);
+-	gdk_flush();
+-	gdk_error_trap_pop ();
++	gdk_window_focus (window, GDK_CURRENT_TIME);
+ }
+ 
+ void
+--- eel/eel-gdk-extensions.h
++++ eel/eel-gdk-extensions.h
+@@ -137,8 +137,6 @@
+ /* Misc GdkWindow helper functions */
+ void                eel_gdk_window_bring_to_front          (GdkWindow           *window);
+ void                eel_gdk_window_set_invisible_cursor    (GdkWindow           *window);
+-void                eel_gdk_window_focus                   (GdkWindow           *window,
+-							    guint32              timestamp);
+ void                eel_gdk_window_set_wm_protocols        (GdkWindow           *window,
+ 							    GdkAtom             *protocols,
+ 							    int                  nprotocols);
+--- libnautilus-private/nautilus-icon-container.c
++++ libnautilus-private/nautilus-icon-container.c
+@@ -4475,7 +4475,7 @@
+ 	/* Ensure the window itself is focused.. */
+ 	toplevel = gtk_widget_get_toplevel (GTK_WIDGET (container));
+ 	if (toplevel != NULL && gtk_widget_get_realized (toplevel)) {
+-		eel_gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
++		gdk_window_focus (toplevel->window, GDK_CURRENT_TIME);
+ 	}
+ 
+ 	return TRUE;
diff --git a/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild b/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild
new file mode 100644
index 000000000000..0cfeb7525175
--- /dev/null
+++ b/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.30.1-r2.ebuild,v 1.1 2010/09/26 17:10:20 nirbheek Exp $
+
+EAPI="2"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A file manager for the GNOME desktop"
+HOMEPAGE="http://www.gnome.org/projects/nautilus/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc gnome xmp"
+
+RDEPEND=">=dev-libs/glib-2.24.0
+	>=gnome-base/gnome-desktop-2.29.91
+	>=x11-libs/pango-1.1.2
+	>=x11-libs/gtk+-2.20.0
+	>=dev-libs/libxml2-2.4.7
+	>=media-libs/libexif-0.5.12
+	>=gnome-base/gconf-2.0
+	dev-libs/libunique
+	dev-libs/dbus-glib
+	x11-libs/libXft
+	x11-libs/libXrender
+	xmp? ( >=media-libs/exempi-2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-lang/perl-5
+	sys-devel/gettext
+	>=dev-util/pkgconfig-0.9
+	>=dev-util/intltool-0.40.1
+	doc? ( >=dev-util/gtk-doc-1.4 )"
+# For eautoreconf
+#	gnome-base/gnome-common
+#	dev-util/gtk-doc-am"
+
+PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
+	>=gnome-base/gvfs-0.1.2"
+
+DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-packagekit
+		$(use_enable xmp)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove crazy CFLAGS
+	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
+		|| die "sed 4 failed"
+
+	# Fix nautilus flipping-out with --no-desktop -- bug 266398
+	epatch "${FILESDIR}/${PN}-2.27.4-change-reg-desktop-file-with-no-desktop.patch"
+
+	# Do not show Unmount when showing Eject/Safe removal
+	epatch "${FILESDIR}/${P}-unmount-entries.patch"
+
+	# Fixes compilation with gtk+-2.22
+	epatch "${FILESDIR}/${PN}-2.30.1-remove-eel-gdk-window-focus.patch"
+}
+
+src_test() {
+	addwrite "/root/.gnome2_private"
+	unset SESSION_MANAGER
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	Xemake check || die "Test phase failed"
+}
+
+src_install() {
+	gnome2_src_install
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "nautilus can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview"
+}