update to 2.28.0

This switches to the gnome-2.28 release branch.

8 files changed, 33 insertions, 506 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 4253d29d72e..4357920288c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.114 2009/08/26 19:56:47 sno Exp $
+# $NetBSD: Makefile,v 1.115 2009/10/22 17:29:42 drochner Exp $
 #
 
-DISTNAME=		gnome-panel-2.26.3
-PKGREVISION=		1
+DISTNAME=		gnome-panel-2.28.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.26/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-panel/2.28/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -13,8 +12,8 @@ COMMENT=		GNOME2 panel application
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-EGDIR=		${PREFIX}/share/examples/gnome-panel
-CONF_FILES+=	${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
+#EGDIR=		${PREFIX}/share/examples/gnome-panel
+#CONF_FILES+=	${PREFIX}/share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf \
 		${PKG_SYSCONFDIR}/dbus-1/system.d/org.gnome.ClockApplet.Mechanism.conf
 
 GNU_CONFIGURE=		YES
@@ -50,7 +49,7 @@ PKG_SUGGESTED_OPTIONS=	evolution
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
+#.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
@@ -67,6 +66,7 @@ BUILDLINK_API_DEPENDS.libgweather+=	libgweather>=2.24.1
 .include "../../security/policykit/buildlink3.mk"
 .include "../../security/policykit-gnome/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.gnome-menus+= gnome-menus>=2.28.0
 .include "../../sysutils/gnome-menus/buildlink3.mk"
 .include "../../sysutils/hal/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST
index 4d29f505425..2c1e08a45de 100644
--- a/x11/gnome-panel/PLIST
+++ b/x11/gnome-panel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.48 2009/07/09 17:54:37 drochner Exp $
+@comment $NetBSD: PLIST,v 1.49 2009/10/22 17:29:42 drochner Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/panel-test-applets
@@ -14,14 +14,11 @@ lib/libpanel-applet-2.la
 lib/pkgconfig/libpanelapplet-2.0.pc
 libexec/clock-applet
 libexec/fish-applet-2
-libexec/gnome-clock-applet-mechanism
+libexec/gnome-panel-add
 libexec/notification-area-applet
 libexec/wnck-applet
 man/man1/gnome-panel.1
-share/PolicyKit/policy/org.gnome.clockapplet.mechanism.policy
 share/applications/gnome-panel.desktop
-share/dbus-1/system-services/org.gnome.ClockApplet.Mechanism.service
-share/examples/gnome-panel/org.gnome.ClockApplet.Mechanism.conf
 share/gconf/schemas/clock.schemas
 share/gconf/schemas/fish.schemas
 share/gconf/schemas/panel-compatibility.schemas
@@ -40,13 +37,6 @@ 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/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
@@ -66,6 +56,13 @@ share/gnome-panel/pixmaps/monkey.png
 share/gnome-panel/pixmaps/oldwanda.png
 share/gnome-panel/pixmaps/wanda.png
 share/gnome-panel/pixmaps/world_map-960.png
+share/gnome-panel/ui/clock.ui
+share/gnome-panel/ui/fish.ui
+share/gnome-panel/ui/panel-properties-dialog.ui
+share/gnome-panel/ui/panel-run-dialog.ui
+share/gnome-panel/ui/panel-test-applets.ui
+share/gnome-panel/ui/window-list.ui
+share/gnome-panel/ui/workspace-switcher.ui
 share/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
@@ -196,50 +193,6 @@ share/gnome/help/fish/uk/legal.xml
 share/gnome/help/fish/zh_CN/figures/fish_applet.png
 share/gnome/help/fish/zh_CN/fish.xml
 share/gnome/help/fish/zh_CN/legal.xml
-share/gnome/help/window-list/C/window-list.xml
-share/gnome/help/window-list/ar/window-list.xml
-share/gnome/help/window-list/ca/window-list.xml
-share/gnome/help/window-list/cs/window-list.xml
-share/gnome/help/window-list/da/window-list.xml
-share/gnome/help/window-list/de/window-list.xml
-share/gnome/help/window-list/el/window-list.xml
-share/gnome/help/window-list/en_GB/window-list.xml
-share/gnome/help/window-list/es/window-list.xml
-share/gnome/help/window-list/eu/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/ko/window-list.xml
-share/gnome/help/window-list/oc/window-list.xml
-share/gnome/help/window-list/pa/window-list.xml
-share/gnome/help/window-list/pt_BR/window-list.xml
-share/gnome/help/window-list/ru/window-list.xml
-share/gnome/help/window-list/sv/window-list.xml
-share/gnome/help/window-list/uk/window-list.xml
-share/gnome/help/window-list/zh_CN/window-list.xml
-share/gnome/help/workspace-switcher/C/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ar/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ca/workspace-switcher.xml
-share/gnome/help/workspace-switcher/cs/workspace-switcher.xml
-share/gnome/help/workspace-switcher/da/workspace-switcher.xml
-share/gnome/help/workspace-switcher/de/workspace-switcher.xml
-share/gnome/help/workspace-switcher/el/workspace-switcher.xml
-share/gnome/help/workspace-switcher/en_GB/workspace-switcher.xml
-share/gnome/help/workspace-switcher/es/workspace-switcher.xml
-share/gnome/help/workspace-switcher/eu/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/ko/workspace-switcher.xml
-share/gnome/help/workspace-switcher/nl/workspace-switcher.xml
-share/gnome/help/workspace-switcher/oc/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pa/workspace-switcher.xml
-share/gnome/help/workspace-switcher/pt_BR/workspace-switcher.xml
-share/gnome/help/workspace-switcher/ru/workspace-switcher.xml
-share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
-share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
-share/gnome/help/workspace-switcher/vi/workspace-switcher.xml
-share/gnome/help/workspace-switcher/zh_CN/workspace-switcher.xml
 share/gtk-doc/html/panel-applet/PanelApplet.html
 share/gtk-doc/html/panel-applet/applet-popups.html
 share/gtk-doc/html/panel-applet/applet-porting.html
@@ -461,47 +414,6 @@ share/omf/fish/fish-sv.omf
 share/omf/fish/fish-th.omf
 share/omf/fish/fish-uk.omf
 share/omf/fish/fish-zh_CN.omf
-share/omf/window-list/window-list-C.omf
-share/omf/window-list/window-list-ar.omf
-share/omf/window-list/window-list-ca.omf
-share/omf/window-list/window-list-cs.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-en_GB.omf
-share/omf/window-list/window-list-es.omf
-share/omf/window-list/window-list-eu.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
-share/omf/window-list/window-list-oc.omf
-share/omf/window-list/window-list-pa.omf
-share/omf/window-list/window-list-pt_BR.omf
-share/omf/window-list/window-list-ru.omf
-share/omf/window-list/window-list-sv.omf
-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-ar.omf
-share/omf/workspace-switcher/workspace-switcher-ca.omf
-share/omf/workspace-switcher/workspace-switcher-cs.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-en_GB.omf
-share/omf/workspace-switcher/workspace-switcher-es.omf
-share/omf/workspace-switcher/workspace-switcher-eu.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
-share/omf/workspace-switcher/workspace-switcher-nl.omf
-share/omf/workspace-switcher/workspace-switcher-oc.omf
-share/omf/workspace-switcher/workspace-switcher-pa.omf
-share/omf/workspace-switcher/workspace-switcher-pt_BR.omf
-share/omf/workspace-switcher/workspace-switcher-ru.omf
-share/omf/workspace-switcher/workspace-switcher-sv.omf
-share/omf/workspace-switcher/workspace-switcher-uk.omf
-share/omf/workspace-switcher/workspace-switcher-vi.omf
-share/omf/workspace-switcher/workspace-switcher-zh_CN.omf
+@pkgdir share/polkit-1/actions
+@pkgdir share/examples/gnome-panel
+@pkgdir share/dbus-1/system-services
diff --git a/x11/gnome-panel/buildlink3.mk b/x11/gnome-panel/buildlink3.mk
index 5e06f2eca40..0889e7a2bdc 100644
--- a/x11/gnome-panel/buildlink3.mk
+++ b/x11/gnome-panel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.31 2009/08/26 19:56:47 sno Exp $
+# $NetBSD: buildlink3.mk,v 1.32 2009/10/22 17:29:42 drochner Exp $
 
 BUILDLINK_TREE+=	gnome-panel
 
@@ -20,7 +20,6 @@ pkgbase:= gnome-panel
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
-.include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../devel/libwnck/buildlink3.mk"
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index c3e0b07455d..eb377cf9404 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.57 2009/07/09 17:54:37 drochner Exp $
+$NetBSD: distinfo,v 1.58 2009/10/22 17:29:42 drochner Exp $
 
-SHA1 (gnome-panel-2.26.3.tar.bz2) = 8fdb1e47bef9f3de9c01f830a84ecf30fda3d48f
-RMD160 (gnome-panel-2.26.3.tar.bz2) = 07b961a2224c6de0253495c6aeefdb2fb4804c8e
-Size (gnome-panel-2.26.3.tar.bz2) = 2988811 bytes
-SHA1 (patch-aa) = e19be3cb14a38e1ea98f368a1fd1f53e1a7d6513
-SHA1 (patch-ab) = 5a3788a3eaf6ba4c0c7832e390e2ebe3bbf15161
-SHA1 (patch-ac) = 5b9855e1cf0bb00635be234ed24a740dd33f5b67
+SHA1 (gnome-panel-2.28.0.tar.bz2) = 667975e0f269b6b3320c04bd1bd705378c0f4927
+RMD160 (gnome-panel-2.28.0.tar.bz2) = b3c2025b47b9d6c74aba0a2961394d94f59c4381
+Size (gnome-panel-2.28.0.tar.bz2) = 2976766 bytes
+SHA1 (patch-aa) = b2e88627fe7ead48c946baf276ecc99fc17e906a
+SHA1 (patch-ab) = 2bea1a4fe4b68b45988e2d1e88eeb488d14ac0e1
 SHA1 (patch-ad) = c24a5d0a8c1c88d46edfa3e8fc3e4528637a8d31
 SHA1 (patch-ae) = d85575dc403c67a4fcb0818904ab9b0517f7b8e0
-SHA1 (patch-af) = 49057b4991a404a24da3e00b8b8bc64f901abf89
diff --git a/x11/gnome-panel/patches/patch-aa b/x11/gnome-panel/patches/patch-aa
index 5e7e77aa0d1..db75281e4eb 100644
--- a/x11/gnome-panel/patches/patch-aa
+++ b/x11/gnome-panel/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.9 2008/11/23 17:32:12 jmcneill Exp $
+$NetBSD: patch-aa,v 1.10 2009/10/22 17:29:42 drochner Exp $
 
---- applets/clock/Makefile.in.orig	2008-11-23 11:58:54.000000000 -0500
+--- applets/clock/Makefile.in.orig	2009-09-21 18:36:46.000000000 +0200
 +++ applets/clock/Makefile.in
-@@ -511,7 +511,7 @@ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
+@@ -571,7 +571,7 @@ schemasdir = $(GCONF_SCHEMA_FILE_DIR)
  schemas_in_files = clock.schemas.in
  schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
  dbus_servicesdir = $(datadir)/dbus-1/system-services
 -dbus_confdir = $(sysconfdir)/dbus-1/system.d
 +dbus_confdir = $(datadir)/examples/gnome-panel
- polkitdir = $(datadir)/PolicyKit/policy
+ polkitdir = $(datadir)/polkit-1/actions
  dbus_services_in_files = org.gnome.ClockApplet.Mechanism.service.in
  polkit_in_files = org.gnome.clockapplet.mechanism.policy.in
diff --git a/x11/gnome-panel/patches/patch-ab b/x11/gnome-panel/patches/patch-ab
index 78b660fe10e..99c1c8c0612 100644
--- a/x11/gnome-panel/patches/patch-ab
+++ b/x11/gnome-panel/patches/patch-ab
@@ -1,225 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2009/03/19 18:54:42 drochner Exp $
+$NetBSD: patch-ab,v 1.8 2009/10/22 17:29:42 drochner Exp $
 
---- applets/clock/calendar-client.c.orig	2009-01-13 01:02:20.000000000 +0100
+--- applets/clock/calendar-client.c.orig	2009-10-22 00:29:21.000000000 +0200
 +++ applets/clock/calendar-client.c
-@@ -523,7 +523,7 @@ calendar_client_new (void)
-  *
-  * "What?", you say, "Something useful in libc?"
-  */
--static inline GTime
-+static inline time_t
- make_time_for_day_begin (int day,
- 			 int month,
- 			 int year)
-@@ -543,14 +543,14 @@ make_isodate_for_day_begin (int day,
- 			    int month,
- 			    int year)
- {
--  GTime utctime;
-+  time_t utctime;
- 
-   utctime = make_time_for_day_begin (day, month, year);
- 
-   return utctime != -1 ? isodate_from_time_t (utctime) : NULL;
- }
- 
--static GTime
-+static time_t
- get_time_from_property (icalcomponent         *ical,
- 			icalproperty_kind      prop_kind,
- 			struct icaltimetype (* get_prop_func) (const icalproperty *prop),
-@@ -624,7 +624,7 @@ get_ical_description (icalcomponent *ica
-   return g_strdup (icalproperty_get_description (prop));
- }
- 
--static inline GTime
-+static inline time_t
- get_ical_start_time (icalcomponent *ical,
-                      icaltimezone  *default_zone)
- {
-@@ -634,7 +634,7 @@ get_ical_start_time (icalcomponent *ical
-                                  default_zone);
- }
- 
--static inline GTime
-+static inline time_t
- get_ical_end_time (icalcomponent *ical,
-                    icaltimezone  *default_zone)
- {
-@@ -646,13 +646,12 @@ get_ical_end_time (icalcomponent *ical,
- 
- static gboolean
- get_ical_is_all_day (icalcomponent *ical,
--                     GTime          start_gtime,
-+                     time_t         start_time,
-                      icaltimezone  *default_zone)
- {
-   icalproperty            *prop;
--  time_t                   start_time;
-   struct tm               *start_tm;
--  GTime                    end_time;
-+  time_t                   end_time;
-   struct icaldurationtype  duration;
-   struct icaltimetype      start_icaltime;
- 
-@@ -660,7 +659,6 @@ get_ical_is_all_day (icalcomponent *ical
-   if (start_icaltime.is_date)
-     return TRUE;
- 
--  start_time = (time_t) start_gtime;
-   start_tm = gmtime (&start_time);
-   if (start_tm->tm_sec  != 0 ||
-       start_tm->tm_min  != 0 ||
-@@ -679,7 +677,7 @@ get_ical_is_all_day (icalcomponent *ical
-   return icaldurationtype_as_int (duration) % 86400 == 0;
- }
- 
--static inline GTime
-+static inline time_t
- get_ical_due_time (icalcomponent *ical,
-                    icaltimezone  *default_zone)
- {
-@@ -713,7 +711,7 @@ get_ical_percent_complete (icalcomponent
-   return CLAMP (percent_complete, 0, 100);
- }
- 
--static inline GTime
-+static inline time_t
- get_ical_completed_time (icalcomponent *ical,
-                          icaltimezone  *default_zone)
- {
-@@ -909,11 +907,12 @@ resolve_timezone_id (const char *tzid,
- 
- static gboolean
- calendar_appointment_collect_occurrence (ECalComponent  *component,
--					 GTime           occurrence_start,
--					 GTime           occurrence_end,
--					 GSList        **collect_loc)
-+					 time_t           occurrence_start,
-+					 time_t           occurrence_end,
-+					 gpointer         data)
- {
-   CalendarOccurrence *occurrence;
-+  GSList **collect_loc = data;
- 
-   occurrence             = g_new0 (CalendarOccurrence, 1);
-   occurrence->start_time = occurrence_start;
-@@ -928,8 +927,8 @@ static void
- calendar_appointment_generate_ocurrences (CalendarAppointment *appointment,
- 					  icalcomponent       *ical,
- 					  ECal                *source,
--					  GTime                start,
--					  GTime                end,
-+					  time_t               start,
-+					  time_t               end,
-                                           icaltimezone        *default_zone)
- {
-   ECalComponent *ecal;
-@@ -943,7 +942,7 @@ calendar_appointment_generate_ocurrences
-   e_cal_recur_generate_instances (ecal,
- 				  start,
- 				  end,
--				  (ECalRecurInstanceFn) calendar_appointment_collect_occurrence,
-+				  calendar_appointment_collect_occurrence,
- 				  &appointment->occurrences,
- 				  (ECalRecurResolveTimezoneFn) resolve_timezone_id,
- 				  source,
-@@ -1160,8 +1159,8 @@ static void
- calendar_event_generate_ocurrences (CalendarEvent *event,
- 				    icalcomponent *ical,
- 				    ECal          *source,
--				    GTime          start,
--				    GTime          end,
-+				    time_t         start,
-+				    time_t         end,
-                                     icaltimezone  *default_zone)
- {
-   if (event->type != CALENDAR_EVENT_APPOINTMENT)
-@@ -1332,8 +1331,8 @@ calendar_client_handle_query_result (Cal
-   gboolean             emit_signal;
-   gboolean             events_changed;
-   GList               *l;
--  GTime                month_begin;
--  GTime                month_end;
-+  time_t               month_begin;
-+  time_t               month_end;
- 
-   client = source->client;
- 
-@@ -1846,8 +1845,8 @@ typedef struct
- {
-   CalendarClient *client;
-   GSList         *events;
--  GTime           start_time;
--  GTime           end_time;
-+  time_t          start_time;
-+  time_t          end_time;
- } FilterData;
- 
- typedef void (* CalendarEventFilterFunc) (const char    *uid,
-@@ -1870,8 +1869,8 @@ filter_appointment (const char    *uid,
-   for (l = occurrences; l; l = l->next)
-     {
-       CalendarOccurrence *occurrence = l->data;
--      GTime start_time = occurrence->start_time;
--      GTime end_time   = occurrence->end_time;
-+      time_t start_time = occurrence->start_time;
-+      time_t end_time   = occurrence->end_time;
- 
-       if ((start_time >= filter_data->start_time &&
-            start_time < filter_data->end_time) ||
-@@ -1924,8 +1923,8 @@ static GSList *
- calendar_client_filter_events (CalendarClient          *client,
- 			       GSList                  *sources,
- 			       CalendarEventFilterFunc  filter_func,
--			       GTime                    start_time,
--			       GTime                    end_time)
-+			       time_t                   start_time,
-+			       time_t                   end_time)
- {
-   FilterData  filter_data;
-   GSList     *l;
-@@ -1966,8 +1965,8 @@ calendar_client_get_events (CalendarClie
- {
-   GSList *appointments;
-   GSList *tasks;
--  GTime   day_begin;
--  GTime   day_end;
-+  time_t  day_begin;
-+  time_t  day_end;
- 
-   g_return_val_if_fail (CALENDAR_IS_CLIENT (client), NULL);
-   g_return_val_if_fail (client->priv->day   != -1 &&
-@@ -2021,8 +2020,8 @@ calendar_client_foreach_appointment_day 
- {
-   GSList   *appointments, *l;
-   gboolean  marked_days [32] = { FALSE, };
--  GTime     month_begin;
--  GTime     month_end;
-+  time_t    month_begin;
-+  time_t    month_end;
-   int       i;
- 
-   g_return_if_fail (CALENDAR_IS_CLIENT (client));
-@@ -2048,7 +2047,7 @@ calendar_client_foreach_appointment_day 
- 
-       if (appointment->start_time)
-         {
--          GTime day_time = appointment->start_time;
-+          time_t day_time = appointment->start_time;
- 
-           if (day_time >= month_begin)
-             marked_days [day_from_time_t (day_time)] = TRUE;
-@@ -2060,7 +2059,7 @@ calendar_client_foreach_appointment_day 
- 	      /* mark the days for the appointment, no need to add an extra one when duration is a multiple of 86400 */
-               for (day_offset = 1; day_offset <= duration / 86400 && duration != day_offset * 86400; day_offset++)
-                 {
--                  GTime day_tm = appointment->start_time + day_offset * 86400;
-+                  time_t day_tm = appointment->start_time + day_offset * 86400;
- 
-                   if (day_tm > month_end)
-                     break;
-@@ -2124,7 +2123,7 @@ calendar_client_set_task_completed (Cale
+@@ -2123,7 +2123,7 @@ calendar_client_set_task_completed (Cale
      {
        struct icaltimetype  completed_time;
  
diff --git a/x11/gnome-panel/patches/patch-ac b/x11/gnome-panel/patches/patch-ac
deleted file mode 100644
index 9b561f84c21..00000000000
--- a/x11/gnome-panel/patches/patch-ac
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-ac,v 1.9 2009/03/19 18:54:42 drochner Exp $
-
---- applets/clock/calendar-client.h.orig	2009-03-04 09:49:20.000000000 +0100
-+++ applets/clock/calendar-client.h
-@@ -65,8 +65,8 @@ struct _CalendarClientClass
- 
- typedef struct
- {
--  GTime start_time;
--  GTime end_time;
-+  time_t start_time;
-+  time_t end_time;
- } CalendarOccurrence;
- 
- typedef struct
-@@ -77,8 +77,8 @@ typedef struct
-   char   *summary;
-   char   *description;
-   char   *color_string;
--  GTime   start_time;
--  GTime   end_time;
-+  time_t  start_time;
-+  time_t  end_time;
-   guint   is_all_day : 1;
- 
-   /* Only used internally */
-@@ -92,10 +92,10 @@ typedef struct
-   char  *description;
-   char  *color_string;
-   char  *url;
--  GTime  start_time;
--  GTime  due_time;
-+  time_t start_time;
-+  time_t due_time;
-   guint  percent_complete;
--  GTime  completed_time;
-+  time_t completed_time;
-   int    priority;
- } CalendarTask;
- 
diff --git a/x11/gnome-panel/patches/patch-af b/x11/gnome-panel/patches/patch-af
deleted file mode 100644
index d13490e00d5..00000000000
--- a/x11/gnome-panel/patches/patch-af
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-af,v 1.4 2009/03/19 18:54:42 drochner Exp $
-
---- applets/clock/calendar-window.c.orig	2009-03-04 09:59:24.000000000 +0100
-+++ applets/clock/calendar-window.c
-@@ -280,12 +280,12 @@ handle_tasks_changed (CalendarWindow *ca
-                                     TASK_COLUMN_UID,                   task->uid,
-                                     TASK_COLUMN_SUMMARY,               task->summary,
-                                     TASK_COLUMN_DESCRIPTION,           task->description,
--                                    TASK_COLUMN_START_TIME,            task->start_time,
--                                    TASK_COLUMN_DUE_TIME,              task->due_time,
-+                                    TASK_COLUMN_START_TIME,            (gint64)task->start_time,
-+                                    TASK_COLUMN_DUE_TIME,              (gint64)task->due_time,
-                                     TASK_COLUMN_PERCENT_COMPLETE,      task->percent_complete,
-                                     TASK_COLUMN_PERCENT_COMPLETE_TEXT, percent_complete_text,
-                                     TASK_COLUMN_COMPLETED,             task->percent_complete == 100,
--                                    TASK_COLUMN_COMPLETED_TIME,        task->completed_time,
-+                                    TASK_COLUMN_COMPLETED_TIME,        (gint64)task->completed_time,
-                                     TASK_COLUMN_COLOR,                 task->color_string,
-                                     TASK_COLUMN_PRIORITY,              task->priority,
-                                     -1);
-@@ -425,15 +425,19 @@ filter_out_tasks (GtkTreeModel   *model,
-                   GtkTreeIter    *iter,
-                   CalendarWindow *calwin)
- {
--        GTime    start_time;
--        GTime    completed_time;
--        GTime    one_day_ago;
-+        gint64   start_time64;
-+        gint64   completed_time64;
-+        time_t   start_time;
-+        time_t   completed_time;
-+        time_t   one_day_ago;
-         gboolean visible;
- 
-         gtk_tree_model_get (model, iter,
--                            TASK_COLUMN_START_TIME,     &start_time,
--                            TASK_COLUMN_COMPLETED_TIME, &completed_time,
-+                            TASK_COLUMN_START_TIME,     &start_time64,
-+                            TASK_COLUMN_COMPLETED_TIME, &completed_time64,
-                             -1);
-+	start_time = start_time64;
-+	completed_time = completed_time64;
- 
-         one_day_ago = *(calwin->priv->current_time) - (24 * 60 * 60);
- 
-@@ -451,7 +455,8 @@ modify_task_text_attributes (GtkTreeMode
-                              gint            column,
-                              CalendarWindow *calwin)
- {
--        GTime           due_time;
-+        gint64          due_time64;
-+        time_t          due_time;
-         PangoAttrList  *attr_list;
-         PangoAttribute *attr;
-         GtkTreeIter     child_iter;
-@@ -469,8 +474,9 @@ modify_task_text_attributes (GtkTreeMode
-         }
- 
-         gtk_tree_model_get (GTK_TREE_MODEL (calwin->priv->tasks_model),
--			    &child_iter, TASK_COLUMN_DUE_TIME, &due_time,
-+			    &child_iter, TASK_COLUMN_DUE_TIME, &due_time64,
-                             -1);
-+	due_time = due_time64;
-         if (due_time && due_time > *(calwin->priv->current_time))
-                 return;
- 
-@@ -702,12 +708,15 @@ compare_tasks  (GtkTreeModel *model,
- 	else if (priority_a > priority_b)
- 		return 1;
- 	else {
--                GTime due_time_a, due_time_b;
-+                gint64 due_time_a64, due_time_b64;
-+                time_t due_time_a, due_time_b;
- 
-                 gtk_tree_model_get (model, a,
--				    TASK_COLUMN_DUE_TIME, &due_time_a, -1);
-+				    TASK_COLUMN_DUE_TIME, &due_time_a64, -1);
-                 gtk_tree_model_get (model, b,
--				    TASK_COLUMN_DUE_TIME, &due_time_b, -1);
-+				    TASK_COLUMN_DUE_TIME, &due_time_b64, -1);
-+		due_time_a = due_time_a64;
-+		due_time_b = due_time_b64;
- 
-                 if (due_time_a < due_time_b)
-                         return -1;
-@@ -906,9 +915,9 @@ handle_appointments_changed (CalendarWin
-                                     APPOINTMENT_COLUMN_URI,         appointment->uri,
-                                     APPOINTMENT_COLUMN_SUMMARY,     appointment->summary,
-                                     APPOINTMENT_COLUMN_DESCRIPTION, appointment->description,
--                                    APPOINTMENT_COLUMN_START_TIME,  appointment->start_time,
-+                                    APPOINTMENT_COLUMN_START_TIME,  (gint64)appointment->start_time,
-                                     APPOINTMENT_COLUMN_START_TEXT,  start_text,
--                                    APPOINTMENT_COLUMN_END_TIME,    appointment->end_time,
-+                                    APPOINTMENT_COLUMN_END_TIME,    (gint64)appointment->end_time,
-                                     APPOINTMENT_COLUMN_ALL_DAY,     appointment->is_all_day,
-                                     APPOINTMENT_COLUMN_PIXBUF,      appointment->color_string,
-                                     -1);
-@@ -1098,12 +1107,12 @@ calendar_window_create_tasks_model (Cale
- 		G_TYPE_STRING,         /* uid                     */
- 		G_TYPE_STRING,         /* summary                 */
- 		G_TYPE_STRING,         /* description             */
--		G_TYPE_LONG,           /* start time              */
--		G_TYPE_LONG,           /* due time                */
-+		G_TYPE_INT64,          /* start time              */
-+		G_TYPE_INT64,          /* due time                */
- 		G_TYPE_UINT,           /* percent complete        */
- 		G_TYPE_STRING,         /* percent complete text   */
- 		G_TYPE_BOOLEAN,        /* completed               */
--		G_TYPE_LONG,           /* completed time          */
-+		G_TYPE_INT64,          /* completed time          */
- 		PANGO_TYPE_ATTR_LIST,  /* summary text attributes */
- 		G_TYPE_STRING,         /* color                   */
- 		G_TYPE_INT             /* priority                */
-@@ -1147,9 +1156,9 @@ calendar_window_create_appointments_mode
- 				    G_TYPE_STRING,   /* uri              */
- 				    G_TYPE_STRING,   /* summary          */
- 				    G_TYPE_STRING,   /* description      */
--				    G_TYPE_LONG,     /* start time       */
-+				    G_TYPE_INT64,    /* start time       */
- 				    G_TYPE_STRING,   /* start time text  */
--				    G_TYPE_LONG,     /* end time         */
-+				    G_TYPE_INT64,    /* end time         */
- 				    G_TYPE_BOOLEAN,  /* all day          */
- 				    G_TYPE_STRING);  /* color            */
-