diff --git a/x11/gnome/session/Makefile b/x11/gnome/session/Makefile index 0df04b47aec..6f45c322013 100644 --- a/x11/gnome/session/Makefile +++ b/x11/gnome/session/Makefile @@ -1,10 +1,9 @@ -# $OpenBSD: Makefile,v 1.215 2012/09/01 14:36:59 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.216 2012/09/28 07:34:24 ajacoutot Exp $ COMMENT= GNOME session GNOME_PROJECT= gnome-session -GNOME_VERSION= 3.4.2.1 -REVISION= 2 +GNOME_VERSION= 3.6.0 CATEGORIES= x11 @@ -22,19 +21,20 @@ WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 WANTLIB += gthread-2.0 gtk-3 json-glib-1.0 m pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs WANTLIB += upower-glib xcb xcb-render xcb-shm z stdc++ +WANTLIB += atk-bridge-2.0 atspi harfbuzz icudata icule icuuc MODULES= devel/gettext \ x11/gnome \ devel/dconf BUILD_DEPENDS= textproc/xmlto \ - x11/gnome/settings-daemon + x11/gnome/settings-daemon>=3.6.0 LIB_DEPENDS= devel/libexecinfo \ - x11/gtk+3 \ + x11/gtk+3>=3.6.0 \ devel/gconf2 \ sysutils/upower \ devel/json-glib -RUN_DEPENDS= x11/gnome/settings-daemon \ +RUN_DEPENDS= x11/gnome/settings-daemon>=3.6.0 \ sysutils/consolekit # gnome.session+gnome-fallback.session RequiredComponents. diff --git a/x11/gnome/session/distinfo b/x11/gnome/session/distinfo index 41ffaf6f4b1..21a4919ab1d 100644 --- a/x11/gnome/session/distinfo +++ b/x11/gnome/session/distinfo @@ -1,2 +1,2 @@ -SHA256 (gnome/gnome-session-3.4.2.1.tar.xz) = L7zxDUrYZIGX/v3iBSq9i/FrgneBqXT1msEY590NtDM= -SIZE (gnome/gnome-session-3.4.2.1.tar.xz) = 725144 +SHA256 (gnome/gnome-session-3.6.0.tar.xz) = +Csjbxi8eM7xbUzD04kvmlr/+B/bPgQxmzUFqgDoiME= +SIZE (gnome/gnome-session-3.6.0.tar.xz) = 728492 diff --git a/x11/gnome/session/patches/patch-gnome-session_main_c b/x11/gnome/session/patches/patch-gnome-session_main_c index 650fadc18e0..293af080561 100644 --- a/x11/gnome/session/patches/patch-gnome-session_main_c +++ b/x11/gnome/session/patches/patch-gnome-session_main_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-gnome-session_main_c,v 1.9 2012/02/16 22:23:25 ajacoutot Exp $ +$OpenBSD: patch-gnome-session_main_c,v 1.10 2012/09/28 07:34:24 ajacoutot Exp $ Set XDG_MENU_PREFIX so that menu is created from SYSCONFDIR/xdg/menus/gnome-applications.menu ---- gnome-session/main.c.orig Thu Sep 8 00:55:51 2011 -+++ gnome-session/main.c Tue Feb 7 09:36:03 2012 -@@ -334,6 +334,13 @@ main (int argc, char **argv) +--- gnome-session/main.c.orig Mon Sep 24 20:07:50 2012 ++++ gnome-session/main.c Fri Sep 28 09:24:16 2012 +@@ -347,6 +347,13 @@ main (int argc, char **argv) */ gsm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated"); diff --git a/x11/gnome/session/patches/patch-tools_gnome-session-quit_c b/x11/gnome/session/patches/patch-tools_gnome-session-quit_c new file mode 100644 index 00000000000..42c80a62ac2 --- /dev/null +++ b/x11/gnome/session/patches/patch-tools_gnome-session-quit_c @@ -0,0 +1,70 @@ +$OpenBSD: patch-tools_gnome-session-quit_c,v 1.1 2012/09/28 07:34:24 ajacoutot Exp $ + +XXX push upstream +gnome-session-quit.c:48: error: 'reboot' redeclared as different kind of symbol +/usr/include/unistd.h:480: error: previous declaration of 'reboot' was here + +--- tools/gnome-session-quit.c.orig Fri Sep 28 09:26:07 2012 ++++ tools/gnome-session-quit.c Fri Sep 28 09:28:54 2012 +@@ -43,18 +43,18 @@ enum { + GSM_LOGOUT_MODE_FORCE + }; + +-static gboolean logout = FALSE; +-static gboolean power_off = FALSE; +-static gboolean reboot = FALSE; +-static gboolean no_prompt = FALSE; +-static gboolean force = FALSE; ++static gboolean gs_logout = FALSE; ++static gboolean gs_power_off = FALSE; ++static gboolean gs_reboot = FALSE; ++static gboolean gs_no_prompt = FALSE; ++static gboolean gs_force = FALSE; + + static GOptionEntry options[] = { +- {"logout", '\0', 0, G_OPTION_ARG_NONE, &logout, N_("Log out"), NULL}, +- {"power-off", '\0', 0, G_OPTION_ARG_NONE, &power_off, N_("Power off"), NULL}, +- {"reboot", '\0', 0, G_OPTION_ARG_NONE, &reboot, N_("Reboot"), NULL}, +- {"force", '\0', 0, G_OPTION_ARG_NONE, &force, N_("Ignoring any existing inhibitors"), NULL}, +- {"no-prompt", '\0', 0, G_OPTION_ARG_NONE, &no_prompt, N_("Don't prompt for user confirmation"), NULL}, ++ {"gs_logout", '\0', 0, G_OPTION_ARG_NONE, &gs_logout, N_("Log out"), NULL}, ++ {"gs_power-off", '\0', 0, G_OPTION_ARG_NONE, &gs_power_off, N_("Power off"), NULL}, ++ {"gs_reboot", '\0', 0, G_OPTION_ARG_NONE, &gs_reboot, N_("Reboot"), NULL}, ++ {"gs_force", '\0', 0, G_OPTION_ARG_NONE, &gs_force, N_("Ignoring any existing inhibitors"), NULL}, ++ {"gs_no-prompt", '\0', 0, G_OPTION_ARG_NONE, &gs_no_prompt, N_("Don't prompt for user confirmation"), NULL}, + {NULL} + }; + +@@ -193,25 +193,25 @@ main (int argc, char *argv[]) + } + + conflicting_options = 0; +- if (logout) ++ if (gs_logout) + conflicting_options++; +- if (power_off) ++ if (gs_power_off) + conflicting_options++; +- if (reboot) ++ if (gs_reboot) + conflicting_options++; + if (conflicting_options > 1) + display_error (_("Program called with conflicting options")); + +- if (power_off) { ++ if (gs_power_off) { + do_power_off ("Shutdown"); +- } else if (reboot) { ++ } else if (gs_reboot) { + do_power_off ("Reboot"); + } else { + /* default to logout */ + +- if (force) ++ if (gs_force) + do_logout (GSM_LOGOUT_MODE_FORCE); +- else if (no_prompt) ++ else if (gs_no_prompt) + do_logout (GSM_LOGOUT_MODE_NO_CONFIRMATION); + else + do_logout (GSM_LOGOUT_MODE_NORMAL);