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

Extend the gs-bug-buddy-debug patch so that g_debug messages are only

Browse Source 
printed if we compile with --enable-debug even when the
libgnomesegvhandler module from bug-buddy is loaded.
This commit is contained in:
ajacoutot 2010-12-03 13:15:27 +00:00
parent de217ce23d
commit 59d44b2666
7 changed files with 60 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/gnome/session/Makefile
View File

@ -1,19 +1,18 @@
# $OpenBSD: Makefile,v 1.133 2010/11/22 08:36:58 espie Exp $ # $OpenBSD: Makefile,v 1.134 2010/12/03 13:15:27 ajacoutot Exp $
COMMENT= GNOME session COMMENT= GNOME session
GNOME_PROJECT= gnome-session GNOME_PROJECT= gnome-session
GNOME_VERSION= 2.32.1 GNOME_VERSION= 2.32.1
REVISION= 0 REVISION= 1
CATEGORIES= x11 CATEGORIES= x11
# XXX when bug-buddy is installed, all debug messages are print in # XXX when bug-buddy is installed, all debug messages are print in
# .xsession, we do not want that # .xsession, we do not want that
MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/ MASTER_SITES0= http://www.bsdfrog.org/OpenBSD/distfiles/
PATCHFILES= gs-bug-buddy-debug.diff:0 PATCHFILES= gs-bug-buddy-debug.2.diff:0
PATCH_DIST_STRIP= -p1
# GPLv2/LGPLv2/GFDLv1.1 # GPLv2/LGPLv2/GFDLv1.1
PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_CDROM= Yes

10
x11/gnome/session/distinfo
View File

@ -1,10 +1,10 @@
MD5 (gnome/gnome-session-2.32.1.tar.bz2) = Iiuta0RssZprkCjqJFOAAg== MD5 (gnome/gnome-session-2.32.1.tar.bz2) = Iiuta0RssZprkCjqJFOAAg==
MD5 (gnome/gs-bug-buddy-debug.diff) = 7vQtskdWCVWWdk7GREbSNg== MD5 (gnome/gs-bug-buddy-debug.2.diff) = GmolI4aPP+2VFMELiQoeJQ==
RMD160 (gnome/gnome-session-2.32.1.tar.bz2) = xXm/GXs4yN998Ux1HAVr6GaVooc= RMD160 (gnome/gnome-session-2.32.1.tar.bz2) = xXm/GXs4yN998Ux1HAVr6GaVooc=
RMD160 (gnome/gs-bug-buddy-debug.diff) = mtcOW3zz4KmY38/Q6gGQraTZ2fI= RMD160 (gnome/gs-bug-buddy-debug.2.diff) = qrXRfFYdABB/S+hbSnHiQafTZws=
SHA1 (gnome/gnome-session-2.32.1.tar.bz2) = fUx2UiR2BqlyovHlCmpjOYCaW54= SHA1 (gnome/gnome-session-2.32.1.tar.bz2) = fUx2UiR2BqlyovHlCmpjOYCaW54=
SHA1 (gnome/gs-bug-buddy-debug.diff) = 5ZSQRZ8ZjIIREACIJDKDMOMnwtw= SHA1 (gnome/gs-bug-buddy-debug.2.diff) = scoVpmiVCl6VF7rUqYPVKNh+y2w=
SHA256 (gnome/gnome-session-2.32.1.tar.bz2) = Itk85DP8+cfOa1823YH2TmkuoOQfqqD2EVndrCjDaGo= SHA256 (gnome/gnome-session-2.32.1.tar.bz2) = Itk85DP8+cfOa1823YH2TmkuoOQfqqD2EVndrCjDaGo=
SHA256 (gnome/gs-bug-buddy-debug.diff) = L24NxsqarvbnB1iTC2rXpuBe/tVBkMUWbRRlsS6nMjA= SHA256 (gnome/gs-bug-buddy-debug.2.diff) = gRlAkHs+3gmDzPQd058TMFZT4XsdgnUpG3B5p4j+aR4=
SIZE (gnome/gnome-session-2.32.1.tar.bz2) = 774842 SIZE (gnome/gnome-session-2.32.1.tar.bz2) = 774842
SIZE (gnome/gs-bug-buddy-debug.diff) = 61848 SIZE (gnome/gs-bug-buddy-debug.2.diff) = 93056

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

@ -1,7 +1,7 @@
$OpenBSD: patch-gnome-session_gsm-consolekit_c,v 1.3 2010/07/23 09:28:05 ajacoutot Exp $ $OpenBSD: patch-gnome-session_gsm-consolekit_c,v 1.4 2010/12/03 13:15:27 ajacoutot Exp $
--- gnome-session/gsm-consolekit.c.orig Fri Jul 23 11:13:25 2010 --- gnome-session/gsm-consolekit.c.orig Fri Dec 3 13:41:07 2010
+++ gnome-session/gsm-consolekit.c Fri Jul 23 11:15:37 2010 +++ gnome-session/gsm-consolekit.c Fri Dec 3 13:41:07 2010
@@ -728,6 +728,12 @@ gsm_consolekit_can_switch_user (GsmConsolekit *manager @@ -734,6 +734,12 @@ gsm_consolekit_can_switch_user (GsmConsolekit *manager
error = NULL; error = NULL;

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

@ -1,12 +1,12 @@
$OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.2 2010/10/26 17:20:28 ajacoutot Exp $ $OpenBSD: patch-gnome-session_gsm-dbus-client_c,v 1.3 2010/12/03 13:15:27 ajacoutot Exp $
dbus_message_get_path() can return NULL dbus_message_get_path() can return NULL
--- gnome-session/gsm-dbus-client.c.orig Tue Oct 26 19:10:23 2010 --- gnome-session/gsm-dbus-client.c.orig Fri Dec 3 13:41:07 2010
+++ gnome-session/gsm-dbus-client.c Tue Oct 26 19:11:41 2010 +++ gnome-session/gsm-dbus-client.c Fri Dec 3 13:41:07 2010
@@ -215,10 +215,11 @@ client_dbus_filter_function (DBusConnection *connectio @@ -218,10 +218,11 @@ client_dbus_filter_function (DBusConnection *connectio
path = dbus_message_get_path (message); path = dbus_message_get_path (message);
#ifdef GNOME_ENABLE_DEBUG #ifdef GNOME_ENABLE_DEBUG
- g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s", - g_debug ("GsmDBusClient: obj_path=%s interface=%s method=%s",
- dbus_message_get_path (message), - dbus_message_get_path (message),
@ -18,5 +18,5 @@ dbus_message_get_path() can return NULL
+ dbus_message_get_interface (message), + dbus_message_get_interface (message),
+ dbus_message_get_member (message)); + dbus_message_get_member (message));
#endif #endif
if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) { if (dbus_message_is_method_call (message, SM_DBUS_CLIENT_PRIVATE_INTERFACE, "EndSessionResponse")) {
g_assert (gsm_client_peek_id (GSM_CLIENT (client)) != NULL);

20
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.7 2010/10/26 17:20:28 ajacoutot Exp $ $OpenBSD: patch-gnome-session_gsm-manager_c,v 1.8 2010/12/03 13:15:27 ajacoutot Exp $
OpenBSD does not support uPower. OpenBSD does not support uPower.
--- gnome-session/gsm-manager.c.orig Tue Oct 26 19:10:23 2010 --- gnome-session/gsm-manager.c.orig Fri Dec 3 13:41:07 2010
+++ gnome-session/gsm-manager.c Tue Oct 26 19:12:14 2010 +++ gnome-session/gsm-manager.c Fri Dec 3 13:42:09 2010
@@ -38,7 +38,9 @@ @@ -38,7 +38,9 @@
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
@ -24,7 +24,7 @@ OpenBSD does not support uPower.
}; };
enum { enum {
@@ -1005,6 +1009,7 @@ manager_perhaps_lock (GsmManager *manager) @@ -1013,6 +1017,7 @@ manager_perhaps_lock (GsmManager *manager)
static void static void
manager_attempt_hibernate (GsmManager *manager) manager_attempt_hibernate (GsmManager *manager)
{ {
@ -32,7 +32,7 @@ OpenBSD does not support uPower.
gboolean can_hibernate; gboolean can_hibernate;
GError *error; GError *error;
gboolean ret; gboolean ret;
@@ -1023,11 +1028,13 @@ manager_attempt_hibernate (GsmManager *manager) @@ -1031,11 +1036,13 @@ manager_attempt_hibernate (GsmManager *manager)
g_error_free (error); g_error_free (error);
} }
} }
@ -46,7 +46,7 @@ OpenBSD does not support uPower.
gboolean can_suspend; gboolean can_suspend;
GError *error; GError *error;
gboolean ret; gboolean ret;
@@ -1046,6 +1053,7 @@ manager_attempt_suspend (GsmManager *manager) @@ -1054,6 +1061,7 @@ manager_attempt_suspend (GsmManager *manager)
g_error_free (error); g_error_free (error);
} }
} }
@ -54,7 +54,7 @@ OpenBSD does not support uPower.
} }
static void static void
@@ -2253,10 +2261,12 @@ gsm_manager_dispose (GObject *object) @@ -2288,10 +2296,12 @@ gsm_manager_dispose (GObject *object)
manager->priv->gconf_client = NULL; manager->priv->gconf_client = NULL;
} }
@ -67,7 +67,7 @@ OpenBSD does not support uPower.
G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object); G_OBJECT_CLASS (gsm_manager_parent_class)->dispose (object);
} }
@@ -2488,7 +2498,9 @@ gsm_manager_init (GsmManager *manager) @@ -2523,7 +2533,9 @@ gsm_manager_init (GsmManager *manager)
G_CALLBACK (on_presence_status_changed), G_CALLBACK (on_presence_status_changed),
manager); manager);
@ -77,7 +77,7 @@ OpenBSD does not support uPower.
/* GConf setup */ /* GConf setup */
gconf_client_add_dir (manager->priv->gconf_client, gconf_client_add_dir (manager->priv->gconf_client,
@@ -3024,10 +3036,12 @@ gsm_manager_can_shutdown (GsmManager *manager, @@ -3069,10 +3081,12 @@ gsm_manager_can_shutdown (GsmManager *manager,
gboolean can_suspend; gboolean can_suspend;
gboolean can_hibernate; gboolean can_hibernate;
@ -87,6 +87,6 @@ OpenBSD does not support uPower.
"can-hibernate", &can_hibernate, "can-hibernate", &can_hibernate,
NULL); NULL);
+#endif +#endif
#ifdef GNOME_ENABLE_DEBUG #ifdef GNOME_ENABLE_DEBUG
g_debug ("GsmManager: CanShutdown called"); g_debug ("GsmManager: CanShutdown called");
#endif

8
x11/gnome/session/patches/patch-gnome-session_main_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-gnome-session_main_c,v 1.3 2010/04/22 22:38:51 ajacoutot Exp $ $OpenBSD: patch-gnome-session_main_c,v 1.4 2010/12/03 13:15:27 ajacoutot Exp $
--- gnome-session/main.c.orig Tue Mar 9 00:31:27 2010 --- gnome-session/main.c.orig Fri Dec 3 13:41:07 2010
+++ gnome-session/main.c Fri Apr 23 00:33:12 2010 +++ gnome-session/main.c Fri Dec 3 13:41:08 2010
@@ -486,6 +486,13 @@ main (int argc, char **argv) @@ -508,6 +508,13 @@ main (int argc, char **argv)
*/ */
gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");

29
x11/gnome/session/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.29 2010/10/28 22:42:44 jasper Exp $ @comment $OpenBSD: PLIST,v 1.30 2010/12/03 13:15:27 ajacoutot Exp $
@bin bin/gnome-session @bin bin/gnome-session
@bin bin/gnome-session-properties @bin bin/gnome-session-properties
@bin bin/gnome-session-save @bin bin/gnome-session-save
@ -15,14 +15,27 @@ share/doc/pkg-readmes/${FULLPKGNAME}
share/gnome-session/ share/gnome-session/
share/gnome-session/gsm-inhibit-dialog.ui share/gnome-session/gsm-inhibit-dialog.ui
share/gnome-session/session-properties.ui share/gnome-session/session-properties.ui
share/icons/hicolor/
share/icons/hicolor/16x16/
share/icons/hicolor/16x16/apps/
share/icons/hicolor/16x16/apps/session-properties.png share/icons/hicolor/16x16/apps/session-properties.png
share/icons/hicolor/22x22/
share/icons/hicolor/22x22/apps/
share/icons/hicolor/22x22/apps/session-properties.png share/icons/hicolor/22x22/apps/session-properties.png
share/icons/hicolor/24x24/
share/icons/hicolor/24x24/apps/
share/icons/hicolor/24x24/apps/session-properties.png share/icons/hicolor/24x24/apps/session-properties.png
share/icons/hicolor/32x32/
share/icons/hicolor/32x32/apps/
share/icons/hicolor/32x32/apps/session-properties.png share/icons/hicolor/32x32/apps/session-properties.png
share/icons/hicolor/48x48/ share/icons/hicolor/48x48/
share/icons/hicolor/48x48/apps/ share/icons/hicolor/48x48/apps/
share/icons/hicolor/48x48/apps/session-properties.png share/icons/hicolor/48x48/apps/session-properties.png
share/icons/hicolor/scalable/
share/icons/hicolor/scalable/apps/
share/icons/hicolor/scalable/apps/session-properties.svg share/icons/hicolor/scalable/apps/session-properties.svg
share/locale/af/
share/locale/af/LC_MESSAGES/
share/locale/af/LC_MESSAGES/gnome-session-2.0.mo share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
share/locale/am/LC_MESSAGES/gnome-session-2.0.mo share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@ -30,14 +43,20 @@ share/locale/as/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo share/locale/ast/LC_MESSAGES/gnome-session-2.0.mo
share/locale/az/LC_MESSAGES/gnome-session-2.0.mo share/locale/az/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be/LC_MESSAGES/gnome-session-2.0.mo share/locale/be/LC_MESSAGES/gnome-session-2.0.mo
share/locale/be@latin/
share/locale/be@latin/LC_MESSAGES/
share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo share/locale/be@latin/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo share/locale/bg/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo share/locale/bn_IN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/br/
share/locale/br/LC_MESSAGES/
share/locale/br/LC_MESSAGES/gnome-session-2.0.mo share/locale/br/LC_MESSAGES/gnome-session-2.0.mo
share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo share/locale/bs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo share/locale/ca@valencia/LC_MESSAGES/gnome-session-2.0.mo
share/locale/crh/
share/locale/crh/LC_MESSAGES/
share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo share/locale/crh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo share/locale/cs/LC_MESSAGES/gnome-session-2.0.mo
share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo share/locale/cy/LC_MESSAGES/gnome-session-2.0.mo
@ -96,10 +115,14 @@ share/locale/mn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo share/locale/mr/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo share/locale/ms/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo share/locale/nb/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nds/
share/locale/nds/LC_MESSAGES/
share/locale/nds/LC_MESSAGES/gnome-session-2.0.mo share/locale/nds/LC_MESSAGES/gnome-session-2.0.mo
share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
share/locale/nso/
share/locale/nso/LC_MESSAGES/
share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
share/locale/oc/LC_MESSAGES/gnome-session-2.0.mo share/locale/oc/LC_MESSAGES/gnome-session-2.0.mo
share/locale/or/LC_MESSAGES/gnome-session-2.0.mo share/locale/or/LC_MESSAGES/gnome-session-2.0.mo
@ -138,6 +161,8 @@ share/locale/uz@cyrillic/
share/locale/uz@cyrillic/LC_MESSAGES/ share/locale/uz@cyrillic/LC_MESSAGES/
share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-2.0.mo share/locale/uz@cyrillic/LC_MESSAGES/gnome-session-2.0.mo
share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
share/locale/wa/
share/locale/wa/LC_MESSAGES/
share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
share/locale/yo/ share/locale/yo/
@ -146,6 +171,8 @@ share/locale/yo/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
share/locale/zu/
share/locale/zu/LC_MESSAGES/
share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/${SCHEMAS_INSTDIR}/*.schemas > /dev/null
${SCHEMAS_INSTDIR}/ ${SCHEMAS_INSTDIR}/