From fac0586550414fab7f7c73e723bf6403bad0c304 Mon Sep 17 00:00:00 2001 From: CyberLeo Date: Sat, 7 Feb 2015 01:28:35 -0600 Subject: [PATCH] Revert "java/openjdk[67]: temporary patch for openjdk build error" This reverts commit 509ecd24a2b20015369fe58c99be71abe8653b9f. --- ..._classes_java_util_CurrencyData.properties | 217 ------------------ ..._classes_java_util_CurrencyData.properties | 127 ---------- 2 files changed, 344 deletions(-) delete mode 100644 cdn/ports/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties delete mode 100644 cdn/ports/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties diff --git a/cdn/ports/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties b/cdn/ports/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties deleted file mode 100644 index 07937bc..0000000 --- a/cdn/ports/java/openjdk6/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties +++ /dev/null @@ -1,217 +0,0 @@ ---- jdk/src/share/classes/java/util/CurrencyData.properties.orig 2014-10-08 15:35:09 UTC -+++ jdk/src/share/classes/java/util/CurrencyData.properties -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2000, 2007, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -26,10 +26,9 @@ - formatVersion=1 - - # Version of the currency code information in this class. --# It is a serial number that accompanies with each amendment, such as --# 'MAxxx.doc' -+# It is a serial number that accompanies with each amendment. - --dataVersion=139 -+dataVersion=156 - - # List of all valid ISO 4217 currency codes. - # To ensure compatibility, do not remove codes. -@@ -37,7 +36,7 @@ dataVersion=139 - all=ADP020-AED784-AFA004-AFN971-ALL008-AMD051-ANG532-AOA973-ARS032-ATS040-AUD036-\ - AWG533-AYM945-AZM031-AZN944-BAM977-BBD052-BDT050-BEF056-BGL100-BGN975-BHD048-BIF108-\ - BMD060-BND096-BOB068-BOV984-BRL986-BSD044-BTN064-BWP072-BYB112-BYR974-\ -- BZD084-CAD124-CDF976-CHF756-CLF990-CLP152-CNY156-COP170-CRC188-CSD891-CUP192-\ -+ BZD084-CAD124-CDF976-CHF756-CLF990-CLP152-CNY156-COP170-CRC188-CSD891-CUP192-CUC931-\ - CVE132-CYP196-CZK203-DEM276-DJF262-DKK208-DOP214-DZD012-EEK233-EGP818-\ - ERN232-ESP724-ETB230-EUR978-FIM246-FJD242-FKP238-FRF250-GBP826-GEL981-\ - GHC288-GHS936-GIP292-GMD270-GNF324-GRD300-GTQ320-GWP624-GYD328-HKD344-HNL340-\ -@@ -49,11 +48,12 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-A - NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ - PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ - SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ -- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TND788-TOP776-\ -+ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ - TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ - UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ - XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ -- XPT962-XTS963-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWN942 -+ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ -+ ZWN942-ZWR935 - - - # Mappings from ISO 3166 country codes to ISO 4217 currency codes. -@@ -71,7 +71,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-A - # - # The table is based on the following web sites: - # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html --# http://www.bsi-global.com/iso4217currency -+# http://www.currency-iso.org/iso_index/iso_tables.htm - # http://www.cia.gov/cia/publications/factbook/indexgeo.html - - # AFGHANISTAN -@@ -105,7 +105,7 @@ AU=AUD - # AUSTRIA - AT=EUR - # AZERBAIJAN --AZ=AZM;2005-12-31-20-00-00;AZN -+AZ=AZN - # BAHAMAS - BS=BSD - # BAHRAIN -@@ -124,6 +124,8 @@ BZ=BZD - BJ=XOF - # BERMUDA - BM=BMD -+# Bonaire, Sint Eustatius and Saba -+BQ=USD - # BHUTAN - BT=BTN - # BOLIVIA -@@ -186,8 +188,10 @@ CI=XOF - HR=HRK - # CUBA - CU=CUP -+# Cura\u00e7ao -+CW=ANG - # CYPRUS --CY=CYP -+CY=EUR - # CZECH REPUBLIC - CZ=CZK - # DENMARK -@@ -210,7 +214,7 @@ GQ=XAF - # ERITREA - ER=ERN - # ESTONIA --EE=EEK -+EE=EUR - # ETHIOPIA - ET=ETB - # FALKLAND ISLANDS (MALVINAS) -@@ -316,7 +320,7 @@ KG=KGS - # LAO PEOPLE'S DEMOCRATIC REPUBLIC - LA=LAK - # LATVIA --LV=LVL -+LV=LVL;2013-12-31-22-00-00;EUR - # LEBANON - LB=LBP - # LESOTHO -@@ -346,7 +350,7 @@ MV=MVR - # MALI - ML=XOF - # MALTA --MT=MTL -+MT=EUR - # MARSHALL ISLANDS - MH=USD - # MARTINIQUE -@@ -374,7 +378,7 @@ MS=XCD - # MOROCCO - MA=MAD - # MOZAMBIQUE --MZ=MZM;2006-06-30-22-00-00;MZN -+MZ=MZN - # MYANMAR - MM=MMK - # NAMIBIA -@@ -436,17 +440,21 @@ QA=QAR - # REUNION - RE=EUR - # ROMANIA --RO=ROL;2005-06-30-21-00-00;RON -+RO=RON - # RUSSIAN FEDERATION - RU=RUB - # RWANDA - RW=RWF -+# SAINT BARTHELEMY -+BL=EUR - # SAINT HELENA - SH=SHP - # SAINT KITTS AND NEVIS - KN=XCD - # SAINT LUCIA - LC=XCD -+# SAINT MARTIN -+MF=EUR - # SAINT PIERRE AND MIQUELON - PM=EUR - # SAINT VINCENT AND THE GRENADINES -@@ -455,6 +463,8 @@ VC=XCD - WS=WST - # SAN MARINO - SM=EUR -+# SOUTH SUDAN -+SS=SSP - # SAO TOME AND PRINCIPE - ST=STD - # SAUDI ARABIA -@@ -472,7 +482,7 @@ SL=SLL - # SINGAPORE - SG=SGD - # SLOVAKIA --SK=SKK -+SK=EUR - # SLOVENIA - SI=EUR - # SOLOMON ISLANDS -@@ -493,6 +503,8 @@ SD=SDG - SR=SRD - # SVALBARD AND JAN MAYEN - SJ=NOK -+# Sint Maarten (Dutch part) -+SX=ANG - # SWAZILAND - SZ=SZL - # SWEDEN -@@ -522,9 +534,9 @@ TT=TTD - # TUNISIA - TN=TND - # TURKEY --TR=TRL;2004-12-31-22-00-00;TRY -+TR=TRY - # TURKMENISTAN --TM=TMM -+TM=TMT - # TURKS AND CAICOS ISLANDS - TC=USD - # TUVALU -@@ -548,7 +560,7 @@ UZ=UZS - # VANUATU - VU=VUV - # VENEZUELA --VE=VEB;2008-01-01-04-00-00;VEF -+VE=VEF - # VIET NAM - VN=VND - # VIRGIN ISLANDS, BRITISH -@@ -562,9 +574,9 @@ EH=MAD - # YEMEN - YE=YER - # ZAMBIA --ZM=ZMK -+ZM=ZMW - # ZIMBABWE --ZW=ZWD -+ZW=ZWL - - - # List of currencies with 0, 1, OR 3 decimals for minor units, or where there -@@ -573,10 +585,10 @@ ZW=ZWD - minor0=\ - ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ - GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ -- TPE-TRL-VUV-XAF-XOF-XPF -+ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF - minor1= - minor3=\ - BHD-IQD-JOD-KWD-LYD-OMR-TND - minorUndefined=\ - XAG-XAU-XBA-XBB-XBC-XBD-XDR-XFO-XFU-XPD-\ -- XPT-XTS-XXX -+ XPT-XSU-XTS-XUA-XXX diff --git a/cdn/ports/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties b/cdn/ports/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties deleted file mode 100644 index 95cbc0b..0000000 --- a/cdn/ports/java/openjdk7/files/patch-jdk_src_share_classes_java_util_CurrencyData.properties +++ /dev/null @@ -1,127 +0,0 @@ ---- jdk/src/share/classes/java/util/CurrencyData.properties.orig 2013-09-06 18:28:15 UTC -+++ jdk/src/share/classes/java/util/CurrencyData.properties -@@ -1,5 +1,5 @@ - # --# Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved. -+# Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. - # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - # - # This code is free software; you can redistribute it and/or modify it -@@ -26,10 +26,9 @@ - formatVersion=1 - - # Version of the currency code information in this class. --# It is a serial number that accompanies with each amendment, such as --# 'MAxxx.doc' -+# It is a serial number that accompanies with each amendment. - --dataVersion=151 -+dataVersion=156 - - # List of all valid ISO 4217 currency codes. - # To ensure compatibility, do not remove codes. -@@ -49,11 +48,12 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-A - NIO558-NLG528-NOK578-NPR524-NZD554-OMR512-PAB590-PEN604-PGK598-PHP608-\ - PKR586-PLN985-PTE620-PYG600-QAR634-ROL946-RON946-RSD941-RUB643-RUR810-RWF646-SAR682-\ - SBD090-SCR690-SDD736-SDG938-SEK752-SGD702-SHP654-SIT705-SKK703-SLL694-SOS706-\ -- SRD968-SRG740-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ -+ SRD968-SRG740-SSP728-STD678-SVC222-SYP760-SZL748-THB764-TJS972-TMM795-TMT934-TND788-TOP776-\ - TPE626-TRL792-TRY949-TTD780-TWD901-TZS834-UAH980-UGX800-USD840-USN997-USS998-\ - UYU858-UZS860-VEB862-VEF937-VND704-VUV548-WST882-XAF950-XAG961-XAU959-XBA955-\ - XBB956-XBC957-XBD958-XCD951-XDR960-XFO000-XFU000-XOF952-XPD964-XPF953-\ -- XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZWD716-ZWL932-ZWN942-ZWR935 -+ XPT962-XSU994-XTS963-XUA965-XXX999-YER886-YUM891-ZAR710-ZMK894-ZMW967-ZWD716-ZWL932-\ -+ ZWN942-ZWR935 - - - # Mappings from ISO 3166 country codes to ISO 4217 currency codes. -@@ -71,7 +71,7 @@ all=ADP020-AED784-AFA004-AFN971-ALL008-A - # - # The table is based on the following web sites: - # http://www.din.de/gremien/nas/nabd/iso3166ma/codlstp1/db_en.html --# http://www.bsi-global.com/iso4217currency -+# http://www.currency-iso.org/iso_index/iso_tables.htm - # http://www.cia.gov/cia/publications/factbook/indexgeo.html - - # AFGHANISTAN -@@ -105,7 +105,7 @@ AU=AUD - # AUSTRIA - AT=EUR - # AZERBAIJAN --AZ=AZM;2005-12-31-20-00-00;AZN -+AZ=AZN - # BAHAMAS - BS=BSD - # BAHRAIN -@@ -320,7 +320,7 @@ KG=KGS - # LAO PEOPLE'S DEMOCRATIC REPUBLIC - LA=LAK - # LATVIA --LV=LVL -+LV=LVL;2013-12-31-22-00-00;EUR - # LEBANON - LB=LBP - # LESOTHO -@@ -378,7 +378,7 @@ MS=XCD - # MOROCCO - MA=MAD - # MOZAMBIQUE --MZ=MZM;2006-06-30-22-00-00;MZN -+MZ=MZN - # MYANMAR - MM=MMK - # NAMIBIA -@@ -440,7 +440,7 @@ QA=QAR - # REUNION - RE=EUR - # ROMANIA --RO=ROL;2005-06-30-21-00-00;RON -+RO=RON - # RUSSIAN FEDERATION - RU=RUB - # RWANDA -@@ -463,6 +463,8 @@ VC=XCD - WS=WST - # SAN MARINO - SM=EUR -+# SOUTH SUDAN -+SS=SSP - # SAO TOME AND PRINCIPE - ST=STD - # SAUDI ARABIA -@@ -532,7 +534,7 @@ TT=TTD - # TUNISIA - TN=TND - # TURKEY --TR=TRL;2004-12-31-22-00-00;TRY -+TR=TRY - # TURKMENISTAN - TM=TMT - # TURKS AND CAICOS ISLANDS -@@ -558,7 +560,7 @@ UZ=UZS - # VANUATU - VU=VUV - # VENEZUELA --VE=VEB;2008-01-01-04-00-00;VEF -+VE=VEF - # VIET NAM - VN=VND - # VIRGIN ISLANDS, BRITISH -@@ -572,7 +574,7 @@ EH=MAD - # YEMEN - YE=YER - # ZAMBIA --ZM=ZMK -+ZM=ZMW - # ZIMBABWE - ZW=ZWL - -@@ -583,7 +585,7 @@ ZW=ZWL - minor0=\ - ADP-BEF-BIF-BYB-BYR-CLF-CLP-DJF-ESP-GNF-\ - GRD-ISK-ITL-JPY-KMF-KRW-LUF-MGF-PYG-PTE-RWF-\ -- TPE-TRL-VUV-XAF-XOF-XPF -+ TPE-TRL-UGX-VND-VUV-XAF-XOF-XPF - minor1= - minor3=\ - BHD-IQD-JOD-KWD-LYD-OMR-TND -- 2.42.0