update to 2.24.0

This switches to the gnome-2.24 release branch.

5 files changed, 59 insertions, 76 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 06101c1278d..a38588bc1aa 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.100 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.101 2008/10/16 15:25:58 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.22.2
-PKGREVISION=		1
+DISTNAME=		gnome-panel-2.24.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.24/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 04d6baa6451..7fbf903cd09 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.38 2008/05/29 11:15:49 drochner Exp $
+@comment $NetBSD: PLIST,v 1.39 2008/10/16 15:25:58 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -67,6 +67,9 @@ share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
 share/gnome/help/clock/C/legal.xml
+share/gnome/help/clock/ar/clock.xml
+share/gnome/help/clock/ar/figures/clock_applet.png
+share/gnome/help/clock/ar/legal.xml
 share/gnome/help/clock/ca/clock.xml
 share/gnome/help/clock/ca/figures/clock_applet.png
 share/gnome/help/clock/ca/legal.xml
@@ -79,6 +82,9 @@ share/gnome/help/clock/el/legal.xml
 share/gnome/help/clock/es/clock.xml
 share/gnome/help/clock/es/figures/clock_applet.png
 share/gnome/help/clock/es/legal.xml
+share/gnome/help/clock/fi/clock.xml
+share/gnome/help/clock/fi/figures/clock_applet.png
+share/gnome/help/clock/fi/legal.xml
 share/gnome/help/clock/fr/clock.xml
 share/gnome/help/clock/fr/figures/clock_applet.png
 share/gnome/help/clock/fr/legal.xml
@@ -112,6 +118,9 @@ share/gnome/help/clock/sr/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
+share/gnome/help/clock/th/clock.xml
+share/gnome/help/clock/th/figures/clock_applet.png
+share/gnome/help/clock/th/legal.xml
 share/gnome/help/clock/uk/clock.xml
 share/gnome/help/clock/uk/figures/clock_applet.png
 share/gnome/help/clock/uk/legal.xml
@@ -142,12 +151,18 @@ share/gnome/help/fish/C/legal.xml
 share/gnome/help/fish/ca/figures/fish_applet.png
 share/gnome/help/fish/ca/fish.xml
 share/gnome/help/fish/ca/legal.xml
+share/gnome/help/fish/de/figures/fish_applet.png
+share/gnome/help/fish/de/fish.xml
+share/gnome/help/fish/de/legal.xml
 share/gnome/help/fish/el/figures/fish_applet.png
 share/gnome/help/fish/el/fish.xml
 share/gnome/help/fish/el/legal.xml
 share/gnome/help/fish/es/figures/fish_applet.png
 share/gnome/help/fish/es/fish.xml
 share/gnome/help/fish/es/legal.xml
+share/gnome/help/fish/fi/figures/fish_applet.png
+share/gnome/help/fish/fi/fish.xml
+share/gnome/help/fish/fi/legal.xml
 share/gnome/help/fish/fr/figures/fish_applet.png
 share/gnome/help/fish/fr/fish.xml
 share/gnome/help/fish/fr/legal.xml
@@ -160,9 +175,15 @@ share/gnome/help/fish/ko/legal.xml
 share/gnome/help/fish/oc/figures/fish_applet.png
 share/gnome/help/fish/oc/fish.xml
 share/gnome/help/fish/oc/legal.xml
+share/gnome/help/fish/ru/figures/fish_applet.png
+share/gnome/help/fish/ru/fish.xml
+share/gnome/help/fish/ru/legal.xml
 share/gnome/help/fish/sv/figures/fish_applet.png
 share/gnome/help/fish/sv/fish.xml
 share/gnome/help/fish/sv/legal.xml
+share/gnome/help/fish/th/figures/fish_applet.png
+share/gnome/help/fish/th/fish.xml
+share/gnome/help/fish/th/legal.xml
 share/gnome/help/fish/uk/figures/fish_applet.png
 share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
@@ -176,6 +197,7 @@ share/gnome/help/window-list/de/legal.xml
 share/gnome/help/window-list/de/window-list.xml
 share/gnome/help/window-list/el/window-list.xml
 share/gnome/help/window-list/es/window-list.xml
+share/gnome/help/window-list/fi/window-list.xml
 share/gnome/help/window-list/fr/window-list.xml
 share/gnome/help/window-list/it/window-list.xml
 share/gnome/help/window-list/ja/figures/window_list_applet.png
@@ -203,6 +225,7 @@ share/gnome/help/workspace-switcher/de/legal.xml
 share/gnome/help/workspace-switcher/de/workspace-switcher.xml
 share/gnome/help/workspace-switcher/el/workspace-switcher.xml
 share/gnome/help/workspace-switcher/es/workspace-switcher.xml
+share/gnome/help/workspace-switcher/fi/workspace-switcher.xml
 share/gnome/help/workspace-switcher/fr/workspace-switcher.xml
 share/gnome/help/workspace-switcher/it/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ja/figures/workspace_switcher_applet.png
@@ -339,6 +362,7 @@ share/locale/hr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/hy/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/id/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/is/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-panel-2.0.mo
@@ -349,6 +373,7 @@ share/locale/ky/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/li/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/mai/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mg/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-panel-2.0.mo
@@ -376,8 +401,8 @@ share/locale/sk/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-panel-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sr@ije/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-panel-2.0.mo
@@ -395,10 +420,12 @@ share/locale/zh_HK/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 share/omf/clock/clock-C.omf
+share/omf/clock/clock-ar.omf
 share/omf/clock/clock-ca.omf
 share/omf/clock/clock-de.omf
 share/omf/clock/clock-el.omf
 share/omf/clock/clock-es.omf
+share/omf/clock/clock-fi.omf
 share/omf/clock/clock-fr.omf
 share/omf/clock/clock-it.omf
 share/omf/clock/clock-ja.omf
@@ -410,18 +437,23 @@ share/omf/clock/clock-pt_BR.omf
 share/omf/clock/clock-ru.omf
 share/omf/clock/clock-sr.omf
 share/omf/clock/clock-sv.omf
+share/omf/clock/clock-th.omf
 share/omf/clock/clock-uk.omf
 share/omf/clock/clock-zh_CN.omf
 share/omf/clock/clock-zh_TW.omf
 share/omf/fish/fish-C.omf
 share/omf/fish/fish-ca.omf
+share/omf/fish/fish-de.omf
 share/omf/fish/fish-el.omf
 share/omf/fish/fish-es.omf
+share/omf/fish/fish-fi.omf
 share/omf/fish/fish-fr.omf
 share/omf/fish/fish-it.omf
 share/omf/fish/fish-ko.omf
 share/omf/fish/fish-oc.omf
+share/omf/fish/fish-ru.omf
 share/omf/fish/fish-sv.omf
+share/omf/fish/fish-th.omf
 share/omf/fish/fish-uk.omf
 share/omf/gnome-panel/fish-applet-2-de.omf
 share/omf/gnome-panel/fish-applet-2-ja.omf
@@ -440,6 +472,7 @@ share/omf/window-list/window-list-da.omf
 share/omf/window-list/window-list-de.omf
 share/omf/window-list/window-list-el.omf
 share/omf/window-list/window-list-es.omf
+share/omf/window-list/window-list-fi.omf
 share/omf/window-list/window-list-fr.omf
 share/omf/window-list/window-list-it.omf
 share/omf/window-list/window-list-ko.omf
@@ -455,6 +488,7 @@ share/omf/workspace-switcher/workspace-switcher-da.omf
 share/omf/workspace-switcher/workspace-switcher-de.omf
 share/omf/workspace-switcher/workspace-switcher-el.omf
 share/omf/workspace-switcher/workspace-switcher-es.omf
+share/omf/workspace-switcher/workspace-switcher-fi.omf
 share/omf/workspace-switcher/workspace-switcher-fr.omf
 share/omf/workspace-switcher/workspace-switcher-it.omf
 share/omf/workspace-switcher/workspace-switcher-ko.omf
@@ -499,6 +533,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/workspace-switcher/ja
 @dirrm share/gnome/help/workspace-switcher/it
 @dirrm share/gnome/help/workspace-switcher/fr
+@dirrm share/gnome/help/workspace-switcher/fi
 @dirrm share/gnome/help/workspace-switcher/es
 @dirrm share/gnome/help/workspace-switcher/el
 @dirrm share/gnome/help/workspace-switcher/de/figures
@@ -520,6 +555,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/window-list/ja
 @dirrm share/gnome/help/window-list/it
 @dirrm share/gnome/help/window-list/fr
+@dirrm share/gnome/help/window-list/fi
 @dirrm share/gnome/help/window-list/es
 @dirrm share/gnome/help/window-list/el
 @dirrm share/gnome/help/window-list/de/figures
@@ -530,8 +566,12 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/window-list
 @dirrm share/gnome/help/fish/uk/figures
 @dirrm share/gnome/help/fish/uk
+@dirrm share/gnome/help/fish/th/figures
+@dirrm share/gnome/help/fish/th
 @dirrm share/gnome/help/fish/sv/figures
 @dirrm share/gnome/help/fish/sv
+@dirrm share/gnome/help/fish/ru/figures
+@dirrm share/gnome/help/fish/ru
 @dirrm share/gnome/help/fish/oc/figures
 @dirrm share/gnome/help/fish/oc
 @dirrm share/gnome/help/fish/ko/figures
@@ -540,10 +580,14 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/fish/it
 @dirrm share/gnome/help/fish/fr/figures
 @dirrm share/gnome/help/fish/fr
+@dirrm share/gnome/help/fish/fi/figures
+@dirrm share/gnome/help/fish/fi
 @dirrm share/gnome/help/fish/es/figures
 @dirrm share/gnome/help/fish/es
 @dirrm share/gnome/help/fish/el/figures
 @dirrm share/gnome/help/fish/el
+@dirrm share/gnome/help/fish/de/figures
+@dirrm share/gnome/help/fish/de
 @dirrm share/gnome/help/fish/ca/figures
 @dirrm share/gnome/help/fish/ca
 @dirrm share/gnome/help/fish/C/figures
@@ -564,6 +608,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/clock/zh_CN
 @dirrm share/gnome/help/clock/uk/figures
 @dirrm share/gnome/help/clock/uk
+@dirrm share/gnome/help/clock/th/figures
+@dirrm share/gnome/help/clock/th
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/sr/figures
@@ -586,6 +632,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/clock/it
 @dirrm share/gnome/help/clock/fr/figures
 @dirrm share/gnome/help/clock/fr
+@dirrm share/gnome/help/clock/fi/figures
+@dirrm share/gnome/help/clock/fi
 @dirrm share/gnome/help/clock/es/figures
 @dirrm share/gnome/help/clock/es
 @dirrm share/gnome/help/clock/el/figures
@@ -594,6 +642,8 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/clock/de
 @dirrm share/gnome/help/clock/ca/figures
 @dirrm share/gnome/help/clock/ca
+@dirrm share/gnome/help/clock/ar/figures
+@dirrm share/gnome/help/clock/ar
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index d8cfe050e20..ac725cfb059 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.45 2008/05/31 12:21:14 drochner Exp $
+$NetBSD: distinfo,v 1.46 2008/10/16 15:25:58 drochner Exp $
 
-SHA1 (gnome-panel-2.22.2.tar.bz2) = 73752c3ce6224886c2381b0b13111253008bc6f7
-RMD160 (gnome-panel-2.22.2.tar.bz2) = 64a37f44b9f34f74d30f30aca349749a24c80859
-Size (gnome-panel-2.22.2.tar.bz2) = 3255261 bytes
-SHA1 (patch-aa) = 192ebd41ddcca1d6db8898b7b65e3acfb200ce00
+SHA1 (gnome-panel-2.24.0.tar.bz2) = d820b09e0a83e41814f6ddf8045023d814589d9d
+RMD160 (gnome-panel-2.24.0.tar.bz2) = d7aad642d3ab3922c4c879925c7ab6ec9cb340fc
+Size (gnome-panel-2.24.0.tar.bz2) = 3312276 bytes
 SHA1 (patch-ab) = 961186c5db258557294fae4a280d13efdcfe1de1
-SHA1 (patch-ac) = 266fbb403a11c4776a17cd257d3f577b97f01c66
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa
deleted file mode 100644
index 68434d6e40f..00000000000
--- a/x11/gnome-panel/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2008/04/16 16:48:25 drochner Exp $
-
---- applets/clock/calendar-window.c.orig	2008-04-15 22:58:01.000000000 +0200
-+++ applets/clock/calendar-window.c
-@@ -1161,22 +1161,28 @@ calendar_day_activated (GtkCalendar    *
- 	time_t        now;
- 	struct tm     utc_tm;
- 	struct tm     local_tm;
-+	time_t        daystart;
- 	char         *argument;
- 
- 	gtk_calendar_get_date (calendar, &year, &month, &day);
- 
--	time (&now);
--	gmtime_r (&now, &utc_tm);
--	localtime_r (&now, &local_tm);
-+	bzero(&local_tm, sizeof(local_tm));
-+	local_tm.tm_mday = day;
-+	local_tm.tm_mon = month;
-+	local_tm.tm_year = year - 1900;
-+	local_tm.tm_isdst = -1;
-+	daystart = mktime(&local_tm);
-+	gmtime_r (&daystart, &utc_tm);
- 
- 	/* FIXME: once bug 409200 is fixed, we'll have to make this hh:mm:ss
- 	 * instead of hhmmss */
- 	argument = g_strdup_printf ("calendar:///?startdate="
- 				    "%.4d%.2d%.2dT%.2d%.2d%.2dZ",
--				    year, month + 1, day,
--				    12 + utc_tm.tm_hour - local_tm.tm_hour,
--				    0  + utc_tm.tm_min  - local_tm.tm_min,
--				    0);
-+				    utc_tm.tm_year + 1900, utc_tm.tm_mon + 1,
-+				    utc_tm.tm_mday,
-+				    utc_tm.tm_hour,
-+				    utc_tm.tm_min,
-+				    utc_tm.tm_sec);
- 
- 	clock_launch_evolution (calwin, argument);
- 
diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac
deleted file mode 100644
index f4e1f25fba6..00000000000
--- a/x11/gnome-panel/patches/patch-ac
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ac,v 1.7 2007/12/27 15:29:32 joerg Exp $
-
---- gnome-panel/panel-util.c.orig	2007-12-27 13:36:58.000000000 +0000
-+++ gnome-panel/panel-util.c
-@@ -18,6 +18,7 @@
- 
- #include <dirent.h>
- #include <string.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <sys/types.h>
- 
-@@ -856,7 +857,11 @@ panel_make_unique_desktop_path_from_name
- {
- 	int   num = 1;
- 	char *path = NULL;
-+#ifdef NAME_MAX
-+	char  filename[NAME_MAX];
-+#else
- 	char  filename[MAXNAMLEN];
-+#endif
- 
- /* g_file_set_contents() use "%s.XXXXXX"
-  * FIXME: waiting for http://bugzilla.gnome.org/show_bug.cgi?id=437977 */