Update to 3.6.2.

Submitted by:	Gustau Perez


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18582 df743ca5-7f9a-e211-a948-0013205c9059

9 files changed, 120 insertions, 219 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 5392299e0..9edb0398c 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -1,9 +1,9 @@
 # Created by: Pawel Worach <pawel.worach@gmail.com>
 # $FreeBSD$
-#   $MCom: ports/trunk/x11/gnome-shell/Makefile 17268 2013-04-01 05:13:11Z marcus $
+#   $MCom$
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.4.2
+PORTVERSION=	3.6.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,16 +11,16 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
 
-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
-		gcr>=3.4.1:${PORTSDIR}/security/gcr
+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
 LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
 		caribou:${PORTSDIR}/accessibility/caribou \
 		mutter:${PORTSDIR}/x11-wm/mutter \
 		gnome-keyring:${PORTSDIR}/security/libgnome-keyring \
-		gcr:${PORTSDIR}/security/gcr \
+		gcr-3:${PORTSDIR}/security/gcr \
 		telepathy-glib:${PORTSDIR}/net-im/telepathy-glib \
 		telepathy-logger:${PORTSDIR}/net-im/telepathy-logger \
 		folks:${PORTSDIR}/net-im/folks \
+		ibus:${PORTSDIR}/textproc/ibus \
 		pulse:${PORTSDIR}/audio/pulseaudio \
 		croco-0.6:${PORTSDIR}/textproc/libcroco \
 		dbus-glib-1:${PORTSDIR}/devel/dbus-glib \
@@ -34,26 +34,28 @@ USE_XORG=	x11 xfixes sm
 USES=		gettext pathfix
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomeprefix intlhack gtk30 gnomemenus3 \
-		gnomedesktop3 evolutiondataserver3 ltverhack
-USE_GSTREAMER=	theora vp8 ogg
+USE_GNOME=	evolutiondataserver3 gnomedesktop3 gnomemenus3 gnomeprefix \
+		gtk30 intlhack ltverhack
+USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 
-GLIB_SCHEMAS=	org.gnome.shell.gschema.xml \
-		org.gnome.shell.evolution.calendar.gschema.xml
+GLIB_SCHEMAS=	org.gnome.shell.gschema.xml
+
 MAN1=		gnome-shell.1
 
 CONFIGURE_ARGS+=--enable-compile-warnings=no \
 		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
+CONFIGURE_ENV+=	BROWSER_PLUGIN_DIR=${PREFIX}/lib/browser_plugins
 CPPFLAGS+=	-I${LOCALASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \
 		${WRKSRC}/src/shell-app-system.c
+	@${REINPLACE_CMD} -e 's|\-DG_DISABLE_DEPRECATED||g' \
+		${WRKSRC}/src/Makefile.in \
+		${WRKSRC}/browser-plugin/Makefile.in 
 	@${REINPLACE_CMD} -e 's|libnm-glib libnm-util ||g' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|UBDIRS = data js src browser-plugin|UBDIRS = data js src|g' \
-		${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index 2798e97ba..9cf3d524f 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-shell-3.4.2.tar.xz) = 3807f7882968d032f8f5c64b0e0af51c0d016f2e1c4fd1576203c9350e412720
-SIZE (gnome3/gnome-shell-3.4.2.tar.xz) = 1257612
+SHA256 (gnome3/gnome-shell-3.6.2.tar.xz) = 86cff93ade1bf6a67ebd339c017d567c7dc849ff8b256a3803306f44c24b44f0
+SIZE (gnome3/gnome-shell-3.6.2.tar.xz) = 1396196
diff --git a/x11/gnome-shell/files/patch-js_ui_extensionSystem.js b/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
deleted file mode 100644
index 33d06aa66..000000000
--- a/x11/gnome-shell/files/patch-js_ui_extensionSystem.js
+++ /dev/null
@@ -1,82 +0,0 @@
---- js/ui/extensionSystem.js.orig	2012-06-16 10:04:12.000000000 -0500
-+++ js/ui/extensionSystem.js	2012-06-16 10:06:45.000000000 -0500
-@@ -8,7 +8,6 @@
- const Gio = imports.gi.Gio;
- const St = imports.gi.St;
- const Shell = imports.gi.Shell;
--const Soup = imports.gi.Soup;
- 
- const Config = imports.misc.config;
- const ExtensionUtils = imports.misc.extensionUtils;
-@@ -34,15 +33,10 @@
- const REPOSITORY_URL_DOWNLOAD = REPOSITORY_URL_BASE + '/download-extension/%s.shell-extension.zip';
- const REPOSITORY_URL_INFO =     REPOSITORY_URL_BASE + '/extension-info/';
- 
--const _httpSession = new Soup.SessionAsync();
--
- // The unfortunate state of gjs, gobject-introspection and libsoup
- // means that I have to do a hack to add a feature.
- // See: https://bugzilla.gnome.org/show_bug.cgi?id=655189 for context.
- 
--if (Soup.Session.prototype.add_feature != null)
--    Soup.Session.prototype.add_feature.call(_httpSession, new Soup.ProxyResolverDefault());
--
- function _getCertFile() {
-     let localCert = GLib.build_filenamev([global.userdatadir, 'extensions.gnome.org.crt']);
-     if (GLib.file_test(localCert, GLib.FileTest.EXISTS))
-@@ -51,8 +45,6 @@
-         return Config.SHELL_SYSTEM_CA_FILE;
- }
- 
--_httpSession.ssl_ca_file = _getCertFile();
--
- // Arrays of uuids
- var enabledExtensions;
- // Contains the order that extensions were enabled in.
-@@ -75,14 +67,6 @@
-                    shell_version: Config.PACKAGE_VERSION,
-                    api_version: API_VERSION.toString() };
- 
--    let message = Soup.form_request_new_from_hash('GET', REPOSITORY_URL_INFO, params);
--
--    _httpSession.queue_message(message,
--                               function(session, message) {
--                                   let info = JSON.parse(message.response_body.data);
--                                   let dialog = new InstallExtensionDialog(uuid, version_tag, info.name);
--                                   dialog.open(global.get_current_time());
--                               });
- }
- 
- function uninstallExtensionFromUUID(uuid) {
-@@ -110,10 +94,6 @@
- }
- 
- function gotExtensionZipFile(session, message, uuid) {
--    if (message.status_code != Soup.KnownStatusCode.OK) {
--        logExtensionError(uuid, 'downloading extension: ' + message.status_code);
--        return;
--    }
- 
-     // FIXME: use a GFile mkstemp-type method once one exists
-     let fd, tmpzip;
-@@ -126,7 +106,6 @@
- 
-     let stream = new Gio.UnixOutputStream({ fd: fd });
-     let dir = ExtensionUtils.userExtensionsDir.get_child(uuid);
--    Shell.write_soup_message_to_stream(stream, message);
-     stream.close(null);
-     let [success, pid] = GLib.spawn_async(null,
-                                           ['unzip', '-uod', dir.get_path(), '--', tmpzip],
-@@ -440,12 +419,6 @@
-                        api_version: API_VERSION.toString() };
- 
-         let url = REPOSITORY_URL_DOWNLOAD.format(this._uuid);
--        let message = Soup.form_request_new_from_hash('GET', url, params);
--
--        _httpSession.queue_message(message,
--                                   Lang.bind(this, function(session, message) {
--                                       gotExtensionZipFile(session, message, this._uuid);
--                                   }));
- 
-         this.close(global.get_current_time());
-     }
diff --git a/x11/gnome-shell/files/patch-js_ui_main.js b/x11/gnome-shell/files/patch-js_ui_main.js
deleted file mode 100644
index 34d93391c..000000000
--- a/x11/gnome-shell/files/patch-js_ui_main.js
+++ /dev/null
@@ -1,46 +0,0 @@
---- js/ui/main.js.orig	2012-04-16 18:41:48.000000000 +0200
-+++ js/ui/main.js	2012-08-07 23:34:04.000000000 +0200
-@@ -26,12 +26,11 @@
- const RunDialog = imports.ui.runDialog;
- const Layout = imports.ui.layout;
- const LookingGlass = imports.ui.lookingGlass;
--const NetworkAgent = imports.ui.networkAgent;
- const NotificationDaemon = imports.ui.notificationDaemon;
- const WindowAttentionHandler = imports.ui.windowAttentionHandler;
- const Scripting = imports.ui.scripting;
- const ShellDBus = imports.ui.shellDBus;
--const TelepathyClient = imports.ui.telepathyClient;
-+//const TelepathyClient = imports.ui.telepathyClient;
- const WindowManager = imports.ui.windowManager;
- const Magnifier = imports.ui.magnifier;
- const XdndHandler = imports.ui.xdndHandler;
-@@ -54,7 +53,7 @@
- let messageTray = null;
- let notificationDaemon = null;
- let windowAttentionHandler = null;
--let telepathyClient = null;
-+//let telepathyClient = null;
- let ctrlAltTabManager = null;
- let recorder = null;
- let shellDBusService = null;
-@@ -66,7 +65,6 @@
- let statusIconDispatcher = null;
- let keyboard = null;
- let layoutManager = null;
--let networkAgent = null;
- let _errorLogStack = [];
- let _startDate;
- let _defaultCssStylesheet = null;
-@@ -82,10 +80,10 @@
-     global.launch_calendar_server();
- 
-     placesManager = new PlaceDisplay.PlacesManager();
--    telepathyClient = new TelepathyClient.Client();
-+// For some reason the below doesn't work ...
-+//    telepathyClient = new TelepathyClient.Client();
-     automountManager = new AutomountManager.AutomountManager();
-     autorunManager = new AutorunManager.AutorunManager();
--    networkAgent = new NetworkAgent.NetworkAgent();
- }
- 
- function _createGDMSession() {
diff --git a/x11/gnome-shell/files/patch-js_ui_networkAgent.js b/x11/gnome-shell/files/patch-js_ui_networkAgent.js
deleted file mode 100644
index 19bc94dd6..000000000
--- a/x11/gnome-shell/files/patch-js_ui_networkAgent.js
+++ /dev/null
@@ -1,10 +0,0 @@
---- js/ui/networkAgent.js.orig	2011-12-15 15:55:59.000000000 +0100
-+++ js/ui/networkAgent.js	2011-12-15 15:56:24.000000000 +0100
-@@ -22,7 +22,6 @@
- const Clutter = imports.gi.Clutter;
- const Gio = imports.gi.Gio;
- const Lang = imports.lang;
--const NetworkManager = imports.gi.NetworkManager;
- const NMClient = imports.gi.NMClient;
- const Pango = imports.gi.Pango;
- const Shell = imports.gi.Shell;
diff --git a/x11/gnome-shell/files/patch-js_ui_panel.js b/x11/gnome-shell/files/patch-js_ui_panel.js
index 1bd215d8f..5c57b6a19 100644
--- a/x11/gnome-shell/files/patch-js_ui_panel.js
+++ b/x11/gnome-shell/files/patch-js_ui_panel.js
@@ -1,23 +1,16 @@
---- js/ui/panel.js.orig	2011-12-15 15:57:12.000000000 +0100
-+++ js/ui/panel.js	2011-12-15 15:57:42.000000000 +0100
-@@ -27,7 +27,7 @@ const BUTTON_DND_ACTIVATION_TIMEOUT = 25
- const ANIMATED_ICON_UPDATE_TIMEOUT = 100;
- const SPINNER_ANIMATION_TIME = 0.2;
- 
--const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'network', 'battery', 'userMenu'];
-+const STANDARD_STATUS_AREA_ORDER = ['a11y', 'keyboard', 'volume', 'bluetooth', 'battery', 'userMenu'];
- const STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION = {
-     'a11y': imports.ui.status.accessibility.ATIndicator,
-     'volume': imports.ui.status.volume.Indicator,
-@@ -39,11 +39,6 @@ const STANDARD_STATUS_AREA_SHELL_IMPLEME
- if (Config.HAVE_BLUETOOTH)
-     STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['bluetooth'] = imports.ui.status.bluetooth.Indicator;
+--- js/ui/panel.js.old	2013-04-28 19:22:35.753485501 +0000
++++ js/ui/panel.js	2013-04-28 19:23:28.059021301 +0000
+@@ -910,13 +910,6 @@
+     PANEL_ITEM_IMPLEMENTATIONS['bluetooth'] =
+         imports.ui.status.bluetooth.Indicator;
  
 -try {
--    STANDARD_STATUS_AREA_SHELL_IMPLEMENTATION['network'] = imports.ui.status.network.NMApplet;
+-    PANEL_ITEM_IMPLEMENTATIONS['network'] =
+-        imports.ui.status.network.NMApplet;
 -} catch(e) {
 -    log('NMApplet is not supported. It is possible that your NetworkManager version is too old');
 -}
+-
+ const Panel = new Lang.Class({
+     Name: 'Panel',
  
- const GDM_STATUS_AREA_ORDER = ['a11y', 'display', 'keyboard', 'volume', 'battery', 'powerMenu'];
- const GDM_STATUS_AREA_SHELL_IMPLEMENTATION = {
diff --git a/x11/gnome-shell/files/patch-js_ui_sessionMode.js b/x11/gnome-shell/files/patch-js_ui_sessionMode.js
new file mode 100644
index 000000000..19e314e45
--- /dev/null
+++ b/x11/gnome-shell/files/patch-js_ui_sessionMode.js
@@ -0,0 +1,36 @@
+--- js/ui/sessionMode.js.orig	2013-04-28 19:50:35.808911032 +0000
++++ js/ui/sessionMode.js	2013-04-28 19:51:07.527210205 +0000
+@@ -50,7 +50,7 @@
+         isLocked: true,
+         isGreeter: undefined,
+         unlockDialog: undefined,
+-        components: ['polkitAgent', 'telepathyClient'],
++        components: ['polkitAgent'],
+         panel: {
+             left: ['userMenu'],
+             center: [],
+@@ -61,7 +61,7 @@
+     'unlock-dialog': {
+         isLocked: true,
+         unlockDialog: undefined,
+-        components: ['polkitAgent', 'telepathyClient'],
++        components: ['polkitAgent'],
+         panel: {
+             left: ['userMenu'],
+             center: [],
+@@ -91,13 +91,13 @@
+         isLocked: false,
+         isPrimary: true,
+         unlockDialog: imports.ui.unlockDialog.UnlockDialog,
+-        components: ['networkAgent', 'polkitAgent', 'telepathyClient',
++        components: ['polkitAgent',
+                      'keyring', 'recorder', 'autorunManager', 'automountManager'],
+         panel: {
+             left: ['activities', 'appMenu'],
+             center: ['dateMenu'],
+             right: ['a11y', 'keyboard', 'volume', 'bluetooth',
+-                    'network', 'battery', 'userMenu']
++                    'battery', 'userMenu']
+         }
+     }
+ };
diff --git a/x11/gnome-shell/files/patch-src_Makefile.in b/x11/gnome-shell/files/patch-src_Makefile.in
index 1abafc1bb..c9b3ca40d 100644
--- a/x11/gnome-shell/files/patch-src_Makefile.in
+++ b/x11/gnome-shell/files/patch-src_Makefile.in
@@ -1,8 +1,8 @@
---- src/Makefile.in.orig	2012-06-14 23:43:49.000000000 +0200
-+++ src/Makefile.in	2012-06-14 23:44:29.000000000 +0200
-@@ -125,9 +125,9 @@
- 	shell-embedded-window.h shell-generic-container.h \
- 	shell-gtk-embed.h shell-global.h shell-idle-monitor.h \
+--- src/Makefile.in.orig	2013-04-12 17:24:31.329599290 +0000
++++ src/Makefile.in	2013-04-12 17:25:03.025595800 +0000
+@@ -143,9 +143,9 @@
+ 	shell-generic-container.h shell-gtk-embed.h shell-global.h \
+ 	shell-idle-monitor.h shell-invert-lightness-effect.h \
  	shell-mobile-providers.h shell-mount-operation.h \
 -	shell-network-agent.h shell-perf-log.h shell-screenshot.h \
 +	shell-perf-log.h shell-screenshot.h \
@@ -12,16 +12,16 @@
  	shell-util.h shell-window-tracker.h shell-wm.h \
  	shell-xfixes-cursor.h gactionmuxer.h gactionmuxer.c \
  	gactionobservable.h gactionobservable.c gactionobserver.h \
-@@ -141,7 +141,7 @@
- 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
- 	shell-idle-monitor.c shell-keyring-prompt.h \
- 	shell-keyring-prompt.c shell-mobile-providers.c \
--	shell-mount-operation.c shell-network-agent.c shell-perf-log.c \
-+	shell-mount-operation.c shell-perf-log.c \
+@@ -159,7 +159,7 @@
+ 	shell-idle-monitor.c shell-invert-lightness-effect.c \
+ 	shell-keyring-prompt.h shell-keyring-prompt.c \
+ 	shell-mobile-providers.c shell-mount-operation.c \
+-	shell-network-agent.c shell-perf-log.c \
++	shell-perf-log.c \
  	shell-polkit-authentication-agent.h \
  	shell-polkit-authentication-agent.c shell-screenshot.c \
  	shell-screen-grabber.c shell-secure-text-buffer.c \
-@@ -173,7 +173,6 @@
+@@ -191,7 +191,6 @@
  	libgnome_shell_la-shell-keyring-prompt.lo \
  	libgnome_shell_la-shell-mobile-providers.lo \
  	libgnome_shell_la-shell-mount-operation.lo \
@@ -29,8 +29,8 @@
  	libgnome_shell_la-shell-perf-log.lo \
  	libgnome_shell_la-shell-polkit-authentication-agent.lo \
  	libgnome_shell_la-shell-screenshot.lo \
-@@ -850,13 +849,11 @@
- 	shell-idle-monitor.h		\
+@@ -888,13 +887,11 @@
+ 	shell-invert-lightness-effect.h	\
  	shell-mobile-providers.h	\
  	shell-mount-operation.h		\
 -	shell-network-agent.h		\
@@ -43,25 +43,25 @@
  	shell-tray-icon.h		\
  	shell-tray-manager.h		\
  	shell-util.h			\
-@@ -878,7 +875,7 @@
- 	shell-generic-container.c shell-gtk-embed.c shell-global.c \
- 	shell-idle-monitor.c shell-keyring-prompt.h \
- 	shell-keyring-prompt.c shell-mobile-providers.c \
--	shell-mount-operation.c shell-network-agent.c shell-perf-log.c \
-+	shell-mount-operation.c shell-perf-log.c \
+@@ -916,7 +913,7 @@
+ 	shell-idle-monitor.c shell-invert-lightness-effect.c \
+ 	shell-keyring-prompt.h shell-keyring-prompt.c \
+ 	shell-mobile-providers.c shell-mount-operation.c \
+-	shell-network-agent.c shell-perf-log.c \
++	shell-perf-log.c \
  	shell-polkit-authentication-agent.h \
  	shell-polkit-authentication-agent.c shell-screenshot.c \
  	shell-screen-grabber.c shell-secure-text-buffer.c \
-@@ -952,7 +949,7 @@
+@@ -990,7 +987,7 @@
  	$(NULL)
  
  libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)
--Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0 Folks-0.6
-+Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 Folks-0.6
+-Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 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 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0
  Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
  Shell_0_1_gir_LIBS = libgnome-shell.la
  Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
-@@ -1234,7 +1231,6 @@
+@@ -1285,7 +1282,6 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-keyring-prompt.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mobile-providers.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-mount-operation.Plo@am__quote@
@@ -69,7 +69,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-perf-log.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-polkit-authentication-agent.Plo@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnome_shell_la-shell-recorder-src.Plo@am__quote@
-@@ -2355,7 +2351,7 @@
+@@ -2446,7 +2442,7 @@
  
  shell-enum-types.h: stamp-shell-enum-types.h Makefile
  	@true
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index b3d832c9d..92b413f19 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,6 +1,10 @@
 bin/gnome-shell
 bin/gnome-shell-extension-prefs
 bin/gnome-shell-extension-tool
+bin/gnome-shell-perf-tool
+lib/browser_plugins/libgnome-shell-browser-plugin.a
+lib/browser_plugins/libgnome-shell-browser-plugin.la
+lib/browser_plugins/libgnome-shell-browser-plugin.so
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
 lib/gnome-shell/ShellJS-0.1.typelib
@@ -21,7 +25,6 @@ share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
 share/doc/shell/ShellAppSystem.html
-share/doc/shell/ShellContactSystem.html
 share/doc/shell/ShellEmbeddedWindow.html
 share/doc/shell/ShellGenericContainer.html
 share/doc/shell/ShellGtkEmbed.html
@@ -94,64 +97,70 @@ share/doc/st/style.css
 share/doc/st/styling.html
 share/doc/st/up.png
 share/doc/st/widgets.html
+share/applications/evolution-calendar.desktop
 share/gnome-shell/js/extensionPrefs/main.js
 share/gnome-shell/js/gdm/batch.js
-share/gnome-shell/js/gdm/consoleKit.js
 share/gnome-shell/js/gdm/fingerprint.js
 share/gnome-shell/js/gdm/loginDialog.js
 share/gnome-shell/js/gdm/powerMenu.js
-share/gnome-shell/js/gdm/systemd.js
+share/gnome-shell/js/gdm/realmd.js
+share/gnome-shell/js/gdm/util.js
 share/gnome-shell/js/misc/config.js
 share/gnome-shell/js/misc/extensionUtils.js
 share/gnome-shell/js/misc/fileUtils.js
-share/gnome-shell/js/misc/format.js
 share/gnome-shell/js/misc/gnomeSession.js
 share/gnome-shell/js/misc/history.js
 share/gnome-shell/js/misc/jsParse.js
+share/gnome-shell/js/misc/loginManager.js
 share/gnome-shell/js/misc/modemManager.js
 share/gnome-shell/js/misc/params.js
-share/gnome-shell/js/misc/screenSaver.js
 share/gnome-shell/js/misc/util.js
 share/gnome-shell/js/perf/core.js
 share/gnome-shell/js/ui/altTab.js
 share/gnome-shell/js/ui/appDisplay.js
 share/gnome-shell/js/ui/appFavorites.js
-share/gnome-shell/js/ui/automountManager.js
-share/gnome-shell/js/ui/autorunManager.js
 share/gnome-shell/js/ui/boxpointer.js
 share/gnome-shell/js/ui/calendar.js
 share/gnome-shell/js/ui/checkBox.js
-share/gnome-shell/js/ui/contactDisplay.js
+share/gnome-shell/js/ui/components/__init__.js
+share/gnome-shell/js/ui/components/automountManager.js
+share/gnome-shell/js/ui/components/autorunManager.js
+share/gnome-shell/js/ui/components/keyring.js
+share/gnome-shell/js/ui/components/networkAgent.js
+share/gnome-shell/js/ui/components/polkitAgent.js
+share/gnome-shell/js/ui/components/recorder.js
+share/gnome-shell/js/ui/components/telepathyClient.js
 share/gnome-shell/js/ui/ctrlAltTab.js
 share/gnome-shell/js/ui/dash.js
 share/gnome-shell/js/ui/dateMenu.js
 share/gnome-shell/js/ui/dnd.js
 share/gnome-shell/js/ui/endSessionDialog.js
 share/gnome-shell/js/ui/environment.js
+share/gnome-shell/js/ui/extensionDownloader.js
 share/gnome-shell/js/ui/extensionSystem.js
 share/gnome-shell/js/ui/flashspot.js
+share/gnome-shell/js/ui/grabHelper.js
+share/gnome-shell/js/ui/ibusCandidatePopup.js
 share/gnome-shell/js/ui/iconGrid.js
 share/gnome-shell/js/ui/keyboard.js
-share/gnome-shell/js/ui/keyringPrompt.js
 share/gnome-shell/js/ui/layout.js
 share/gnome-shell/js/ui/lightbox.js
-share/gnome-shell/js/ui/link.js
 share/gnome-shell/js/ui/lookingGlass.js
 share/gnome-shell/js/ui/magnifier.js
 share/gnome-shell/js/ui/magnifierDBus.js
 share/gnome-shell/js/ui/main.js
 share/gnome-shell/js/ui/messageTray.js
 share/gnome-shell/js/ui/modalDialog.js
-share/gnome-shell/js/ui/networkAgent.js
 share/gnome-shell/js/ui/notificationDaemon.js
 share/gnome-shell/js/ui/overview.js
 share/gnome-shell/js/ui/panel.js
 share/gnome-shell/js/ui/panelMenu.js
-share/gnome-shell/js/ui/placeDisplay.js
-share/gnome-shell/js/ui/polkitAuthenticationAgent.js
+share/gnome-shell/js/ui/pointerWatcher.js
 share/gnome-shell/js/ui/popupMenu.js
 share/gnome-shell/js/ui/remoteSearch.js
 share/gnome-shell/js/ui/runDialog.js
+share/gnome-shell/js/ui/screenShield.js
+share/gnome-shell/js/ui/sessionMode.js
 share/gnome-shell/js/ui/scripting.js
 share/gnome-shell/js/ui/search.js
 share/gnome-shell/js/ui/searchDisplay.js
@@ -161,12 +170,12 @@ share/gnome-shell/js/ui/shellMountOperation.js
 share/gnome-shell/js/ui/status/accessibility.js
 share/gnome-shell/js/ui/status/bluetooth.js
 share/gnome-shell/js/ui/status/keyboard.js
+share/gnome-shell/js/ui/status/lockScreenMenu.js
 share/gnome-shell/js/ui/status/network.js
 share/gnome-shell/js/ui/status/power.js
 share/gnome-shell/js/ui/status/volume.js
-share/gnome-shell/js/ui/statusIconDispatcher.js
-share/gnome-shell/js/ui/telepathyClient.js
 share/gnome-shell/js/ui/tweener.js
+share/gnome-shell/js/ui/unlockDialog.js
 share/gnome-shell/js/ui/userMenu.js
 share/gnome-shell/js/ui/viewSelector.js
 share/gnome-shell/js/ui/wanda.js
@@ -177,9 +186,6 @@ share/gnome-shell/js/ui/workspaceSwitcherPopup.js
 share/gnome-shell/js/ui/workspaceThumbnail.js
 share/gnome-shell/js/ui/workspacesView.js
 share/gnome-shell/js/ui/xdndHandler.js
-share/gnome-shell/open-search-providers/google.xml
-share/gnome-shell/open-search-providers/wikipedia.xml
-share/gnome-shell/shaders/dim-window.glsl
 share/gnome-shell/theme/calendar-arrow-left.svg
 share/gnome-shell/theme/calendar-arrow-right.svg
 share/gnome-shell/theme/calendar-today.svg
@@ -194,22 +200,23 @@ share/gnome-shell/theme/corner-ripple-rtl.png
 share/gnome-shell/theme/dash-placeholder.svg
 share/gnome-shell/theme/filter-selected-ltr.svg
 share/gnome-shell/theme/filter-selected-rtl.svg
-share/gnome-shell/theme/gdm.css
 share/gnome-shell/theme/gnome-shell.css
+share/gnome-shell/theme/logged-in-indicator.svg
+share/gnome-shell/theme/message-tray-background.png
+share/gnome-shell/theme/noise-texture.png
 share/gnome-shell/theme/panel-button-border.svg
 share/gnome-shell/theme/panel-button-highlight-narrow.svg
 share/gnome-shell/theme/panel-button-highlight-wide.svg
 share/gnome-shell/theme/process-working.svg
 share/gnome-shell/theme/running-indicator.svg
-share/gnome-shell/theme/scroll-hhandle.svg
-share/gnome-shell/theme/scroll-vhandle.svg
 share/gnome-shell/theme/source-button-border.svg
+share/gnome-shell/theme/summary-counter.svg
 share/gnome-shell/theme/toggle-off-intl.svg
 share/gnome-shell/theme/toggle-off-us.svg
 share/gnome-shell/theme/toggle-on-intl.svg
 share/gnome-shell/theme/toggle-on-us.svg
-share/gnome-shell/theme/ws-switch-arrow-down.svg
-share/gnome-shell/theme/ws-switch-arrow-up.svg
+share/gnome-shell/theme/ws-switch-arrow-down.png
+share/gnome-shell/theme/ws-switch-arrow-up.png
 share/locale/af/LC_MESSAGES/gnome-shell.mo
 share/locale/an/LC_MESSAGES/gnome-shell.mo
 share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -246,6 +253,7 @@ share/locale/kk/LC_MESSAGES/gnome-shell.mo
 share/locale/kn/LC_MESSAGES/gnome-shell.mo
 share/locale/ko/LC_MESSAGES/gnome-shell.mo
 share/locale/ku/LC_MESSAGES/gnome-shell.mo
+share/locale/ky/LC_MESSAGES/gnome-shell.mo
 share/locale/lt/LC_MESSAGES/gnome-shell.mo
 share/locale/lv/LC_MESSAGES/gnome-shell.mo
 share/locale/mk/LC_MESSAGES/gnome-shell.mo
@@ -299,9 +307,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
 @dirrmtry share/locale/an/LC_MESSAGES
 @dirrmtry share/locale/an
 @dirrm share/gnome-shell/theme
-@dirrm share/gnome-shell/shaders
-@dirrm share/gnome-shell/open-search-providers
 @dirrm share/gnome-shell/js/ui/status
+@dirrm share/gnome-shell/js/ui/components
 @dirrm share/gnome-shell/js/ui
 @dirrm share/gnome-shell/js/perf
 @dirrm share/gnome-shell/js/misc
@@ -310,5 +317,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
 @dirrm share/gnome-shell/js
 @dirrm share/gnome-shell
 @dirrm lib/gnome-shell
+@dirrmtry lib/browser_plugins
 @dirrm share/doc/st
 @dirrm share/doc/shell