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 1SC5Ak-00023K-TY for garchives@archives.gentoo.org; Mon, 26 Mar 2012 08:21:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0500DE05A4; Mon, 26 Mar 2012 08:20:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id BB2F9E05A4 for ; Mon, 26 Mar 2012 08:20:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EDC551B406E for ; Mon, 26 Mar 2012 08:20:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id AA325E5432 for ; Mon, 26 Mar 2012 08:20:06 +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: <1332749977.c4748e73924d22cb2216701fe4fef9b4445b4fd5.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-shell/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild gnome-base/gnome-shell/gnome-shell-9999.ebuild X-VCS-Directories: gnome-base/gnome-shell/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: c4748e73924d22cb2216701fe4fef9b4445b4fd5 X-VCS-Branch: master Date: Mon, 26 Mar 2012 08:20:06 +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: 58d2f356-9dbe-486c-9da7-4213908ab4fb X-Archives-Hash: 4dce04cf63412f1feb7705104c4ec816 commit: c4748e73924d22cb2216701fe4fef9b4445b4fd5 Author: Nirbheek Chauhan gentoo org> AuthorDate: Sun Mar 25 05:36:48 2012 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Mon Mar 26 08:19:37 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3Dc4748e73 Add gnome-base/gnome-shell-3.3.92, incomplete * Patches to amke NM and Bluetooth optional need to be ported --- ...shell-9999.ebuild =3D> gnome-shell-3.3.92.ebuild} | 115 ++++++++++++= +++----- gnome-base/gnome-shell/gnome-shell-9999.ebuild | 115 ++++++++++++++= +----- 2 files changed, 178 insertions(+), 52 deletions(-) diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild b/gnome-base/= gnome-shell/gnome-shell-3.3.92.ebuild similarity index 58% copy from gnome-base/gnome-shell/gnome-shell-9999.ebuild copy to gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild index 6cffe0b..1fc49c6 100644 --- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild +++ b/gnome-base/gnome-shell/gnome-shell-3.3.92.ebuild @@ -7,7 +7,7 @@ GCONF_DEBUG=3D"no" GNOME2_LA_PUNT=3D"yes" PYTHON_DEPEND=3D"2:2.5" =20 -inherit gnome2 python +inherit autotools eutils gnome2 multilib pax-utils python if [[ ${PV} =3D 9999 ]]; then inherit gnome2-live fi @@ -17,6 +17,8 @@ HOMEPAGE=3D"http://live.gnome.org/GnomeShell" =20 LICENSE=3D"GPL-2" SLOT=3D"0" +# TODO: reinstate this +#IUSE=3D"+bluetooth +networkmanager" IUSE=3D"" if [[ ${PV} =3D 9999 ]]; then KEYWORDS=3D"" @@ -25,48 +27,51 @@ else fi =20 # gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome= -desktop -# FIXME: Automagic gnome-bluetooth[introspection] support. -# 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 # libXfixes-5.0 needed for pointer barriers -COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 - >=3Ddev-libs/gjs-1.29.18 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.6:2 + >=3Ddev-libs/gjs-1.31.22 >=3Ddev-libs/gobject-introspection-0.10.1 - x11-libs/gdk-pixbuf:2[introspection] - >=3Dx11-libs/gtk+-3.0.0:3[introspection] - >=3Dmedia-libs/clutter-1.7.5:1.0[introspection] - app-misc/ca-certificates + >=3Dx11-libs/gtk+-3.3.9:3[introspection] + >=3Dmedia-libs/clutter-1.9.16:1.0[introspection] >=3Ddev-libs/folks-0.5.2 >=3Ddev-libs/json-glib-0.13.2 + >=3Ddev-libs/libcroco-0.6.2:0.6 >=3Dgnome-base/gnome-desktop-2.91.2:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 - gnome-base/libgnome-keyring + >=3Dgnome-base/gnome-keyring-3.3.90 + >=3Dgnome-base/gnome-menus-2.29.10:3[introspection] >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16:0.10 >=3Dmedia-libs/gst-plugins-base-0.10.16:0.10 >=3Dnet-im/telepathy-logger-0.2.4[introspection] - net-libs/libsoup:2.4[introspection] - >=3Dnet-libs/telepathy-glib-0.15.5[introspection] - >=3Dnet-misc/networkmanager-0.8.999[introspection] - >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] + >=3Dnet-libs/telepathy-glib-0.17.5[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-3.2.1[introspection] + >=3Dx11-libs/libXfixes-5.0 + >=3Dx11-wm/mutter-3.3.92[introspection] + >=3Dx11-libs/startup-notification-0.11 =20 + app-misc/ca-certificates dev-libs/dbus-glib dev-libs/libxml2:2 - x11-libs/pango[introspection] - >=3Ddev-libs/libcroco-0.6.2:0.6 - - gnome-base/gconf:2[introspection] - >=3Dgnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra + media-libs/mesa media-sound/pulseaudio - - >=3Dx11-libs/startup-notification-0.11 + net-libs/libsoup:2.4[introspection] x11-libs/libX11 - >=3Dx11-libs/libXfixes-5.0 - x11-apps/mesa-progs" + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-apps/mesa-progs + + >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] + gnome-base/libgnome-keyring + >=3Dnet-misc/networkmanager-0.8.999[introspection] +" +# bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] ) +# networkmanager? ( +# gnome-base/libgnome-keyring +# >=3Dnet-misc/networkmanager-0.8.999[introspection] )" # Runtime-only deps are probably incomplete and approximate. # Each block: # 1. Pull in polkit-0.101 for pretty authorization dialogs @@ -76,6 +81,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 # 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fas= t # user switching with gdm-3.1.x) # 6. caribou needed for on-screen keyboard +# 7. xdg-utils needed for xdg-open, used by extension tool +# 8. gnome-icon-theme-symbolic neeed for various icons +# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-prov= iders.c RDEPEND=3D"${COMMON_DEPEND} >=3Dsys-auth/polkit-0.101[introspection] =20 @@ -90,7 +98,18 @@ RDEPEND=3D"${COMMON_DEPEND} =20 >=3Dsys-apps/accountsservice-0.6.14 =20 - >=3Dapp-accessibility/caribou-0.3" + >=3Dapp-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + x11-themes/gnome-icon-theme-symbolic + + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data +" +# networkmanager? ( +# net-misc/mobile-broadband-provider-info +# sys-libs/timezone-data )" DEPEND=3D"${COMMON_DEPEND} >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 @@ -108,13 +127,23 @@ pkg_setup() { --disable-schemas-compile --disable-jhbuild-wrapper-script --with-ca-certificates=3D${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins + --without-systemd" + # TODO: systemd support python_set_active_version 2 python_pkg_setup } =20 src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + #epatch "${FILESDIR}/${PN}-3.4.0-automagic-gnome-bluetooth.patch" + + # Make networkmanager optional, bug #398593 + #epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch" + + #[[ ${PV} !=3D 9999 ]] && eautoreconf gnome2_src_prepare + # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 # Note: sed Makefile.in because it is generated from several Makefile.a= ms sed -e 's/-DG_DISABLE_DEPRECATED//g' \ @@ -124,10 +153,14 @@ src_prepare() { src_install() { gnome2_src_install python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}usr/bin/gnome-shell" } =20 pkg_postinst() { gnome2_pkg_postinst + if ! has_version '>=3Dmedia-libs/gst-plugins-good-0.10.23' || \ ! has_version 'media-plugins/gst-plugins-vp8'; then ewarn "To make use of GNOME Shell's built-in screen recording utility,= " @@ -135,4 +168,34 @@ pkg_postinst() { ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi + + if ! has_version ">=3Dx11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=3Dx11-base/xorg-server-1.11 to be able to make use= of" + ewarn "pointer barriers which will make it easier to use hot corners." + fi + + if has_version "=3Ddev-libs/glib-2.25.9:2 - >=3Ddev-libs/gjs-1.29.18 +COMMON_DEPEND=3D">=3Ddev-libs/glib-2.31.6:2 + >=3Ddev-libs/gjs-1.31.22 >=3Ddev-libs/gobject-introspection-0.10.1 - x11-libs/gdk-pixbuf:2[introspection] - >=3Dx11-libs/gtk+-3.0.0:3[introspection] - >=3Dmedia-libs/clutter-1.7.5:1.0[introspection] - app-misc/ca-certificates + >=3Dx11-libs/gtk+-3.3.9:3[introspection] + >=3Dmedia-libs/clutter-1.9.16:1.0[introspection] >=3Ddev-libs/folks-0.5.2 >=3Ddev-libs/json-glib-0.13.2 + >=3Ddev-libs/libcroco-0.6.2:0.6 >=3Dgnome-base/gnome-desktop-2.91.2:3 >=3Dgnome-base/gsettings-desktop-schemas-2.91.91 - gnome-base/libgnome-keyring + >=3Dgnome-base/gnome-keyring-3.3.90 + >=3Dgnome-base/gnome-menus-2.29.10:3[introspection] >=3Dgnome-extra/evolution-data-server-2.91.6 >=3Dmedia-libs/gstreamer-0.10.16:0.10 >=3Dmedia-libs/gst-plugins-base-0.10.16:0.10 >=3Dnet-im/telepathy-logger-0.2.4[introspection] - net-libs/libsoup:2.4[introspection] - >=3Dnet-libs/telepathy-glib-0.15.5[introspection] - >=3Dnet-misc/networkmanager-0.8.999[introspection] - >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] + >=3Dnet-libs/telepathy-glib-0.17.5[introspection] >=3Dsys-auth/polkit-0.100[introspection] - >=3Dx11-wm/mutter-3.2.1[introspection] + >=3Dx11-libs/libXfixes-5.0 + >=3Dx11-wm/mutter-3.3.92[introspection] + >=3Dx11-libs/startup-notification-0.11 =20 + app-misc/ca-certificates dev-libs/dbus-glib dev-libs/libxml2:2 - x11-libs/pango[introspection] - >=3Ddev-libs/libcroco-0.6.2:0.6 - - gnome-base/gconf:2[introspection] - >=3Dgnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra + media-libs/mesa media-sound/pulseaudio - - >=3Dx11-libs/startup-notification-0.11 + net-libs/libsoup:2.4[introspection] x11-libs/libX11 - >=3Dx11-libs/libXfixes-5.0 - x11-apps/mesa-progs" + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-apps/mesa-progs + + >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] + gnome-base/libgnome-keyring + >=3Dnet-misc/networkmanager-0.8.999[introspection] +" +# bluetooth? ( >=3Dnet-wireless/gnome-bluetooth-3.1.0[introspection] ) +# networkmanager? ( +# gnome-base/libgnome-keyring +# >=3Dnet-misc/networkmanager-0.8.999[introspection] )" # Runtime-only deps are probably incomplete and approximate. # Each block: # 1. Pull in polkit-0.101 for pretty authorization dialogs @@ -76,6 +81,9 @@ COMMON_DEPEND=3D">=3Ddev-libs/glib-2.25.9:2 # 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fas= t # user switching with gdm-3.1.x) # 6. caribou needed for on-screen keyboard +# 7. xdg-utils needed for xdg-open, used by extension tool +# 8. gnome-icon-theme-symbolic neeed for various icons +# 9. mobile-broadband-provider-info, timezone-data for shell-mobile-prov= iders.c RDEPEND=3D"${COMMON_DEPEND} >=3Dsys-auth/polkit-0.101[introspection] =20 @@ -90,7 +98,18 @@ RDEPEND=3D"${COMMON_DEPEND} =20 >=3Dsys-apps/accountsservice-0.6.14 =20 - >=3Dapp-accessibility/caribou-0.3" + >=3Dapp-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + x11-themes/gnome-icon-theme-symbolic + + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data +" +# networkmanager? ( +# net-misc/mobile-broadband-provider-info +# sys-libs/timezone-data )" DEPEND=3D"${COMMON_DEPEND} >=3Dsys-devel/gettext-0.17 >=3Ddev-util/pkgconfig-0.22 @@ -108,13 +127,23 @@ pkg_setup() { --disable-schemas-compile --disable-jhbuild-wrapper-script --with-ca-certificates=3D${EPREFIX}/etc/ssl/certs/ca-certificates.crt - BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + BROWSER_PLUGIN_DIR=3D${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins + --without-systemd" + # TODO: systemd support python_set_active_version 2 python_pkg_setup } =20 src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + #epatch "${FILESDIR}/${PN}-3.4.0-automagic-gnome-bluetooth.patch" + + # Make networkmanager optional, bug #398593 + #epatch "${FILESDIR}/${PN}-3.4.0-optional-networkmanager.patch" + + #[[ ${PV} !=3D 9999 ]] && eautoreconf gnome2_src_prepare + # Drop G_DISABLE_DEPRECATED for sanity on glib upgrades; bug #384765 # Note: sed Makefile.in because it is generated from several Makefile.a= ms sed -e 's/-DG_DISABLE_DEPRECATED//g' \ @@ -124,10 +153,14 @@ src_prepare() { src_install() { gnome2_src_install python_convert_shebangs 2 "${D}"/usr/bin/gnome-shell-extension-tool + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}usr/bin/gnome-shell" } =20 pkg_postinst() { gnome2_pkg_postinst + if ! has_version '>=3Dmedia-libs/gst-plugins-good-0.10.23' || \ ! has_version 'media-plugins/gst-plugins-vp8'; then ewarn "To make use of GNOME Shell's built-in screen recording utility,= " @@ -135,4 +168,34 @@ pkg_postinst() { ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to chang= e" ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." fi + + if ! has_version ">=3Dx11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=3Dx11-base/xorg-server-1.11 to be able to make use= of" + ewarn "pointer barriers which will make it easier to use hot corners." + fi + + if has_version "