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

Restore shutdown capability.

Browse Source 
Remove undeeded patches.
This commit is contained in:
ajacoutot 2012-04-07 11:07:54 +00:00
parent 771bf2b6dd
commit 741d0715b3
4 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
x11/gnome/session/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.208 2012/03/29 07:23:21 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.209 2012/04/07 11:07:54 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 3.4.0
REVISION= 0
CATEGORIES= x11
@ -36,10 +37,6 @@ LIB_DEPENDS= devel/libexecinfo \
RUN_DEPENDS= x11/gnome/settings-daemon \
sysutils/consolekit
# only needed at runtime since the move from gconf to gsettings
# (see NEWS in the source tarball)
RUN_DEPENDS+= devel/gsettings-desktop-schemas
# gnome.session+gnome-fallback.session RequiredComponents.
RUN_DEPENDS+= sysutils/notification-daemon
@ -53,8 +50,9 @@ RUN_DEPENDS+= x11/gnome/metacity \
x11/gnome/panel>=3 \
x11/polkit-gnome
# Defaults from gsettings-desktop-schema.
RUN_DEPENDS+= fonts/cantarell-fonts \
# defaults are set in gsettings-desktop-schema (runtime (see NEWS))
RUN_DEPENDS+= devel/gsettings-desktop-schemas \
fonts/cantarell-fonts \
x11/gnome/backgrounds>=3 \
x11/gnome/themes-standard

16
x11/gnome/session/patches/patch-gnome-session_gsm-consolekit_c
View File

@ -1,16 +0,0 @@
$OpenBSD: patch-gnome-session_gsm-consolekit_c,v 1.8 2012/03/29 07:23:22 ajacoutot Exp $
--- gnome-session/gsm-consolekit.c.orig Thu Feb 2 15:33:01 2012
+++ gnome-session/gsm-consolekit.c Wed Mar 28 16:23:14 2012
@@ -707,6 +707,12 @@ gsm_consolekit_can_stop (GsmSystem *system)
error = NULL;
+/* User switching requires running another new X server which will not
+ * work by default on OpenBSD.
+ */
+#ifdef __OpenBSD__
+ return FALSE;
+#endif
if (!gsm_consolekit_ensure_ck_connection (manager, &error)) {
g_warning ("Could not connect to ConsoleKit: %s",
error->message);

22
x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.5 2011/09/12 07:28:54 jasper Exp $
dbus_message_get_path() can return NULL
--- gnome-session/gsm-dbus-client.c.orig Tue Mar 22 21:31:43 2011
+++ gnome-session/gsm-dbus-client.c Wed May 18 14:37:20 2011
@@ -212,10 +212,11 @@ client_dbus_filter_function (DBusConnection *connectio
path = dbus_message_get_path (message);
- g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
- dbus_message_get_path (message),
- dbus_message_get_interface (message),
- dbus_message_get_member (message));
+ if (path != NULL)
+ g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
+ dbus_message_get_path (message),
+ dbus_message_get_interface (message),
+ dbus_message_get_member (message));
if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);

17
x11/gnome/session/patches/patch-tools_gnome-session-check-accelerated-helper_c
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-tools_gnome-session-check-accelerated-helper_c,v 1.2 2012/03/29 07:23:22 ajacoutot Exp $
XXX remove when we have gnome-shell.
--- tools/gnome-session-check-accelerated-helper.c.orig Mon Dec 19 10:47:00 2011
+++ tools/gnome-session-check-accelerated-helper.c Wed Mar 28 16:23:14 2012
@@ -407,6 +407,10 @@ main (int argc, char **argv)
_print_error ("Invalid value for gnome.fallback passed in kernel command line.");
}
+#ifdef __OpenBSD__
+ _print_error ("Running on OpenBSD, forcing fallback mode.");
+ goto out;
+#endif
display = XOpenDisplay (NULL);
if (!display) {
_print_error ("No X display.");