[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/

[Nirbheek Chauhan]

commit:     ca6673d0fbbcf9053b251f5618d9904d335171ec
Author:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 08:00:21 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 08:35:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=ca6673d0

gnome-base/gnome-shell: 2.91.92 → 2.91.93

---
 .../files/gnome-shell-fix-gnome-bluetooth.patch    |   20 --------------------
 ...l-2.91.92.ebuild => gnome-shell-2.91.93.ebuild} |   12 +-----------
 gnome-base/gnome-shell/gnome-shell-9999.ebuild     |   12 +-----------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/gnome-base/gnome-shell/files/gnome-shell-fix-gnome-bluetooth.patch b/gnome-base/gnome-shell/files/gnome-shell-fix-gnome-bluetooth.patch
deleted file mode 100644
index 3a6e994..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-fix-gnome-bluetooth.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/main.c
-+++ src/main.c
-@@ -458,3 +458,17 @@ main (int argc, char **argv)
- 
-   return meta_run ();
- }
-+
-+#if HAVE_BLUETOOTH
-+/* HACK:
-+   Add a non-static function that calls into libgnome-bluetooth-applet.so,
-+   to avoid the linker being too smart and removing the dependency.
-+   This function is never actually called.
-+*/
-+extern GType bluetooth_applet_get_type(void);
-+void _shell_link_to_bluetooth(void);
-+
-+void _shell_link_to_bluetooth(void) {
-+  bluetooth_applet_get_type();
-+}
-+#endif

diff --git a/gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild b/gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild
similarity index 90%
rename from gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild
rename to gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild
index ca39314..b31d84a 100644
--- a/gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild
@@ -23,7 +23,6 @@ fi
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest mutter is needed due to commit 474ff2e9 and commit 079953c3
 # latest gsettings-desktop-schemas is needed due to commit 602fa1c6
 # latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
 COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
@@ -41,7 +40,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=net-libs/telepathy-glib-0.13.12[introspection]
 	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-2.91.91.1[introspection]
+	>=x11-wm/mutter-2.91.93[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
@@ -93,15 +92,6 @@ G2CONF="--enable-compile-warnings=maximum
 --disable-schemas-compile
 --disable-jhbuild-wrapper-script"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=645063
-	sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || die
-
-	gnome2_src_prepare
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \

diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index ca39314..b31d84a 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -23,7 +23,6 @@ fi
 
 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop
 # FIXME: Automagic gnome-bluetooth[introspection] support.
-# latest mutter is needed due to commit 474ff2e9 and commit 079953c3
 # latest gsettings-desktop-schemas is needed due to commit 602fa1c6
 # latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057
 COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
@@ -41,7 +40,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.25.9:2
 	>=net-libs/telepathy-glib-0.13.12[introspection]
 	>=net-wireless/gnome-bluetooth-2.90.0[introspection]
 	>=sys-auth/polkit-0.100[introspection]
-	>=x11-wm/mutter-2.91.91.1[introspection]
+	>=x11-wm/mutter-2.91.93[introspection]
 
 	dev-libs/dbus-glib
 	dev-libs/libxml2:2
@@ -93,15 +92,6 @@ G2CONF="--enable-compile-warnings=maximum
 --disable-schemas-compile
 --disable-jhbuild-wrapper-script"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch"
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=645063
-	sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || die
-
-	gnome2_src_prepare
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if ! has_version '>=media-libs/gst-plugins-good-0.10.23' || \