head 1.13; access; symbols pkgsrc-2019Q2:1.12.0.88 pkgsrc-2019Q2-base:1.12 pkgsrc-2019Q1:1.12.0.86 pkgsrc-2019Q1-base:1.12 pkgsrc-2018Q4:1.12.0.84 pkgsrc-2018Q4-base:1.12 pkgsrc-2018Q3:1.12.0.82 pkgsrc-2018Q3-base:1.12 pkgsrc-2018Q2:1.12.0.80 pkgsrc-2018Q2-base:1.12 pkgsrc-2018Q1:1.12.0.78 pkgsrc-2018Q1-base:1.12 pkgsrc-2017Q4:1.12.0.76 pkgsrc-2017Q4-base:1.12 pkgsrc-2017Q3:1.12.0.74 pkgsrc-2017Q3-base:1.12 pkgsrc-2017Q2:1.12.0.70 pkgsrc-2017Q2-base:1.12 pkgsrc-2017Q1:1.12.0.68 pkgsrc-2017Q1-base:1.12 pkgsrc-2016Q4:1.12.0.66 pkgsrc-2016Q4-base:1.12 pkgsrc-2016Q3:1.12.0.64 pkgsrc-2016Q3-base:1.12 pkgsrc-2016Q2:1.12.0.62 pkgsrc-2016Q2-base:1.12 pkgsrc-2016Q1:1.12.0.60 pkgsrc-2016Q1-base:1.12 pkgsrc-2015Q4:1.12.0.58 pkgsrc-2015Q4-base:1.12 pkgsrc-2015Q3:1.12.0.56 pkgsrc-2015Q3-base:1.12 pkgsrc-2015Q2:1.12.0.54 pkgsrc-2015Q2-base:1.12 pkgsrc-2015Q1:1.12.0.52 pkgsrc-2015Q1-base:1.12 pkgsrc-2014Q4:1.12.0.50 pkgsrc-2014Q4-base:1.12 pkgsrc-2014Q3:1.12.0.48 pkgsrc-2014Q3-base:1.12 pkgsrc-2014Q2:1.12.0.46 pkgsrc-2014Q2-base:1.12 pkgsrc-2014Q1:1.12.0.44 pkgsrc-2014Q1-base:1.12 pkgsrc-2013Q4:1.12.0.42 pkgsrc-2013Q4-base:1.12 pkgsrc-2013Q3:1.12.0.40 pkgsrc-2013Q3-base:1.12 pkgsrc-2013Q2:1.12.0.38 pkgsrc-2013Q2-base:1.12 pkgsrc-2013Q1:1.12.0.36 pkgsrc-2013Q1-base:1.12 pkgsrc-2012Q4:1.12.0.34 pkgsrc-2012Q4-base:1.12 pkgsrc-2012Q3:1.12.0.32 pkgsrc-2012Q3-base:1.12 pkgsrc-2012Q2:1.12.0.30 pkgsrc-2012Q2-base:1.12 pkgsrc-2012Q1:1.12.0.28 pkgsrc-2012Q1-base:1.12 pkgsrc-2011Q4:1.12.0.26 pkgsrc-2011Q4-base:1.12 pkgsrc-2011Q3:1.12.0.24 pkgsrc-2011Q3-base:1.12 pkgsrc-2011Q2:1.12.0.22 pkgsrc-2011Q2-base:1.12 pkgsrc-2011Q1:1.12.0.20 pkgsrc-2011Q1-base:1.12 pkgsrc-2010Q4:1.12.0.18 pkgsrc-2010Q4-base:1.12 pkgsrc-2010Q3:1.12.0.16 pkgsrc-2010Q3-base:1.12 pkgsrc-2010Q2:1.12.0.14 pkgsrc-2010Q2-base:1.12 pkgsrc-2010Q1:1.12.0.12 pkgsrc-2010Q1-base:1.12 pkgsrc-2009Q4:1.12.0.10 pkgsrc-2009Q4-base:1.12 pkgsrc-2009Q3:1.12.0.8 pkgsrc-2009Q3-base:1.12 pkgsrc-2009Q2:1.12.0.6 pkgsrc-2009Q2-base:1.12 pkgsrc-2009Q1:1.12.0.4 pkgsrc-2009Q1-base:1.12 pkgsrc-2008Q4:1.12.0.2 pkgsrc-2008Q4-base:1.12 pkgsrc-2008Q3:1.11.0.8 pkgsrc-2008Q3-base:1.11 cube-native-xorg:1.11.0.6 cube-native-xorg-base:1.11 pkgsrc-2008Q2:1.11.0.4 pkgsrc-2008Q2-base:1.11 cwrapper:1.11.0.2 pkgsrc-2008Q1:1.10.0.8 pkgsrc-2008Q1-base:1.10 pkgsrc-2007Q4:1.10.0.6 pkgsrc-2007Q4-base:1.10 pkgsrc-2007Q3:1.10.0.4 pkgsrc-2007Q3-base:1.10 pkgsrc-2007Q2:1.10.0.2 pkgsrc-2007Q2-base:1.10 pkgsrc-2007Q1:1.9.0.4 pkgsrc-2007Q1-base:1.9 pkgsrc-2006Q4:1.9.0.2 pkgsrc-2006Q4-base:1.9 pkgsrc-2006Q3:1.8.0.2 pkgsrc-2006Q3-base:1.8 pkgsrc-2006Q2:1.7.0.2 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.5.0.8 pkgsrc-2006Q1-base:1.5 pkgsrc-2005Q4:1.5.0.6 pkgsrc-2005Q4-base:1.5 pkgsrc-2005Q3:1.5.0.4 pkgsrc-2005Q3-base:1.5 pkgsrc-2005Q2:1.5.0.2 pkgsrc-2005Q2-base:1.5 pkgsrc-2005Q1:1.4.0.4 pkgsrc-2005Q1-base:1.4 pkgsrc-2004Q4:1.4.0.2 pkgsrc-2004Q4-base:1.4 pkgsrc-2004Q3:1.3.0.8 pkgsrc-2004Q3-base:1.3 pkgsrc-2004Q2:1.3.0.6 pkgsrc-2004Q2-base:1.3 pkgsrc-2004Q1:1.3.0.4 pkgsrc-2004Q1-base:1.3 pkgsrc-2003Q4:1.3.0.2 pkgsrc-2003Q4-base:1.3 netbsd-1-6-1:1.1.1.1.0.2 netbsd-1-6-1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.13 date 2019.09.16.10.53.23; author nia; state dead; branches; next 1.12; commitid 7IAX00xDF9ER2eDB; 1.12 date 2008.10.16.18.17.30; author drochner; state Exp; branches; next 1.11; 1.11 date 2008.04.25.04.02.23; author bjs; state Exp; branches; next 1.10; 1.10 date 2007.04.11.20.25.38; author drochner; state dead; branches; next 1.9; 1.9 date 2006.11.28.22.17.24; author drochner; state Exp; branches; next 1.8; 1.8 date 2006.09.15.15.18.16; author jmmv; state Exp; branches; next 1.7; 1.7 date 2006.05.03.11.21.26; author drochner; state Exp; branches; next 1.6; 1.6 date 2006.04.01.17.36.41; author jmmv; state Exp; branches; next 1.5; 1.5 date 2005.03.22.16.21.26; author jmmv; state dead; branches; next 1.4; 1.4 date 2004.11.19.19.59.14; author jmmv; state Exp; branches; next 1.3; 1.3 date 2003.04.20.13.59.35; author rh; state dead; branches; next 1.2; 1.2 date 2003.02.14.21.08.39; author jmmv; state Exp; branches; next 1.1; 1.1 date 2002.09.15.06.03.04; author rh; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2002.09.15.06.03.04; author rh; state Exp; branches; next ; desc @@ 1.13 log @Remove x11/gnome-session successor x11/mate-session-manager @ text @$NetBSD: patch-ac,v 1.12 2008/10/16 18:17:30 drochner Exp $ --- data/Makefile.in.orig 2008-09-22 23:30:16.000000000 +0200 +++ data/Makefile.in @@@@ -683,8 +683,8 @@@@ info: info-recursive info-am: install-data-am: install-data-local install-gladeDATA \ - install-pixmapDATA install-schemasDATA install-settingsDATA \ - install-xsessionDATA + install-pixmapDATA install-schemasDATA install-settingsDATA +# install-xsessionDATA install-dvi: install-dvi-recursive @ 1.12 log @update to 2.24.0 This switches to the gnome-2.24 release branch. @ text @d1 1 a1 1 $NetBSD$ @ 1.11 log @ Patch data/Makefile.in not to install share/xsessions/gnome.desktop; this conflicts with the file gdm installs. Given that gdm has always done this and that gdm's file uses dbus, let's keep the status quo for now. Thanks to jmcneill@@ for reporting this. @ text @d3 1 a3 1 --- data/Makefile.in.orig 2008-04-10 10:34:02.000000000 -0400 d5 1 a5 1 @@@@ -628,8 +628,8 @@@@ info: info-recursive d8 1 a8 1 install-data-am: install-data-local install-defaultDATA \ @ 1.10 log @update to 2.18.0 This moves this pkg to the new stable gnome branch, too much to list here. pkgsrc note: automatic dbus startup doesn't work well, it seems to conflict with another dbus autostart. Better start the session with "dbus-launch". gdm-2.18 will take care of that. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.9 2006/11/28 22:17:24 drochner Exp $ d3 4 a6 21 --- gnome-session/main.c.orig 2006-11-20 00:24:40.000000000 +0100 +++ gnome-session/main.c @@@@ -43,6 +43,7 @@@@ #include "command.h" #include "splash-widget.h" #include "util.h" +#include "gsm-dbus.h" #include "gsm-sound.h" #include "gsm-gsd.h" #include "gsm-proxy.h" @@@@ -336,6 +337,7 @@@@ main (int argc, char *argv[]) char **versions; GConfClient *gconf_client; GOptionContext *goption_context; + gboolean dbus_daemon_owner; if (getenv ("GSM_VERBOSE_DEBUG")) gsm_set_verbose (TRUE); @@@@ -420,6 +422,7 @@@@ main (int argc, char *argv[]) fprintf (stderr, "SESSION_MANAGER=%s\n", getenv ("SESSION_MANAGER")); gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-session.png"); d8 5 a12 1 + dbus_daemon_owner = gsm_dbus_daemon_start (); d14 1 a14 11 /* Make sure children see the right value for DISPLAY. This is useful if --display was specified on the command line. */ @@@@ -506,6 +509,9 @@@@ main (int argc, char *argv[]) gsm_keyring_daemon_stop (); + if (dbus_daemon_owner) + gsm_dbus_daemon_stop (); + g_object_unref (gconf_client); gsm_shutdown_gconfd (); @ 1.9 log @update to 2.16.2 changes: -UI improvements -Add fvwm and compiz support to gnome-wm -build system improvements -bugfixes -translation updates @ text @d1 1 a1 1 $NetBSD$ @ 1.8 log @Update to 2.16.0: ============== Version 2.16.0 ============== Misc * Updated splash screen (Andreas Nilsson, Vincent) Translators * Jordi Mallach (ca) * Kostas Papadimas (el) * Robert-André Mauchin (fr) * Rajesh Ranjan (hi) * Gabor Kelemen (hu) * Gintautas Miliauskas (lt) * Raivis Dejus (lv) * Duarte Loreto (pt) * Vasiliy Faronov (ru) * Felix (ta) =============== Version 2.15.92 =============== Session Manager * Fix crash caused by debug output on Solaris (Brian Cameron) Translators * Rostislav "zbrox" Raykov (bg) * Khandakar Mujahidul Islam (bn) * Mindu Dorji (dz) * Mate ORY (hu) * Satoru SATOH (ja) * Young-Ho Cha (ko) * Artur Flinta (pl) * Matic Žgur (sl) * Daniel Nylander (sv) * Maxim Dziumanenko (uk) * Clytie Siddall (vi) * Funda Wang (zh_CN) =============== Version 2.15.91 =============== Session Manager * Fix leaks (Rodrigo Moya, Vincent) * Use GOption (Michael Terry) * Make it possible to really disable the login sound (Vincent) * Set the right parent window for an error dialog (Vincent) * Update keyring daemon DISPLAY environment variable if it's already running (Jon Nettleton) * Fix sensitivity of edit/delete buttons when editing sessions (Don Scorgie, Vincent) * Add support for e16 window manager in gnome-wm (Kim Woelders) * Fix edition of startup programs containing a space in a command line argument (Vincent) * Fix warning (Kjartan Maraas) * Backward compatibility to run orca if gnopernicus is not available and the gconf key is set to gnopernicus (Bill Haneman, Willie Walker) Misc * Add gnome-keyring dependency (Vincent) Translators * Runa Bhattacharjee (bn_IN) * Rhys Jones (cy) * Jochen Skulj (de) * Francisco Javier F. Serrador (es) * Priit Laes (et) * Iñaki Larrañaga Murgoitio (eu) * Ilkka Tuohela (fi) * Ankit Patel (gu) * Fano Rajaonarisoa (mg) * Jovan Naumovski (mk) * Ani Peter (ml) * Kjartan Maraas (nb) * Tino Meinen (nl) * Subhransu Behera (or) * A S Alam (pa) * Evandro Fernandes Giovanini (pt_BR) * Duarte Loreto (pt) * Leonid Kanter (ru) * Marcel Telka (sk) * Jayaradha N (ta) * Theppitak Karoonboonyanan (th) * Woodman Tuen (zh_HK) * Woodman Tuen (zh_TW) =============== Version 2.15.90 =============== Translators * Subhransu Behera (or) ============== Version 2.15.4 ============== Session Manager * Improve verbosity string (Glynn Foster) * Fix critical warning when removing a client (Kjartan Maraas) * Create autostart directory if it doesn't exist (Ray Strode) * Give generated desktop filenames .desktop extension when encountering naming conflicts (Ray Strode) * Launch gnome-settings-daemon through dbus (Sergey Udaltsov) Misc * Use po/LINGUAS (Claudio Saavedra) * Require intltool 0.35.0 (Vincent) * Add gnome-settings-daemon (from gnome-control-center) dependency (Sergey Udaltsov) * Add dbus dependency (Vincent) Translators * Khandakar Mujahidul Islam (bn_IN) * Guillaume Savaton (eo) * Laurent Richard (fr) * Young-Ho Cha (ko) * Rahul Bhalerao (mr) * Pablo Saratxaga (wa) ============== Version 2.15.1 ============== Session Manager * Use libgnomeui functions instead of libegg (Vincent) * Fix "try again" dialog never disappearing (Frédéric Crozat) * Fix crash in 64 bits computers (Joe Marcus Clarke) * Reduce default verbosity (Fryderyk Dziarmagowski) Translators * Mindu Dorji (dz) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.7 2006/05/03 11:21:26 drochner Exp $ d3 1 a3 1 --- gnome-session/main.c.orig 2006-07-26 14:46:36.000000000 +0200 d12 2 a13 2 #include "gsm-keyring.h" @@@@ -335,6 +336,7 @@@@ main (int argc, char *argv[]) d21 1 a21 1 @@@@ -419,6 +421,7 @@@@ main (int argc, char *argv[]) d29 1 a29 1 @@@@ -503,6 +506,9 @@@@ main (int argc, char *argv[]) @ 1.7 log @update to 2.14.1 changes: -Share one GConfClient -Plug leaks -translation updates @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gnome-session/main.c.orig 2006-03-21 18:37:40.000000000 +0100 d13 1 a13 2 @@@@ -334,6 +335,7 @@@@ main (int argc, char *argv[]) char *display_str; d16 1 d21 1 a21 1 @@@@ -415,6 +417,7 @@@@ main (int argc, char *argv[]) d29 1 a29 1 @@@@ -496,6 +499,9 @@@@ main (int argc, char *argv[]) @ 1.6 log @Make gnome-session spawn a dbus-daemon for the current session so that things work "out of the box" again: some programs now require dbus to even start up (e.g. epiphany). Bump PKGREVISION to 1. The code comes from GNOME's bug 336237 and I'm adding it to the package so that it can get some testing. @ text @d3 1 a3 3 http://bugzilla.gnome.org/show_bug.cgi?id=336237 --- gnome-session/main.c.orig 2006-03-06 14:30:08.000000000 +0100 a13 1 int status; d16 1 d29 1 a29 2 @@@@ -497,6 +500,9 @@@@ main (int argc, char *argv[]) gsm_sound_logout (); d32 3 d36 1 a36 3 + if (dbus_daemon_owner) + gsm_dbus_daemon_stop (); @ 1.5 log @Update to 2.10.0: ============== Version 2.10.0 ============== Misc * New splash screen (Sami "alump" Viitanen) * Improved schemas string (Byran Clark, Kjartan Maraas) Translators * Vladimir \"Kaladan\" Petkov (bg) * Jordi Mallach (ca) * Miloslav Trmac (cs) * Martin Willemoes Hansen (da) * Frank Arnold (de) * Kostas Papadimas (el) * Adam Weinberger (en_CA) * David Lodge (en_GB) * Francisco Javier F. Serrador (es) * Ivar Smolin (et) * Pauli Virtanen (fi) * Christophe Merlet (RedFox) (fr) * Ankit Patel (gu) * Gil Osher (he) * Gabor Kelemen (hu) * Luca Ferretti (it) * Takeshi AIHANA (ja) * Changwoo Ryu (ko) * Žygimantas Beručka (lt) * Kjartan Maraas (nb) * Tino Meinen (nl) * Åsmund Skjæveland (nn) * Kjartan Maraas (no) * GNOME PL Team (pl) * Evandro Fernandes Giovanini (pt_BR) * Duarte Loreto (pt) * Mişu Moldovan (ro) * Leonid Kanter (ru) * Marcel Telka (sk) * Laurent Dhima (sq) * Данило Шеган (sr) * Christian Rose (sv) * Theppitak Karoonboonyanan (th) * Maxim Dziumanenko (uk) * Simon Kemisho (xh) * Wang Jian (zh_CN) * Woodman Tuen (zh_TW) ============= Version 2.9.4 ============= Session Manager * Use GDM's logout actions protocol to shutdown/reboot (Raffaele Sandrini, Mark) * Change "Prompt" to "Ask" in the configuration dialog (Vincent Noel) * Fix compiler warnings (Jens Granseuer) * Slave the lifecycle of the keyring daemon to the session (Alex Larsson) Translators * Jordi Mallach (ca) * Miloslav Trmac (cs) * Adam Weinberger (en_CA) * Francisco Javier F. Serrador (es) * Kjartan Maraas (nb) * Kjartan Maraas (no) * Laurent Dhima (sq) * Christian Rose (sv) * Zuza Software Foundation (zu) ============= Version 2.9.2 ============= Misc * Add X-GNOME-Bugzilla-Version to .desktop file (Christoffer Olsen) * Install .desktop file in $(datadir)/applications (Mark) Translators * Martin Willemoes Hansen (da) * Zuza Software Foundation (nso) @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.4 2004/11/19 19:59:14 jmmv Exp $ d3 23 a25 3 --- gnome-session/logout.c.orig 2004-07-19 20:11:14.000000000 +0200 +++ gnome-session/logout.c @@@@ -37,12 +37,20 @@@@ d27 1 a27 8 static gchar *halt_command[] = { +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + "/sbin/shutdown", "-p", "now", NULL +#else HALT_COMMAND, NULL +#endif }; d29 4 a32 8 static gchar *reboot_command[] = { +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) + "/sbin/shutdown", "-r", "now", NULL +#else REBOOT_COMMAND, NULL +#endif }; d34 6 a39 12 /* What action to take upon shutdown */ @@@@ -298,6 +306,7 @@@@ display_gui (void) GtkWidget *reboot = NULL; GtkWidget *invisible; gboolean retval = FALSE; + gboolean can_shutdown = FALSE; gboolean save_active = FALSE; gboolean halt_active = FALSE; gboolean reboot_active = FALSE; @@@@ -392,6 +401,7 @@@@ display_gui (void) FALSE, TRUE, 0); } a40 18 +#if defined(__linux__) /* Red Hat specific code to check if the user has a * good chance of being able to shutdown the system, * and if so, give them that option @@@@ -400,6 +410,13 @@@@ display_gui (void) t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL); if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) && access (halt_command[0], X_OK) == 0) + can_shutdown = TRUE; +#else + if (access (halt_command[0], X_OK) == 0) + can_shutdown = TRUE; +#endif + + if (can_shutdown) { GtkWidget *title, *spacer; GtkWidget *action_vbox, *hbox; @ 1.4 log @Let the reboot and halt options appear in GNOME's "Log Out" dialog and make they use /sbin/shutdown under *BSD, instead of the poweroff and reboot commands. The patch is a hack (not to be submitted back to the upstream developers without modification), but is the simplest thing we can do to avoid ugly and hard to maintain patches. I'll submit a better, but more complex one, to GNOME's Bugzilla when I have more time. Bump PKGREVISION to 1. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update gnome-session to 2.2.1. Changes include: * Remove --program-transform-name and associated patches now that gnome-core has been split into multiple parts * Honour the --disable-schemas-install configure option (Julio Merino) * Support themeing of the icons on the splash screen (Havoc Pennington) * Locale updates @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.2 2003/02/14 21:08:39 jmmv Exp $ d3 3 a5 8 --- gnome-session/splash-widget.c.orig 2002-11-28 02:01:40.000000000 +0100 +++ gnome-session/splash-widget.c @@@@ -313,7 +313,7 @@@@ read_background (SplashWidget *sw) "/apps/gnome-session/options/splash_image", NULL); if (!filename) - filename = g_strdup (GNOME_ICONDIR "/splash/gnome-splash.png"); + filename = g_strdup (GNOME_ICONDIR "/splash/gnome2-splash.png"); d7 49 a55 2 pb = gdk_pixbuf_new_from_file (filename, NULL); g_free (filename); @ 1.2 log @Update to 2.2.0.2. Changes since 2.0.8: * Build fix (Thomas Vander Stichele) * Mark a couple of strings for translation (Yuriy Syrota) * Cool new splash screen (Jakub Steiner) * Up the slow client purge delay to 2 minutes (Mark) * Fix GsmProtocol initialisation problem (Mark) * Ensure child dialogs are kept above the parent (Satyajit) * Add startup notification flag to .desktop files (Dennis Cranston) * Unref the GConfCliet (Brian Cameron) * Add X-GNOME-BUGZILLA to the .desktop files (Fernando Herrera) * Fixup manpages (Christian Marillat, Mark, Alex Duggan) * Update application icons map (Evandro Fernandes Giovanini) * Fixup Xinerama aware logout iris code (Mark) * Allow splash screen to be configured (Rodney Dawes) * Use intltool to merge schmemas translations (Mark) * Use metacity for the window manager by default (Jacob) * Multiscreen support for logout iris and dialog (Mark) * Use "Order" instead of "Priority" in the capplet (Mark) * New translations. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1.1.1 2002/09/15 06:03:04 rh Exp $ @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- gnome-session/splash-widget.c.orig Fri Jul 26 03:01:04 2002 d5 6 a10 9 @@@@ -336,6 +336,10 @@@@ read_background (SplashWidget *sw) if (!pb) pb = gdk_pixbuf_new_from_file ( + GNOME_ICONDIR "/splash/gnome2-splash.png", NULL); + + if (!pb) + pb = gdk_pixbuf_new_from_file ( GNOME_ICONDIR "/splash/gnome-splash.png", NULL); d12 2 a13 1 sw->background = pb; @ 1.1.1.1 log @Initial import of gnome-session-2.0.7, the GNOME2 session manager. Provided by Julio Merino , with some modifications to make this co-exist with gnome-core. Closes PR pkg/18221 @ text @@