summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch')
-rw-r--r--dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch95
1 files changed, 95 insertions, 0 deletions
diff --git a/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
new file mode 100644
index 000000000000..dd47da77ad68
--- /dev/null
+++ b/dev-java/icu4j/files/icu4j-52.1-fix-test-DataDrivenFormat-ConsistentPivot-2.patch
@@ -0,0 +1,95 @@
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java
+===================================================================
+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34867)
++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/text/SimpleDateFormat.java (revision 34868)
+@@ -2820,5 +2820,5 @@
+ if ( override != null && (override.compareTo("hebr") == 0 || override.indexOf("y=hebr") >= 0) && value < 1000 ) {
+ value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;
+- } else if (count == 2 && (pos.getIndex() - start) == 2 && !isChineseCalendar && !cal.getType().equals("japanese")
++ } else if (count == 2 && (pos.getIndex() - start) == 2 && cal.haveDefaultCentury()
+ && UCharacter.isDigit(text.charAt(start))
+ && UCharacter.isDigit(text.charAt(start+1)))
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
+===================================================================
+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java (revision 34867)
++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java (revision 34868)
+@@ -1,5 +1,5 @@
+ /*
+ *******************************************************************************
+- * Copyright (C) 1996-2010,2012, International Business Machines Corporation and *
++ * Copyright (C) 1996-2014, International Business Machines Corporation and *
+ * others. All Rights Reserved. *
+ *******************************************************************************
+@@ -639,4 +639,13 @@
+ /**
+ * {@inheritDoc}
++ * @internal
++ * @deprecated This API is ICU internal only.
++ */
++ public boolean haveDefaultCentury() {
++ return false;
++ }
++
++ /**
++ * {@inheritDoc}
+ * @stable ICU 4.0
+ */
+@@ -662,3 +671,4 @@
+ return super.getActualMaximum(field);
+ }
++
+ }
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java
+===================================================================
+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java (revision 34867)
++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/Calendar.java (revision 34868)
+@@ -1,4 +1,4 @@
+ /*
+-* Copyright (C) 1996-2013, International Business Machines
++* Copyright (C) 1996-2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ */
+@@ -6081,4 +6081,19 @@
+ }
+
++ /**
++ * Returns if two digit representation of year in this calendar type
++ * customarily implies a default century (i.e. 03 -> 2003).
++ * The default implementation returns <code>true</code>. A subclass may
++ * return <code>false</code> if such practice is not applicable (for example,
++ * Chinese calendar and Japanese calendar).
++ *
++ * @return <code>true<code> if this calendar has a default century.
++ * @internal
++ * @deprecated This API is ICU internal only.
++ */
++ public boolean haveDefaultCentury() {
++ return true;
++ }
++
+ // -------- BEGIN ULocale boilerplate --------
+
+Index: /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
+===================================================================
+--- /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java (revision 34867)
++++ /icu4j/trunk/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java (revision 34868)
+@@ -1,4 +1,4 @@
+ /*********************************************************************
+- * Copyright (C) 2000-2012, International Business Machines
++ * Copyright (C) 2000-2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ *********************************************************************
+@@ -1019,4 +1019,13 @@
+
+ /**
++ * {@inheritDoc}
++ * @internal
++ * @deprecated This API is ICU internal only.
++ */
++ public boolean haveDefaultCentury() {
++ return false;
++ }
++
++ /**
+ * Override readObject.
+ */