summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
Diffstat (limited to 'x11')
-rw-r--r--x11/gnome-panel/Makefile6
-rw-r--r--x11/gnome-panel/distinfo6
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c43
-rw-r--r--x11/gnome-panel/files/patch-po_ko.po31
4 files changed, 19 insertions, 67 deletions
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e122b1f0f..0bf54076a 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -3,12 +3,12 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gnome-panel/Makefile,v 1.172 2008/02/13 04:35:44 marcus Exp $
+# $MCom: ports/x11/gnome-panel/Makefile,v 1.173 2008/02/16 17:20:19 marcus Exp $
#
PORTNAME= gnome-panel
-PORTVERSION= 2.21.91
-PORTREVISION?= 3
+PORTVERSION= 2.21.92
+PORTREVISION?= 0
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_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 ac83692c8..86802dc88 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-panel-2.21.91.tar.bz2) = 4b2a79d02110fdb38e1573c13e85ab7a
-SHA256 (gnome2/gnome-panel-2.21.91.tar.bz2) = f38aba0c10d496a662a59029eb4973b500e7bc36f6bb60fa9f54b67f0494e0b2
-SIZE (gnome2/gnome-panel-2.21.91.tar.bz2) = 3128564
+MD5 (gnome2/gnome-panel-2.21.92.tar.bz2) = 46544232bc0148ff61790f9141a6904b
+SHA256 (gnome2/gnome-panel-2.21.92.tar.bz2) = 5c9f9e9ae663a80c3a9216e9b0fbd9a62d895054fb972b0339d3c3625afdd00f
+SIZE (gnome2/gnome-panel-2.21.92.tar.bz2) = 3192717
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
index 455a2316e..5acc58b40 100644
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ b/x11/gnome-panel/files/patch-applets_clock_clock.c
@@ -1,5 +1,5 @@
---- applets/clock/clock.c.orig 2008-02-12 23:25:13.000000000 -0500
-+++ applets/clock/clock.c 2008-02-12 23:27:56.000000000 -0500
+--- applets/clock/clock.c.orig 2008-02-26 14:17:49.000000000 +0100
++++ applets/clock/clock.c 2008-02-26 18:01:17.000000000 +0100
@@ -84,6 +84,8 @@
#define FALLBACK_CONFIG_TOOL "time-admin"
@@ -9,42 +9,3 @@
static const char *clock_config_tools [] = {
CLOCK_TIME_UTILITY,
FALLBACK_CONFIG_TOOL
-@@ -2848,6 +2850,20 @@ prefs_locations_changed (GtkTreeSelectio
- gtk_widget_set_sensitive (cd->prefs_location_remove_button, n > 0);
- }
-
-+static GList *
-+glist_deep_copy (GList *src)
-+{
-+ GList *dst;
-+ GList *l;
-+
-+ dst = g_list_copy (src);
-+ for (l = dst; l; l = l->next) {
-+ l->data = g_object_ref (l->data);
-+ }
-+
-+ return dst;
-+}
-+
- static gchar *
- loc_to_string (ClockLocation *loc)
- {
-@@ -2954,7 +2970,7 @@ run_prefs_edit_save (GtkButton *button,
-
- loc = clock_location_new (name, clock_zoneinfo_get_name (info), lat, lon, weather_code, &prefs);
-
-- locs = g_list_copy (cd->locations);
-+ locs = glist_deep_copy (cd->locations);
- locs = g_list_append (locs, loc);
- set_locations (cd, locs);
- }
-@@ -3520,7 +3536,7 @@ remove_tree_row (GtkTreeModel *model, Gt
- {
- ClockData *cd = data;
- ClockLocation *loc = NULL;
-- GList *list = g_list_copy (cd->locations);
-+ GList *list = glist_deep_copy (cd->locations);
-
- gtk_tree_model_get (model, iter, COL_CITY_LOC, &loc, -1);
-
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
index 45d98a92c..7de508a0e 100644
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ b/x11/gnome-panel/files/patch-po_ko.po
@@ -1,38 +1,29 @@
---- po/ko.po.orig Sun Jul 8 18:23:19 2007
-+++ po/ko.po Sun Jul 8 18:26:46 2007
-@@ -88,7 +88,7 @@
+--- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100
++++ po/ko.po 2008-02-26 18:16:31.000000000 +0100
+@@ -95,7 +95,7 @@ msgstr "%H:%M"
#. * possible.
- #: ../applets/clock/calendar-window.c:233
+ #: ../applets/clock/calendar-window.c:250
msgid "%b %d"
-msgstr "%b %e일"
+msgstr "%B %e일"
- #: ../applets/clock/calendar-window.c:741
- msgid "_Tasks"
-@@ -129,7 +129,7 @@
+ #: ../applets/clock/calendar-window.c:765
+ msgid "Tasks"
+@@ -146,7 +146,7 @@ msgstr "%H:%M:%S"
#.
- #: ../applets/clock/clock.c:367
+ #: ../applets/clock/clock.c:443
msgid "%a %b %e"
-msgstr "%b %e일 (%a)"
+msgstr "%B %e일 (%a)"
#. translators: reverse the order of these arguments
#. * if the time should come before the
-@@ -156,7 +156,7 @@
- #. Show date in tooltip
- #: ../applets/clock/clock.c:520
- msgid "%A %B %d"
--msgstr "%b %e일 %A"
-+msgstr "%B %e일 %A"
+@@ -207,7 +207,7 @@ msgstr "%p %I:%M"
- #: ../applets/clock/clock.c:534
- msgid "Click to hide your appointments and tasks"
-@@ -188,7 +188,7 @@
-
- #: ../applets/clock/clock.c:1073
+ #: ../applets/clock/clock.c:1590
msgid "%A, %B %d %Y"
-msgstr "%Y년 %b %e일 %A"
+msgstr "%Y년 %B %e일 %A"
- #: ../applets/clock/clock.c:1148
+ #: ../applets/clock/clock.c:1665
#, c-format