From bd76e577a9f12b3036b0e7923b223dcd8b8ab7ed Mon Sep 17 00:00:00 2001 From: Hugo Vasconcelos Saldanha Date: Tue, 24 Feb 2015 13:05:39 -0300 Subject: icedtea7-native: remove currency data generation expiration date Removes a currency date expiration check whis causes a build failure. Signed-off-by: Hugo Vasconcelos Saldanha Signed-off-by: Otavio Salvador --- ...njdk-remove-currency-data-generation-expi.patch | 25 ++++++++++++++++++++++ recipes-core/icedtea/openjdk-7-release-03b147.inc | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch (limited to 'recipes-core/icedtea') diff --git a/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch b/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch new file mode 100644 index 0000000..6dd36af --- /dev/null +++ b/recipes-core/icedtea/openjdk-7-03b147/icedtea-openjdk-remove-currency-data-generation-expi.patch @@ -0,0 +1,25 @@ +From 7df2fd1014a0c31f518be4f6a0018533f469d584 Mon Sep 17 00:00:00 2001 +From: Alex Gonzalez +Date: Wed, 31 Dec 2014 16:07:32 +0100 +Subject: [PATCH] icedtea: openjdk: remove currency data generation expiration + date + +Signed-off-by: Alex Gonzalez +--- + .../src/build/tools/generatecurrencydata/GenerateCurrencyData.java | 3 --- + 1 file changed, 3 deletions(-) + +diff --git openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +index bf335fa22c1d..0e421360fef9 100644 +--- openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java ++++ openjdk/jdk/make/tools/src/build/tools/generatecurrencydata/GenerateCurrencyData.java +@@ -281,9 +281,6 @@ public class GenerateCurrencyData { + checkCurrencyCode(newCurrency); + String timeString = currencyInfo.substring(4, length - 4); + long time = format.parse(timeString).getTime(); +- if (Math.abs(time - System.currentTimeMillis()) > ((long) 10) * 365 * 24 * 60 * 60 * 1000) { +- throw new RuntimeException("time is more than 10 years from present: " + time); +- } + specialCaseCutOverTimes[specialCaseCount] = time; + specialCaseOldCurrencies[specialCaseCount] = oldCurrency; + specialCaseOldCurrenciesDefaultFractionDigits[specialCaseCount] = getDefaultFractionDigits(oldCurrency); diff --git a/recipes-core/icedtea/openjdk-7-release-03b147.inc b/recipes-core/icedtea/openjdk-7-release-03b147.inc index 1f3533c..47813cd 100644 --- a/recipes-core/icedtea/openjdk-7-release-03b147.inc +++ b/recipes-core/icedtea/openjdk-7-release-03b147.inc @@ -80,6 +80,7 @@ OPENJDK_PATCHES = " \ file://icedtea-hotspot-make-arch-sane-for-x86.patch;apply=no \ file://icedtea-jdk-sane-x86-arch.patch;apply=no \ file://icedtea-flags.patch;apply=no \ + file://icedtea-openjdk-remove-currency-data-generation-expi.patch;apply=no \ " export DISTRIBUTION_PATCHES = " \ @@ -89,4 +90,5 @@ export DISTRIBUTION_PATCHES = " \ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-flags.patch \ + patches/icedtea-openjdk-remove-currency-data-generation-expi.patch \ " -- cgit v1.2.3-54-g00ecf