pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11
Module Name: pkgsrc
Committed By: nia
Date: Tue Nov 10 12:06:59 UTC 2020
Modified Files:
pkgsrc/x11: Makefile
Added Files:
pkgsrc/x11/gnome-shell: DESCR Makefile PLIST distinfo
pkgsrc/x11/gnome-shell/files: org.freedesktop.ConsoleKit.Manager.xml
org.freedesktop.ConsoleKit.Session.xml
pkgsrc/x11/gnome-shell/patches:
patch-data_gnome-shell-dbus-interfaces_gresource_xml
patch-js_misc_loginManager_js patch-js_ui_endSessionDialog.js
patch-meson.build patch-src_shell-util.c
Log Message:
x11: Add gnome-shell. Based on work by Dan Cîrnaț and myself in wip.
GNOME Shell provides core user interface functions for the GNOME 3 desktop,
like switching to windows and launching applications. GNOME Shell takes
advantage of the capabilities of modern graphics hardware and introduces
innovative user interface concepts to provide a visually attractive and
easy to use experience.
To generate a diff of this commit:
cvs rdiff -u -r1.911 -r1.912 pkgsrc/x11/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gnome-shell/DESCR \
pkgsrc/x11/gnome-shell/Makefile pkgsrc/x11/gnome-shell/PLIST \
pkgsrc/x11/gnome-shell/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml \
pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml
cvs rdiff -u -r0 -r1.1 \
pkgsrc/x11/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml \
pkgsrc/x11/gnome-shell/patches/patch-js_misc_loginManager_js \
pkgsrc/x11/gnome-shell/patches/patch-js_ui_endSessionDialog.js \
pkgsrc/x11/gnome-shell/patches/patch-meson.build \
pkgsrc/x11/gnome-shell/patches/patch-src_shell-util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.911 pkgsrc/x11/Makefile:1.912
--- pkgsrc/x11/Makefile:1.911 Tue Nov 10 02:15:00 2020
+++ pkgsrc/x11/Makefile Tue Nov 10 12:06:58 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.911 2020/11/10 02:15:00 nia Exp $
+# $NetBSD: Makefile,v 1.912 2020/11/10 12:06:58 nia Exp $
#
COMMENT= Packages to support the X window system
@@ -68,6 +68,7 @@ SUBDIR+= ggiterm
SUBDIR+= gnome-desktop
SUBDIR+= gnome-desktop3
SUBDIR+= gnome-session
+SUBDIR+= gnome-shell
SUBDIR+= gnome-terminal
SUBDIR+= gnome-themes
SUBDIR+= gnome-themes-extras
Added files:
Index: pkgsrc/x11/gnome-shell/DESCR
diff -u /dev/null pkgsrc/x11/gnome-shell/DESCR:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/DESCR Tue Nov 10 12:06:59 2020
@@ -0,0 +1,5 @@
+GNOME Shell provides core user interface functions for the GNOME 3 desktop,
+like switching to windows and launching applications. GNOME Shell takes
+advantage of the capabilities of modern graphics hardware and introduces
+innovative user interface concepts to provide a visually attractive and
+easy to use experience.
Index: pkgsrc/x11/gnome-shell/Makefile
diff -u /dev/null pkgsrc/x11/gnome-shell/Makefile:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/Makefile Tue Nov 10 12:06:59 2020
@@ -0,0 +1,64 @@
+# $NetBSD: Makefile,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+DISTNAME= gnome-shell-3.38.1
+CATEGORIES= x11 gnome
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
+EXTRACT_SUFX= .tar.xz
+
+MAINTAINER= dan%alt.md@localhost
+HOMEPAGE= https://wiki.gnome.org/Projects/GnomeShell
+COMMENT= Next generation GNOME shell
+LICENSE= gnu-gpl-v2
+
+USE_TOOLS+= pkg-config perl msgfmt xgettext
+
+MESON_ARGS+= -Dnetworkmanager=false
+MESON_ARGS+= -Dsystemd=false
+MESON_ARGS+= -Dextensions_app=false
+MESON_ARGS+= -Dextensions_tool=false
+
+TOOL_DEPENDS+= sassc>=3.6:../../www/sassc
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+TOOL_DEPENDS+= gdbus-codegen>=2.64:../../devel/gdbus-codegen
+
+MAKE_ENV+= LD_LIBRARY_PATH=${WRKSRC}/output/subprojects/gvc
+
+LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/gnome-shell
+
+CONF_FILES+= ${PREFIX}/share/examples/xdg/autostart/gnome-shell-overrides-migration.desktop \
+ ${PKG_SYSCONFDIR}/xdg/autostart/gnome-shell-overrides-migration.desktop
+
+.include "../../mk/bsd.prefs.mk"
+
+# msgfmt: unknown option -- desktop
+.if ${OPSYS} == "NetBSD"
+TOOLS_PLATFORM.msgfmt=
+.endif
+
+PYTHON_FOR_BUILD_ONLY= tool
+
+post-extract:
+ cp ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces/
+
+.include "../../devel/meson/build.mk"
+.include "../../archivers/gnome-autoar/buildlink3.mk"
+.include "../../audio/pulseaudio/buildlink3.mk"
+.include "../../devel/at-spi2-atk/buildlink3.mk"
+.include "../../devel/glib2/schemas.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../graphics/adwaita-icon-theme/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
+.include "../../inputmethod/ibus/buildlink3.mk"
+.include "../../lang/gjs/buildlink3.mk"
+.include "../../lang/python/tool.mk"
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
+.include "../../security/gcr/buildlink3.mk"
+.include "../../security/libsecret/buildlink3.mk"
+.include "../../security/polkit/buildlink3.mk"
+.include "../../sysutils/gsettings-desktop-schemas/buildlink3.mk"
+.include "../../wm/mutter/buildlink3.mk"
+.include "../../x11/gnome-desktop3/buildlink3.mk"
+.include "../../x11/startup-notification/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/gnome-shell/PLIST
diff -u /dev/null pkgsrc/x11/gnome-shell/PLIST:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/PLIST Tue Nov 10 12:06:59 2020
@@ -0,0 +1,136 @@
+@comment $NetBSD: PLIST,v 1.1 2020/11/10 12:06:59 nia Exp $
+bin/gnome-shell
+bin/gnome-shell-extension-prefs
+bin/gnome-shell-perf-tool
+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-shell.1
+share/GConf/gsettings/gnome-shell-overrides.convert
+share/applications/evolution-calendar.desktop
+share/applications/org.gnome.Shell.Extensions.desktop
+share/applications/org.gnome.Shell.desktop
+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.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/examples/xdg/autostart/gnome-shell-overrides-migration.desktop
+share/glib-2.0/schemas/00_org.gnome.shell.gschema.override
+share/glib-2.0/schemas/org.gnome.shell.gschema.xml
+share/gnome-control-center/keybindings/50-gnome-shell-system.xml
+share/gnome-shell/Gvc-1.0.gir
+share/gnome-shell/Shell-0.1.gir
+share/gnome-shell/St-1.0.gir
+share/gnome-shell/gir-1.0/Shew-0.gir
+share/gnome-shell/gnome-shell-dbus-interfaces.gresource
+share/gnome-shell/gnome-shell-osk-layouts.gresource
+share/gnome-shell/gnome-shell-theme.gresource
+share/gnome-shell/org.gnome.Shell.Extensions
+share/gnome-shell/org.gnome.Shell.Extensions.src.gresource
+share/gnome-shell/org.gnome.Shell.Notifications
+share/gnome-shell/org.gnome.Shell.Notifications.src.gresource
+share/gnome-shell/perf-background.xml
+share/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.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/kab/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/os/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/xdg-desktop-portal/portals/gnome-shell.portal
Index: pkgsrc/x11/gnome-shell/distinfo
diff -u /dev/null pkgsrc/x11/gnome-shell/distinfo:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/distinfo Tue Nov 10 12:06:59 2020
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+SHA1 (gnome-shell-3.38.1.tar.xz) = 29d70150d37c35abb40e78c1deaedd669dfa9431
+RMD160 (gnome-shell-3.38.1.tar.xz) = e963d1570853308827bfa5d99d425ad0aa63b636
+SHA512 (gnome-shell-3.38.1.tar.xz) = 7ab580f892c4b4dac2fc8625343dfab1bf7a11e148dc01e6e805a5b1ac1d4cb17943b9a3058ec69fc086c270d76ef8073dca494991a5da1dcfa52b42dcc03f01
+Size (gnome-shell-3.38.1.tar.xz) = 1812860 bytes
+SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7
+SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c
+SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c
+SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7
+SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6
Index: pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml
diff -u /dev/null pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml Tue Nov 10 12:06:59 2020
@@ -0,0 +1,25 @@
+<!-- $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>
Index: pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml
diff -u /dev/null pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml Tue Nov 10 12:06:59 2020
@@ -0,0 +1,11 @@
+<!-- $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>
Index: pkgsrc/x11/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml Tue Nov 10 12:06:59 2020
@@ -0,0 +1,16 @@
+$NetBSD: patch-data_gnome-shell-dbus-interfaces_gresource_xml,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+$OpenBSD: patch-data_gnome-shell-dbus-interfaces_gresource_xml,v 1.1 2019/01/17 19:00:46 ajacoutot Exp $
+
+Index: data/gnome-shell-dbus-interfaces.gresource.xml
+--- data/gnome-shell-dbus-interfaces.gresource.xml.orig
++++ data/gnome-shell-dbus-interfaces.gresource.xml
+@@ -6,6 +6,8 @@
+ <file preprocess="xml-stripblanks">org.freedesktop.Application.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.bolt1.Device.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.bolt1.Manager.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.DBus.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Agent.xml</file>
+ <file preprocess="xml-stripblanks">org.freedesktop.GeoClue2.Manager.xml</file>
Index: pkgsrc/x11/gnome-shell/patches/patch-js_misc_loginManager_js
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-js_misc_loginManager_js:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/patches/patch-js_misc_loginManager_js Tue Nov 10 12:06:59 2020
@@ -0,0 +1,121 @@
+$NetBSD: patch-js_misc_loginManager_js,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+$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 2020-10-05 18:36:07.887838800 +0000
++++ js/misc/loginManager.js
+@@ -14,6 +14,12 @@ const SystemdLoginManager = Gio.DBusProx
+ 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;
+ }
+@@ -81,7 +87,7 @@ function getLoginManager() {
+ if (haveSystemd())
+ _loginManager = new LoginManagerSystemd();
+ else
+- _loginManager = new LoginManagerDummy();
++ _loginManager = new LoginManagerConsoleKit();
+ }
+
+ return _loginManager;
+@@ -209,6 +215,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) {
+ // we could return a DummySession object that fakes whatever callers
Index: pkgsrc/x11/gnome-shell/patches/patch-js_ui_endSessionDialog.js
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-js_ui_endSessionDialog.js:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/patches/patch-js_ui_endSessionDialog.js Tue Nov 10 12:06:59 2020
@@ -0,0 +1,41 @@
+$NetBSD: patch-js_ui_endSessionDialog.js,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+Remove unsupported "BootLoaderMenu"
+
+--- js/ui/endSessionDialog.js.orig 2020-10-05 18:36:07.893838600 +0000
++++ js/ui/endSessionDialog.js
+@@ -230,10 +230,6 @@ class EndSessionDialog extends ModalDial
+ destroyOnClose: false });
+
+ this._loginManager = LoginManager.getLoginManager();
+- this._loginManager.canRebootToBootLoaderMenu(
+- (canRebootToBootLoaderMenu, unusedNeedsAuth) => {
+- this._canRebootToBootLoaderMenu = canRebootToBootLoaderMenu;
+- });
+
+ this._userManager = AccountsService.UserManager.get_default();
+ this._user = this._userManager.get_user(GLib.get_user_name());
+@@ -453,23 +449,6 @@ class EndSessionDialog extends ModalDial
+ label,
+ });
+
+- // Add Alt "Boot Options" option to the Reboot button
+- if (this._canRebootToBootLoaderMenu && signal === 'ConfirmedReboot') {
+- this._rebootButton = button;
+- this._rebootButtonAlt = this.addButton({
+- action: () => {
+- this.close(true);
+- let signalId = this.connect('closed', () => {
+- this.disconnect(signalId);
+- this._confirmRebootToBootLoaderMenu();
+- });
+- },
+- label: C_('button', 'Boot Options'),
+- });
+- this._rebootButtonAlt.visible = false;
+- this._capturedEventId = global.stage.connect('captured-event',
+- this._onCapturedEvent.bind(this));
+- }
+ }
+ }
+
Index: pkgsrc/x11/gnome-shell/patches/patch-meson.build
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-meson.build:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/patches/patch-meson.build Tue Nov 10 12:06:59 2020
@@ -0,0 +1,15 @@
+$NetBSD: patch-meson.build,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+Install config files to examples.
+
+--- meson.build.orig 2020-10-05 18:36:07.906838400 +0000
++++ meson.build
+@@ -52,7 +52,7 @@ sysconfdir = join_paths(prefix, get_opti
+ pkgdatadir = join_paths(datadir, meson.project_name())
+ pkglibdir = join_paths(libdir, meson.project_name())
+
+-autostartdir = join_paths(sysconfdir, 'xdg', 'autostart')
++autostartdir = join_paths(datadir, 'examples', 'xdg', 'autostart')
+ convertdir = join_paths(datadir, 'GConf', 'gsettings')
+ desktopdir = join_paths(datadir, 'applications')
+ icondir = join_paths(datadir, 'icons')
Index: pkgsrc/x11/gnome-shell/patches/patch-src_shell-util.c
diff -u /dev/null pkgsrc/x11/gnome-shell/patches/patch-src_shell-util.c:1.1
--- /dev/null Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/patches/patch-src_shell-util.c Tue Nov 10 12:06:59 2020
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_shell-util.c,v 1.1 2020/11/10 12:06:59 nia Exp $
+
+Quick ugly fix, breaks time string translation/format
+
+--- src/shell-util.c.orig 2020-10-05 18:36:07.971836800 +0000
++++ src/shell-util.c
+@@ -154,18 +154,22 @@ shell_util_translate_time_string (const
+ locale_t old_loc;
+ locale_t loc = (locale_t) 0;
+
++#ifndef __NetBSD__
+ if (locale)
+ loc = newlocale (LC_MESSAGES_MASK, locale, (locale_t) 0);
+
+ old_loc = uselocale (loc);
++#endif
+
+ sep = strchr (str, '\004');
+ res = g_dpgettext (NULL, str, sep ? sep - str + 1 : 0);
+
++#ifndef __NetBSD__
+ uselocale (old_loc);
+
+ if (loc != (locale_t) 0)
+ freelocale (loc);
++#endif
+
+ return res;
+ }
Home |
Main Index |
Thread Index |
Old Index