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 a9d8bcb..e139bcf 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 57a199b..21d520d 100644 --- a/openjfx.spec +++ b/openjfx.spec @@ -3,14 +3,14 @@ %global xmvn_bootstrap 0 Name: openjfx -Version: 11.0.3 -Release: 6 +Version: 11.0.18.0 +Release: 1 Summary: Rich client application platform for Java License: GPL v2 with exceptions and BSD 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,16 +145,19 @@ 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 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 diff --git a/pom-graphics_antlr.xml b/pom-graphics_antlr.xml index 4210c6f..e88f1d5 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