[Midnightbsd-cvs] mports [24646] trunk/x11/gnome-shell: update gnome shell

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Nov 21 21:33:50 EST 2018 

Revision: 24646
          http://svnweb.midnightbsd.org/mports/?rev=24646
Author:   laffer1
Date:     2018-11-21 21:33:50 -0500 (Wed, 21 Nov 2018)
Log Message:
-----------
update gnome shell

Modified Paths:
--------------
    trunk/x11/gnome-shell/Makefile
    trunk/x11/gnome-shell/distinfo
    trunk/x11/gnome-shell/files/patch-js_misc_loginManager.js
    trunk/x11/gnome-shell/pkg-plist

Removed Paths:
-------------
    trunk/x11/gnome-shell/files/patch-js_gdm_loginDialog.js
    trunk/x11/gnome-shell/files/patch-src_data-to-c.pl

Modified: trunk/x11/gnome-shell/Makefile
===================================================================
--- trunk/x11/gnome-shell/Makefile	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/Makefile	2018-11-22 02:33:50 UTC (rev 24646)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	gnome-shell
-PORTVERSION=	3.16.4
-PORTREVISION=	0
+PORTVERSION=	3.28.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -13,59 +12,61 @@
 LICENSE=	gpl2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
-		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center
-LIB_DEPENDS=	libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
-		libcaribou.so:${PORTSDIR}/accessibility/caribou \
-		libmutter.so:${PORTSDIR}/x11-wm/mutter \
-		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
-		libgcr-3.so:${PORTSDIR}/security/gcr \
-		libtelepathy-glib.so:${PORTSDIR}/net-im/telepathy-glib \
-		libtelepathy-logger.so:${PORTSDIR}/net-im/telepathy-logger \
-		libfolks.so:${PORTSDIR}/net-im/folks \
-		libibus-1.0.so:${PORTSDIR}/textproc/ibus \
-		libpulse.so:${PORTSDIR}/audio/pulseaudio \
-		libcroco-0.6.so:${PORTSDIR}/textproc/libcroco \
-		libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
-		libclutter-1.0.so:${PORTSDIR}/graphics/clutter \
-		libgjs.so:${PORTSDIR}/lang/gjs
-RUN_DEPENDS=	py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
-		gnome-control-center:${PORTSDIR}/sysutils/gnome-control-center \
-		ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
+BUILD_DEPENDS=	docbook-xsl>=0:textproc/docbook-xsl \
+		sassc:textproc/sassc \
+		gnome-control-center:sysutils/gnome-control-center
+LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification \
+		libdrm.so:graphics/libdrm \
+		libmutter-2.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 \
+		libsecret-1.so:security/libsecret \
+		libpolkit-agent-1.so:sysutils/polkit \
+		libp11-kit.so:security/p11-kit \
+		libical.so:devel/libical \
+		libgcr-3.so:security/gcr \
+		libicuuc.so:devel/icu \
+		libpulse.so:audio/pulseaudio \
+		libcroco-0.6.so:textproc/libcroco \
+		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
 
 PORTSCOUT=	limitw:1,even
 
-USES=		cpe gettext gmake libtool pathfix pkgconfig \
-		tar:xz webplugin:native
-USE_GNOME=	evolutiondataserver3 gnomedesktop3 gtk30 intlhack \
-		introspection
-USE_XORG=	x11 xfixes sm
+USES=		compiler:c11 cpe gettext gnome libtool localbase meson \
+		pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz webplugin:native
+USE_GL=		yes
+USE_GNOME=	cairo evolutiondataserver3 gdkpixbuf2 introspection \
+		libxslt:build libxml2
+USE_XORG=	x11 xcomposite xdamage xext xfixes xi xrandr xtst
+USE_GL=		egl gbm
 USE_GSTREAMER1=	yes
-GNU_CONFIGURE=	yes
+USE_PERL5=	build
 USE_LDCONFIG=	yes
+SHEBANG_FILES=	src/gnome-shell-perf-tool.in \
+		src/gnome-shell-extension-tool.in
+
 WEBPLUGIN_NAME=	libgnome-shell-browser-plugin.so
 WEBPLUGIN_DIR=	${PREFIX}/lib/mozilla/plugins/
 WEBPLUGIN_FILES=libgnome-shell-browser-plugin.so
-CONFIGURE_ARGS+=--enable-compile-warnings=no \
-		--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
-CPPFLAGS+=	-I${LOCALASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-INSTALL_TARGET=	install-strip
+
+MESON_ARGS=	-Dsystemd=false \
+		-Dnetworkmanager=false
 CPE_VENDOR=	gnome
 
 GLIB_SCHEMAS=	org.gnome.shell.gschema.xml
 
-.include <bsd.mport.options.mk>
-
-USES+= 	compiler:c11
-
 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
-	@${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
 
+pre-build:
+	@cd ${BUILD_WRKSRC} && ninja src/st/st-scroll-view-fade-generated.c
+
 .include <bsd.port.mk>

Modified: trunk/x11/gnome-shell/distinfo
===================================================================
--- trunk/x11/gnome-shell/distinfo	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/distinfo	2018-11-22 02:33:50 UTC (rev 24646)
@@ -1,2 +1,3 @@
-SHA256 (gnome3/gnome-shell-3.16.4.tar.xz) = 37bc440a2c5bed6cbd095ddb95a488cb67ef0e1d17153bc87635ce4120d917a9
-SIZE (gnome3/gnome-shell-3.16.4.tar.xz) = 1579292
+TIMESTAMP = 1525955404
+SHA256 (gnome3/gnome-shell-3.28.2.tar.xz) = 27e690c0c4bb0faac2892b9772d3160aa3c6b09523a873b1c2b63c21634236ad
+SIZE (gnome3/gnome-shell-3.28.2.tar.xz) = 1432208

Deleted: trunk/x11/gnome-shell/files/patch-js_gdm_loginDialog.js
===================================================================
--- trunk/x11/gnome-shell/files/patch-js_gdm_loginDialog.js	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/files/patch-js_gdm_loginDialog.js	2018-11-22 02:33:50 UTC (rev 24646)
@@ -1,23 +0,0 @@
---- js/gdm/loginDialog.js.orig	2012-03-24 21:19:24.000000000 -0500
-+++ js/gdm/loginDialog.js	2012-03-24 21:21:23.000000000 -0500
-@@ -301,11 +301,17 @@
-         this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
-     },
- 
--    _moveFocusToItems: function() {
--        let hasItems = Object.keys(this._items).length > 0;
-+    _hasItems: function() {
-+        for (let userName in this._items) {
-+            return true;
-+        }
-+        return false;
-+    },
- 
--        if (!hasItems)
-+    _moveFocusToItems: function() {
-+        if (!this._hasItems()) {
-             return;
-+        }
- 
-         if (global.stage.get_key_focus() != this.actor)
-             return;

Modified: trunk/x11/gnome-shell/files/patch-js_misc_loginManager.js
===================================================================
--- trunk/x11/gnome-shell/files/patch-js_misc_loginManager.js	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/files/patch-js_misc_loginManager.js	2018-11-22 02:33:50 UTC (rev 24646)
@@ -1,6 +1,30 @@
---- js/misc/loginManager.js.orig	2014-10-13 22:57:05.000000000 +0200
-+++ js/misc/loginManager.js	2014-10-23 19:53:12.854065483 +0200
-@@ -46,6 +46,32 @@
+$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 at 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 at 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);
  
@@ -33,7 +57,7 @@
  function haveSystemd() {
      return GLib.access("/run/systemd/seats", 0) >= 0;
  }
-@@ -75,7 +101,7 @@
+@@ -78,7 +101,7 @@ function canLock() {
                                                 -1, null);
  
          let version = result.deep_unpack()[0].deep_unpack();
@@ -42,7 +66,7 @@
      } catch(e) {
          return false;
      }
-@@ -93,7 +119,7 @@
+@@ -96,7 +119,7 @@ function getLoginManager() {
          if (haveSystemd())
              _loginManager = new LoginManagerSystemd();
          else
@@ -51,35 +75,35 @@
      }
  
      return _loginManager;
-@@ -110,6 +136,9 @@
-                                   Lang.bind(this, this._prepareForSleep));
+@@ -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: function(callback) {
+     getCurrentSessionProxy(callback) {
          if (this._currentSession) {
              callback (this._currentSession);
-@@ -177,13 +206,35 @@
+@@ -188,13 +214,35 @@ var LoginManagerSystemd = new Lang.Class({
  });
  Signals.addSignalMethods(LoginManagerSystemd.prototype);
  
--const LoginManagerDummy = new Lang.Class({
+-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: function(callback) {
+     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
@@ -101,8 +125,8 @@
 +            }));
      },
  
-     canSuspend: function(asyncCallback) {
-@@ -203,4 +254,4 @@
+     canSuspend(asyncCallback) {
+@@ -214,4 +262,4 @@ var LoginManagerDummy = new Lang.Class({
          callback(null);
      }
  });

Deleted: trunk/x11/gnome-shell/files/patch-src_data-to-c.pl
===================================================================
--- trunk/x11/gnome-shell/files/patch-src_data-to-c.pl	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/files/patch-src_data-to-c.pl	2018-11-22 02:33:50 UTC (rev 24646)
@@ -1,8 +0,0 @@
---- src/data-to-c.pl.orig	2014-03-22 16:28:35.000000000 +0100
-+++ src/data-to-c.pl	2014-03-22 16:28:44.000000000 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+#!/usr/bin/env perl
- 
- # Copyright © 2011 Red Hat, Inc
- #

Modified: trunk/x11/gnome-shell/pkg-plist
===================================================================
--- trunk/x11/gnome-shell/pkg-plist	2018-11-22 02:24:07 UTC (rev 24645)
+++ trunk/x11/gnome-shell/pkg-plist	2018-11-22 02:33:50 UTC (rev 24646)
@@ -4,12 +4,12 @@
 bin/gnome-shell-perf-tool
 lib/gnome-shell/Gvc-1.0.typelib
 lib/gnome-shell/Shell-0.1.typelib
-lib/gnome-shell/ShellJS-0.1.typelib
 lib/gnome-shell/ShellMenu-0.1.typelib
 lib/gnome-shell/St-1.0.typelib
-lib/gnome-shell/libgnome-shell-js.so
 lib/gnome-shell/libgnome-shell-menu.so
 lib/gnome-shell/libgnome-shell.so
+lib/gnome-shell/libgvc.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
@@ -18,8 +18,8 @@
 share/GConf/gsettings/gnome-shell-overrides.convert
 share/applications/evolution-calendar.desktop
 share/applications/gnome-shell-extension-prefs.desktop
-share/applications/gnome-shell-wayland.desktop
-share/applications/gnome-shell.desktop
+share/applications/org.gnome.Shell.desktop
+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
@@ -27,84 +27,13 @@
 share/dbus-1/services/org.gnome.Shell.CalendarServer.service
 share/dbus-1/services/org.gnome.Shell.HotplugSniffer.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%%/gnome-shell-osk-layouts.gresource
 %%DATADIR%%/gnome-shell-theme.gresource
 %%DATADIR%%/perf-background.xml
-share/gtk-doc/html/shell/ShellApp.html
-share/gtk-doc/html/shell/ShellAppSystem.html
-share/gtk-doc/html/shell/ShellAppUsage.html
-share/gtk-doc/html/shell/ShellEmbeddedWindow.html
-share/gtk-doc/html/shell/ShellGenericContainer.html
-share/gtk-doc/html/shell/ShellGlobal.html
-share/gtk-doc/html/shell/ShellGtkEmbed.html
-share/gtk-doc/html/shell/ShellMountOperation.html
-share/gtk-doc/html/shell/ShellStack.html
-share/gtk-doc/html/shell/ShellTpClient.html
-share/gtk-doc/html/shell/ShellTrayIcon.html
-share/gtk-doc/html/shell/ShellTrayManager.html
-share/gtk-doc/html/shell/ShellWM.html
-share/gtk-doc/html/shell/ShellWindowTracker.html
-share/gtk-doc/html/shell/annotation-glossary.html
-share/gtk-doc/html/shell/api-index-full.html
-share/gtk-doc/html/shell/ch01.html
-share/gtk-doc/html/shell/ch02.html
-share/gtk-doc/html/shell/ch03.html
-share/gtk-doc/html/shell/ch04.html
-share/gtk-doc/html/shell/ch05.html
-share/gtk-doc/html/shell/ch06.html
-share/gtk-doc/html/shell/deprecated-api-index.html
-share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider.html
-share/gtk-doc/html/shell/gdbus-org.gnome.Shell.SearchProvider2.html
-share/gtk-doc/html/shell/home.png
-share/gtk-doc/html/shell/index.html
-share/gtk-doc/html/shell/left-insensitive.png
-share/gtk-doc/html/shell/left.png
-share/gtk-doc/html/shell/object-tree.html
-share/gtk-doc/html/shell/right-insensitive.png
-share/gtk-doc/html/shell/right.png
-share/gtk-doc/html/shell/shell-shell-action-modes.html
-share/gtk-doc/html/shell/shell-shell-polkit-authentication-agent.html
-share/gtk-doc/html/shell/shell-shell-recorder.html
-share/gtk-doc/html/shell/shell-shell-util.html
-share/gtk-doc/html/shell/shell.devhelp2
-share/gtk-doc/html/shell/style.css
-share/gtk-doc/html/shell/up-insensitive.png
-share/gtk-doc/html/shell/up.png
-share/gtk-doc/html/st/StBin.html
-share/gtk-doc/html/st/StBoxLayout.html
-share/gtk-doc/html/st/StButton.html
-share/gtk-doc/html/st/StDrawingArea.html
-share/gtk-doc/html/st/StEntry.html
-share/gtk-doc/html/st/StIcon.html
-share/gtk-doc/html/st/StLabel.html
-share/gtk-doc/html/st/StScrollView.html
-share/gtk-doc/html/st/StScrollable.html
-share/gtk-doc/html/st/StTable.html
-share/gtk-doc/html/st/StTextureCache.html
-share/gtk-doc/html/st/StThemeNodeTransition.html
-share/gtk-doc/html/st/StWidget.html
-share/gtk-doc/html/st/StWidgetAccessible.html
-share/gtk-doc/html/st/annotation-glossary.html
-share/gtk-doc/html/st/api-index-full.html
-share/gtk-doc/html/st/base.html
-share/gtk-doc/html/st/containers.html
-share/gtk-doc/html/st/deprecated-api-index.html
-share/gtk-doc/html/st/home.png
-share/gtk-doc/html/st/index.html
-share/gtk-doc/html/st/left-insensitive.png
-share/gtk-doc/html/st/left.png
-share/gtk-doc/html/st/object-tree.html
-share/gtk-doc/html/st/pt01.html
-share/gtk-doc/html/st/right-insensitive.png
-share/gtk-doc/html/st/right.png
-share/gtk-doc/html/st/st-st-theme-context.html
-share/gtk-doc/html/st/st-st-theme-node.html
-share/gtk-doc/html/st/st-st-theme.html
-share/gtk-doc/html/st/st.devhelp2
-share/gtk-doc/html/st/style.css
-share/gtk-doc/html/st/styling.html
-share/gtk-doc/html/st/up-insensitive.png
-share/gtk-doc/html/st/up.png
-share/gtk-doc/html/st/widgets.html
 share/locale/af/LC_MESSAGES/gnome-shell.mo
 share/locale/an/LC_MESSAGES/gnome-shell.mo
 share/locale/ar/LC_MESSAGES/gnome-shell.mo
@@ -131,10 +60,12 @@
 share/locale/fr/LC_MESSAGES/gnome-shell.mo
 share/locale/fur/LC_MESSAGES/gnome-shell.mo
 share/locale/ga/LC_MESSAGES/gnome-shell.mo
+share/locale/gd/LC_MESSAGES/gnome-shell.mo
 share/locale/gl/LC_MESSAGES/gnome-shell.mo
 share/locale/gu/LC_MESSAGES/gnome-shell.mo
 share/locale/he/LC_MESSAGES/gnome-shell.mo
 share/locale/hi/LC_MESSAGES/gnome-shell.mo
+share/locale/hr/LC_MESSAGES/gnome-shell.mo
 share/locale/hu/LC_MESSAGES/gnome-shell.mo
 share/locale/ia/LC_MESSAGES/gnome-shell.mo
 share/locale/id/LC_MESSAGES/gnome-shell.mo
@@ -183,3 +114,4 @@
 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/xdg-desktop-portal/portals/gnome-shell.portal

More information about the Midnightbsd-cvs mailing list