cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drop a systemd specific function that's in the way.

Browse Source
This commit is contained in:
ajacoutot 2016-11-04 10:11:02 +00:00
parent 77a5caf7e3
commit 42f0f56063
3 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
x11/gnome/shell/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.133 2016/10/31 16:15:08 jasper Exp $
# $OpenBSD: Makefile,v 1.134 2016/11/04 10:11:02 ajacoutot Exp $
USE_WXNEEDED= Yes
@ -6,6 +6,7 @@ COMMENT= next generation GNOME shell
GNOME_PROJECT= gnome-shell
GNOME_VERSION= 3.22.1
REVISION= 0
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes

31
x11/gnome/shell/patches/patch-js_misc_loginManager_js
View File

@ -1,4 +1,10 @@
$OpenBSD: patch-js_misc_loginManager_js,v 1.2 2016/10/31 16:15:09 jasper Exp $
$OpenBSD: patch-js_misc_loginManager_js,v 1.3 2016/11/04 10:11:02 ajacoutot 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
@ -7,8 +13,17 @@ Date: Thu, 24 Apr 2014 17:55:56 +0200
Subject: loginManager: Kill ConsoleKit support
--- js/misc/loginManager.js.orig Sat Aug 20 01:42:50 2016
+++ js/misc/loginManager.js Mon Oct 31 16:02:40 2016
@@ -49,6 +49,32 @@ const SystemdLoginSessionIface = '<node> \
+++ js/misc/loginManager.js Fri Nov 4 10:57:19 2016
@@ -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);
@ -41,7 +56,7 @@ Subject: loginManager: Kill ConsoleKit support
function haveSystemd() {
return GLib.access("/run/systemd/seats", 0) >= 0;
}
@@ -78,7 +104,7 @@ function canLock() {
@@ -78,7 +101,7 @@ function canLock() {
-1, null);
let version = result.deep_unpack()[0].deep_unpack();
@ -50,7 +65,7 @@ Subject: loginManager: Kill ConsoleKit support
} catch(e) {
return false;
}
@@ -96,7 +122,7 @@ function getLoginManager() {
@@ -96,7 +119,7 @@ function getLoginManager() {
if (haveSystemd())
_loginManager = new LoginManagerSystemd();
else
@ -59,7 +74,7 @@ Subject: loginManager: Kill ConsoleKit support
}
return _loginManager;
@@ -113,6 +139,9 @@ const LoginManagerSystemd = new Lang.Class({
@@ -113,6 +136,9 @@ const LoginManagerSystemd = new Lang.Class({
Lang.bind(this, this._prepareForSleep));
},
@ -69,7 +84,7 @@ Subject: loginManager: Kill ConsoleKit support
getCurrentSessionProxy: function(callback) {
if (this._currentSession) {
callback (this._currentSession);
@@ -183,13 +212,35 @@ const LoginManagerSystemd = new Lang.Class({
@@ -183,13 +209,35 @@ const LoginManagerSystemd = new Lang.Class({
});
Signals.addSignalMethods(LoginManagerSystemd.prototype);
@ -110,7 +125,7 @@ Subject: loginManager: Kill ConsoleKit support
},
canSuspend: function(asyncCallback) {
@@ -209,4 +260,4 @@ const LoginManagerDummy = new Lang.Class({
@@ -209,4 +257,4 @@ const LoginManagerDummy = new Lang.Class({
callback(null);
}
});

20
x11/gnome/shell/patches/patch-js_ui_screenShield_js Normal file
View File

@ -0,0 +1,20 @@
$OpenBSD: patch-js_ui_screenShield_js,v 1.1 2016/11/04 10:11:02 ajacoutot 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
--- js/ui/screenShield.js.orig Fri Nov 4 10:55:41 2016
+++ js/ui/screenShield.js Fri Nov 4 10:56:48 2016
@@ -576,9 +576,6 @@ const ScreenShield = new Lang.Class({
if (prevIsActive != this._isActive)
this.emit('active-changed');
- if (this._loginSession)
- this._loginSession.SetLockedHintRemote(active);
-
this._syncInhibitor();
},