commit: be235b8f86137da0a471b6736744e47047a6b8d5
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 12 21:48:30 2014 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 22:00:20 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=be235b8f
gnome-base/gnome-shell: 3.10.4-r2 → 3.12.0
---
.../gnome-shell-3.10-networkmanager-flag.patch | 228 ---------------------
.../files/gnome-shell-3.10.4-bluetooth-gold.patch | 31 +++
...patch => gnome-shell-3.12-bluetooth-flag.patch} | 32 +--
...l-3.10.2.1.ebuild => gnome-shell-3.12.0.ebuild} | 35 ++--
gnome-base/gnome-shell/gnome-shell-9999.ebuild | 31 +--
5 files changed, 83 insertions(+), 274 deletions(-)
diff --git
a/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch
b/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch
deleted file mode 100644
index 4e28835..0000000
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10-networkmanager-flag.patch
+++ /dev/null
@@ -1,228 +0,0 @@
-From 2ca59eb6e8ca9ba76757ede04e734c743aa21769 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <e...@gentoo.org>
-Date: Tue, 10 Dec 2013 23:37:08 +0100
-Subject: [PATCH 3/3] Make networkmanager support optional
-
- * use config.js (and AC_SUBST HAVE_NETWORKMANAGER appropriately);
- * take care to not import ui.status.network if nm is disabled;
- * do not try to reassign to const variables;
- * no point really in fiddling with the list of installed js
- * files;
- * don't build shell-mobile-providers if nm is disabled;
- * use "networkmanager" instead of "network_manager" because THE
- BIKESHED SHOULD BE BLUE, also because the upstream package name is
- NetworkManager, not Network_Manager.
----
- configure.ac | 46 ++++++++++++++++++++++++++++++++++++++++++++--
- js/Makefile.am | 1 +
- js/misc/config.js.in | 2 ++
- js/ui/panel.js | 15 ++++++++++++---
- js/ui/sessionMode.js | 7 ++++++-
- src/Makefile.am | 12 +++++++++---
- 6 files changed, 74 insertions(+), 9 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e749ca6..5044302 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -91,8 +91,6 @@ SHARED_PCS="gio-unix-2.0 >= $GIO_MIN_VERSION
- libcanberra libcanberra-gtk3
- telepathy-glib >= $TELEPATHY_GLIB_MIN_VERSION
- polkit-agent-1 >= $POLKIT_MIN_VERSION
-- libnm-glib libnm-util >= $NETWORKMANAGER_MIN_VERSION
-- libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
- libsecret-unstable gcr-base-3 >= $GCR_MIN_VERSION"
-
- PKG_CHECK_MODULES(GNOME_SHELL, $SHARED_PCS)
-@@ -169,6 +167,38 @@ if test "$langinfo_ok" = "yes"; then
- [Define if _NL_TIME_FIRST_WEEKDAY is available])
- fi
-
-+AC_ARG_ENABLE(networkmanager,
-+ AS_HELP_STRING([--disable-networkmanager],
-+ [disable NetworkManager support
@<:@default=auto@:>@]),,
-+ [enable_networkmanager=auto])
-+
-+if test "x$enable_networkmanager" != "xno"; then
-+ PKG_CHECK_MODULES(NETWORKMANAGER,
-+ [libnm-glib
-+ libnm-util >= $NETWORKMANAGER_MIN_VERSION
-+ libnm-gtk >= $NETWORKMANAGER_MIN_VERSION
-+ gnome-keyring-1],
-+ [have_networkmanager=yes],
-+ [have_networkmanager=no])
-+
-+ GNOME_SHELL_CFLAGS="$GNOME_SHELL_CFLAGS $NETWORKMANAGER_CFLAGS"
-+ GNOME_SHELL_LIBS="$GNOME_SHELL_LIBS $NETWORKMANAGER_LIBS"
-+else
-+ have_networkmanager="no (disabled)"
-+fi
-+
-+if test "x$have_networkmanager" = "xyes"; then
-+ AC_DEFINE(HAVE_NETWORKMANAGER, [1], [Define if we have NetworkManager])
-+ AC_SUBST([HAVE_NETWORKMANAGER], [1])
-+else
-+ if test "x$enable_networkmanager" = "xyes"; then
-+ AC_MSG_ERROR([Couldn't find NetworkManager.])
-+ fi
-+ AC_SUBST([HAVE_NETWORKMANAGER], [0])
-+fi
-+
-+AM_CONDITIONAL(HAVE_NETWORKMANAGER, test "$have_networkmanager" = "yes")
-+
- # Sets GLIB_GENMARSHAL and GLIB_MKENUMS
- AM_PATH_GLIB_2_0()
-
-@@ -210,3 +240,15 @@ AC_CONFIG_FILES([
- man/Makefile
- ])
- AC_OUTPUT
-+
-+echo "
-+Build configuration:
-+
-+ Prefix: ${prefix}
-+ Source code location: ${srcdir}
-+ Compiler: ${CC}
-+ Compiler Warnings: $enable_compile_warnings
-+
-+ Support for NetworkManager: $have_networkmanager
-+ Support for GStreamer recording: $build_recorder
-+"
-diff --git a/js/Makefile.am b/js/Makefile.am
-index d614f4f..88a3887 100644
---- a/js/Makefile.am
-+++ b/js/Makefile.am
-@@ -8,6 +8,7 @@ misc/config.js: misc/config.js.in Makefile
- sed -e "s|[@]PACKAGE_NAME@|$(PACKAGE_NAME)|g" \
- -e "s|[@]PACKAGE_VERSION@|$(PACKAGE_VERSION)|g" \
- -e "s|[@]HAVE_BLUETOOTH@|$(HAVE_BLUETOOTH)|g" \
-+ -e "s|[@]HAVE_NETWORKMANAGER@|$(HAVE_NETWORKMANAGER)|g" \
- -e "s|[@]GETTEXT_PACKAGE@|$(GETTEXT_PACKAGE)|g" \
- -e "s|[@]datadir@|$(datadir)|g" \
- -e "s|[@]libexecdir@|$(libexecdir)|g" \
-diff --git a/js/misc/config.js.in b/js/misc/config.js.in
-index 9769104..9c4795d 100644
---- a/js/misc/config.js.in
-+++ b/js/misc/config.js.in
-@@ -6,6 +6,8 @@ const PACKAGE_NAME = '@PACKAGE_NAME@';
- const PACKAGE_VERSION = '@PACKAGE_VERSION@';
- /* 1 if gnome-bluetooth is available, 0 otherwise */
- const HAVE_BLUETOOTH = @HAVE_BLUETOOTH@;
-+/* 1 if networkmanager is available, 0 otherwise */
-+const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
- /* gettext package */
- const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
- /* locale dir */
-diff --git a/js/ui/panel.js b/js/ui/panel.js
-index 2337a63..17e4f10 100644
---- a/js/ui/panel.js
-+++ b/js/ui/panel.js
-@@ -809,7 +809,12 @@ const AggregateMenu = new Lang.Class({
- this._indicators = new St.BoxLayout({ style_class:
'panel-status-indicators-box' });
- this.actor.add_child(this._indicators);
-
-- this._network = new imports.ui.status.network.NMApplet();
-+ if (Config.HAVE_NETWORKMANAGER) {
-+ this._network = new imports.ui.status.network.NMApplet();
-+ } else {
-+ this._network = null;
-+ }
-+
- if (Config.HAVE_BLUETOOTH) {
- this._bluetooth = new imports.ui.status.bluetooth.Indicator();
- } else {
-@@ -824,7 +829,9 @@ const AggregateMenu = new Lang.Class({
- this._screencast = new imports.ui.status.screencast.Indicator();
-
- this._indicators.add_child(this._screencast.indicators);
-- this._indicators.add_child(this._network.indicators);
-+ if (this._network) {
-+ this._indicators.add_child(this._network.indicators);
-+ }
- if (this._bluetooth) {
- this._indicators.add_child(this._bluetooth.indicators);
- }
-@@ -836,7 +843,9 @@ const AggregateMenu = new Lang.Class({
- this.menu.addMenuItem(this._volume.menu);
- this.menu.addMenuItem(this._brightness.menu);
- this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
-- this.menu.addMenuItem(this._network.menu);
-+ if (this._network) {
-+ this.menu.addMenuItem(this._network.menu);
-+ }
- if (this._bluetooth) {
- this.menu.addMenuItem(this._bluetooth.menu);
- }
-diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
-index eb04c62..b882364 100644
---- a/js/ui/sessionMode.js
-+++ b/js/ui/sessionMode.js
-@@ -10,6 +10,8 @@ const FileUtils = imports.misc.fileUtils;
- const Main = imports.ui.main;
- const Params = imports.misc.params;
-
-+const Config = imports.misc.config;
-+
- const DEFAULT_MODE = 'restrictive';
-
- const _modes = {
-@@ -92,7 +94,10 @@ const _modes = {
- isLocked: false,
- isPrimary: true,
- unlockDialog: imports.ui.unlockDialog.UnlockDialog,
-- components: ['networkAgent', 'polkitAgent', 'telepathyClient',
-+ components: Config.HAVE_NETWORKMANAGER ?
-+ ['networkAgent', 'polkitAgent', 'telepathyClient',
-+ 'keyring', 'autorunManager', 'automountManager'] :
-+ ['polkitAgent', 'telepathyClient',
- 'keyring', 'autorunManager', 'automountManager'],
- panel: {
- left: ['activities', 'appMenu'],
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 8041052..b5da6aa 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -103,7 +103,6 @@ shell_public_headers_h = \
- shell-invert-lightness-effect.h \
- shell-keybinding-modes.h \
- shell-mount-operation.h \
-- shell-network-agent.h \
- shell-perf-log.h \
- shell-screenshot.h \
- shell-slicer.h \
-@@ -140,7 +139,6 @@ libgnome_shell_base_la_SOURCES = \
- shell-menu-tracker.c \
- shell-menu-tracker.h \
- shell-mount-operation.c \
-- shell-network-agent.c \
- shell-perf-log.c \
- shell-polkit-authentication-agent.h \
- shell-polkit-authentication-agent.c \
-@@ -175,6 +173,11 @@ libgnome_shell_sources = \
-
- libgnome_shell_la_SOURCES = $(libgnome_shell_sources)
-
-+if HAVE_NETWORKMANAGER
-+libgnome_shell_la_SOURCES += shell-network-agent.c
-+shell_public_headers_h += shell-network-agent.h
-+endif
-+
- libgnome_shell_la_gir_sources = \
- $(filter-out %-private.h $(shell_private_sources),
$(shell_public_headers_h) $(libgnome_shell_base_la_SOURCES)
$(libgnome_shell_sources))
-
-@@ -331,7 +334,10 @@ INTROSPECTION_GIRS += ShellMenu-0.1.gir
- CLEANFILES += ShellMenu-0.1.gir
-
- Shell-0.1.gir: gnome-shell St-1.0.gir ShellMenu-0.1.gir
--Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0
TelepathyGLib-0.12 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0
TelepathyGLib-0.12 Soup-2.4 GMenu-3.0
-+if HAVE_NETWORKMANAGER
-+Shell_0_1_gir_INCLUDES += NetworkManager-1.0 NMClient-1.0
-+endif HAVE_NETWORKMANAGER
- Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
- # Hack! we use PROGRAM instead of LIBS so that the soname is not included
- # in the typelib. This way the symbols will be resolved with the
libgnome-shell
---
-1.8.5.1
-
diff --git
a/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
new file mode 100644
index 0000000..b688dd6
--- /dev/null
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.10.4-bluetooth-gold.patch
@@ -0,0 +1,31 @@
+From 9f056842fad21dc69a51fd9f01543cd85a6d4047 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetrom...@gentoo.org>
+Date: Sat, 15 Mar 2014 17:48:41 -0400
+Subject: [PATCH 3/3] build: Add BLUETOOTH_LIBS to libgnome-shell's libadd for
+ ld.gold
+
+For ld.gold, adding BLUETOOTH_LIBS to gnome_shell_LDADD has no effect:
+the libgnome-bluetooth-applet must be linked to the binary that actually
+uses a function from libgnome-bluetooth-applet, i.e. to libgnome-shell.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=726435
+---
+ src/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f489a56..79838a3 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -320,7 +320,7 @@ libgnome_shell_base_la_LIBADD = $(libgnome_shell_libadd)
+ libgnome_shell_base_la_CPPFLAGS = $(gnome_shell_cflags)
+
+ libgnome_shell_la_LDFLAGS = $(libgnome_shell_ldflags)
+-libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
libgnome-shell-base.la
++libgnome_shell_la_LIBADD = $(GNOME_SHELL_LIBS) $(MUTTER_LIBS)
$(BLUETOOTH_LIBS) libgnome-shell-base.la
+ libgnome_shell_la_CPPFLAGS = $(MUTTER_CFLAGS) $(gnome_shell_cflags)
+
+ if HAVE_MUTTER_WAYLAND
+--
+1.9.0
+
diff --git a/gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch
b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
similarity index 57%
rename from gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch
rename to gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
index e74e18f..2fa93af 100644
--- a/gnome-base/gnome-shell/files/gnome-shell-3.10-bluetooth-flag.patch
+++ b/gnome-base/gnome-shell/files/gnome-shell-3.12-bluetooth-flag.patch
@@ -1,4 +1,4 @@
-From d15e9df8903c05fa0e355b3b1b133171c706d3ac Mon Sep 17 00:00:00 2001
+From 3c9c3b19fcb212171036e1e57e749411b5fd7d65 Mon Sep 17 00:00:00 2001
From: Sobhan Mohammadpour <sobhanmohammadpo...@yahoo.fr>
Date: Thu, 28 Feb 2013 18:48:32 +0330
Subject: [PATCH 2/3] Make bluetooth support optional
@@ -13,28 +13,32 @@ 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 | 7 +++++++
- 1 file changed, 7 insertions(+)
+ configure.ac | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
-index 334323a..e749ca6 100644
+index 9a30e65..aa710f0 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -116,6 +116,10 @@ PKG_CHECK_MODULES(DESKTOP_SCHEMAS,
gsettings-desktop-schemas >= 3.7.4)
- PKG_CHECK_MODULES(CARIBOU, caribou-1.0 >= 0.4.8)
+@@ -138,11 +138,21 @@ AS_IF([test x$enable_browser_plugin = xyes], [
+ ])
+ AM_CONDITIONAL(BUILD_BROWSER_PLUGIN, test x$enable_browser_plugin = xyes)
- AC_MSG_CHECKING([for bluetooth support])
++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.9.0],
- [BLUETOOTH_DIR=`$PKG_CONFIG --variable=applet_libdir
gnome-bluetooth-1.0`
- BLUETOOTH_LIBS=`$PKG_CONFIG --variable=applet_libs gnome-bluetooth-1.0`
-@@ -128,6 +132,9 @@ PKG_CHECK_EXISTS([gnome-bluetooth-1.0 >= 3.9.0],
+ PKG_CHECK_MODULES(BLUETOOTH, gnome-bluetooth-1.0 >= 3.9.0,
+- [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have
libgnome-bluetooth-applet])
+- AC_SUBST([HAVE_BLUETOOTH],[1])],
++ [AC_DEFINE([HAVE_BLUETOOTH],[1],[Define if you have
libgnome-bluetooth-applet])
++ AC_SUBST([HAVE_BLUETOOTH],[1])
++ AC_MSG_RESULT([yes])],
[AC_DEFINE([HAVE_BLUETOOTH],[0])
- AC_SUBST([HAVE_BLUETOOTH],[0])
- AC_MSG_RESULT([no])])
+- AC_SUBST([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])])
@@ -42,5 +46,5 @@ index 334323a..e749ca6 100644
PKG_CHECK_MODULES(CALENDAR_SERVER, libecal-1.2 >= $LIBECAL_MIN_VERSION
libedataserver-1.2 >= $LIBEDATASERVER_MIN_VERSION gio-2.0)
AC_SUBST(CALENDAR_SERVER_CFLAGS)
--
-1.8.5.1
+1.9.0
diff --git a/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild
b/gnome-base/gnome-shell/gnome-shell-3.12.0.ebuild
similarity index 89%
rename from gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild
rename to gnome-base/gnome-shell/gnome-shell-3.12.0.ebuild
index a86ab1f..6dbd7f3 100644
--- a/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-3.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -10,37 +10,32 @@ PYTHON_COMPAT=( python2_{6,7} )
inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell";
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
IUSE="+bluetooth +i18n +networkmanager -openrc-force"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
# libXfixes-5.0 needed for pointer barriers
# FIXME:
# * gstreamer support is currently automagic
# * mutter/mutter-wayland support is automagic
-#
-# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be
in sync for 3.8.3
-# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
COMMON_DEPEND="
- app-crypt/libsecret
>=app-accessibility/at-spi2-atk-2.5.3
>=dev-libs/atk-2[introspection]
>=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.37:2
- >=dev-libs/gjs-1.38.1
+ >=dev-libs/glib-2.39.1:2
+ >=dev-libs/gjs-1.39
>=dev-libs/gobject-introspection-0.10.1
>=x11-libs/gtk+-3.7.9:3[introspection]
- >=media-libs/clutter-1.13.4:1.0[introspection]
+ >=media-libs/clutter-1.15.90:1.0[introspection]
>=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.7.4
+ >=gnome-base/gsettings-desktop-schemas-3.12
>=gnome-base/gnome-keyring-3.3.90
- >=gnome-base/gnome-menus-3.5.3:3[introspection]
gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.5.3:=
>=media-libs/gstreamer-0.11.92:1.0
@@ -49,7 +44,7 @@ COMMON_DEPEND="
>=sys-auth/polkit-0.100[introspection]
>=x11-libs/libXfixes-5.0
x11-libs/libXtst
- >=x11-wm/mutter-3.10.1[introspection]
+ >=x11-wm/mutter-3.12[introspection]
>=x11-libs/startup-notification-0.11
${PYTHON_DEPS}
@@ -68,7 +63,9 @@ COMMON_DEPEND="
x11-apps/mesa-progs
bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- networkmanager? ( >=net-misc/networkmanager-0.9.8[introspection] )
+ networkmanager? (
+ app-crypt/libsecret
+ >=net-misc/networkmanager-0.9.8[introspection] )
"
# Runtime-only deps are probably incomplete and approximate.
# Introspection deps generated using:
@@ -125,10 +122,11 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-defaults.patch"
# Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-3.10-bluetooth-flag.patch"
+ epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
- # Make networkmanager optional, bug #398593
- epatch "${FILESDIR}/${PN}-3.10-networkmanager-flag.patch"
+ # Fix silent bluetooth linking failure with ld.gold, bug #503952
+ # https://bugzilla.gnome.org/show_bug.cgi?id=726435
+ epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
epatch_user
@@ -139,8 +137,9 @@ src_prepare() {
src_configure() {
# Do not error out on warnings
gnome2_src_configure \
+ --enable-browser-plugin \
--enable-man \
- --disable-jhbuild-wrapper-script \
+ $(use_enable !openrc-force systemd) \
$(use_with bluetooth) \
$(use_enable networkmanager) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
diff --git a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
index 7a154ed..f7baf30 100644
--- a/gnome-base/gnome-shell/gnome-shell-9999.ebuild
+++ b/gnome-base/gnome-shell/gnome-shell-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]]; then
fi
DESCRIPTION="Provides core UI functions for the GNOME 3 desktop"
-HOMEPAGE="http://live.gnome.org/GnomeShell";
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeShell";
LICENSE="GPL-2+ LGPL-2+"
SLOT="0"
@@ -22,7 +22,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
if [[ ${PV} = 9999 ]]; then
KEYWORDS=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
fi
# libXfixes-5.0 needed for pointer barriers
@@ -33,21 +33,19 @@ fi
# gnome-shell/gnome-control-center/mutter/gnome-settings-daemon better to be
in sync for 3.8.3
# https://mail.gnome.org/archives/gnome-announce-list/2013-June/msg00005.html
COMMON_DEPEND="
- app-crypt/libsecret
>=app-accessibility/at-spi2-atk-2.5.3
>=dev-libs/atk-2[introspection]
>=app-crypt/gcr-3.7.5[introspection]
- >=dev-libs/glib-2.37:2
- >=dev-libs/gjs-1.38.1
+ >=dev-libs/glib-2.39.1:2
+ >=dev-libs/gjs-1.39
>=dev-libs/gobject-introspection-0.10.1
>=x11-libs/gtk+-3.7.9:3[introspection]
- >=media-libs/clutter-1.13.4:1.0[introspection]
+ >=media-libs/clutter-1.15.90:1.0[introspection]
>=dev-libs/json-glib-0.13.2
>=dev-libs/libcroco-0.6.8:0.6
>=gnome-base/gnome-desktop-3.7.90:3=[introspection]
- >=gnome-base/gsettings-desktop-schemas-3.7.4
+ >=gnome-base/gsettings-desktop-schemas-3.12
>=gnome-base/gnome-keyring-3.3.90
- >=gnome-base/gnome-menus-3.5.3:3[introspection]
gnome-base/libgnome-keyring
>=gnome-extra/evolution-data-server-3.5.3:=
>=media-libs/gstreamer-0.11.92:1.0
@@ -56,7 +54,7 @@ COMMON_DEPEND="
>=sys-auth/polkit-0.100[introspection]
>=x11-libs/libXfixes-5.0
x11-libs/libXtst
- >=x11-wm/mutter-3.10.1[introspection]
+ >=x11-wm/mutter-3.12[introspection]
>=x11-libs/startup-notification-0.11
${PYTHON_DEPS}
@@ -75,7 +73,9 @@ COMMON_DEPEND="
x11-apps/mesa-progs
bluetooth? ( >=net-wireless/gnome-bluetooth-3.9[introspection] )
- networkmanager? ( >=net-misc/networkmanager-0.9.8[introspection] )
+ networkmanager? (
+ app-crypt/libsecret
+ >=net-misc/networkmanager-0.9.8[introspection] )
"
# Runtime-only deps are probably incomplete and approximate.
# Introspection deps generated using:
@@ -132,10 +132,11 @@ src_prepare() {
epatch "${FILESDIR}/${PN}-defaults.patch"
# Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-3.10-bluetooth-flag.patch"
+ epatch "${FILESDIR}/${PN}-3.12-bluetooth-flag.patch"
- # Make networkmanager optional, bug #398593
- epatch "${FILESDIR}/${PN}-3.10-networkmanager-flag.patch"
+ # Fix silent bluetooth linking failure with ld.gold, bug #503952
+ # https://bugzilla.gnome.org/show_bug.cgi?id=726435
+ epatch "${FILESDIR}/${PN}-3.10.4-bluetooth-gold.patch"
epatch_user
@@ -146,8 +147,10 @@ src_prepare() {
src_configure() {
# Do not error out on warnings
gnome2_src_configure \
+ --enable-browser-plugin \
--enable-man \
--disable-jhbuild-wrapper-script \
+ $(use_enable !openrc-force systemd) \
$(use_with bluetooth) \
$(use_enable networkmanager) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
