diff options
| -rw-r--r-- | x11/gnome-session/Makefile | 4 | ||||
| -rw-r--r-- | x11/gnome-session/distinfo | 6 | ||||
| -rw-r--r-- | x11/gnome-session/files/patch-gnome-session_gsm-keyring.c | 56 | ||||
| -rw-r--r-- | x11/gnome-session/pkg-plist | 2 |
4 files changed, 6 insertions, 62 deletions
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile index 584cdec4d..8f19fdc9d 100644 --- a/x11/gnome-session/Makefile +++ b/x11/gnome-session/Makefile @@ -3,11 +3,11 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11/gnome-session/Makefile,v 1.132 2008/01/28 04:35:38 mezz Exp $ +# $MCom: ports/x11/gnome-session/Makefile,v 1.133 2008/02/11 20:25:11 kwm Exp $ # PORTNAME= gnome-session -PORTVERSION= 2.21.91 +PORTVERSION= 2.21.92 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} \ http://www.marcuscom.com/downloads/:local diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo index e3b96f74e..097a152dd 100644 --- a/x11/gnome-session/distinfo +++ b/x11/gnome-session/distinfo @@ -1,6 +1,6 @@ -MD5 (gnome2/gnome-session-2.21.91.tar.bz2) = 1fd5f145f4f65f12efaa4bcb860c2c73 -SHA256 (gnome2/gnome-session-2.21.91.tar.bz2) = 03f5dc2f1909d9a0022d4f6418736cef4793a7279e7a7f543eddb239aafff0d1 -SIZE (gnome2/gnome-session-2.21.91.tar.bz2) = 762472 +MD5 (gnome2/gnome-session-2.21.92.tar.bz2) = b1d3f82efc633772bfe92a2ddca92168 +SHA256 (gnome2/gnome-session-2.21.92.tar.bz2) = 73bc1a00f614403ae5900b4b6e92fc451c67fc57417f0c481979fd6bc9762476 +SIZE (gnome2/gnome-session-2.21.92.tar.bz2) = 766160 MD5 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 80eb8c52fcf9fe977e0bf8ed48b85fe5 SHA256 (gnome2/freebsd-splashes-gnome-2.18_1.tar) = fcca0f6eb759a4ef0211ecd61340f84ce8ad4d7493f725ac8613724faadbb508 SIZE (gnome2/freebsd-splashes-gnome-2.18_1.tar) = 1630720 diff --git a/x11/gnome-session/files/patch-gnome-session_gsm-keyring.c b/x11/gnome-session/files/patch-gnome-session_gsm-keyring.c deleted file mode 100644 index 1f606d065..000000000 --- a/x11/gnome-session/files/patch-gnome-session_gsm-keyring.c +++ /dev/null @@ -1,56 +0,0 @@ -Index: gnome-session/gsm-keyring.c -=================================================================== ---- gnome-session/gsm-keyring.c (revision 4516) -+++ gnome-session/gsm-keyring.c (working copy) -@@ -53,10 +53,10 @@ - { - GError *err; - char *standard_out; -- char **lines; -+ char **lines, **l; - int status; - long pid; -- char *pid_str, *end; -+ char *t, *end; - const char *old_keyring; - const char *display; - char *argv[2]; -@@ -100,22 +100,26 @@ - WEXITSTATUS (status) == 0 && - standard_out != NULL) - { -- lines = g_strsplit (standard_out, "\n", 3); -+ lines = g_strsplit (standard_out, "\n", 0); -+ for (l = lines; *l; ++l) -+ { -+ /* Split the line into name=value */ -+ t = strchr (*l, '='); -+ if (!t) -+ continue; -+ *(t++) = 0; - -- if (lines[0] != NULL && -- lines[1] != NULL && -- g_str_has_prefix (lines[1], "GNOME_KEYRING_PID=")) -- { -- pid_str = lines[1] + strlen ("GNOME_KEYRING_PID="); -- pid = strtol (pid_str, &end, 10); -- if (end != pid_str) -+ /* Everything that comes out should be an env var */ -+ g_setenv (*l, t, TRUE); -+ -+ /* Track the daemon's PID */ -+ if (g_str_equal (*l, "GNOME_KEYRING_PID")) - { -- gnome_keyring_daemon_pid = pid; -- g_setenv ("GNOME_KEYRING_SOCKET", -- lines[0] + strlen ("GNOME_KEYRING_SOCKET="), TRUE); -+ pid = strtol (t, &end, 10); -+ if (end != t) -+ gnome_keyring_daemon_pid = pid; - } - } -- - g_strfreev (lines); - } - else diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist index fb29730d6..62b250a27 100644 --- a/x11/gnome-session/pkg-plist +++ b/x11/gnome-session/pkg-plist @@ -35,8 +35,8 @@ share/locale/et/LC_MESSAGES/gnome-session-2.0.mo share/locale/eu/LC_MESSAGES/gnome-session-2.0.mo share/locale/fa/LC_MESSAGES/gnome-session-2.0.mo share/locale/fi/LC_MESSAGES/gnome-session-2.0.mo -share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo share/locale/fr/LC_MESSAGES/gnome-session-2.0.mo +share/locale/fur/LC_MESSAGES/gnome-session-2.0.mo share/locale/ga/LC_MESSAGES/gnome-session-2.0.mo share/locale/gl/LC_MESSAGES/gnome-session-2.0.mo share/locale/gu/LC_MESSAGES/gnome-session-2.0.mo |