From b0b2e18c3fd7adc072d06440780baa49d04bae10 Mon Sep 17 00:00:00 2001 From: Andreas Proschofsky Date: Wed, 6 Jun 2012 09:19:51 +0000 Subject: And the next GNOME 3.5.2 round... svn path=/; revision=339 --- gnome-base/gnome-shell/Manifest | 4 + ...ome-shell-3.2.1-automagic-gnome-bluetooth.patch | 44 +++++ gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild | 185 ++++++++++++++++++++ gnome-base/gnome-shell/gnome-shell-9999.ebuild | 193 +++++++++++++++++++++ 4 files changed, 426 insertions(+) create mode 100644 gnome-base/gnome-shell/Manifest create mode 100644 gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch create mode 100644 gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild create mode 100644 gnome-base/gnome-shell/gnome-shell-9999.ebuild (limited to 'gnome-base/gnome-shell') diff --git a/gnome-base/gnome-shell/Manifest b/gnome-base/gnome-shell/Manifest new file mode 100644 index 0000000..851ff43 --- /dev/null +++ b/gnome-base/gnome-shell/Manifest @@ -0,0 +1,4 @@ +AUX gnome-shell-3.2.1-automagic-gnome-bluetooth.patch 1841 RMD160 4b57dfeb42f299ef74799409132778b60ddc7a09 SHA1 4acf93b0bda58660b6c7ed5c8fdb6b06df86c035 SHA256 df5f86858b8abc08225ffb7679e829250e05a419b439b2ecad0f02bd93b670b2 +DIST gnome-shell-3.5.2.tar.xz 1259328 RMD160 55deb5a9092d1913420d915363a33fe59b9b3188 SHA1 daafbd0271a28fe9da659f0f135599cf2f2147fd SHA256 38d9b32e68e88bb2900cba1706c22fcf86914c3539d98d6a1a69aed674cbe9f4 +EBUILD gnome-shell-3.5.2.ebuild 6215 RMD160 4010b035ea7fb9b6abad4fd4e792c676f7eba0bb SHA1 e57d00e8cd1cb75e6d1da426aabd898a87ec212b SHA256 03e02cbfc4868bd389f460675f27374ceaef8ce70e4560183d2489d6ad74fc23 +EBUILD gnome-shell-9999.ebuild 6369 RMD160 900e234cb1ecbb3f1dc580c95d36630a35af9b44 SHA1 42485adff20227f3eea55a9a31721c6e3ee73d68 SHA256 2c1b51150a8b12789663d10c2d2976ed459a22433224c6f1e5951ece199bed3b diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch new file mode 100644 index 0000000..ae23a6c --- /dev/null +++ b/gnome-base/gnome-shell/files/gnome-shell-3.2.1-automagic-gnome-bluetooth.patch @@ -0,0 +1,44 @@ +From 84568fa9454f279ff519a2a11174e112786e46db Mon Sep 17 00:00:00 2001 +From: root +Date: Sun, 8 Jan 2012 13:55:05 +0000 +Subject: [PATCH] Fix automagic gnome-bluetooth dependency + +https://bugs.gentoo.org/show_bug.cgi?id=398145 + +Ed Catmur 2012-01-08 13:46:22 UTC +libgnome-bluetooth-applet is a private library so they shouldn't be linking +against it anyway. I tried to work out how to tell libtool to add it to rpath +but got totally lost. + +I'll see if I can work out how to fix the automagic gnome-bluetooth dependency +so I can at least merge USE=-bluetooth. +--- + configure.ac | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 1c64122..a699838 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -127,6 +127,8 @@ PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) + PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) + + AC_MSG_CHECKING([for bluetooth support]) ++AC_ARG_WITH([bluetooth], AS_HELP_STRING([--without-bluetooth], [Build without gnome-bluetooth library (default: auto)])) ++AS_IF([test "x$with_bluetooth" != "xno"], [ + PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir gnome-bluetooth-1.0` + BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0` +@@ -138,6 +140,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.1.0], + [AC_DEFINE([HAVE_BLUETOOTH],[0]) + AC_SUBST([HAVE_BLUETOOTH],[0]) + AC_MSG_RESULT([no])]) ++], [AC_DEFINE([HAVE_BLUETOOTH],[0]) ++ AC_SUBST([HAVE_BLUETOOTH],[0]) ++ AC_MSG_RESULT([no])]) + + PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION libedataserverui-3.0 >= $LIBEDATASERVERUI_MIN_VERSION gio-2.0) + AC_SUBST(CALENDAR_SERVER_CFLAGS) +-- +1.7.8.2 + diff --git a/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild b/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild new file mode 100644 index 0000000..606eb70 --- /dev/null +++ b/gnome-base/gnome-shell/gnome-shell-3.5.2.ebuild @@ -0,0 +1,185 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="no" +GNOME2_LA_PUNT="yes" +PYTHON_DEPEND="2:2.5" + +inherit autotools eutils gnome2 multilib pax-utils python + +DESCRIPTION="Provides core UI functions for the GNOME 3 desktop" +HOMEPAGE="http://live.gnome.org/GnomeShell" + +LICENSE="GPL-2" +SLOT="0" +IUSE="+bluetooth systemd" +KEYWORDS="~amd64 ~x86" + +# gnome-desktop-2.91.2 is needed due to header changes, db82a33 in gnome-desktop +# latest g-c-c is needed due to https://bugs.gentoo.org/show_bug.cgi?id=360057 +# libXfixes-5.0 needed for pointer barriers +COMMON_DEPEND=">=app-crypt/gcr-3.3.90[introspection] + >=dev-libs/glib-2.31.6:2 + >=dev-libs/gjs-1.31.22 + >=dev-libs/gobject-introspection-0.10.1 + >=x11-libs/gtk+-3.3.9:3[introspection] + >=media-libs/clutter-1.9.16:1.0[introspection] + >=dev-libs/folks-0.5.2 + >=dev-libs/json-glib-0.13.2 + >=dev-libs/libcroco-0.6.2:0.6 + >=gnome-base/gnome-desktop-3.5.1:3 + >=gnome-base/gsettings-desktop-schemas-2.91.91 + >=gnome-base/gnome-keyring-3.3.90 + >=gnome-base/gnome-menus-2.29.10:3[introspection] + gnome-base/libgnome-keyring + >=gnome-extra/evolution-data-server-2.91.6 + >=media-libs/gstreamer-0.10.16:0.10 + >=media-libs/gst-plugins-base-0.10.16:0.10 + >=net-im/telepathy-logger-0.2.4[introspection] + >=net-libs/telepathy-glib-0.17.5[introspection] + >=sys-auth/polkit-0.100[introspection] + >=x11-libs/libXfixes-5.0 + >=x11-wm/mutter-3.4.1[introspection] + >=x11-libs/startup-notification-0.11 + + app-misc/ca-certificates + dev-libs/dbus-glib + dev-libs/libxml2:2 + gnome-base/librsvg + media-libs/libcanberra + media-libs/mesa + media-sound/pulseaudio + net-libs/libsoup:2.4[introspection] + x11-libs/libX11 + x11-libs/gdk-pixbuf:2[introspection] + x11-libs/pango[introspection] + x11-apps/mesa-progs + + bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) + >=net-misc/networkmanager-0.8.999[introspection] + systemd? ( >=sys-apps/systemd-31 ) +" +# Runtime-only deps are probably incomplete and approximate. +# Each block: +# 1. Pull in polkit-0.101 for pretty authorization dialogs +# 2. Introspection stuff + dconf needed via imports.gi.* +# 3. gnome-session is needed for gnome-session-quit +# 4. Control shell settings +# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast +# 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-providers.c +RDEPEND="${COMMON_DEPEND} + >=sys-auth/polkit-0.101[introspection] + + >=gnome-base/dconf-0.4.1 + sys-power/upower[introspection] + + >=gnome-base/gnome-session-2.91.91 + + >=gnome-base/gnome-settings-daemon-2.91 + >=gnome-base/gnome-control-center-2.91.92-r1[bluetooth(+)?] + + >=sys-apps/accountsservice-0.6.14[introspection] + + >=app-accessibility/caribou-0.3 + + x11-misc/xdg-utils + + x11-themes/gnome-icon-theme-symbolic + + networkmanager? ( + net-misc/mobile-broadband-provider-info + sys-libs/timezone-data ) + + !systemd? ( sys-auth/consolekit ) +" +DEPEND="${COMMON_DEPEND} + >=sys-devel/gettext-0.17 + >=dev-util/intltool-0.40 + gnome-base/gnome-common + virtual/pkgconfig + !!=dev-lang/spidermonkey-1.8.2*" +# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time +# https://bugs.gentoo.org/show_bug.cgi?id=360413 + +pkg_setup() { + DOCS="AUTHORS NEWS README" + # Don't error out on warnings + G2CONF="${G2CONF} + --enable-compile-warnings=maximum + --disable-schemas-compile + --disable-jhbuild-wrapper-script + $(use_with bluetooth) + $(use_with systemd) + --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt + BROWSER_PLUGIN_DIR=${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + # Fix automagic gnome-bluetooth dep, bug #398145 + epatch "${FILESDIR}/${PN}-3.2.1-automagic-gnome-bluetooth.patch" + + 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.ams + sed -e 's/-DG_DISABLE_DEPRECATED//g' \ + -i src/Makefile.in browser-plugin/Makefile.in || die "sed failed" +} + +src_install() { + gnome2_src_install + python_convert_shebangs 2 "${ED}/usr/bin/gnome-shell-extension-tool" + + # Required for gnome-shell on hardened/PaX, bug #398941 + pax-mark mr "${ED}usr/bin/gnome-shell" +} + +pkg_postinst() { + gnome2_pkg_postinst + + if ! has_version '>=media-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," + ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version ">=x11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=x11-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 "=media-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," + ewarn "you need to either install >=media-libs/gst-plugins-good-0.10.23" + ewarn "and media-plugins/gst-plugins-vp8, or use dconf-editor to change" + ewarn "apps.gnome-shell.recorder/pipeline to what you want to use." + fi + + if ! has_version ">=x11-base/xorg-server-1.11"; then + ewarn "If you use multiple screens, it is highly recommended that you" + ewarn "upgrade to >=x11-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 "