pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Remove gnome-shell, imported



Module Name:	pkgsrc-wip
Committed By:	nia <nia%netbsd.org@localhost>
Pushed By:	nee
Date:		Tue Nov 10 13:08:37 2020 +0100
Changeset:	e70e53732326b96c801538d0b3c66e8ceae7f48a

Modified Files:
	Makefile
Removed Files:
	gnome-shell/DESCR
	gnome-shell/Makefile
	gnome-shell/PLIST
	gnome-shell/TODO
	gnome-shell/distinfo
	gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml
	gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml
	gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml
	gnome-shell/patches/patch-js_misc_loginManager_js
	gnome-shell/patches/patch-js_ui_endSessionDialog.js
	gnome-shell/patches/patch-meson.build
	gnome-shell/patches/patch-src_shell-util.c

Log Message:
Remove gnome-shell, imported

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e70e53732326b96c801538d0b3c66e8ceae7f48a

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Makefile                                           |   1 -
 gnome-shell/DESCR                                  |   5 -
 gnome-shell/Makefile                               |  64 ----------
 gnome-shell/PLIST                                  | 136 ---------------------
 gnome-shell/TODO                                   |   2 -
 gnome-shell/distinfo                               |  11 --
 .../files/org.freedesktop.ConsoleKit.Manager.xml   |  25 ----
 .../files/org.freedesktop.ConsoleKit.Session.xml   |  11 --
 ...-data_gnome-shell-dbus-interfaces_gresource_xml |  16 ---
 gnome-shell/patches/patch-js_misc_loginManager_js  | 121 ------------------
 .../patches/patch-js_ui_endSessionDialog.js        |  41 -------
 gnome-shell/patches/patch-meson.build              |  15 ---
 gnome-shell/patches/patch-src_shell-util.c         |  29 -----
 13 files changed, 477 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index 92d51da37b..efc9859455 100644
--- a/Makefile
+++ b/Makefile
@@ -1130,7 +1130,6 @@ SUBDIR+=	gnome-mount
 SUBDIR+=	gnome-paint
 SUBDIR+=	gnome-panel
 SUBDIR+=	gnome-screenshot
-SUBDIR+=	gnome-shell
 SUBDIR+=	gnome-todo
 SUBDIR+=	gnome3
 SUBDIR+=	gnomebaker
diff --git a/gnome-shell/DESCR b/gnome-shell/DESCR
deleted file mode 100644
index 3a964fc222..0000000000
--- a/gnome-shell/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-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.
diff --git a/gnome-shell/Makefile b/gnome-shell/Makefile
deleted file mode 100644
index b8e5d91700..0000000000
--- a/gnome-shell/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD$
-
-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"
diff --git a/gnome-shell/PLIST b/gnome-shell/PLIST
deleted file mode 100644
index 055e955279..0000000000
--- a/gnome-shell/PLIST
+++ /dev/null
@@ -1,136 +0,0 @@
-@comment $NetBSD$
-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
diff --git a/gnome-shell/TODO b/gnome-shell/TODO
deleted file mode 100644
index 2943d2cab6..0000000000
--- a/gnome-shell/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-This package has known vulnerabilities, please investigate and fix if possible:
-  CVE-2020-17489
diff --git a/gnome-shell/distinfo b/gnome-shell/distinfo
deleted file mode 100644
index 805032bdb3..0000000000
--- a/gnome-shell/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD$
-
-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
diff --git a/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml b/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml
deleted file mode 100644
index bf6a73cf3c..0000000000
--- a/gnome-shell/files/org.freedesktop.ConsoleKit.Manager.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!-- $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>
diff --git a/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml b/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml
deleted file mode 100644
index ffa38faf13..0000000000
--- a/gnome-shell/files/org.freedesktop.ConsoleKit.Session.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- $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>
diff --git a/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml b/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml
deleted file mode 100644
index 03da39cdea..0000000000
--- a/gnome-shell/patches/patch-data_gnome-shell-dbus-interfaces_gresource_xml
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
-$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>
diff --git a/gnome-shell/patches/patch-js_misc_loginManager_js b/gnome-shell/patches/patch-js_misc_loginManager_js
deleted file mode 100644
index 01d8b0fffa..0000000000
--- a/gnome-shell/patches/patch-js_misc_loginManager_js
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD$
-
-$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
diff --git a/gnome-shell/patches/patch-js_ui_endSessionDialog.js b/gnome-shell/patches/patch-js_ui_endSessionDialog.js
deleted file mode 100644
index 43e5bd52b2..0000000000
--- a/gnome-shell/patches/patch-js_ui_endSessionDialog.js
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
-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));
--            }
-         }
-     }
- 
diff --git a/gnome-shell/patches/patch-meson.build b/gnome-shell/patches/patch-meson.build
deleted file mode 100644
index 3ad9e51503..0000000000
--- a/gnome-shell/patches/patch-meson.build
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-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')
diff --git a/gnome-shell/patches/patch-src_shell-util.c b/gnome-shell/patches/patch-src_shell-util.c
deleted file mode 100644
index 63f9b871e9..0000000000
--- a/gnome-shell/patches/patch-src_shell-util.c
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
-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