diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-06-01 03:48:18 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-06-01 03:48:18 +0800 |
| commit | 424a9737a511bbb90997f0d045ec6eebae27394f (patch) | |
| tree | bfcaddc1ea9be227109b52dc66e0c67ca15ad92d /x11/gnome-session/files | |
| parent | 745d054e059152b4ef4af909c492514ac3b4f931 (diff) | |
| download | marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar.gz marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar.bz2 marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar.lz marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar.xz marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.tar.zst marcuscom-ports-424a9737a511bbb90997f0d045ec6eebae27394f.zip | |
Re-add gnomesession, at 2.7.1.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2324 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11/gnome-session/files')
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_Makefile.in | 11 | ||||
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_logout.c | 36 |
2 files changed, 47 insertions, 0 deletions
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in new file mode 100644 index 000000000..2b05e8c00 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in @@ -0,0 +1,11 @@ +--- gnome-session/Makefile.in.orig Mon May 31 14:34:48 2004 ++++ gnome-session/Makefile.in Mon May 31 14:34:57 2004 +@@ -153,7 +153,7 @@ + + NULL = + +-defaultdir = $(datadir)/gnome ++defaultdir = $(datadir) + + INCLUDES = $(GNOME_SESSION_CFLAGS) $(STANDARD_PROPERTIES_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED_CFLAGS) -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\"" -DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" -DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\" -DGNOME_ICONDIR=\""$(datadir)/pixmaps\"" -DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\"" -DHALT_COMMAND=\""$(HALT_COMMAND)\"" -DRSH_COMMAND=\""$(RSH_COMMAND)\"" -DGCONFTOOL_CMD=\""$(GCONFTOOL)\"" -DDEFAULTDIR="\"$(defaultdir)\"" -DESD_SERVER="\"$(ESD_SERVER)\"" + diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c new file mode 100644 index 000000000..f82aefdc7 --- /dev/null +++ b/x11/gnome-session/files/patch-gnome-session_logout.c @@ -0,0 +1,36 @@ +--- gnome-session/logout.c.orig Sun May 9 15:45:34 2004 ++++ gnome-session/logout.c Sun May 9 15:48:29 2004 +@@ -37,12 +37,20 @@ + + static gchar *halt_command[] = + { ++#ifdef __FreeBSD__ ++ HALT_COMMAND, "-p", "now", NULL ++#else + HALT_COMMAND, NULL ++#endif + }; + + static gchar *reboot_command[] = + { ++#ifdef __FreeBSD__ ++ REBOOT_COMMAND, "-r", "now", NULL ++#else + REBOOT_COMMAND, NULL ++#endif + }; + + /* What action to take upon shutdown */ +@@ -401,8 +409,12 @@ + */ + s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL); + t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL); ++#ifndef __FreeBSD__ + if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) && + access (halt_command[0], X_OK) == 0) ++#else ++ if (access (halt_command[0], X_OK) == 0) ++#endif + { + GtkWidget *title, *spacer; + GtkWidget *action_vbox, *hbox; |