Commit 9971f1b1 authored by Olivier Duchateau's avatar Olivier Duchateau
Browse files

Update to 3.36.8

parent b9f23b85
# Created by: Pawel Worach <pawel.worach@gmail.com>
# $FreeBSD: head/x11/gnome-shell/Makefile 553940 2020-11-03 00:56:26Z jbeich $
PORTNAME= gnome-shell
PORTVERSION= 3.36.8
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= Next generation GNOME desktop shell
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= docbook-xsl>=0:textproc/docbook-xsl \
sassc:textproc/sassc \
a2x:textproc/asciidoc \
${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion
LIB_DEPENDS= libstartup-notification-1.so:x11/startup-notification \
libdrm.so:graphics/libdrm \
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 \
libsecret-1.so:security/libsecret \
libpolkit-agent-1.so:sysutils/polkit \
libp11-kit.so:security/p11-kit \
libical.so:devel/libical \
libgcr-base-3.so:security/gcr \
libicuuc.so:devel/icu \
libpulse.so:audio/pulseaudio \
libgjs.so:lang/gjs \
libgraphene-1.0.so:graphics/graphene \
libgnome-autoar-0.so:archivers/gnome-autoar
PORTSCOUT= limitw:1,even
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 gnomedesktop3
USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst
USE_GL= egl gbm
USE_GSTREAMER1= yes
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
CPE_VENDOR= gnome
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."
LDFLAGS+= -fuse-ld=lld
.endif
post-extract:
${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces
post-patch:
${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \
${WRKSRC}/meson.build
.include <bsd.port.mk>
TIMESTAMP = 1610716783
SHA256 (gnome/gnome-shell-3.36.8.tar.xz) = 7ac599db23cd85915f33eb278aa9bee0d3e0ab45f41a60d637912dc3ba3d8807
SIZE (gnome/gnome-shell-3.36.8.tar.xz) = 1777412
<!-- $OpenBSD: org.freedesktop.ConsoleKit.Manager.xml,v 1.1 2019/01/17 19:00:46 ajacoutot Exp $ -->
<node>
<interface name="org.freedesktop.ConsoleKit.Manager">
<method name="Suspend">
<arg type="b" direction="in"/>
</method>
<method name="CanSuspend">
<arg type="s" direction="out"/>
</method>
<method name="Inhibit">
<arg type="s" direction="in"/>
<arg type="s" direction="in"/>
<arg type="s" direction="in"/>
<arg type="s" direction="in"/>
<arg type="h" direction="out"/>
</method>
<signal name="PrepareForSleep">
<arg type="b" direction="out"/>
</signal>
<method name="GetCurrentSession">
<arg type="o" direction="out"/>
</method>
</interface>
</node>
<!-- $OpenBSD: org.freedesktop.ConsoleKit.Session.xml,v 1.1 2019/01/17 19:00:46 ajacoutot Exp $ -->
<node>
<interface name="org.freedesktop.ConsoleKit.Session">
<signal name="Lock" />
<signal name="Unlock" />
<method name="SetLockedHint">
<arg type="b" direction="in"/>
</method>
</interface>
</node>
--- data/gnome-shell-dbus-interfaces.gresource.xml.orig 2020-09-07 20:29:58 UTC
+++ data/gnome-shell-dbus-interfaces.gresource.xml
@@ -12,6 +12,8 @@
<file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Access.xml</file>
<file preprocess="xml-stripblanks">org.freedesktop.impl.portal.PermissionStore.xml</file>
<file preprocess="xml-stripblanks">org.freedesktop.impl.portal.Request.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.ConsoleKit.Manager.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.ConsoleKit.Session.xml</file>
<file preprocess="xml-stripblanks">org.freedesktop.login1.Manager.xml</file>
<file preprocess="xml-stripblanks">org.freedesktop.login1.Session.xml</file>
<file preprocess="xml-stripblanks">org.freedesktop.login1.User.xml</file>
$OpenBSD: patch-js_misc_loginManager_js,v 1.10 2020/05/14 15:28:46 jasper Exp $
Index: js/misc/loginManager.js
--- js/misc/loginManager.js.orig
+++ js/misc/loginManager.js
@@ -14,6 +14,12 @@ const SystemdLoginManager = Gio.DBusProxy.makeProxyWra
const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface);
const SystemdLoginUser = Gio.DBusProxy.makeProxyWrapper(SystemdLoginUserIface);
+const ConsoleKitManagerIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Manager');
+const ConsoleKitSessionIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Session');
+
+const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface);
+const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface);
+
function haveSystemd() {
return GLib.access("/run/systemd/seats", 0) >= 0;
}
@@ -43,7 +49,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;
}
@@ -84,7 +90,7 @@ function getLoginManager() {
if (haveSystemd())
_loginManager = new LoginManagerSystemd();
else
- _loginManager = new LoginManagerDummy();
+ _loginManager = new LoginManagerConsoleKit();
}
return _loginManager;
@@ -199,6 +205,82 @@ var LoginManagerSystemd = class {
}
};
Signals.addSignalMethods(LoginManagerSystemd.prototype);
+
+var LoginManagerConsoleKit = class {
+ constructor () {
+ this._proxy = new ConsoleKitManager(Gio.DBus.system,
+ 'org.freedesktop.ConsoleKit',
+ '/org/freedesktop/ConsoleKit/Manager');
+ this._proxy.connectSignal('PrepareForSleep',
+ 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);
+ return;
+ }
+
+ this._proxy.GetCurrentSessionRemote((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) {
+ this._proxy.CanSuspendRemote((result, error) => {
+ if (error) {
+ asyncCallback(false, false);
+ } else {
+ asyncCallback(result[0], false);
+ }
+ });
+ }
+
+ listSessions(asyncCallback) {
+ asyncCallback([]);
+ }
+
+ suspend() {
+ this._proxy.SuspendRemote(true);
+ }
+
+ inhibit(reason, callback) {
+ let inVariant = GLib.Variant.new('(ssss)',
+ ['sleep',
+ 'GNOME Shell',
+ reason,
+ 'delay']);
+ this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null,
+ (proxy, result) => {
+ let fd = -1;
+ try {
+ let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result);
+ fd = fdList.steal_fds()[0];
+ callback(new Gio.UnixInputStream({ fd: fd }));
+ } catch(e) {
+ logError(e, "Error getting ConsoleKit inhibitor");
+ callback(null);
+ }
+ });
+ }
+
+ _prepareForSleep(proxy, sender, [aboutToSuspend]) {
+ this.emit('prepare-for-sleep', aboutToSuspend);
+ }
+}
+Signals.addSignalMethods(LoginManagerConsoleKit.prototype);
var LoginManagerDummy = class {
getCurrentSessionProxy(_callback) {
$OpenBSD: patch-js_ui_status_keyboard_js,v 1.6 2020/05/14 15:28:46 jasper Exp $
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235009
Index: js/ui/status/keyboard.js
--- js/ui/status/keyboard.js.orig
+++ js/ui/status/keyboard.js
@@ -242,6 +242,19 @@ var InputSourceSystemSettings = class extends InputSou
id += '+%s'.format(variants[i]);
sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id });
}
+
+ // fallback: retrieve input source from current locale if we don't
+ // support the org.freedesktop.locale1 interface
+ if (sourcesList.length == 0) {
+ let _keyboardManagerLayout = KeyboardManager.getKeyboardManager()._getLocaleLayout();
+ if (_keyboardManagerLayout) {
+ let _kMLid = _keyboardManagerLayout.layout;
+ if (!!_keyboardManagerLayout.variant)
+ _kMLid = _kMLid + '+' + _keyboardManagerLayout.variant;
+ sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: _kMLid });
+ }
+ }
+
return sourcesList;
}
Next generation GNOME desktop shell
WWW: http://live.gnome.org/GnomeShell
[
{ type: install
message: <<EOM
Gnome-shell requires acceleration of to work. For this a nvidia card
with the nvidia-driver, or a Intel/ATI KMS enabled card is needed.
For the nvidia users no other changes are needed. For Intel/ATI KMS
driver the user needs to have read/write permissions on
/dev/dri/cardN (usually N=0). If gnome-shell is launched from gdm, the
gdm user also needs this access.
Access can be granted by adding the user(s) to the video group.
% pw groupmod video -m jerry
EOM
}
]
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/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
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/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%%/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
share/locale/as/LC_MESSAGES/gnome-shell.mo
share/locale/ast/LC_MESSAGES/gnome-shell.mo
share/locale/be/LC_MESSAGES/gnome-shell.mo
share/locale/bg/LC_MESSAGES/gnome-shell.mo
share/locale/bn/LC_MESSAGES/gnome-shell.mo
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
share/locale/el/LC_MESSAGES/gnome-shell.mo
share/locale/en_GB/LC_MESSAGES/gnome-shell.mo
share/locale/eo/LC_MESSAGES/gnome-shell.mo
share/locale/es/LC_MESSAGES/gnome-shell.mo
share/locale/et/LC_MESSAGES/gnome-shell.mo
share/locale/eu/LC_MESSAGES/gnome-shell.mo
share/locale/fa/LC_MESSAGES/gnome-shell.mo
share/locale/fi/LC_MESSAGES/gnome-shell.mo
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
share/locale/is/LC_MESSAGES/gnome-shell.mo
share/locale/it/LC_MESSAGES/gnome-shell.mo
share/locale/ja/LC_MESSAGES/gnome-shell.mo
share/locale/kk/LC_MESSAGES/gnome-shell.mo
share/locale/km/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/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
share/locale/ms/LC_MESSAGES/gnome-shell.mo
share/locale/nb/LC_MESSAGES/gnome-shell.mo
share/locale/ne/LC_MESSAGES/gnome-shell.mo
share/locale/nl/LC_MESSAGES/gnome-shell.mo
share/locale/nn/LC_MESSAGES/gnome-shell.mo
share/locale/oc/LC_MESSAGES/gnome-shell.mo
share/locale/or/LC_MESSAGES/gnome-shell.mo
share/locale/pa/LC_MESSAGES/gnome-shell.mo
share/locale/pl/LC_MESSAGES/gnome-shell.mo
share/locale/pt/LC_MESSAGES/gnome-shell.mo
share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo
share/locale/ro/LC_MESSAGES/gnome-shell.mo
share/locale/ru/LC_MESSAGES/gnome-shell.mo
share/locale/si/LC_MESSAGES/gnome-shell.mo
share/locale/sk/LC_MESSAGES/gnome-shell.mo
share/locale/sl/LC_MESSAGES/gnome-shell.mo
share/locale/sr/LC_MESSAGES/gnome-shell.mo
share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo
share/locale/sv/LC_MESSAGES/gnome-shell.mo
share/locale/ta/LC_MESSAGES/gnome-shell.mo
share/locale/te/LC_MESSAGES/gnome-shell.mo
share/locale/tg/LC_MESSAGES/gnome-shell.mo
share/locale/th/LC_MESSAGES/gnome-shell.mo
share/locale/tr/LC_MESSAGES/gnome-shell.mo
share/locale/ug/LC_MESSAGES/gnome-shell.mo
share/locale/uk/LC_MESSAGES/gnome-shell.mo
share/locale/uz@cyrillic/LC_MESSAGES/gnome-shell.mo
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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment