diff --git a/.gitignore b/.gitignore index f20af65..2d052e3 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /8u202-b02.tar.bz2 /8u202-b07.tar.bz2 /rt-11.0.3+1.tar.bz2 +/rt-11.0.9+2.tar.bz2 diff --git a/build.xml b/build.xml index 13ab3e5..3141919 100755 --- a/build.xml +++ b/build.xml @@ -5,10 +5,8 @@ - - - + @@ -52,12 +50,6 @@ - - - - - - diff --git a/openjfx.spec b/openjfx.spec index 8a2a286..36d2006 100644 --- a/openjfx.spec +++ b/openjfx.spec @@ -1,15 +1,15 @@ %global openjfxdir %{_jvmdir}/%{name} -%global rtdir rt-11.0.3+1 +%global rtdir rt-11.0.9+2 Name: openjfx -Version: 11.0.3 -Release: 2%{?dist} +Version: 11.0.9.2 +Release: 1%{?dist} 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: hg.openjdk.java.net/openjfx/11-dev/rt/archive/rt-11.0.9+2.tar.bz2 Source1: pom-base.xml Source2: pom-controls.xml Source3: pom-fxml.xml @@ -52,8 +52,8 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: libstdc++-static BuildRequires: mvn(org.eclipse.swt:swt) -BuildRequires: mvn(antlr:antlr) BuildRequires: mvn(org.antlr:antlr) +BuildRequires: mvn(org.antlr:antlr4-maven-plugin) BuildRequires: mvn(org.antlr:stringtemplate) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.codehaus.mojo:native-maven-plugin) @@ -71,8 +71,9 @@ BuildRequires: pkgconfig(gl) BuildRequires: cmake BuildRequires: gperf BuildRequires: perl -BuildRequires: python27 +BuildRequires: python3 BuildRequires: ruby-devel +BuildRequires: rubygem-json %description JavaFX/OpenJFX is a set of graphics and media APIs that enables Java @@ -141,7 +142,7 @@ export CXXFLAGS="${RPM_OPT_FLAGS}" %mvn_build --skip-javadoc -%{cmake} -DPORT="Java" --icu-unicode --64-bit --cmakeargs= -DENABLE_TOOLS=1 -DCMAKE_C_COMPILER='gcc' -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_C_FLAGS='-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS' -DCMAKE_CXX_FLAGS='-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS' -DCMAKE_SHARED_LINKER_FLAGS='-static-libgcc -static-libstdc++ -shared -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS -z relro -Wl,--gc-sections' -DCMAKE_EXE_LINKER_FLAGS='-static-libgcc -static-libstdc++ -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS -z relro -Wl,--gc-sections' -DJAVAFX_RELEASE_VERSION=11 ./modules/javafx.web/src/main/native +%{cmake} -DPORT="Java" --icu-unicode --64-bit --cmakeargs= -DENABLE_TOOLS=1 -DCMAKE_C_COMPILER='gcc' -DCMAKE_SYSTEM_NAME=Linux -DCMAKE_SYSTEM_PROCESSOR=x86_64 -DCMAKE_C_FLAGS='-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS' -DCMAKE_CXX_FLAGS='-fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS' -DCMAKE_SHARED_LINKER_FLAGS='-static-libgcc -static-libstdc++ -shared -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS -z relro -Wl,--gc-sections' -DCMAKE_EXE_LINKER_FLAGS='-static-libgcc -static-libstdc++ -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=implicit-function-declaration -DGLIB_DISABLE_DEPRECATION_WARNINGS -z relro -Wl,--gc-sections' -DJAVAFX_RELEASE_VERSION=11 ./modules/javafx.web/src/main/native %{cmake_build} strip -g %{_builddir}/%{rtdir}/%_target_platform/lib/libjfxwebkit.so @@ -169,6 +170,9 @@ cp -a %_target_platform/lib/libjfxwebkit.so %{buildroot}%{openjfxdir} %doc README %changelog +* Tue Oct 20 2020 Nicolas De Amicis - 11.0.9.2-1 +- Update to openjfx-11.0.9+2 + * Tue Oct 06 2020 Nicolas De Amicis - 11.0.3-2 - Adding web module diff --git a/pom-graphics_antlr.xml b/pom-graphics_antlr.xml index ddf5da6..920f152 100644 --- a/pom-graphics_antlr.xml +++ b/pom-graphics_antlr.xml @@ -9,11 +9,11 @@ org.antlr - antlr + antlr4 org.antlr - antlr-runtime + antlr4-runtime org.antlr @@ -44,7 +44,7 @@ org.antlr - antlr3-maven-plugin + antlr4-maven-plugin ../src/main/antlr3 ../build/gensrc/antlr @@ -53,7 +53,7 @@ antlr - antlr + antlr4 diff --git a/pom-graphics_libjavafx_iio.xml b/pom-graphics_libjavafx_iio.xml index 620fbc1..4276f5f 100644 --- a/pom-graphics_libjavafx_iio.xml +++ b/pom-graphics_libjavafx_iio.xml @@ -7,7 +7,7 @@ org.openjfx @RELEASE_VERSION@ - -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -c -ffunction-sections -fdata-sections -O2 -DNDEBUG + -fno-strict-aliasing -fPIC -fno-omit-frame-pointer -fstack-protector -Wextra -Wall -Wformat-security -Wno-unused -Wno-parentheses -Werror=trampolines -c -ffunction-sections -fdata-sections -O2 -DNDEBUG -Werror=implicit-function-declaration ../src/main/native-iio @@ -29,6 +29,9 @@ + ${native.source.dir}/libjpeg + + ${JAVA_HOME}/include diff --git a/sources b/sources index 1b65719..c588339 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rt-11.0.3+1.tar.bz2) = 8f8e07d7588b1a5fbcdfcc2837ae0389fefea3a1d91f89fdd4aab03e0bc6f5b9a1e66a824ae9388b777b36e76beb19cb6c69c963c7d904d36cad40f36c5ef0c7 +SHA512 (rt-11.0.9+2.tar.bz2) = 6c0b0a7c8b4b99d9437cc6600774749854ec1cc46acb4d161e442a6e101d4d8cbb19fe158b7c562f40aacfc0b280a69a6c617b660af1c723053694b41dbc0cdf