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

Bring a patch from momonga-linux to prevent DEBUG messages pollution in

Browse Source 
.xsession-errors when bug-buddy is installed.
This commit is contained in:
ajacoutot 2010-10-26 17:20:27 +00:00
parent c794585beb
commit e8ddd57709
4 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/gnome/session/Makefile
View File

@ -1,14 +1,20 @@
# $OpenBSD: Makefile,v 1.127 2010/10/25 17:45:57 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.128 2010/10/26 17:20:27 ajacoutot Exp $
COMMENT= GNOME session
GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.32.0
REVISION= 4
REVISION= 5
CATEGORIES= x11
# XXX when bug-buddy is installed, all debug messages are print in
# .xsession, we do not want that
MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/
PATCHFILES= gs-bug-buddy-debug.diff:0
PATCH_DIST_STRIP= -p1
# GPLv2/LGPLv2/GFDLv1.1
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes

5
x11/gnome/session/distinfo
View File

@ -1,5 +1,10 @@
MD5 (gnome/gnome-session-2.32.0.tar.bz2) = s0i9Ak+84mT3ShdOvN85Rw==
MD5 (gnome/gs-bug-buddy-debug.diff) = 7vQtskdWCVWWdk7GREbSNg==
RMD160 (gnome/gnome-session-2.32.0.tar.bz2) = pItenuoUcoopLx/33TG+VjWFecs=
RMD160 (gnome/gs-bug-buddy-debug.diff) = mtcOW3zz4KmY38/Q6gGQraTZ2fI=
SHA1 (gnome/gnome-session-2.32.0.tar.bz2) = UYpwaVqL3HbRef8bw2+t95VFefU=
SHA1 (gnome/gs-bug-buddy-debug.diff) = 5ZSQRZ8ZjIIREACIJDKDMOMnwtw=
SHA256 (gnome/gnome-session-2.32.0.tar.bz2) = S3V1dDAwYsulYM/+ymVOzNTtDdFj7+eTpKPvtoIt6iU=
SHA256 (gnome/gs-bug-buddy-debug.diff) = L24NxsqarvbnB1iTC2rXpuBe/tVBkMUWbRRlsS6nMjA=
SIZE (gnome/gnome-session-2.32.0.tar.bz2) = 773010
SIZE (gnome/gs-bug-buddy-debug.diff) = 61848

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

@ -1,22 +1,22 @@
$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.1 2009/11/12 00:22:55 jasper Exp $
$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.2 2010/10/26 17:20:28 ajacoutot Exp $
dbus_message_get_path() can return NULL
--- gnome-session/gsm-dbus-client.c.orig Thu Nov 12 01:17:12 2009
+++ gnome-session/gsm-dbus-client.c Thu Nov 12 01:17:51 2009
@@ -213,10 +213,11 @@ client_dbus_filter_function (DBusConnection *connectio
--- gnome-session/gsm-dbus-client.c.orig Tue Oct 26 19:10:23 2010
+++ gnome-session/gsm-dbus-client.c Tue Oct 26 19:11:41 2010
@@ -215,10 +215,11 @@ client_dbus_filter_function (DBusConnection *connectio
path = dbus_message_get_path (message);
#ifdef GNOME_ENABLE_DEBUG
- 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 (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));
#endif
if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);

22
x11/gnome/session/patches/patch-gnome-session_gsm-manager_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.6 2010/09/30 07:37:05 ajacoutot Exp $
$OpenBSD: patch-gnome-session_gsm-manager_c,v 1.7 2010/10/26 17:20:28 ajacoutot Exp $
OpenBSD does not support uPower.
--- gnome-session/gsm-manager.c.orig Thu Jul 15 14:53:08 2010
+++ gnome-session/gsm-manager.c Tue Sep 28 13:53:51 2010
--- gnome-session/gsm-manager.c.orig Tue Oct 26 19:10:23 2010
+++ gnome-session/gsm-manager.c Tue Oct 26 19:12:14 2010
@@ -38,7 +38,9 @@
#include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h>
@ -24,7 +24,7 @@ OpenBSD does not support uPower.
};
enum {
@@ -983,6 +987,7 @@ manager_perhaps_lock (GsmManager *manager)
@@ -1005,6 +1009,7 @@ manager_perhaps_lock (GsmManager *manager)
static void
manager_attempt_hibernate (GsmManager *manager)
{
@ -32,7 +32,7 @@ OpenBSD does not support uPower.
gboolean can_hibernate;
GError *error;
gboolean ret;
@@ -1001,11 +1006,13 @@ manager_attempt_hibernate (GsmManager *manager)
@@ -1023,11 +1028,13 @@ manager_attempt_hibernate (GsmManager *manager)
g_error_free (error);
}
}
@ -46,7 +46,7 @@ OpenBSD does not support uPower.
gboolean can_suspend;
GError *error;
gboolean ret;
@@ -1024,6 +1031,7 @@ manager_attempt_suspend (GsmManager *manager)
@@ -1046,6 +1053,7 @@ manager_attempt_suspend (GsmManager *manager)
g_error_free (error);
}
}
@ -54,7 +54,7 @@ OpenBSD does not support uPower.
}
static void
@@ -2196,10 +2204,12 @@ gsm_manager_dispose (GObject *object)
@@ -2253,10 +2261,12 @@ gsm_manager_dispose (GObject *object)
manager->priv->gconf_client = NULL;
}
@ -67,7 +67,7 @@ OpenBSD does not support uPower.
G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
}
@@ -2429,7 +2439,9 @@ gsm_manager_init (GsmManager *manager)
@@ -2488,7 +2498,9 @@ gsm_manager_init (GsmManager *manager)
G_CALLBACK (on_presence_status_changed),
manager);
@ -77,7 +77,7 @@ OpenBSD does not support uPower.
/* GConf setup */
gconf_client_add_dir (manager->priv->gconf_client,
@@ -2953,10 +2965,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
@@ -3024,10 +3036,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
gboolean can_suspend;
gboolean can_hibernate;
@ -87,6 +87,6 @@ OpenBSD does not support uPower.
"can-hibernate", &can_hibernate,
NULL);
+#endif
#ifdef GNOME_ENABLE_DEBUG
g_debug ("GsmManager: CanShutdown called");
#endif