Merge branch 'I66VDG' into openEuler-20.03-LTS-SP3

This commit is contained in:
dongbohe 2022-12-21 15:42:44 +08:00
commit fe2e45ee46
4 changed files with 27 additions and 17 deletions

View File

@ -3,14 +3,14 @@
%global xmvn_bootstrap 0
Name: openjfx
Version: 11.0.3
Release: 5
Version: 11.0.18.0
Release: 1
Summary: Rich client application platform for Java
License: LGPL-2.0-only and ICU and Public Domain and LGPL-2.1-only and GPL-2.0-only and GPL-2.0-or-later
URL: http://openjdk.java.net/projects/openjfx/
Source0: hg.openjdk.java.net/openjfx/11/rt/archive/rt-11.0.3+1.tar.bz2
Source0: https://github.com/openjdk/jfx11u/archive/refs/tags/11.0.18+0.tar.gz
Source1: pom-base.xml
Source2: pom-controls.xml
Source3: pom-fxml.xml
@ -53,7 +53,7 @@ BuildRequires: ant
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-static
BuildRequires: mvn(antlr:antlr)
BuildRequires: mvn(org.antlr:antlr4-maven-plugin)
BuildRequires: mvn(org.apache.ant:ant)
BuildRequires: pkgconfig(gtk+-2.0)
@ -82,7 +82,7 @@ Summary: OpenJFX development tools and libraries
%global debug_package %{nil}
%prep
%setup -q -n rt-11.0.3+1
%setup -q -n rt-11.0.18+0
#Drop *src/test folders
rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/
@ -130,7 +130,6 @@ export JAVA_HOME=%{_jvmdir}/java-11-openjdk
export CFLAGS="${RPM_OPT_FLAGS}"
export CXXFLAGS="${RPM_OPT_FLAGS}"
# %%mvn_build --skip-javadoc
mvn install --settings ./settings.xml
%install
@ -146,18 +145,24 @@ cp -a modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
%license LICENSE
%license ADDITIONAL_LICENSE_INFO
%license ASSEMBLY_EXCEPTION
%doc README
%doc README.md
%files devel
%{openjfxdir}/
%license LICENSE
%license ADDITIONAL_LICENSE_INFO
%license ASSEMBLY_EXCEPTION
%doc README
%doc README.md
%changelog
* Wed Sep 22 2021 sunguoshuai <sunguoshuai@huawei.com> - 11.0.3-5
- change maven repository to huaweicloud
* Wed Dec 20 2022 Noah <hedongbo@huawei.com> - 11.0.18.0-1
- update to openjfx-11.0.18+0
* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 11.0.3-6
- change maven repository to huawei cloud
* Mon Jun 21 2021 Benshuai5D <zhangyunbo7@huawei.com> - 11.0.3-5
- add openjfx11.yaml
* Tue Mar 23 2021 Noah <hedongbo@huawei.com> - 11.0.3-4
- change maven repository to ali cloud

5
openjfx11.yaml Normal file
View File

@ -0,0 +1,5 @@
---
version_control: git
src_repo: https://github.com/openjdk/jfx11u
tag_prefix:
seperator: "."

View File

@ -9,13 +9,13 @@
<dependencies>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr</artifactId>
<version>3.5.2</version>
<artifactId>antlr4</artifactId>
<version>4.7.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
<version>3.5.2</version>
<artifactId>antlr4-runtime</artifactId>
<version>4.7.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@ -48,8 +48,8 @@
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.5.2</version>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.7.2</version>
<configuration>
<sourceDirectory>../src/main/antlr3</sourceDirectory>
<outputDirectory>../build/gensrc/antlr</outputDirectory>
@ -58,7 +58,7 @@
<execution>
<id>antlr</id>
<goals>
<goal>antlr</goal>
<goal>antlr4</goal>
</goals>
</execution>
</executions>