forked from pool/icu4j
Fix build with OpenJDK 25
This commit is contained in:
@@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 23 09:40:37 UTC 2025 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Added patch:
|
||||
* icu4j-detectjava25.patch
|
||||
+ detect java version up to 25 when running ant
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 21 09:16:19 UTC 2024 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ Patch1: improve-osgi-manifest.patch
|
||||
Patch2: icu4j-70.1-java8compat.patch
|
||||
Patch3: icu4j-javadoc.patch
|
||||
Patch4: icu4j-detectjava21.patch
|
||||
Patch5: icu4j-detectjava25.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel
|
||||
@@ -87,6 +88,7 @@ API documentation for %{name}.
|
||||
%patch -P 2 -p1
|
||||
%patch -P 3 -p1
|
||||
%patch -P 4 -p1
|
||||
%patch -P 5 -p1
|
||||
|
||||
sed -i 's/\r//' APIChangeReport.html
|
||||
sed -i 's/\r//' readme.html
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
--- icu4j-73.1/build.xml 2025-10-23 11:29:16.556122245 +0200
|
||||
+++ icu4j-73.1/build.xml 2025-10-23 11:34:28.175211409 +0200
|
||||
@@ -142,6 +142,22 @@
|
||||
<matches string="${java.version}" pattern="^21((-.|\.\d).*)?"/>
|
||||
</condition>
|
||||
|
||||
+ <condition property="is.java22">
|
||||
+ <matches string="${java.version}" pattern="^22((-.|\.\d).*)?"/>
|
||||
+ </condition>
|
||||
+
|
||||
+ <condition property="is.java23">
|
||||
+ <matches string="${java.version}" pattern="^23((-.|\.\d).*)?"/>
|
||||
+ </condition>
|
||||
+
|
||||
+ <condition property="is.java24">
|
||||
+ <matches string="${java.version}" pattern="^24((-.|\.\d).*)?"/>
|
||||
+ </condition>
|
||||
+
|
||||
+ <condition property="is.java25">
|
||||
+ <matches string="${java.version}" pattern="^25((-.|\.\d).*)?"/>
|
||||
+ </condition>
|
||||
+
|
||||
<condition property="is.java9.plus">
|
||||
<or>
|
||||
<isset property="is.java9"/>
|
||||
@@ -157,6 +173,10 @@
|
||||
<isset property="is.java19"/>
|
||||
<isset property="is.java20"/>
|
||||
<isset property="is.java21"/>
|
||||
+ <isset property="is.java22"/>
|
||||
+ <isset property="is.java23"/>
|
||||
+ <isset property="is.java24"/>
|
||||
+ <isset property="is.java25"/>
|
||||
</or>
|
||||
</condition>
|
||||
|
||||
Reference in New Issue
Block a user