From 59d44b2666e34c3e29e9b3372bc6d2e506299dfd Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Fri, 3 Dec 2010 13:15:27 +0000 Subject: [PATCH] Extend the gs-bug-buddy-debug patch so that g_debug messages are only printed if we compile with --enable-debug even when the libgnomesegvhandler module from bug-buddy is loaded. --- x11/gnome/session/Makefile | 7 ++--- x11/gnome/session/distinfo | 10 +++---- .../patch-gnome-session_gsm-consolekit_c | 8 ++--- .../patch-gnome-session_gsm-dbus-client_c | 12 ++++---- .../patches/patch-gnome-session_gsm-manager_c | 20 ++++++------- .../patches/patch-gnome-session_main_c | 8 ++--- x11/gnome/session/pkg/PLIST | 29 ++++++++++++++++++- 7 files changed, 60 insertions(+), 34 deletions(-) diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile index 7b143023e1f..4be3eeccaf3 100644 --- a/x11/gnome/session/Makefile +++ b/x11/gnome/session/Makefile @@ -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 GNOME_PROJECT= gnome-session GNOME_VERSION= 2.32.1 -REVISION= 0 +REVISION= 1 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 +PATCHFILES= gs-bug-buddy-debug.2.diff:0 # GPLv2/LGPLv2/GFDLv1.1 PERMIT_PACKAGE_CDROM= Yes diff --git a/x11/gnome/session/distinfo b/x11/gnome/session/distinfo index 46006f7856f..470de0a9f53 100644 --- a/x11/gnome/session/distinfo +++ b/x11/gnome/session/distinfo @@ -1,10 +1,10 @@ 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/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/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/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/gs-bug-buddy-debug.diff) = 61848 +SIZE (gnome/gs-bug-buddy-debug.2.diff) = 93056 diff --git a/x11/gnome/session/patches/patch-gnome-session_gsm-consolekit_c b/x11/gnome/session/patches/patch-gnome-session_gsm-consolekit_c index 4518387d0c7..e388e767c3c 100644 --- a/x11/gnome/session/patches/patch-gnome-session_gsm-consolekit_c +++ b/x11/gnome/session/patches/patch-gnome-session_gsm-consolekit_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gnome-session_gsm-consolekit_c,v 1.3 2010/07/23 09:28:05 ajacoutot Exp $ ---- gnome-session/gsm-consolekit.c.orig Fri Jul 23 11:13:25 2010 -+++ gnome-session/gsm-consolekit.c Fri Jul 23 11:15:37 2010 -@@ -728,6 +728,12 @@ gsm_consolekit_can_switch_user (GsmConsolekit *manager +$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 Dec 3 13:41:07 2010 ++++ gnome-session/gsm-consolekit.c Fri Dec 3 13:41:07 2010 +@@ -734,6 +734,12 @@ gsm_consolekit_can_switch_user (GsmConsolekit *manager error = NULL; diff --git a/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c b/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c index f8e5021c755..e5f11c45b9f 100644 --- a/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c +++ b/x11/gnome/session/patches/patch-gnome-session_gsm-dbus-client_c @@ -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 ---- 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 - +--- gnome-session/gsm-dbus-client.c.orig Fri Dec 3 13:41:07 2010 ++++ gnome-session/gsm-dbus-client.c Fri Dec 3 13:41:07 2010 +@@ -218,10 +218,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), @@ -18,5 +18,5 @@ dbus_message_get_path() can return NULL + 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); diff --git a/x11/gnome/session/patches/patch-gnome-session_gsm-manager_c b/x11/gnome/session/patches/patch-gnome-session_gsm-manager_c index a4556790b93..bf61c08ee64 100644 --- a/x11/gnome/session/patches/patch-gnome-session_gsm-manager_c +++ b/x11/gnome/session/patches/patch-gnome-session_gsm-manager_c @@ -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. ---- 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 +--- gnome-session/gsm-manager.c.orig Fri Dec 3 13:41:07 2010 ++++ gnome-session/gsm-manager.c Fri Dec 3 13:42:09 2010 @@ -38,7 +38,9 @@ #include #include @@ -24,7 +24,7 @@ OpenBSD does not support uPower. }; enum { -@@ -1005,6 +1009,7 @@ manager_perhaps_lock (GsmManager *manager) +@@ -1013,6 +1017,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; -@@ -1023,11 +1028,13 @@ manager_attempt_hibernate (GsmManager *manager) +@@ -1031,11 +1036,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; -@@ -1046,6 +1053,7 @@ manager_attempt_suspend (GsmManager *manager) +@@ -1054,6 +1061,7 @@ manager_attempt_suspend (GsmManager *manager) g_error_free (error); } } @@ -54,7 +54,7 @@ OpenBSD does not support uPower. } 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; } @@ -67,7 +67,7 @@ OpenBSD does not support uPower. 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), manager); @@ -77,7 +77,7 @@ OpenBSD does not support uPower. /* GConf setup */ 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_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 diff --git a/x11/gnome/session/patches/patch-gnome-session_main_c b/x11/gnome/session/patches/patch-gnome-session_main_c index efea0b477e1..9c50baad14b 100644 --- a/x11/gnome/session/patches/patch-gnome-session_main_c +++ b/x11/gnome/session/patches/patch-gnome-session_main_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gnome-session_main_c,v 1.3 2010/04/22 22:38:51 ajacoutot Exp $ ---- gnome-session/main.c.orig Tue Mar 9 00:31:27 2010 -+++ gnome-session/main.c Fri Apr 23 00:33:12 2010 -@@ -486,6 +486,13 @@ main (int argc, char **argv) +$OpenBSD: patch-gnome-session_main_c,v 1.4 2010/12/03 13:15:27 ajacoutot Exp $ +--- gnome-session/main.c.orig Fri Dec 3 13:41:07 2010 ++++ gnome-session/main.c Fri Dec 3 13:41:08 2010 +@@ -508,6 +508,13 @@ main (int argc, char **argv) */ gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); diff --git a/x11/gnome/session/pkg/PLIST b/x11/gnome/session/pkg/PLIST index 0d98fa9f539..fa9175f8da9 100644 --- a/x11/gnome/session/pkg/PLIST +++ b/x11/gnome/session/pkg/PLIST @@ -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-properties @bin bin/gnome-session-save @@ -15,14 +15,27 @@ share/doc/pkg-readmes/${FULLPKGNAME} share/gnome-session/ share/gnome-session/gsm-inhibit-dialog.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/22x22/ +share/icons/hicolor/22x22/apps/ 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/32x32/ +share/icons/hicolor/32x32/apps/ share/icons/hicolor/32x32/apps/session-properties.png share/icons/hicolor/48x48/ share/icons/hicolor/48x48/apps/ 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/locale/af/ +share/locale/af/LC_MESSAGES/ share/locale/af/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 @@ -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/az/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/bg/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/br/ +share/locale/br/LC_MESSAGES/ share/locale/br/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@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/cs/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/ms/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/ne/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/nso/ +share/locale/nso/LC_MESSAGES/ share/locale/nso/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 @@ -138,6 +161,8 @@ share/locale/uz@cyrillic/ share/locale/uz@cyrillic/LC_MESSAGES/ share/locale/uz@cyrillic/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/xh/LC_MESSAGES/gnome-session-2.0.mo 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_HK/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 @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}/