Update to 2.22.1.3.

4 files changed, 18 insertions, 60 deletions

diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index 1edd00ae1268..ff17799541a6 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	gnome-panel
-PORTVERSION=	2.22.1.1
-PORTREVISION?=	1
+PORTVERSION=	2.22.1.3
+PORTREVISION?=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index 18191c9b4c2c..5b7efb61fac4 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.22.1.1.tar.bz2) = c80f265af2dd009917aece662fd6ab37
-SHA256 (gnome2/gnome-panel-2.22.1.1.tar.bz2) = 9b6c7760bb81a5c1638b00fe68d377516e5b66264acfe838a2a9e416f8011bbf
-SIZE (gnome2/gnome-panel-2.22.1.1.tar.bz2) = 3242400
+MD5 (gnome2/gnome-panel-2.22.1.3.tar.bz2) = af5e33b27c4b4a8f932baa8530dd79b9
+SHA256 (gnome2/gnome-panel-2.22.1.3.tar.bz2) = e072531f6a8d1523b06a41c838d22ea33b06e2e7f8a7770d92f5d1d3ce2bd7f6
+SIZE (gnome2/gnome-panel-2.22.1.3.tar.bz2) = 3251621
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
index 405c4b89634e..aa25ac2fce66 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
@@ -9,46 +9,3 @@
  G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT)
  
  typedef struct {
-@@ -62,6 +64,7 @@ static void clock_location_unset_tz (Clo
- static void setup_weather_updates (ClockLocation *loc);
- static void add_to_network_monitor (ClockLocation *loc);
- static void remove_from_network_monitor (ClockLocation *loc);
-+static gchar *clock_location_guess_zone (ClockZoneTable *zones);
- 
- #define PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), CLOCK_LOCATION_TYPE, ClockLocationPrivate))
- 
-@@ -299,7 +302,11 @@ zone_from_etc_sysconfig_clock (void)
- 
- 		parse_etc_sysconfig_clock ();
- 		
-+#ifndef __FreeBSD__
- 		file = g_file_new_for_path ("/etc/sysconfig/clock");
-+#else
-+		file = g_file_new_for_path ("/etc/localtime");
-+#endif
- 
- 		monitor = g_file_monitor_file (file, G_FILE_MONITOR_NONE,
- 					       NULL, NULL);
-@@ -642,12 +649,18 @@ gboolean
- clock_location_is_current_timezone (ClockLocation *loc)
- {
-         ClockLocationPrivate *priv = PRIVATE (loc);
--	const char *zone;
-+	ClockZoneTable *zones;
-+	char *zone;
- 
--	if ((zone = zone_from_etc_sysconfig_clock ()))
-+	zones = clock_zonetable_new (SYSTEM_ZONEINFODIR);
-+	if ((zone = clock_location_guess_zone (zones))) {
-+		g_object_unref (zones);
- 		return strcmp (zone, priv->timezone) == 0;
--	else
--		return clock_location_get_offset (loc) == 0;
-+	}
-+
-+	g_object_unref (zones);
-+
-+	return clock_location_get_offset (loc) == 0;
- }
- 
- gboolean
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
index 0df281fd941d..b6524a42ddd0 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c
@@ -1,14 +1,15 @@
---- applets/clock/clock-zonetable.c.orig	2008-01-20 13:32:13.000000000 -0500
-+++ applets/clock/clock-zonetable.c	2008-01-20 13:35:34.000000000 -0500
-@@ -124,7 +124,10 @@ clock_zonetable_new (gchar *zoneinfodir)
-         priv = PRIVATE (this);
+--- applets/clock/clock-zonetable.c.orig	2008-04-15 16:58:01.000000000 -0400
++++ applets/clock/clock-zonetable.c	2008-04-19 20:32:30.000000000 -0400
+@@ -18,8 +18,12 @@
+ #define ISO3166_FILE SYSTEM_ZONEINFODIR"/country.tab"
+ #else
+ #define ZONETAB_FILE SYSTEM_ZONEINFODIR"/zone.tab"
++#ifdef __FreeBSD__
++#define ISO3166_FILE DATADIR"/gnome-panel/iso3166.tab"
++#else
+ #define ISO3166_FILE SYSTEM_ZONEINFODIR"/iso3166.tab"
+ #endif
++#endif
  
-         priv->zonetab = g_build_filename (zoneinfodir, "zone.tab", NULL);
--        priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);
-+        /*priv->iso3166 = g_build_filename (zoneinfodir, "iso3166.tab", NULL);*/
-+	/* FreeBSD doesn't include iso3166.tab, so we install it especially
-+	 * for this clock. */
-+	priv->iso3166 = g_build_filename (DATADIR, "gnome-panel", "iso3166.tab", NULL);
+ static GObject *zonetable_singleton = NULL;
  
- #ifdef CLOCK_TEXTDOMAIN
-         /* this is used when clock is embedded in the gnome-panel