From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Q4UQ1-00054G-22 for garchives@archives.gentoo.org; Tue, 29 Mar 2011 08:36:53 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73F5C1C104; Tue, 29 Mar 2011 08:36:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2C1A41C104 for ; Tue, 29 Mar 2011 08:36:01 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B8FFB1B41E4 for ; Tue, 29 Mar 2011 08:36:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 284D38006E for ; Tue, 29 Mar 2011 08:36:00 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/, gnome-base/gnome-shell/files/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/files/gnome-shell-fix-gnome-bluetooth.patch gnome-base/gnome-shell/gnome-shell-2.91.92.ebuild gnome-base/gnome-shell/gnome-shell-2.91.93.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ gnome-base/gnome-shell/files/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: ca6673d0fbbcf9053b251f5618d9904d335171ec Date: Tue, 29 Mar 2011 08:36:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: d16a828e346a9e39ff85eefdda93d774 commit: ca6673d0fbbcf9053b251f5618d9904d335171ec Author: Nirbheek Chauhan gentoo org> AuthorDate: Tue Mar 29 08:00:21 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Tue Mar 29 08:35:25 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dca6673d0 gnome-base/gnome-shell: 2.91.92 =E2=86=92 2.91.93 --- .../files/gnome-shell-fix-gnome-bluetooth.patch | 20 --------------= ------ ...l-2.91.92.ebuild =3D> 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.pat= ch 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) -=20 - 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-ba= se/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 =20 # 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=3D= 360057 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 @@ -41,7 +40,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.91.1[introspection] + >=3Dx11-wm/mutter-2.91.93[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 @@ -93,15 +92,6 @@ G2CONF=3D"--enable-compile-warnings=3Dmaximum --disable-schemas-compile --disable-jhbuild-wrapper-script" =20 -src_prepare() { - epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D645063 - sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || di= e - - gnome2_src_prepare -} - pkg_postinst() { gnome2_pkg_postinst if ! has_version '>=3Dmedia-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 =20 # 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=3D= 360057 COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 @@ -41,7 +40,7 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 >=3Dnet-libs/telepathy-glib-0.13.12[introspection] >=3Dnet-wireless/gnome-bluetooth-2.90.0[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-2.91.91.1[introspection] + >=3Dx11-wm/mutter-2.91.93[introspection] =20 dev-libs/dbus-glib dev-libs/libxml2:2 @@ -93,15 +92,6 @@ G2CONF=3D"--enable-compile-warnings=3Dmaximum --disable-schemas-compile --disable-jhbuild-wrapper-script" =20 -src_prepare() { - epatch "${FILESDIR}/${PN}-fix-gnome-bluetooth.patch" - - # https://bugzilla.gnome.org/show_bug.cgi?id=3D645063 - sed -e 's/settings.menu/gnomecc.menu/g' -i src/shell-app-system.c || di= e - - gnome2_src_prepare -} - pkg_postinst() { gnome2_pkg_postinst if ! has_version '>=3Dmedia-libs/gst-plugins-good-0.10.23' || \