diff options
Diffstat (limited to 'x11/gnome-panel/files')
| -rw-r--r-- | x11/gnome-panel/files/iso3166.tab | 268 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock-location.c | 59 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c | 14 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_clock.c | 11 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-applets_clock_gweather-xml.c | 11 | ||||
| -rw-r--r-- | x11/gnome-panel/files/patch-po_ko.po | 31 |
6 files changed, 374 insertions, 20 deletions
diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab new file mode 100644 index 000000000000..22ff82083588 --- /dev/null +++ b/x11/gnome-panel/files/iso3166.tab @@ -0,0 +1,268 @@ +# $OpenBSD: iso3166.tab,v 1.17 2007/02/02 20:26:51 millert Exp $ +# ISO 3166 alpha-2 country codes +# +# @(#)iso3166.tab 8.4 +# +# From Paul Eggert (2006-09-27): +# +# This file contains a table with the following columns: +# 1. ISO 3166-1 alpha-2 country code, current as of +# ISO 3166-1 Newsletter No. V-12 (2006-09-26). See: +# <a href="http://www.iso.org/iso/en/prods-services/iso3166ma/index.html"> +# ISO 3166 Maintenance agency (ISO 3166/MA) +# </a>. +# 2. The usual English name for the country, +# chosen so that alphabetic sorting of subsets produces helpful lists. +# This is not the same as the English name in the ISO 3166 tables. +# +# Columns are separated by a single tab. +# The table is sorted by country code. +# +# Lines beginning with `#' are comments. +# +#country- +#code country name +AD Andorra +AE United Arab Emirates +AF Afghanistan +AG Antigua & Barbuda +AI Anguilla +AL Albania +AM Armenia +AN Netherlands Antilles +AO Angola +AQ Antarctica +AR Argentina +AS Samoa (American) +AT Austria +AU Australia +AW Aruba +AX Aaland Islands +AZ Azerbaijan +BA Bosnia & Herzegovina +BB Barbados +BD Bangladesh +BE Belgium +BF Burkina Faso +BG Bulgaria +BH Bahrain +BI Burundi +BJ Benin +BM Bermuda +BN Brunei +BO Bolivia +BR Brazil +BS Bahamas +BT Bhutan +BV Bouvet Island +BW Botswana +BY Belarus +BZ Belize +CA Canada +CC Cocos (Keeling) Islands +CD Congo (Dem. Rep.) +CF Central African Rep. +CG Congo (Rep.) +CH Switzerland +CI Cote d'Ivoire +CK Cook Islands +CL Chile +CM Cameroon +CN China +CO Colombia +CR Costa Rica +CU Cuba +CV Cape Verde +CX Christmas Island +CY Cyprus +CZ Czech Republic +DE Germany +DJ Djibouti +DK Denmark +DM Dominica +DO Dominican Republic +DZ Algeria +EC Ecuador +EE Estonia +EG Egypt +EH Western Sahara +ER Eritrea +ES Spain +ET Ethiopia +FI Finland +FJ Fiji +FK Falkland Islands +FM Micronesia +FO Faroe Islands +FR France +GA Gabon +GB Britain (UK) +GD Grenada +GE Georgia +GF French Guiana +GG Guernsey +GH Ghana +GI Gibraltar +GL Greenland +GM Gambia +GN Guinea +GP Guadeloupe +GQ Equatorial Guinea +GR Greece +GS South Georgia & the South Sandwich Islands +GT Guatemala +GU Guam +GW Guinea-Bissau +GY Guyana +HK Hong Kong +HM Heard Island & McDonald Islands +HN Honduras +HR Croatia +HT Haiti +HU Hungary +ID Indonesia +IE Ireland +IL Israel +IM Isle of Man +IN India +IO British Indian Ocean Territory +IQ Iraq +IR Iran +IS Iceland +IT Italy +JE Jersey +JM Jamaica +JO Jordan +JP Japan +KE Kenya +KG Kyrgyzstan +KH Cambodia +KI Kiribati +KM Comoros +KN St Kitts & Nevis +KP Korea (North) +KR Korea (South) +KW Kuwait +KY Cayman Islands +KZ Kazakhstan +LA Laos +LB Lebanon +LC St Lucia +LI Liechtenstein +LK Sri Lanka +LR Liberia +LS Lesotho +LT Lithuania +LU Luxembourg +LV Latvia +LY Libya +MA Morocco +MC Monaco +MD Moldova +ME Montenegro +MG Madagascar +MH Marshall Islands +MK Macedonia +ML Mali +MM Myanmar (Burma) +MN Mongolia +MO Macau +MP Northern Mariana Islands +MQ Martinique +MR Mauritania +MS Montserrat +MT Malta +MU Mauritius +MV Maldives +MW Malawi +MX Mexico +MY Malaysia +MZ Mozambique +NA Namibia +NC New Caledonia +NE Niger +NF Norfolk Island +NG Nigeria +NI Nicaragua +NL Netherlands +NO Norway +NP Nepal +NR Nauru +NU Niue +NZ New Zealand +OM Oman +PA Panama +PE Peru +PF French Polynesia +PG Papua New Guinea +PH Philippines +PK Pakistan +PL Poland +PM St Pierre & Miquelon +PN Pitcairn +PR Puerto Rico +PS Palestine +PT Portugal +PW Palau +PY Paraguay +QA Qatar +RE Reunion +RO Romania +RS Serbia +RU Russia +RW Rwanda +SA Saudi Arabia +SB Solomon Islands +SC Seychelles +SD Sudan +SE Sweden +SG Singapore +SH St Helena +SI Slovenia +SJ Svalbard & Jan Mayen +SK Slovakia +SL Sierra Leone +SM San Marino +SN Senegal +SO Somalia +SR Suriname +ST Sao Tome & Principe +SV El Salvador +SY Syria +SZ Swaziland +TC Turks & Caicos Is +TD Chad +TF French Southern & Antarctic Lands +TG Togo +TH Thailand +TJ Tajikistan +TK Tokelau +TL East Timor +TM Turkmenistan +TN Tunisia +TO Tonga +TR Turkey +TT Trinidad & Tobago +TV Tuvalu +TW Taiwan +TZ Tanzania +UA Ukraine +UG Uganda +UM US minor outlying islands +US United States +UY Uruguay +UZ Uzbekistan +VA Vatican City +VC St Vincent +VE Venezuela +VG Virgin Islands (UK) +VI Virgin Islands (US) +VN Vietnam +VU Vanuatu +WF Wallis & Futuna +WS Samoa (western) +YE Yemen +YT Mayotte +ZA South Africa +ZM Zambia +ZW Zimbabwe diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c new file mode 100644 index 000000000000..1bb485f32586 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock-location.c @@ -0,0 +1,59 @@ +--- applets/clock/clock-location.c.orig 2008-03-22 21:14:45.000000000 -0400 ++++ applets/clock/clock-location.c 2008-03-23 02:11:34.000000000 -0400 +@@ -28,6 +28,8 @@ + #include "set-timezone.h" + #include "gweather-xml.h" + ++#define daylight 1 ++ + 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)) + +@@ -271,7 +274,6 @@ parse_etc_sysconfig_clock (void) + } + } + } +- + out: + if (lines) + g_strfreev (lines); +@@ -298,7 +300,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); +@@ -632,10 +638,17 @@ gboolean + clock_location_is_current (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; ++ } ++ ++ g_object_unref (zones); + + return clock_location_get_offset (loc) == 0; + } diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c new file mode 100644 index 000000000000..0df281fd941d --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c @@ -0,0 +1,14 @@ +--- 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); + + 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); + + #ifdef CLOCK_TEXTDOMAIN + /* this is used when clock is embedded in the gnome-panel diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c new file mode 100644 index 000000000000..5acc58b408c6 --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_clock.c @@ -0,0 +1,11 @@ +--- 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" + ++#define daylight 1 ++ + static const char *clock_config_tools [] = { + CLOCK_TIME_UTILITY, + FALLBACK_CONFIG_TOOL diff --git a/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c new file mode 100644 index 000000000000..7ae87fdd360f --- /dev/null +++ b/x11/gnome-panel/files/patch-applets_clock_gweather-xml.c @@ -0,0 +1,11 @@ +--- applets/clock/gweather-xml.c.orig 2008-01-23 00:51:33.000000000 -0500 ++++ applets/clock/gweather-xml.c 2008-01-23 00:52:35.000000000 -0500 +@@ -359,7 +359,7 @@ gweather_xml_load_locations( GtkTreeView + #ifdef GWEATHER_XML_LOCATION + xml = xmlNewTextReaderFilename (GWEATHER_XML_LOCATION "Locations.xml"); + #else +- xml = xmlNewTextReaderFilename ("/usr/share/gnome-applets/gweather/Locations.xml"); ++ xml = xmlNewTextReaderFilename ("/usr/local/share/libgweather/Locations.xml"); + #endif + if( xml == NULL ) + goto error_out; diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po index 45d98a92c0be..7de508a0eba4 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 |