diff --git a/rt-11.0.3+1.tar.bz2 b/11.0.18+0.tar.gz similarity index 76% rename from rt-11.0.3+1.tar.bz2 rename to 11.0.18+0.tar.gz index a9d8bcbdb1e1abd33ba6134a564b23fa9aef73e8..e139bcf4eb702261fef1ad33f6568e58d0a4afa4 100644 Binary files a/rt-11.0.3+1.tar.bz2 and b/11.0.18+0.tar.gz differ diff --git a/openjfx.spec b/openjfx.spec index 56a4027c5f7a017518d2af8be25fb7544ed16483..b31b9e77bf6e21b69ab20e9206f30bb83394789d 100644 --- a/openjfx.spec +++ b/openjfx.spec @@ -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 - 11.0.3-5 -- change maven repository to huaweicloud +* Wed Dec 20 2022 Noah - 11.0.18.0-1 +- update to openjfx-11.0.18+0 + +* Wed Jul 21 2021 Noah - 11.0.3-6 +- change maven repository to huawei cloud + +* Mon Jun 21 2021 Benshuai5D - 11.0.3-5 +- add openjfx11.yaml * Tue Mar 23 2021 Noah - 11.0.3-4 - change maven repository to ali cloud diff --git a/openjfx11.yaml b/openjfx11.yaml new file mode 100644 index 0000000000000000000000000000000000000000..cda265a1f0de2ca8ede994a61c1c63c0e71fa5fc --- /dev/null +++ b/openjfx11.yaml @@ -0,0 +1,5 @@ +--- +version_control: git +src_repo: https://github.com/openjdk/jfx11u +tag_prefix: +seperator: "." diff --git a/pom-graphics_antlr.xml b/pom-graphics_antlr.xml index 4210c6f15d8d947c6c846fca9c4c0933c964862b..e88f1d519650b6a6d0d1d618d6c690e51854b51b 100644 --- a/pom-graphics_antlr.xml +++ b/pom-graphics_antlr.xml @@ -9,13 +9,13 @@ org.antlr - antlr - 3.5.2 + antlr4 + 4.7.2 org.antlr - antlr-runtime - 3.5.2 + antlr4-runtime + 4.7.2 org.antlr @@ -48,8 +48,8 @@ org.antlr - antlr3-maven-plugin - 3.5.2 + antlr4-maven-plugin + 4.7.2 ../src/main/antlr3 ../build/gensrc/antlr @@ -58,7 +58,7 @@ antlr - antlr + antlr4