update to 2.22.1.2

This switches to the gnome-2.22 release branch.

5 files changed, 40 insertions, 46 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index a8a0b060587..8567bdcee2a 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.95 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.96 2008/04/15 17:52:40 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.20.3
-PKGREVISION=		1
+DISTNAME=		gnome-panel-2.22.1.2
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -31,7 +30,6 @@ GCONF_SCHEMAS+=	workspace-switcher.schemas
 GCONF_SCHEMAS+=	window-list.schemas
 GCONF_ENTRIES=		panel-default-setup.entries
 
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.14.2
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.12.0
 BUILDLINK_API_DEPENDS.libglade+=	libglade>=2.5.0
 BUILDLINK_API_DEPENDS.libgnome+=	libgnome>=2.13.0
@@ -51,16 +49,17 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
+.include "../../devel/libgweather/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../graphics/librsvg/buildlink3.mk"
 .if !empty(PKG_OPTIONS:Mevolution)
 .include "../../mail/evolution-data-server/buildlink3.mk"
 .endif
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/omf-scrollkeeper.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index fbcdaa822c4..d0be8b469ec 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.36 2007/11/29 20:44:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.37 2008/04/15 17:52:40 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -37,13 +37,24 @@ share/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome-2.0/ui/GNOME_WindowListApplet.xml
 share/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
+share/gnome-panel/glade/clock.glade
 share/gnome-panel/glade/fish.glade
 share/gnome-panel/glade/panel-properties-dialog.glade
 share/gnome-panel/glade/panel-run-dialog.glade
 share/gnome-panel/glade/panel-test-applets.glade
-share/gnome-panel/glade/timezone.glade
 share/gnome-panel/glade/window-list.glade
 share/gnome-panel/glade/workspace-switcher.glade
+share/gnome-panel/pixmaps/clock-calendar-icon.png
+share/gnome-panel/pixmaps/clock-face-large.svg
+share/gnome-panel/pixmaps/clock-face-small-day.svg
+share/gnome-panel/pixmaps/clock-face-small-evening.svg
+share/gnome-panel/pixmaps/clock-face-small-morning.svg
+share/gnome-panel/pixmaps/clock-face-small-night.svg
+share/gnome-panel/pixmaps/clock-face-small.svg
+share/gnome-panel/pixmaps/clock-map-location-current.png
+share/gnome-panel/pixmaps/clock-map-location-hilight.png
+share/gnome-panel/pixmaps/clock-map-location-marker.png
+share/gnome-panel/pixmaps/clock-map.png
 share/gnome-panel/pixmaps/fishanim.png
 share/gnome-panel/pixmaps/footguy.png
 share/gnome-panel/pixmaps/gnome-gegl2-2.png
@@ -157,6 +168,7 @@ share/gnome/help/fish/uk/fish.xml
 share/gnome/help/fish/uk/legal.xml
 share/gnome/help/window-list/C/window-list.xml
 share/gnome/help/window-list/ca/window-list.xml
+share/gnome/help/window-list/da/window-list.xml
 share/gnome/help/window-list/de/figures/window_list_applet.png
 share/gnome/help/window-list/de/figures/window_list_group.png
 share/gnome/help/window-list/de/figures/window_list_group_applet.png
@@ -184,6 +196,7 @@ share/gnome/help/window-list/zh_TW/legal.xml
 share/gnome/help/window-list/zh_TW/window-list.xml
 share/gnome/help/workspace-switcher/C/workspace-switcher.xml
 share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
+share/gnome/help/workspace-switcher/da/workspace-switcher.xml
 share/gnome/help/workspace-switcher/de/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/de/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/de/legal.xml
@@ -274,6 +287,7 @@ share/icons/hicolor/32x32/apps/gnome-panel-window-list.png
 share/icons/hicolor/32x32/apps/gnome-panel-window-menu.png
 share/icons/hicolor/32x32/apps/gnome-panel-workspace-switcher.png
 share/icons/hicolor/32x32/apps/gnome-panel.png
+share/icons/hicolor/48x48/apps/gnome-panel.png
 share/icons/hicolor/scalable/apps/gnome-panel-clock.svg
 share/icons/hicolor/scalable/apps/gnome-panel-drawer.svg
 share/icons/hicolor/scalable/apps/gnome-panel-fish.svg
@@ -289,6 +303,7 @@ share/idl/gnome-panel-2.0/GNOME_Panel.idl
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-panel-2.0.mo
@@ -313,6 +328,7 @@ share/locale/eu/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-panel-2.0.mo
@@ -348,6 +364,7 @@ share/locale/oc/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ps/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-panel-2.0.mo
@@ -418,6 +435,7 @@ share/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/omf/gnome-panel/workspace-switcher-zh_TW.omf
 share/omf/window-list/window-list-C.omf
 share/omf/window-list/window-list-ca.omf
+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
@@ -432,6 +450,7 @@ share/omf/window-list/window-list-uk.omf
 share/omf/window-list/window-list-zh_CN.omf
 share/omf/workspace-switcher/workspace-switcher-C.omf
 share/omf/workspace-switcher/workspace-switcher-ca.omf
+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
@@ -454,6 +473,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/idl/gnome-panel-2.0
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
@@ -480,6 +500,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/workspace-switcher/el
 @dirrm share/gnome/help/workspace-switcher/de/figures
 @dirrm share/gnome/help/workspace-switcher/de
+@dirrm share/gnome/help/workspace-switcher/da
 @dirrm share/gnome/help/workspace-switcher/ca
 @dirrm share/gnome/help/workspace-switcher/C
 @dirrm share/gnome/help/workspace-switcher
@@ -500,6 +521,7 @@ share/omf/workspace-switcher/workspace-switcher-vi.omf
 @dirrm share/gnome/help/window-list/el
 @dirrm share/gnome/help/window-list/de/figures
 @dirrm share/gnome/help/window-list/de
+@dirrm share/gnome/help/window-list/da
 @dirrm share/gnome/help/window-list/ca
 @dirrm share/gnome/help/window-list/C
 @dirrm share/gnome/help/window-list
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 6ead8cae152..6c2dcb499eb 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.27 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.28 2008/04/15 17:52:40 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_PANEL_BUILDLINK3_MK:=	${GNOME_PANEL_BUILDLINK3_MK}+
@@ -15,6 +15,12 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnome-panel
 BUILDLINK_API_DEPENDS.gnome-panel+=		gnome-panel>=2.12.1nb3
 BUILDLINK_ABI_DEPENDS.gnome-panel?=	gnome-panel>=2.20.3nb1
 BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
+
+pkgbase:= gnome-panel
+.include "../../mk/pkg-build-options.mk"
+.if !empty(PKG_BUILD_OPTIONS.gnome-panel:Mevolution)
+.include "../../mail/evolution-data-server/buildlink3.mk"
+.endif
 .endif	# GNOME_PANEL_BUILDLINK3_MK
 
 .include "../../devel/GConf/buildlink3.mk"
@@ -27,7 +33,6 @@ BUILDLINK_PKGSRCDIR.gnome-panel?=	../../x11/gnome-panel
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index cf8a1f08908..4c6805214c6 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.41 2008/01/11 12:59:09 drochner Exp $
+$NetBSD: distinfo,v 1.42 2008/04/15 17:52:40 drochner Exp $
 
-SHA1 (gnome-panel-2.20.3.tar.bz2) = 7d2abba6a4aedd05418192b50573fb0a1efc6f1f
-RMD160 (gnome-panel-2.20.3.tar.bz2) = c3c2eb81b6baf7e5203bed288c077017526d554c
-Size (gnome-panel-2.20.3.tar.bz2) = 2829469 bytes
-SHA1 (patch-aa) = 602ceea87d5861aa1400268e1a1e189c7281ddac
+SHA1 (gnome-panel-2.22.1.2.tar.bz2) = 4f51f732d8162aa8f462e38458e3c8569f834222
+RMD160 (gnome-panel-2.22.1.2.tar.bz2) = 9fd7ed7282fa04569ff8f908d3c5f2faea73c89a
+Size (gnome-panel-2.22.1.2.tar.bz2) = 3248915 bytes
 SHA1 (patch-ab) = 961186c5db258557294fae4a280d13efdcfe1de1
 SHA1 (patch-ac) = 266fbb403a11c4776a17cd257d3f577b97f01c66
diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa
deleted file mode 100644
index eef5a42a43f..00000000000
--- a/x11/gnome-panel/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2007/12/01 18:14:02 drochner Exp $
-
---- applets/clock/calendar-window.c.orig	2007-11-27 01:02:56.000000000 +0100
-+++ applets/clock/calendar-window.c
-@@ -1098,12 +1098,23 @@ calendar_day_activated (GtkCalendar    *
- 	unsigned int  day;
- 	unsigned int  month;
- 	unsigned int  year;
-+	struct tm date;
-+	time_t daystart;
- 	char         *argument;
- 
- 	gtk_calendar_get_date (calendar, &year, &month, &day);
--
--	argument = g_strdup_printf ("calendar:///?startdate=%.4d%.2d%.2d",
--				    year, month + 1, day);
-+	bzero(&date, sizeof(date));
-+	date.tm_mday = day;
-+	date.tm_mon = month;
-+	date.tm_year = year - 1900;
-+	date.tm_isdst = -1;
-+	daystart = mktime(&date);
-+	gmtime_r(&daystart, &date);
-+
-+	argument = g_strdup_printf (
-+		"calendar:///?startdate=%.4d%.2d%.2dT%.2d%.2d%.2d",
-+		date.tm_year + 1900, date.tm_mon + 1, date.tm_mday,
-+		date.tm_hour, date.tm_min, date.tm_sec);
- 
- 	clock_launch_evolution (calwin, argument);
-