# ChangeLog for gnome-base/gnome-shell
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.83 2014/07/23 15:17:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/ChangeLog,v 1.84 2014/12/23 23:55:19 eva Exp $
+
+*gnome-shell-3.14.3 (23 Dec 2014)
+
+ 23 Dec 2014; Gilles Dartiguelongue <eva@gentoo.org>
+ -gnome-shell-3.10.4-r2.ebuild, +gnome-shell-3.14.3.ebuild,
+ -files/gnome-shell-3.10.4-activate-workspace.patch,
+ -files/gnome-shell-3.10.4-broken-crosshairs.patch,
+ -files/gnome-shell-3.10.4-fix-background-manager.patch,
+ -files/gnome-shell-3.10.4-restore-pref.patch,
+ -files/gnome-shell-3.10.4-scale-factor.patch,
+ -files/gnome-shell-3.10.4-wired-network.patch,
+ -files/gnome-shell-3.10-networkmanager-flag.patch,
+ +files/gnome-shell-3.14.0-bluetooth-gold.patch,
+ +files/gnome-shell-3.14.0-defaults.patch:
+ Version bump for Gnome 3.14. Dropped keywords, bug #526914. Clean up old
+ revision.
23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-shell-3.12.2.ebuild:
Stable for x86, wrt bug #512012
Hash: SHA256
AUX gnome-shell-3.10-bluetooth-flag.patch 1777 SHA256 e792a8d9cf2e352eaff19826c2fb3ab2b7b13864c3ff0d7d646f003c647d8c88 SHA512 3dc2a949a0b139dcb51df1e353ff4ca90631e57858c0be1d80467fda32aa080de18d26b593d97854f3c2e5a5ea93b168c37c4ddf9006fded5afddab87af44233 WHIRLPOOL 8ed260aa62418131f63dca628b09b83ef4b963e25dd79f194f413bc6961066055b1f49d875a9739a747c4f17d3700dca212ddceb2e4be14b7dd6602f9ca97610
-AUX gnome-shell-3.10-networkmanager-flag.patch 8935 SHA256 5fdbc3206b3fb67f216128d988b90a3be9070ac1abfebc8ab33cbf95478849dc SHA512 7cc0d58f12559195f065756c06bb6511ac4dd87d3f8c56204aeb8d0d4145dbc7bcd223fd780a68b6efe089c28d970e4099d816112e557258e4c967e5c8a5dfdf WHIRLPOOL a03e4164c809d88d8e389d4073086dd2272588962ab434c006536677e9f1d305b4e892ed1c524088e9b1da0698de6b869148546524b00f631fb25248145d0ef7
-AUX gnome-shell-3.10.4-activate-workspace.patch 1734 SHA256 6bb2f0c3e07e70d57c0fc8d2a6e5fa6344d4a5c89ef615e58eb3715023ad108e SHA512 4298925152e1484b86d5067bff077cbc0d468fbe3bb95389fa31683ab185e70347cfb9c77756f03651750d6d37c7fbd2587d5bcdb4400f31a8a52d544b52878a WHIRLPOOL 22ac28dbf8555ef248596eec1ee9691969d73f2b75d767c1ba97be58561597ded01056a4025dbfeb9aa0abfdcf8ba2118895f3f1c499e59763b06c4966c4bf43
AUX gnome-shell-3.10.4-bluetooth-gold.patch 1198 SHA256 b92fd31343348e0c7ce3420899e04c454edad388a6489ab19be6ed2461c7dc41 SHA512 1e5eb7aa8a36e7f2bbdde25e0d9796c3041035f6213a8b6b344fc9ef511f8cff65868d09f1e83ca6dc2a5ca01fd7f4f112435fba0b5eb487736d206dcdd32249 WHIRLPOOL 0f78e39364b2f508778bb298ba52759944148d93aee924db4a2b79941352b7b70fd1c3bab5f6f58d1827e83ec86c95ba36530a8f79a5bc2ad84b37f910e16af5
-AUX gnome-shell-3.10.4-broken-crosshairs.patch 7540 SHA256 f0065fb557368644cef74ab25d5e67088f1888c5d95487c0df32f0def75aa4fb SHA512 1a56d68b735abcf4be52206f4b8499904d7561f7d372d7e465cd837bcfd751e80433a0e7dfdaf3833076313bd8311bf12f918744d8b296d750909755414e5204 WHIRLPOOL 3fb856432e83bf1bb53f9409c5e15040ac7490f65bc8e6c7c47b13d6b43114d8f0a12766ba20e7cf652ef3c59b88684822f4aa56efec94fdaa3173203f088ea3
-AUX gnome-shell-3.10.4-fix-background-manager.patch 5674 SHA256 ed257838b97dfb63f2e0ddfd338a21efe5485e6c0b54da6e9d82a3aae9326c2f SHA512 7da462a0b8f5e99f49f3bd66afe652fa1dd9f2d366a60b4349098183d08f6f6a631a9063edba5874d45f5c07b0813a1ce0933ac6a8eef4fc708bab8a1b78ea2a WHIRLPOOL 03cefd14412e3f526f0417452ca37d024e7e1a649ebdb52673117d420147540ae96a342cf1af7f63414091bf0d5f0e3abe9e992ac6c129197e771553ce3ac645
-AUX gnome-shell-3.10.4-restore-pref.patch 1324 SHA256 7439ea6ad9342d084b5212fea8e662b614edf256fe08f155c985c83fb6e27e81 SHA512 3dd50e163ca658bc7a0d4bac584848abb8265c973adcd040d702e69bdb6877cfb09f48b6a574ee064fd2c1feef5248d63e59a5c0d423ee4841a178f02c3cacb5 WHIRLPOOL 1cc2af4a0b43af7500f241ea12d61a39f77e15cffd5bb1893e713183286a5286342a051ced766cb7052dcb7b6e604c53989ce4c6363f08ffec449b70ec42b382
-AUX gnome-shell-3.10.4-scale-factor.patch 1223 SHA256 f5912f9c079ce6a7774c9f3a615b0ea86441cd43437f20ac6f79307abd1328a9 SHA512 089a03b56cac4d51cddf5bf38076b29b4b7659283c50b619445091cf78fe762ddc14bd5cd5db4a10a3a988647bf16c89a27ed4674802a412cc6008916dfcb4d2 WHIRLPOOL e96454a6b1c7fbeb9ea8db681b9e67a0b7774c889ef9e9ffe1d6a24efc6ef62aa2ac8b6c1197c7a3e7426d3c4878f4c7b799dc5b9dcec5e171ce5b1d746596f9
-AUX gnome-shell-3.10.4-wired-network.patch 5804 SHA256 14f61ee92b4f01bc39454e121ea9cf62590ed0f178d111eca000a0ce5c4028fe SHA512 d04dfb8461e970a926b4ef4a386fd01ac8964c2d6a37a8d4d399f0419fedc3a2159f5f6b480ca94225845656d36076a8ebb83e4f0e1734915035aae6a321190a WHIRLPOOL 2923e3005649f4cf6fef3419694df365907abd630a94c5a8fd2511632bed45776cb052a904b96b0e212266cf93b1763a0553abc007986477e0291315a3b94b2d
AUX gnome-shell-3.12-bluetooth-flag.patch 1894 SHA256 1da61704c51128de9b17fcca022e9c4d8d1d3b7def9b3e7ef50e2bc6d13fa256 SHA512 dc18e16e2de667bef09d66acd68fbe0f4d8c0fd1725b352b0f9f4032e43481f2655b1812ffa6f8ae8441b215a372c27f5e1035b7eceeeb22ee18b1a256e79f80 WHIRLPOOL aa98031a3152d570342fb249c3609d6387b6dea1d451e71ecf880c7de412aa493ad414db7e15217bac0775625419fa8ede13c5f61e055ad735d60dbce86fd6e6
+AUX gnome-shell-3.14.0-bluetooth-gold.patch 1217 SHA256 d29893b1cbffda738940eaa64ba1e7164750662db9ffafebbcce97d4d33aded4 SHA512 ce45d488f6af1c22ab76a3eb811ce5eec1d9534c475be4aa66681dad5024c517e9c648caaeedd18750d78e2f47867dbf9a4cbe7b7643caa48e0ff2750322ba1d WHIRLPOOL 6f08b118ea26652a157a4b6bd3610132f6fa06babc7cee00097f86358eed796fe6963172e363394ff1949e728dc66843bd8090d244f527465205dbd4be7af621
+AUX gnome-shell-3.14.0-defaults.patch 1192 SHA256 f53946108a81e98a6dde79c395b49ad5f93838dbc4ccd93cb1c246e69ea944a9 SHA512 ca5bc1e7af5324fc18e44b14b5d43daf182c63b4e29b1626c6d3e4dd27bb750a8eb61c3791ff6a96677a570e690775eada52c834a8d3d54227b1f2ad25436992 WHIRLPOOL 9f50b68783f042db5def6dbdc1533dc1b41e32d172ed2778db44871a9e23c1b7ba8ac1802324fe1f9340f19d9752274306916764e8b3acb85283a32a2d9a7498
AUX gnome-shell-defaults.patch 1266 SHA256 eeea87bd5f02b3da83435c69d44a57e85d0ad58a62f72a350b55e0efac0f2584 SHA512 36c08779466884e1dce41460e56d0b9c82ca07bf2fee491d48604ae6f511dccfcf2bb3fdb1a7213aa47f08d0ec37da798465480ce12444dd22711bb4daec642c WHIRLPOOL 04669a7b93b7440e55d6ce71f43b9a90df531e6a72093c3ac61f775213a66a6e856538b5836a5962169d54746591dc246e12e3d532b2cc6af022092c82b9efe6
-DIST gnome-shell-3.10.4.tar.xz 1521256 SHA256 e082f6847eedbbc474ffe4bcb3dfe51054eb0e4c5ddab440d39afed78526b726 SHA512 bb69942bb1ab97e896ed69b48360c99a1a870074b0bfe16dc546fcb3d23a970b95b7f3bd3f9bac85a73a0fc0c5d7c8b8c08054d28abb5aa80b7b79c918532167 WHIRLPOOL aa2678a9b19e2c92823b0d555d1b88869112796c3876433a3886086a22a25b4cb4c77908d7e82c76430fbfba535af0f2b9791b79be5c7aa3f57575c8c3372d4f
DIST gnome-shell-3.12.2.tar.xz 1540872 SHA256 3ae230e8cb7a31e7b782c16ca178af5957858810788e26a6d630b69b3f85ce71 SHA512 21c6d121d04f631a801367a61822b625bfcbcef13dc99be61fa1972f44012cac06e74684447099e5e1e951e20702df5e3c031fb73f315f843bdbfc55fa8c1e0d WHIRLPOOL 8ca32b15dabc617ba8d61d82ed1357300613ae166aa91dfa427435de8cda07a281f0f085fb6dd12512928fabef82a47785f8fe57ea3cc87f2d49d4e85ec190fb
-EBUILD gnome-shell-3.10.4-r2.ebuild 8393 SHA256 efbb21761cca53ab3d6e3d25c502006617b0cacfeac65cc3524b4ff92ec93355 SHA512 47d8b562a3a5a2f22ef8aeb8bf2adf6f06a6db1fe26206e0ab94b0406aa64645f28e92d3ec2da4682ad92af64aa9d78405369e3a4aa4610b3fc853558e803440 WHIRLPOOL 60415dadcb1192c72cd6c171e367129678658d2079a622f7f2e9d33af5cff5ae63d71f1f8c16eb03bfc7efcb106e8a63704c8b6574d4d221967295862d976a9e
+DIST gnome-shell-3.14.3.tar.xz 1592136 SHA256 fb44484efb94af4d90189127136a82b2cc1afed93e24834165ae550b58b539d6 SHA512 6a8bcd472ea01962e234668dc54e93de17b20121ece53916f6b1498b7a292cd4eb2d08c56b6903ea6dfd532293f513c09c6648a63d19c1775e23bc77e3087aaa WHIRLPOOL c6c7703822c7652d8a5832c3141c7a2632c3d3422791c8d63608df1b1e8a311e94ce2e88b6f6d6aad608b66cca1297a9906cec3bd01dc92a334d2e68563d077a
EBUILD gnome-shell-3.12.2.ebuild 7547 SHA256 6a97274bba51fef690368fee0dca2120cc95d02752c75bbffbb7b0393f4fdac2 SHA512 9abed915bfc8a0815e91853cdd1085b45d50260cb4e0ebb69614692941929995bc562e1ccb9754549a127232fb90539e2d2ee6ffedc145fb8e243400261b1c5e WHIRLPOOL e8b9a8726ed4e41ac6253924e6ee0646ed2885ec812c28247e6597791bdc7d85dc8b569d50f8ff69aa8e483d0caf87bda78e727bd07a54989077c77b8cf837e9
-MISC ChangeLog 18066 SHA256 2a6b31642f108d39a1936552e33aac75ca74b024f95cef4c3d3935776adce804 SHA512 f93a4c85b70d67392c1f8e8a12c6f90f1658b986f1d941aa3f5d7690ebf85bf69585a4dd71161376f477f5072f3acd4ede2e321a82c5f025fc33d60a43eb3e81 WHIRLPOOL 21c7d57f1610bf573f3a08556fecc70516acdd2218091d67454f79e2d293b713eca4864329dd8e732c5bfac411641a7aabb3037a08c47efb38eb6af310157ddd
+EBUILD gnome-shell-3.14.3.ebuild 7477 SHA256 57735e5981da48fa6878e8d11f4e2e63a323b861e9770e35bd7a8ff88540434c SHA512 a91752456642e38a90e183c53d2ce6db4e5f04c1681996129cd8665ea18c877af01fe90fcf703ccf133a6968c09d7cccfcfc31afcf146f4a5ef4ce9383028f9c WHIRLPOOL e5d0a4e3845ace1a11457466af94f5b091ca6a8ce1c12e8fa409ed3de65aa6e9b6064d652781962903d591bd964fd0fa13ad9f93a6cf69d5643c57b6f9b5fa41
+MISC ChangeLog 18761 SHA256 327648927c61603fa8d9bc25a0b316907c52562c6e406c3450ea48e168113d2d SHA512 3c4bbebf0177cc8039f1903af404938d55d2ebd2fc6985e090bca231140b1355a8ad32d69d5cee388a807183073d4b75d388e662e4b3c466cb3a5a561f53cbf9 WHIRLPOOL 3c2bbed5da6782a7271b224884f0d80c7db624c79a7452605467ab03efe39d40af1f122d73b8646503de1e68529be56885876ee503f7b0d7b989447596a07410
MISC metadata.xml 503 SHA256 3b98b49418c316196a011c8706d99612da0dccfc184a11c2b4e2af912190384e SHA512 0e4a7bcc41c9edcbf0882f24427ab29ab8631cb3fdeca8b68734a143987012a66b6383c97dff57c5afd33d93b5da913d0755e6a9607101987bf9413e58551235 WHIRLPOOL 3eec055b8a58e6af24a72a1a8f4a544766aec38fe2c237a26c63468f63e98a2d4c4bb77254bf1dd0498ecb070aefce65da1cbb3dd77cf26c34449d8fc1cc83df
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJTz9H0AAoJELp701BxlEWfZkgQAK3Vi6HpM+vKWwgPm4uT0ku5
-C/GYdiRQrkM8VOy1EoZc3pPqtpAGtynWQBf5U9jPWXg67LfCtXmyFIl30uUAmpwH
-agG75jEevZR0vx5v8Ix2+6pi0dGPIBDYy//uz+UF5A/dD3Q/3JZw8KriCsbtLq5P
-dMOgZhkcQg65mUZAAt8ylDVRPu5EHRr/P+3qPZMB+rJtx/Sh7x9O/6ecZxt//M6h
-68ZWUT2ANG96P7QrVsyw4Bu59IuZ0psLMFt1KXf03YLF+G5ncp27eZ92BvW9jGz4
-F5GI+fA1+R2JGe2cPmCdgf6AY+jElgsgwbmfxc0TaxHRyvrrBEx0BtGrBoyEWG6S
-bZjofAr2TXfJHys3yih4Ds5YOaHc5fN2zs3OJ/QDwfajQLw8WYPzoGg5+sTYbeXp
-fvaWQfL8tAzt3Ean4ATYoBahwxGEVM5R4CKolvoEZK+wSWk/EyMwENrzRbG/n6hV
-fxtNJkSSKzN3w3zgzsWvpPNJJqJ7O0mwB7htm3tILS0Qy7DjswDT0BftYF003N9b
-r6lWvkP1tghshFYGK+f7sbuTy8m70IUgIiRdxQPNDCJqlV04LJW8AXgnT38IzzGV
-63r+4AUNahjxQuoQdaY4CXZprQ8ghJPvh9K5aXzRHp1XfA/WdE/Uxs2tjRHVVRf4
-yhlfhYea1Tkz7soH1she
-=gNJw
+iEYEAREIAAYFAlSaAOgACgkQ1fmVwcYIWAbAfwCdE6nalvkWuK3rpVKcl4unIgww
+ocsAoI1tG9d2vD8o3EeFL43xZmAbNjOP
+=MQEw
-----END PGP SIGNATURE-----
+++ /dev/null
-From 2ca59eb6e8ca9ba76757ede04e734c743aa21769 Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@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
-
+++ /dev/null
-From 0dab133fe578b3b12241ce6f01b58bc755088da8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Mon, 30 Sep 2013 19:55:26 +0200
-Subject: windowManager: Activate new workspace before removing the current one
-
-When removing the current workspace, the active workspace is changed
-to the preceding one automatically before we change explicitly to the
-last workspace. There is no good reason to change workspaces twice in
-this case, we can avoid the first one just by changing to the new
-workspace before removing any workspaces.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=709064
-
-diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js
-index 75be4c5..31b7d2d 100644
---- a/js/ui/windowManager.js
-+++ b/js/ui/windowManager.js
-@@ -254,6 +254,8 @@ const WorkspaceTracker = new Lang.Class({
- if (removingCurrentWorkspace) {
- // "Merge" the empty workspace we are removing with the one at the end
- this._wm.blockAnimations();
-+ global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-+ this._wm.unblockAnimations();
- }
-
- // Delete other empty workspaces; do it from the end to avoid index changes
-@@ -262,11 +264,6 @@ const WorkspaceTracker = new Lang.Class({
- global.screen.remove_workspace(this._workspaces[i], global.get_current_time());
- }
-
-- if (removingCurrentWorkspace) {
-- global.screen.get_workspace_by_index(global.screen.n_workspaces - 1).activate(global.get_current_time());
-- this._wm.unblockAnimations();
-- }
--
- this._checkWorkspacesId = 0;
- return false;
- },
---
-cgit v0.10.1
-
+++ /dev/null
-From 713d4aa6c4a606c8479d7160e9df3fb79d7ec7f0 Mon Sep 17 00:00:00 2001
-From: Magdalen Berns <m.berns@thismagpie.com>
-Date: Wed, 5 Feb 2014 20:53:21 +0000
-Subject: [PATCH] Magnifier: Restore crosshairs
-
-This patch is to restore broken crosshairs so they may be used
-once more
-
-https://bugzilla.gnome.org/show_bug.cgi?id=723709
- magnifier.js
----
- js/ui/magnifier.js | 131 +++++++++++++++++++++++------------------------------
- 1 file changed, 56 insertions(+), 75 deletions(-)
-
-diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
-index 2a6ac38..96c12b2 100644
---- a/js/ui/magnifier.js
-+++ b/js/ui/magnifier.js
-@@ -57,20 +57,6 @@ const Magnifier = new Lang.Class({
- // Magnifier is a manager of ZoomRegions.
- this._zoomRegions = [];
-
-- // Export to dbus.
-- magDBusService = new MagnifierDBus.ShellMagnifier();
--
-- let showAtLaunch = this._settingsInit();
-- this.setActive(showAtLaunch);
-- },
--
-- _initialize: function() {
-- if (this._initialized)
-- return;
-- this._initialized = true;
--
-- this._settingsInitLate();
--
- // Create small clutter tree for the magnified mouse.
- let cursorTracker = Meta.CursorTracker.get_for_screen(global.screen);
- this._mouseSprite = new Clutter.Texture();
-@@ -86,11 +72,15 @@ const Magnifier = new Lang.Class({
-
- let aZoomRegion = new ZoomRegion(this, this._cursorRoot);
- this._zoomRegions.push(aZoomRegion);
-- this._settingsInitRegion(aZoomRegion);
-+ let showAtLaunch = this._settingsInit(aZoomRegion);
- aZoomRegion.scrollContentsTo(this.xMouse, this.yMouse);
-
- cursorTracker.connect('cursor-changed', Lang.bind(this, this._updateMouseSprite));
- this._cursorTracker = cursorTracker;
-+
-+ // Export to dbus.
-+ magDBusService = new MagnifierDBus.ShellMagnifier();
-+ this.setActive(showAtLaunch);
- },
-
- /**
-@@ -115,12 +105,6 @@ const Magnifier = new Lang.Class({
- * @activate: Boolean to activate or de-activate the magnifier.
- */
- setActive: function(activate) {
-- if (activate == this.isActive())
-- return;
--
-- if (activate)
-- this._initialize();
--
- this._zoomRegions.forEach (function(zoomRegion, index, array) {
- zoomRegion.setActive(activate);
- });
-@@ -452,68 +436,64 @@ const Magnifier = new Lang.Class({
- this._mouseSprite.set_anchor_point(xHot, yHot);
- },
-
-- _settingsInitRegion: function(zoomRegion) {
-- // Mag factor is accurate to two decimal places.
-- let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
-- if (aPref != 0.0)
-- zoomRegion.setMagFactor(aPref, aPref);
--
-- aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-- if (aPref)
-- zoomRegion.setScreenPosition(aPref);
--
-- zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-- zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
--
-- aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-- if (aPref)
-- zoomRegion.setMouseTrackingMode(aPref);
--
-- aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-- if (aPref)
-- zoomRegion.setFocusTrackingMode(aPref);
--
-- aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-- if (aPref)
-- zoomRegion.setCaretTrackingMode(aPref);
--
-- aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-- if (aPref)
-- zoomRegion.setInvertLightness(aPref);
--
-- aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-- if (aPref)
-- zoomRegion.setColorSaturation(aPref);
--
-- let bc = {};
-- bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-- bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-- bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-- zoomRegion.setBrightness(bc);
--
-- bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-- bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-- bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-- zoomRegion.setContrast(bc);
-- },
--
-- _settingsInit: function() {
-+ _settingsInit: function(zoomRegion) {
- this._appSettings = new Gio.Settings({ schema: APPLICATIONS_SCHEMA });
- this._settings = new Gio.Settings({ schema: MAGNIFIER_SCHEMA });
-
-- this._appSettings.connect('changed::' + SHOW_KEY, Lang.bind(this, function() {
-- let active = this._appSettings.get_boolean(SHOW_KEY);
-- this.setActive(active);
-- }));
--
-- return this._appSettings.get_boolean(SHOW_KEY);
-- },
-+ if (zoomRegion) {
-+ // Mag factor is accurate to two decimal places.
-+ let aPref = parseFloat(this._settings.get_double(MAG_FACTOR_KEY).toFixed(2));
-+ if (aPref != 0.0)
-+ zoomRegion.setMagFactor(aPref, aPref);
-+
-+ aPref = this._settings.get_enum(SCREEN_POSITION_KEY);
-+ if (aPref)
-+ zoomRegion.setScreenPosition(aPref);
-+
-+ zoomRegion.setLensMode(this._settings.get_boolean(LENS_MODE_KEY));
-+ zoomRegion.setClampScrollingAtEdges(!this._settings.get_boolean(CLAMP_MODE_KEY));
-+
-+ aPref = this._settings.get_enum(MOUSE_TRACKING_KEY);
-+ if (aPref)
-+ zoomRegion.setMouseTrackingMode(aPref);
-+
-+ aPref = this._settings.get_enum(FOCUS_TRACKING_KEY);
-+ if (aPref)
-+ zoomRegion.setFocusTrackingMode(aPref);
-+
-+ aPref = this._settings.get_enum(CARET_TRACKING_KEY);
-+ if (aPref)
-+ zoomRegion.setCaretTrackingMode(aPref);
-+
-+ aPref = this._settings.get_boolean(INVERT_LIGHTNESS_KEY);
-+ if (aPref)
-+ zoomRegion.setInvertLightness(aPref);
-+
-+ aPref = this._settings.get_double(COLOR_SATURATION_KEY);
-+ if (aPref)
-+ zoomRegion.setColorSaturation(aPref);
-+
-+ let bc = {};
-+ bc.r = this._settings.get_double(BRIGHT_RED_KEY);
-+ bc.g = this._settings.get_double(BRIGHT_GREEN_KEY);
-+ bc.b = this._settings.get_double(BRIGHT_BLUE_KEY);
-+ zoomRegion.setBrightness(bc);
-+
-+ bc.r = this._settings.get_double(CONTRAST_RED_KEY);
-+ bc.g = this._settings.get_double(CONTRAST_GREEN_KEY);
-+ bc.b = this._settings.get_double(CONTRAST_BLUE_KEY);
-+ zoomRegion.setContrast(bc);
-+ }
-
-- _settingsInitLate: function() {
- let showCrosshairs = this._settings.get_boolean(SHOW_CROSS_HAIRS_KEY);
- this.addCrosshairs();
- this.setCrosshairsVisible(showCrosshairs);
-
-+ this._appSettings.connect('changed::' + SHOW_KEY,
-+ Lang.bind(this, function() {
-+ this.setActive(this._appSettings.get_boolean(SHOW_KEY));
-+ }));
-+
- this._settings.connect('changed::' + SCREEN_POSITION_KEY,
- Lang.bind(this, this._updateScreenPosition));
- this._settings.connect('changed::' + MAG_FACTOR_KEY,
-@@ -577,6 +557,7 @@ const Magnifier = new Lang.Class({
- Lang.bind(this, function() {
- this.setCrosshairsClip(this._settings.get_boolean(CROSS_HAIRS_CLIP_KEY));
- }));
-+ return this._appSettings.get_boolean(SHOW_KEY);
- },
-
- _updateScreenPosition: function() {
---
-1.8.3.2
-
+++ /dev/null
-From 831bd07b0d6b7055fea8317f2cdf8fd4a408c36d Mon Sep 17 00:00:00 2001
-From: Jasper St. Pierre <jstpierre@mecheye.net>
-Date: Thu, 7 Nov 2013 17:14:47 -0500
-Subject: [PATCH] layout: Fix several issues with the background management code
-
-If monitor-changed fires at startup, it will destroy all of the
-backgrounds, but since this._isStartup is true, won't recreate any
-of them. Additionally, since _bgManagers is indexed by monitor index,
-if the primary index is not 0, it could become a sparse array (e.g.
-[undefined, undefined, primaryBackground]), and our for loop will
-crash trying to access properties of undefined.
-
-Fix both of these issues by always creating background managers for
-every monitor, hiding them on startup but only showing them after
-the startup animation is complete.
-
-One thing we need to watch out for is that while LayoutManager is
-constructing, Main.uiGroup / Main.layoutManager will be undefined,
-so addBackgroundMenu will fail. Fix this by passing down the uiGroup
-to the background menu code.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=709313
-
-
-diff --git a/js/ui/backgroundMenu.js b/js/ui/backgroundMenu.js
-index 06e698c..dcbbb39 100644
---- a/js/ui/backgroundMenu.js
-+++ b/js/ui/backgroundMenu.js
-@@ -13,7 +13,7 @@ const BackgroundMenu = new Lang.Class({
- Name: 'BackgroundMenu',
- Extends: PopupMenu.PopupMenu,
-
-- _init: function(source) {
-+ _init: function(source, layoutManager) {
- this.parent(source, 0, St.Side.TOP);
-
- this.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
-@@ -22,17 +22,17 @@ const BackgroundMenu = new Lang.Class({
-
- this.actor.add_style_class_name('background-menu');
-
-- Main.uiGroup.add_actor(this.actor);
-+ layoutManager.uiGroup.add_actor(this.actor);
- this.actor.hide();
- }
- });
-
--function addBackgroundMenu(actor) {
-+function addBackgroundMenu(actor, layoutManager) {
- let cursor = new St.Bin({ opacity: 0 });
-- Main.uiGroup.add_actor(cursor);
-+ layoutManager.uiGroup.add_actor(cursor);
-
- actor.reactive = true;
-- actor._backgroundMenu = new BackgroundMenu(cursor);
-+ actor._backgroundMenu = new BackgroundMenu(cursor, layoutManager);
- actor._backgroundManager = new PopupMenu.PopupMenuManager({ actor: actor });
- actor._backgroundManager.addMenu(actor._backgroundMenu);
-
-diff --git a/js/ui/layout.js b/js/ui/layout.js
-index 17073a6..80bae9d 100644
---- a/js/ui/layout.js
-+++ b/js/ui/layout.js
-@@ -352,26 +352,26 @@ const LayoutManager = new Lang.Class({
- this.emit('hot-corners-changed');
- },
-
-- _createBackground: function(monitorIndex) {
-+ _addBackgroundMenu: function(bgManager) {
-+ BackgroundMenu.addBackgroundMenu(bgManager.background.actor, this);
-+ },
-+
-+ _createBackgroundManager: function(monitorIndex) {
- let bgManager = new Background.BackgroundManager({ container: this._backgroundGroup,
- layoutManager: this,
- monitorIndex: monitorIndex });
-- BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
--
-- bgManager.connect('changed', Lang.bind(this, function() {
-- BackgroundMenu.addBackgroundMenu(bgManager.background.actor);
-- }));
-
-- this._bgManagers[monitorIndex] = bgManager;
-+ bgManager.connect('changed', Lang.bind(this, this._addBackgroundMenu));
-+ this._addBackgroundMenu(bgManager);
-
-- return bgManager.background;
-+ return bgManager;
- },
-
-- _createSecondaryBackgrounds: function() {
-+ _showSecondaryBackgrounds: function() {
- for (let i = 0; i < this.monitors.length; i++) {
- if (i != this.primaryIndex) {
-- let background = this._createBackground(i);
--
-+ let background = this._bgManagers[i].background;
-+ background.actor.show();
- background.actor.opacity = 0;
- Tweener.addTween(background.actor,
- { opacity: 255,
-@@ -381,10 +381,6 @@ const LayoutManager = new Lang.Class({
- }
- },
-
-- _createPrimaryBackground: function() {
-- this._createBackground(this.primaryIndex);
-- },
--
- _updateBackgrounds: function() {
- let i;
- for (i = 0; i < this._bgManagers.length; i++)
-@@ -395,11 +391,12 @@ const LayoutManager = new Lang.Class({
- if (Main.sessionMode.isGreeter)
- return;
-
-- if (this._startingUp)
-- return;
--
- for (let i = 0; i < this.monitors.length; i++) {
-- this._createBackground(i);
-+ let bgManager = this._createBackgroundManager(i);
-+ this._bgManagers.push(bgManager);
-+
-+ if (i != this.primaryIndex && this._startingUp)
-+ bgManager.background.actor.hide();
- }
- },
-
-@@ -595,7 +592,7 @@ const LayoutManager = new Lang.Class({
- if (Main.sessionMode.isGreeter) {
- this.panelBox.translation_y = -this.panelBox.height;
- } else {
-- this._createPrimaryBackground();
-+ this._updateBackgrounds();
-
- // We need to force an update of the regions now before we scale
- // the UI group to get the coorect allocation for the struts.
-@@ -673,7 +670,7 @@ const LayoutManager = new Lang.Class({
- this.keyboardBox.show();
-
- if (!Main.sessionMode.isGreeter) {
-- this._createSecondaryBackgrounds();
-+ this._showSecondaryBackgrounds();
- global.window_group.remove_clip();
- }
-
---
-Gitg
-
+++ /dev/null
-From 45041b421561ffac0bdfc92680a7a948d3623e65 Mon Sep 17 00:00:00 2001
-From: Adel Gadllah <adel.gadllah@gmail.com>
-Date: Fri, 21 Feb 2014 12:30:40 +0100
-Subject: perf: Restore shell after runs
-
-Currently running the perf tool results into no wm running
-afterwards making it hard for the user to get the results from a terminal
-and generally does not make it easy for users to run it to gather numbers.
-
-So restore the shell after the test has completed.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=724870
-
-diff --git a/src/gnome-shell-perf-tool.in b/src/gnome-shell-perf-tool.in
-index 1ad67b8..4494a92 100644
---- a/src/gnome-shell-perf-tool.in
-+++ b/src/gnome-shell-perf-tool.in
-@@ -99,6 +99,15 @@ def run_shell(perf_output=None):
- shell.wait()
- return shell.returncode == 0
-
-+def restore_shell():
-+ pid = os.fork()
-+ if (pid == 0):
-+ if "MUTTER_WM_CLASS_FILTER" in os.environ:
-+ del os.environ["MUTTER_WM_CLASS_FILTER"]
-+ os.execlp("gnome-shell", "gnome-shell", "--replace")
-+ else:
-+ sys.exit(0)
-+
- def upload_performance_report(report_text):
- try:
- config_home = os.environ['XDG_CONFIG_HOME']
-@@ -320,6 +329,6 @@ if args:
-
- normal_exit = run_performance_test()
- if normal_exit:
-- sys.exit(0)
-+ restore_shell()
- else:
- sys.exit(1)
---
-cgit v0.10.1
-
+++ /dev/null
-From a3d9946803326a5d1fc76c617733df82c7057434 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Sat, 22 Feb 2014 18:00:57 -0500
-Subject: shell-global: Only set the scale factor if get_setting succeeded
-
-If gdk_screen_get_setting fails, like if it's running without XSettings,
-then the GValue will have a value of 0. A lot of code tries to divide by
-the scale factor. This produces NaN, and combined with the fact that NaN
-is "leaky", we very quickly end up spinning out of control.
-
-diff --git a/src/shell-global.c b/src/shell-global.c
-index 852d14f..7a9f6c7 100644
---- a/src/shell-global.c
-+++ b/src/shell-global.c
-@@ -749,8 +749,8 @@ update_scale_factor (GdkScreen *screen, gpointer data)
- GValue value = G_VALUE_INIT;
-
- g_value_init (&value, G_TYPE_INT);
-- gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value);
-- g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
-+ if (gdk_screen_get_setting (global->gdk_screen, "gdk-window-scaling-factor", &value))
-+ g_object_set (context, "scale-factor", g_value_get_int (&value), NULL);
- }
-
- /* This is an IBus workaround. The flow of events with IBus is that every time
---
-cgit v0.10.1
-
+++ /dev/null
-From 7051411be7bbfd9e0c2e831762c87872e5bde468 Mon Sep 17 00:00:00 2001
-From: "Jasper St. Pierre" <jstpierre@mecheye.net>
-Date: Thu, 23 Jan 2014 14:25:06 -0500
-Subject: network: Add a Wired device
-
-This isn't quite like the design, as we don't show icons for other
-devices when wired is in an error state.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=708966
-
-diff --git a/js/ui/status/network.js b/js/ui/status/network.js
-index a3de3dd..3dc694e 100644
---- a/js/ui/status/network.js
-+++ b/js/ui/status/network.js
-@@ -21,6 +21,7 @@ const Util = imports.misc.util;
-
- const NMConnectionCategory = {
- INVALID: 'invalid',
-+ WIRED: 'wired',
- WIRELESS: 'wireless',
- WWAN: 'wwan',
- VPN: 'vpn'
-@@ -296,6 +297,11 @@ const NMConnectionDevice = new Lang.Class({
- this._activeConnectionChangedId = this._device.connect('notify::active-connection', Lang.bind(this, this._activeConnectionChanged));
- },
-
-+ _autoConnect: function() {
-+ let connection = new NetworkManager.Connection();
-+ this._client.add_and_activate_connection(connection, this._device, null, null);
-+ },
-+
- destroy: function() {
- if (this._stateChangedId) {
- GObject.Object.prototype.disconnect.call(this._device, this._stateChangedId);
-@@ -413,6 +419,48 @@ const NMConnectionDevice = new Lang.Class({
- },
- });
-
-+const NMDeviceWired = new Lang.Class({
-+ Name: 'NMDeviceWired',
-+ Extends: NMConnectionDevice,
-+ category: NMConnectionCategory.WIRED,
-+
-+ _init: function(client, device, settings) {
-+ this.parent(client, device, settings);
-+
-+ this.item.menu.addMenuItem(createSettingsAction(_("Wired Settings"), device));
-+ },
-+
-+ _isConnected: function() {
-+ if (!this._device.active_connection)
-+ return false;
-+
-+ let state = this._device.active_connection.state;
-+ return state >= NetworkManager.ActiveConnectionState.ACTIVATING;
-+ },
-+
-+ _sync: function() {
-+ this.item.actor.visible = this._isConnected();
-+ this.parent();
-+ },
-+
-+ _getMenuIcon: function() {
-+ if (this._device.active_connection)
-+ return this.getIndicatorIcon();
-+ else
-+ return 'network-wired-disconnected-symbolic';
-+ },
-+
-+ getIndicatorIcon: function() {
-+ let state = this._device.active_connection.state;
-+ if (state == NetworkManager.ActiveConnectionState.ACTIVATING)
-+ return 'network-wired-acquiring-symbolic';
-+ else if (state == NetworkManager.ActiveConnectionState.ACTIVATED)
-+ return 'network-wired-symbolic';
-+ else
-+ return 'network-wired-disconnected-symbolic';
-+ }
-+});
-+
- const NMDeviceModem = new Lang.Class({
- Name: 'NMDeviceModem',
- Extends: NMConnectionDevice,
-@@ -510,18 +558,6 @@ const NMDeviceBluetooth = new Lang.Class({
- this.item.menu.addMenuItem(createSettingsAction(_("Mobile Broadband Settings"), device));
- },
-
-- _autoConnect: function() {
-- // FIXME: DUN devices are configured like modems, so
-- // We need to spawn the mobile wizard
-- // but the network panel doesn't support bluetooth at the moment
-- // so we just create an empty connection and hope
-- // that this phone supports PAN
--
-- let connection = new NetworkManager.Connection();
-- this._client.add_and_activate_connection(connection, this._device, null, null);
-- return true;
-- },
--
- _getMenuIcon: function() {
- if (this._device.active_connection)
- return this.getIndicatorIcon();
-@@ -1266,6 +1302,7 @@ const NMApplet = new Lang.Class({
-
- // Device types
- this._dtypes = { };
-+ this._dtypes[NetworkManager.DeviceType.ETHERNET] = NMDeviceWired;
- this._dtypes[NetworkManager.DeviceType.WIFI] = NMDeviceWireless;
- this._dtypes[NetworkManager.DeviceType.MODEM] = NMDeviceModem;
- this._dtypes[NetworkManager.DeviceType.BT] = NMDeviceBluetooth;
-@@ -1273,6 +1310,7 @@ const NMApplet = new Lang.Class({
-
- // Connection types
- this._ctypes = { };
-+ this._ctypes[NetworkManager.SETTING_WIRED_SETTING_NAME] = NMConnectionCategory.WIRED;
- this._ctypes[NetworkManager.SETTING_WIRELESS_SETTING_NAME] = NMConnectionCategory.WIRELESS;
- this._ctypes[NetworkManager.SETTING_BLUETOOTH_SETTING_NAME] = NMConnectionCategory.WWAN;
- this._ctypes[NetworkManager.SETTING_CDMA_SETTING_NAME] = NMConnectionCategory.WWAN;
-@@ -1295,6 +1333,15 @@ const NMApplet = new Lang.Class({
- this._tryLateInit();
- },
-
-+ _createDeviceCategory: function() {
-+ let category = {
-+ section: new PopupMenu.PopupMenuSection(),
-+ devices: [ ],
-+ };
-+ this.menu.addMenuItem(category.section);
-+ return category;
-+ },
-+
- _tryLateInit: function() {
- if (!this._client || !this._settings)
- return;
-@@ -1310,17 +1357,9 @@ const NMApplet = new Lang.Class({
- this._nmDevices = [];
- this._devices = { };
-
-- this._devices.wireless = {
-- section: new PopupMenu.PopupMenuSection(),
-- devices: [ ],
-- };
-- this.menu.addMenuItem(this._devices.wireless.section);
--
-- this._devices.wwan = {
-- section: new PopupMenu.PopupMenuSection(),
-- devices: [ ],
-- };
-- this.menu.addMenuItem(this._devices.wwan.section);
-+ this._devices.wired = this._createDeviceCategory();
-+ this._devices.wireless = this._createDeviceCategory();
-+ this._devices.wwan = this._createDeviceCategory();
-
- this._vpnSection = new NMVPNSection(this._client);
- this._vpnSection.connect('activation-failed', Lang.bind(this, this._onActivationFailed));
---
-cgit v0.10.1
-
--- /dev/null
+From 6b43368c9b10ba112e4272f66c507a0da9cf7e13 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@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 a73eaae..c8fd46f 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -315,7 +315,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)
+
+ ShellMenu-0.1.gir: libgnome-shell-menu.la
+--
+2.1.2
+
--- /dev/null
+From 6b658660e822a550da55c735c826ec75b6c0efee Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 10 Dec 2013 23:33:51 +0100
+Subject: [PATCH 1/3] Alter list of default applications
+
+---
+ data/org.gnome.shell.gschema.xml.in.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/org.gnome.shell.gschema.xml.in.in b/data/org.gnome.shell.gschema.xml.in.in
+index 92cef3f..9e783bb 100644
+--- a/data/org.gnome.shell.gschema.xml.in.in
++++ b/data/org.gnome.shell.gschema.xml.in.in
+@@ -31,7 +31,7 @@
+ </_description>
+ </key>
+ <key name="favorite-apps" type="as">
+- <default>[ 'epiphany.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
++ <default>[ 'chromium-browser-chromium.desktop', 'firefox.desktop', 'firefox-bin.desktop', 'evolution.desktop', 'rhythmbox.desktop', 'shotwell.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
+ <_summary>List of desktop file IDs for favorite applications</_summary>
+ <_description>
+ The applications corresponding to these identifiers
+--
+2.1.2
+
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.4-r2.ebuild,v 1.8 2014/06/01 08:07:31 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.14.3.ebuild,v 1.1 2014/12/23 23:55:19 eva Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_{6,7} )
inherit autotools eutils gnome2 multilib pax-utils python-r1 systemd
SLOT="0"
IUSE="+bluetooth +i18n +networkmanager -openrc-force"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~amd64 ~arm ~x86"
# libXfixes-5.0 needed for pointer barriers
# FIXME:
# * gstreamer support is currently automagic
-# * mutter/mutter-wayland support is automagic
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]
+ >=x11-libs/gtk+-3.13.2:3[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
>=sys-auth/polkit-0.100[introspection]
>=x11-libs/libXfixes-5.0
x11-libs/libXtst
- >=x11-wm/mutter-3.10.4[introspection]
+ >=x11-wm/mutter-3.14.3[introspection]
>=x11-libs/startup-notification-0.11
${PYTHON_DEPS}
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:
>=app-accessibility/caribou-0.4.8
media-libs/cogl[introspection]
>=sys-apps/accountsservice-0.6.14[introspection]
- || ( <sys-power/upower-0.99[introspection] sys-power/upower-pm-utils[introspection] )
+ >=sys-power/upower-0.99[introspection]
>=gnome-base/gnome-session-2.91.91
>=gnome-base/gnome-settings-daemon-3.8.3
src_prepare() {
# Change favorites defaults, bug #479918
- epatch "${FILESDIR}/${PN}-defaults.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-defaults.patch
# Fix automagic gnome-bluetooth dep, bug #398145
- epatch "${FILESDIR}/${PN}-3.10-bluetooth-flag.patch"
-
- # Make networkmanager optional, bug #398593
- epatch "${FILESDIR}/${PN}-3.10-networkmanager-flag.patch"
+ epatch "${FILESDIR}"/${PN}-3.12-bluetooth-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"
-
- # Fix background glitches with multiple monitors, from 3.11, bug #504530
- epatch "${FILESDIR}/${PN}-3.10.4-fix-background-manager.patch"
-
- # network: Add a Wired device (from 'master')
- epatch "${FILESDIR}/${PN}-3.10.4-wired-network.patch"
-
- # windowManager: Activate new workspace before removing the current one (from '3.10')
- epatch "${FILESDIR}/${P}-activate-workspace.patch"
-
- # perf: Restore shell after runs (from '3.10')
- epatch "${FILESDIR}/${P}-restore-pref.patch"
-
- # shell-global: Only set the scale factor if get_setting succeeded (from '3.10')
- epatch "${FILESDIR}/${P}-scale-factor.patch"
-
- # Magnifier: Restore crosshairs (from 'master')
- epatch "${FILESDIR}/${PN}-3.10.4-broken-crosshairs.patch"
+ epatch "${FILESDIR}"/${PN}-3.14.0-bluetooth-gold.patch
epatch_user
src_configure() {
# Do not error out on warnings
gnome2_src_configure \
+ --enable-browser-plugin \
--enable-man \
+ $(use_enable !openrc-force systemd) \
$(use_with bluetooth) \
$(use_enable networkmanager) \
BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins
projects / gentoo.git / commitdiff