First batch at upgrading gnome to 3.36/3.38

Update evolution-dataserver to 3.38.0 and because of ABI breakage update ports
depending on it
Update bijiben to 3.38.0
Update gnome-calendar to 3.38.0
Update gnome-contacts to 3.38
Update gnome-maps to 3.38.0
Patch gnome-todo to work with newer evolution-dataserver (patched obtained from
    OpenBSD/Archlinux)
Update evolution to 3.38.0
Update evolution-ews to 3.38.0 (among changes it brings support for office365)
Update folks to 0.14.0

Update cheese to 3.38.0
Update aisleriot to 3.22.9
Update five-or-more to 3.22.2
Update fastream to 0.2.9
Update gnome-control-center to 3.36.4
Update gnmoe-settings-daemon to 3.38.0
Update meld to 3.21.0

Update gnome-desktop to 3.38.0 and because of ABI breakage bump portrevision of
all dependant ports not touched by this update
Update gnome-session to 3.38.0
Update gnome-shell to 3.36.6, now run depends on gdm
Update gnome-shell-extensions to 3.36.3
Update mutter to 3.36.6

5 files changed, 53 insertions, 179 deletions

diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index 3efb542504d2..15becd3d8f6c 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -2,11 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.28.3
-PORTREVISION=	8
+PORTVERSION=	3.36.6
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome3
+DIST_SUBDIR=	gnome
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Next generation GNOME desktop shell
@@ -16,10 +15,11 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
 		sassc:textproc/sassc \
-		gnome-control-center:sysutils/gnome-control-center
+		gnome-control-center:sysutils/gnome-control-center \
+		a2x:textproc/asciidoc
 LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libdrm.so:graphics/libdrm \
-		libmutter-2.so:x11-wm/mutter \
+		libmutter-6.so:x11-wm/mutter \
 		libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libsoup-2.4.so:devel/libsoup \
 		libjson-glib-1.0.so:devel/json-glib \
@@ -34,8 +34,11 @@ LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
 		libcanberra.so:audio/libcanberra \
 		libcanberra-gtk3.so:audio/libcanberra-gtk3 \
 		libp11-kit.so:security/p11-kit \
-		libgjs.so:lang/gjs
-RUN_DEPENDS=	gnome-control-center:sysutils/gnome-control-center
+		libgjs.so:lang/gjs \
+		libgraphene-1.0.so:graphics/graphene \
+		libgnome-autoar-0.so:archivers/gnome-autoar
+RUN_DEPENDS=	gnome-control-center:sysutils/gnome-control-center \
+		gdm:x11/gdm
 
 PORTSCOUT=	limitw:1,even
 
@@ -43,7 +46,7 @@ USES=		compiler:c11 cpe gettext gl gnome libtool localbase meson \
 		pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \
 		webplugin:native xorg
 USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 introspection \
-		libxslt:build libxml2
+		libxslt:build libxml2 gnomedesktop3
 USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr xtst
 USE_GL=		egl gbm
 USE_GSTREAMER1=	yes
@@ -51,16 +54,19 @@ USE_PERL5=	build
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	src/gnome-shell-perf-tool.in \
 		src/gnome-shell-extension-tool.in
+BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 WEBPLUGIN_NAME=	libgnome-shell-browser-plugin.so
 WEBPLUGIN_DIR=	${PREFIX}/lib/mozilla/plugins/
 WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
 
 MESON_ARGS=	-Dsystemd=false \
-		-Dnetworkmanager=false
+		-Dnetworkmanager=false \
+		-Dpython=${PYTHON_CMD}
 CPE_VENDOR=	gnome
 
-GLIB_SCHEMAS=	org.gnome.shell.gschema.xml
+GLIB_SCHEMAS=	org.gnome.shell.gschema.xml \
+		00_org.gnome.shell.gschema.override
 
 .if exists(/usr/bin/ld.lld) && ${/usr/bin/ld:L:tA} != /usr/bin/ld.lld
 # Work around "New rpath must not be longer than the old one."
@@ -68,12 +74,7 @@ LDFLAGS+=	-fuse-ld=lld
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|python3|${PYTHON_VERSION}|g' \
-		${WRKSRC}/meson.build
-	@${REINPLACE_CMD} -e 's|applications.menu|gnome-applications.menu|g' \
-		${WRKSRC}/src/shell-app-system.c
-
-pre-build:
-	@cd ${BUILD_WRKSRC} && ninja src/st/st-scroll-view-fade-generated.c
+	${REINPLACE_CMD} -e "s,%%PYTHON_CMD%%,${PYTHON_CMD},g" \
+		${WRKSRC}/src/meson.build
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo
index eb16f63e1ba5..a56b2d97e265 100644
--- a/x11/gnome-shell/distinfo
+++ b/x11/gnome-shell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1538670467
-SHA256 (gnome3/gnome-shell-3.28.3.tar.xz) = 1c24f5b306fdedbdd7df4a92caef13061302f1cac97838dfcdf30b692352a276
-SIZE (gnome3/gnome-shell-3.28.3.tar.xz) = 1433388
+TIMESTAMP = 1601305988
+SHA256 (gnome/gnome-shell-3.36.6.tar.xz) = 89701e4e3fe3d852ee18047c4f9e0640c9930ea11883c4772c350b7b5a748664
+SIZE (gnome/gnome-shell-3.36.6.tar.xz) = 1775836
diff --git a/x11/gnome-shell/files/patch-js_misc_loginManager.js b/x11/gnome-shell/files/patch-js_misc_loginManager.js
deleted file mode 100644
index f4900004eebb..000000000000
--- a/x11/gnome-shell/files/patch-js_misc_loginManager.js
+++ /dev/null
@@ -1,134 +0,0 @@
-$OpenBSD: patch-js_misc_loginManager_js,v 1.4 2017/11/04 16:44:50 jasper Exp $
-
-REVERT:
-From ddea54a5398c123a4711243e55811c8ba26f8b85 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Thu, 12 May 2016 09:25:49 +0200
-Subject: ScreenShield: set LockedHint property from systemd
-
-REVERT:
-From a244c1e987502e359c45c0a9bc0012b5bc635553 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
-Date: Thu, 24 Apr 2014 17:55:56 +0200
-Subject: loginManager: Kill ConsoleKit support
-
-
---- js/misc/loginManager.js.orig	2018-04-05 22:23:32.831383000 +0200
-+++ js/misc/loginManager.js	2018-04-05 22:30:34.647201000 +0200
-@@ -40,15 +40,38 @@ const SystemdLoginSessionIface = '<node> \
- <signal name="Lock" /> \
- <signal name="Unlock" /> \
- <property name="Active" type="b" access="read" /> \
--<method name="SetLockedHint"> \
--    <arg type="b" direction="in"/> \
--</method> \
- </interface> \
- </node>';
- 
- const SystemdLoginManager = Gio.DBusProxy.makeProxyWrapper(SystemdLoginManagerIface);
- const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
- 
-+const ConsoleKitManagerIface = '<node> \
-+<interface name="org.freedesktop.ConsoleKit.Manager"> \
-+<method name="CanRestart"> \
-+    <arg type="b" direction="out"/> \
-+</method> \
-+<method name="CanStop"> \
-+    <arg type="b" direction="out"/> \
-+</method> \
-+<method name="Restart" /> \
-+<method name="Stop" /> \
-+<method name="GetCurrentSession"> \
-+    <arg type="o" direction="out" /> \
-+</method> \
-+</interface> \
-+</node>';
-+
-+const ConsoleKitSessionIface = '<node> \
-+<interface name="org.freedesktop.ConsoleKit.Session"> \
-+<signal name="Lock" /> \
-+<signal name="Unlock" /> \
-+</interface> \
-+</node>';
-+
-+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
-+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
-+
- function haveSystemd() {
-     return GLib.access("/run/systemd/seats", 0) >= 0;
- }
-@@ -78,7 +101,7 @@ function canLock() {
-                                                -1, null);
- 
-         let version = result.deep_unpack()[0].deep_unpack();
--        return haveSystemd() && versionCompare('3.5.91', version);
-+        return versionCompare('3.5.91', version);
-     } catch(e) {
-         return false;
-     }
-@@ -96,7 +119,7 @@ function getLoginManager() {
-         if (haveSystemd())
-             _loginManager = new LoginManagerSystemd();
-         else
--            _loginManager = new LoginManagerDummy();
-+            _loginManager = new LoginManagerConsoleKit();
-     }
- 
-     return _loginManager;
-@@ -113,6 +136,9 @@ var LoginManagerSystemd = new Lang.Class({
-                                   this._prepareForSleep.bind(this));
-     },
- 
-+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
-+    // session objects have different interfaces - but in both cases there are
-+    // Lock/Unlock signals, and that's all we count upon at the moment.
-     getCurrentSessionProxy(callback) {
-         if (this._currentSession) {
-             callback (this._currentSession);
-@@ -188,13 +214,35 @@ var LoginManagerSystemd = new Lang.Class({
- });
- Signals.addSignalMethods(LoginManagerSystemd.prototype);
- 
--var LoginManagerDummy = new Lang.Class({
--    Name: 'LoginManagerDummy',
-+const LoginManagerConsoleKit = new Lang.Class({
-+    Name: 'LoginManagerConsoleKit',
- 
-+    _init: function() {
-+        this._proxy = new ConsoleKitManager(Gio.DBus.system,
-+                                            'org.freedesktop.ConsoleKit',
-+                                            '/org/freedesktop/ConsoleKit/Manager');
-+    },
-+
-+    // Having this function is a bit of a hack since the Systemd and ConsoleKit
-+    // session objects have different interfaces - but in both cases there are
-+    // Lock/Unlock signals, and that's all we count upon at the moment.
-     getCurrentSessionProxy(callback) {
--        // we could return a DummySession object that fakes whatever callers
--        // expect (at the time of writing: connect() and connectSignal()
--        // methods), but just never calling the callback should be safer
-+        if (this._currentSession) {
-+            callback (this._currentSession);
-+            return;
-+        }
-+
-+        this._proxy.GetCurrentSessionRemote(Lang.bind(this,
-+            function(result, error) {
-+                if (error) {
-+                    logError(error, 'Could not get a proxy for the current session');
-+                } else {
-+                    this._currentSession = new ConsoleKitSession(Gio.DBus.system,
-+                                                                 'org.freedesktop.ConsoleKit',
-+                                                                 result[0]);
-+                    callback(this._currentSession);
-+                }
-+            }));
-     },
- 
-     canSuspend(asyncCallback) {
-@@ -214,4 +262,4 @@ var LoginManagerDummy = new Lang.Class({
-         callback(null);
-     }
- });
--Signals.addSignalMethods(LoginManagerDummy.prototype);
-+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
diff --git a/x11/gnome-shell/files/patch-js_ui_screenShield.js b/x11/gnome-shell/files/patch-js_ui_screenShield.js
deleted file mode 100644
index 7c05eacea297..000000000000
--- a/x11/gnome-shell/files/patch-js_ui_screenShield.js
+++ /dev/null
@@ -1,21 +0,0 @@
-$OpenBSD: patch-js_ui_screenShield_js,v 1.3 2017/11/04 16:44:50 jasper Exp $
-
-REVERT:
-From ddea54a5398c123a4711243e55811c8ba26f8b85 Mon Sep 17 00:00:00 2001
-From: Victor Toso <victortoso@redhat.com>
-Date: Thu, 12 May 2016 09:25:49 +0200
-Subject: ScreenShield: set LockedHint property from systemd
-
-Index: js/ui/screenShield.js
---- js/ui/screenShield.js.orig
-+++ js/ui/screenShield.js
-@@ -582,9 +582,6 @@ var ScreenShield = new Lang.Class({
-         if (prevIsActive != this._isActive)
-             this.emit('active-changed');
- 
--        if (this._loginSession)
--            this._loginSession.SetLockedHintRemote(active);
--
-         this._syncInhibitor();
-     },
- 
diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist
index 89f729b79fff..72f1151e9201 100644
--- a/x11/gnome-shell/pkg-plist
+++ b/x11/gnome-shell/pkg-plist
@@ -1,39 +1,64 @@
+bin/gnome-extensions
+bin/gnome-extensions-app
 bin/gnome-shell
 bin/gnome-shell-extension-prefs
 bin/gnome-shell-extension-tool
 bin/gnome-shell-perf-tool
+etc/xdg/autostart/gnome-shell-overrides-migration.desktop
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
-lib/gnome-shell/ShellMenu-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
+lib/gnome-shell/girepository-1.0/Shew-0.typelib
 lib/gnome-shell/libgnome-shell-menu.so
 lib/gnome-shell/libgnome-shell.so
 lib/gnome-shell/libgvc.so
+lib/gnome-shell/libshew-0.so
 lib/gnome-shell/libst-1.0.so
-%%WEBPLUGIN_DIR%%libgnome-shell-browser-plugin.so
 libexec/gnome-shell-calendar-server
 libexec/gnome-shell-hotplug-sniffer
+libexec/gnome-shell-overrides-migration.sh
 libexec/gnome-shell-perf-helper
+man/man1/gnome-extensions.1.gz
 man/man1/gnome-shell.1.gz
 share/GConf/gsettings/gnome-shell-overrides.convert
 share/applications/evolution-calendar.desktop
-share/applications/gnome-shell-extension-prefs.desktop
+share/applications/org.gnome.Extensions.desktop
+share/applications/org.gnome.Shell.Extensions.desktop
 share/applications/org.gnome.Shell.desktop
+share/bash-completion/completions/gnome-extensions
+share/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
+share/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
 share/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
 share/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
 share/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
 share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
 share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
+share/dbus-1/services/org.gnome.Extensions.service
 share/dbus-1/services/org.gnome.Shell.CalendarServer.service
+share/dbus-1/services/org.gnome.Shell.Extensions.service
 share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
+share/dbus-1/services/org.gnome.Shell.Notifications.service
 share/gnome-control-center/keybindings/50-gnome-shell-system.xml
 %%DATADIR%%/Gvc-1.0.gir
 %%DATADIR%%/Shell-0.1.gir
-%%DATADIR%%/ShellMenu-0.1.gir
 %%DATADIR%%/St-1.0.gir
+%%DATADIR%%/gir-1.0/Shew-0.gir
+%%DATADIR%%/gnome-shell-dbus-interfaces.gresource
 %%DATADIR%%/gnome-shell-osk-layouts.gresource
 %%DATADIR%%/gnome-shell-theme.gresource
+%%DATADIR%%/org.gnome.Extensions
+%%DATADIR%%/org.gnome.Extensions.data.gresource
+%%DATADIR%%/org.gnome.Extensions.src.gresource
+%%DATADIR%%/org.gnome.Shell.Extensions
+%%DATADIR%%/org.gnome.Shell.Extensions.src.gresource
+%%DATADIR%%/org.gnome.Shell.Notifications
+%%DATADIR%%/org.gnome.Shell.Notifications.src.gresource
 %%DATADIR%%/perf-background.xml
+share/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg
+share/icons/hicolor/scalable/apps/org.gnome.Extensions.svg
+share/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg
+share/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
 share/locale/af/LC_MESSAGES/gnome-shell.mo
 share/locale/an/LC_MESSAGES/gnome-shell.mo
 share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -46,6 +71,7 @@ share/locale/bn_IN/LC_MESSAGES/gnome-shell.mo
 share/locale/bs/LC_MESSAGES/gnome-shell.mo
 share/locale/ca/LC_MESSAGES/gnome-shell.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-shell.mo
+share/locale/ckb/LC_MESSAGES/gnome-shell.mo
 share/locale/cs/LC_MESSAGES/gnome-shell.mo
 share/locale/da/LC_MESSAGES/gnome-shell.mo
 share/locale/de/LC_MESSAGES/gnome-shell.mo
@@ -80,6 +106,7 @@ 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/mjw/LC_MESSAGES/gnome-shell.mo
 share/locale/mk/LC_MESSAGES/gnome-shell.mo
 share/locale/ml/LC_MESSAGES/gnome-shell.mo
 share/locale/mr/LC_MESSAGES/gnome-shell.mo
@@ -114,4 +141,5 @@ share/locale/vi/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-shell.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo
+share/metainfo/org.gnome.Extensions.metainfo.xml
 share/xdg-desktop-portal/portals/gnome-shell.portal