From 846408569d4f7affbc2afa98b8f50f6796c15292 Mon Sep 17 00:00:00 2001 From: marcus Date: Sun, 20 Jan 2008 18:40:21 +0000 Subject: Install our own copy of iso3166.tab to fix the clock applet crash. This copy is obtained from OpenBSD. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@10190 df743ca5-7f9a-e211-a948-0013205c9059 --- x11/gnome-panel/Makefile | 9 +- x11/gnome-panel/files/iso3166.tab | 268 +++++++++++++++++++++ .../files/patch-applets_clock_clock-zonetable.c | 14 ++ x11/gnome-panel/pkg-plist | 1 + 4 files changed, 290 insertions(+), 2 deletions(-) create mode 100644 x11/gnome-panel/files/iso3166.tab create mode 100644 x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c (limited to 'x11/gnome-panel') diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index d964302b5..818d230c3 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -3,12 +3,12 @@ # Whom: Joe Marcus Clarke # # $FreeBSD$ -# $MCom$ +# $MCom: ports/x11/gnome-panel/Makefile,v 1.163 2008/01/20 07:24:26 mezz Exp $ # PORTNAME= gnome-panel PORTVERSION= 2.21.5 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/gnome-panel/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} @@ -78,6 +78,11 @@ post-patch: .endfor .endif +post-install: + ${MKDIR} ${PREFIX}/share/gnome-panel + ${INSTALL_DATA} ${FILESDIR}/iso3166.tab \ + ${PREFIX}/share/gnome-panel/iso3166.tab + .include .endif diff --git a/x11/gnome-panel/files/iso3166.tab b/x11/gnome-panel/files/iso3166.tab new file mode 100644 index 000000000..22ff82083 --- /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: +# +# ISO 3166 Maintenance agency (ISO 3166/MA) +# . +# 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-zonetable.c b/x11/gnome-panel/files/patch-applets_clock_clock-zonetable.c new file mode 100644 index 000000000..72c28fbf6 --- /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->zonetab = 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/pkg-plist b/x11/gnome-panel/pkg-plist index b9c3a5205..18c13f024 100644 --- a/x11/gnome-panel/pkg-plist +++ b/x11/gnome-panel/pkg-plist @@ -41,6 +41,7 @@ share/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml %%DATADIR%%/glade/timezone.glade %%DATADIR%%/glade/window-list.glade %%DATADIR%%/glade/workspace-switcher.glade +%%DATADIR%%/iso3166.tab %%DATADIR%%/pixmaps/clock-calendar-icon.png %%DATADIR%%/pixmaps/clock-face-large.svg %%DATADIR%%/pixmaps/clock-face-small-day.svg -- cgit v1.2.3