The package rpms/openjfx.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/openjfx.git/commit/?id=b239517941...
https://src.fedoraproject.org/cgit/rpms/openjfx.git/commit/?id=b137261a9f...
https://src.fedoraproject.org/cgit/rpms/openjfx.git/commit/?id=b246588fec....
Change:
+ExclusiveArch: %{java_arches}
+ExclusiveArch: x86_64
+ExclusiveArch: %{java_arches}
Thanks.
Full change:
============
commit b239517941222ef5704814655add1dded6cf9985
Author: Nicolas De Amicis <deamicis(a)bluewin.ch>
Date: Sat Jul 30 17:56:00 2022 +0200
Build for all java arches
diff --git a/openjfx.spec b/openjfx.spec
index 5dad4f8..a077d12 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -4,7 +4,7 @@
Name: openjfx
Epoch: 3
Version: 17.0.0.1
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Rich client application platform for Java
License: GPL v2 with exceptions and BSD
@@ -41,7 +41,7 @@ Source27: pom-swt.xml
Source28: pom-web.xml
Source29: build.xml
-ExclusiveArch: x86_64
+ExclusiveArch: %{java_arches}
Requires: java-11-openjdk
@@ -162,6 +162,9 @@ cp -a
modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
%doc README.md
%changelog
+* Sat Jul 30 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:17.0.0.1-4
+- Build for all java arches
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
3:17.0.0.1-3
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
commit 58b68b7cd449ea41f06370fd25177480feafd572
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 22 02:07:48 2022 +0000
Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/openjfx.spec b/openjfx.spec
index 5ece7e3..5dad4f8 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -4,7 +4,7 @@
Name: openjfx
Epoch: 3
Version: 17.0.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Rich client application platform for Java
License: GPL v2 with exceptions and BSD
@@ -162,6 +162,9 @@ cp -a
modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
%doc README.md
%changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
3:17.0.0.1-3
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Mon Jul 18 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:17.0.0.1-2
- Rebuilt for use new macro java_arches and drop devel package
commit b137261a9fe8fe1c3dbda18771e8274a32e3b0da
Author: Nicolas De Amicis <deamicis(a)bluewin.ch>
Date: Mon Jul 18 18:45:18 2022 +0200
New macro java_arches not needed
diff --git a/openjfx.spec b/openjfx.spec
index 1ec808d..5ece7e3 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -41,8 +41,7 @@ Source27: pom-swt.xml
Source28: pom-web.xml
Source29: build.xml
-BuildArch: x86_64
-ExclusiveArch: %{java_arches}
+ExclusiveArch: x86_64
Requires: java-11-openjdk
commit b246588fec6a40d8b5b7dfa23dd562553fe0ecb4
Author: Nicolas De Amicis <deamicis(a)bluewin.ch>
Date: Mon Jul 18 18:31:15 2022 +0200
Rebuilt for use new macro java_arches and drop devel package
diff --git a/openjfx.spec b/openjfx.spec
index 4be55cd..1ec808d 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -4,7 +4,7 @@
Name: openjfx
Epoch: 3
Version: 17.0.0.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Rich client application platform for Java
License: GPL v2 with exceptions and BSD
@@ -41,7 +41,8 @@ Source27: pom-swt.xml
Source28: pom-web.xml
Source29: build.xml
-ExclusiveArch: x86_64
+BuildArch: x86_64
+ExclusiveArch: %{java_arches}
Requires: java-11-openjdk
@@ -83,14 +84,6 @@ applications that operate consistently across diverse platforms.
The media module have been removed due to missing dependencies.
-%package devel
-Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: java-devel
-Summary: OpenJFX development tools and libraries
-
-%description devel
-%{summary}.
-
%global debug_package %{nil}
%prep
@@ -169,14 +162,10 @@ cp -a
modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
%license ASSEMBLY_EXCEPTION
%doc README.md
-%files devel
-%{openjfxdir}/
-%license LICENSE
-%license ADDITIONAL_LICENSE_INFO
-%license ASSEMBLY_EXCEPTION
-%doc README.md
-
%changelog
+* Mon Jul 18 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:17.0.0.1-2
+- Rebuilt for use new macro java_arches and drop devel package
+
* Thu Jun 02 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:17.0.0.1-1
- Update to openjfx 17. libjfxwebkit build is disabled
commit db9712bee32dd6d4478db6e3b1c96dada0ce280b
Author: Nicolas De Amicis <deamicis(a)bluewin.ch>
Date: Thu Jun 2 15:45:27 2022 +0200
Update to openjfx 17. libjfxwebkit build is disabled
diff --git a/.gitignore b/.gitignore
index 2d052e3..c1b7839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/8u202-b07.tar.bz2
/rt-11.0.3+1.tar.bz2
/rt-11.0.9+2.tar.bz2
+/jfx-17.0.0.1-1.zip
diff --git a/openjfx.spec b/openjfx.spec
index 79c041e..4be55cd 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -1,18 +1,16 @@
%global openjfxdir %{_jvmdir}/%{name}
-%global rtdir rt-11.0.9+2
-# Instead _target_platform that point on x86_64-redhat-linux-gnu but doesn't work on
rawhide/f35
-%global target_platform redhat-linux-build
+%global rtdir jfx-17.0.0.1-1
Name: openjfx
Epoch: 3
-Version: 11.0.9.2
-Release: 10%{?dist}
+Version: 17.0.0.1
+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-dev/rt/archive/rt-11.0.9+2.tar.bz2
+Source0:
hg.openjdk.java.net/openjfx/11-dev/rt/archive/jfx-17.0.0.1-1.zip
Source1: pom-base.xml
Source2: pom-controls.xml
Source3: pom-fxml.xml
@@ -42,8 +40,6 @@ Source26: pom-swing.xml
Source27: pom-swt.xml
Source28: pom-web.xml
Source29: build.xml
-# g++12 fix with more header inclusion
-Patch1: rt-11.0.9+2-gcc12-include.patch
ExclusiveArch: x86_64
@@ -99,7 +95,6 @@ Summary: OpenJFX development tools and libraries
%prep
%setup -q -n %{rtdir}
-%patch1 -p1 -b .g++12
#Drop *src/test folders
rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/
@@ -118,26 +113,30 @@ mv pom-openjfx.xml pom.xml
for MODULE in base controls fxml graphics media swing swt web
do
- mv pom-$MODULE.xml ./modules/javafx.$MODULE/pom.xml
+ mv pom-$MODULE.xml ./modules/javafx.$MODULE/pom.xml
done
mkdir
./modules/javafx.graphics/mvn-{antlr,decora,compileJava,graphics,libdecora,libglass,libglassgtk2,libglassgtk3,libjavafx_font,libjavafx_font_freetype,libjavafx_font_pango,libjavafx_iio,libprism_common,libprism_es2,libprism_sw,prism}
for GRAPHMOD in antlr decora compileJava graphics libdecora libglass libglassgtk2
libglassgtk3 libjavafx_font libjavafx_font_freetype libjavafx_font_pango libjavafx_iio
libprism_common libprism_es2 libprism_sw prism
do
- mv pom-graphics_$GRAPHMOD.xml ./modules/javafx.graphics/mvn-$GRAPHMOD/pom.xml
+ mv pom-graphics_$GRAPHMOD.xml ./modules/javafx.graphics/mvn-$GRAPHMOD/pom.xml
done
mkdir ./modules/javafx.graphics/mvn-compileJava/mvn-{decora,java,prism}
for SUBMOD in decora java prism
do
- mv pom-graphics_compileJava-$SUBMOD.xml
./modules/javafx.graphics/mvn-compileJava/mvn-$SUBMOD/pom.xml
+ mv pom-graphics_compileJava-$SUBMOD.xml
./modules/javafx.graphics/mvn-compileJava/mvn-$SUBMOD/pom.xml
done
#set VersionInfo
cp -a %{_sourcedir}/build.xml .
ant -f build.xml
-cp -a ./modules/javafx.swing/src/main/module-info/module-info.java
./modules/javafx.swing/src/main/java
+mkdir -p ./modules/javafx.graphics/mvn-antlr/src/main
+mv ./modules/javafx.graphics/src/main/antlr3
./modules/javafx.graphics/mvn-antlr/src/main/antlr4
+
+rm -rf ./modules/javafx.web/src/main/native/Source/WTF/icu
+rm -rf ./modules/javafx.web/src/main/native/Source/ThirdParty/icu
%build
@@ -148,9 +147,11 @@ export CXXFLAGS="${RPM_OPT_FLAGS}"
%mvn_build --skip-javadoc
-%{cmake} -DPORT="Java" -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 -S
./modules/javafx.web/src/main/native .
-%{cmake_build}
-strip -g %{_builddir}/%{rtdir}/%target_platform/lib/libjfxwebkit.so
+# Disable libjfxwebkit build. It fails since F36
+#{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=17
./modules/javafx.web/src/main/native
+#{cmake} -DPORT="Java" -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=17 -S
./modules/javafx.web/src/main/native .
+#{cmake_build}
+#strip -g %{_builddir}/%{rtdir}/%_target_platform/lib/libjfxwebkit.so
%install
@@ -158,7 +159,7 @@ install -d -m 755 %{buildroot}%{openjfxdir}
cp -a modules/javafx.{base,controls,fxml,media,swing,swt,web}/target/*.jar
%{buildroot}%{openjfxdir}
cp -a modules/javafx.graphics/mvn-compileJava/mvn-java/target/*.jar
%{buildroot}%{openjfxdir}
cp -a
modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,javafx_font_pango,glass,glassgtk2,glassgtk3,javafx_iio,prism_common,prism_es2,prism_sw}/target/*.so
%{buildroot}%{openjfxdir}
-cp -a %target_platform/lib/libjfxwebkit.so %{buildroot}%{openjfxdir}
+#cp -a %_target_platform/lib/libjfxwebkit.so %{buildroot}%{openjfxdir}
%files
%dir %{openjfxdir}
@@ -166,16 +167,19 @@ cp -a %target_platform/lib/libjfxwebkit.so
%{buildroot}%{openjfxdir}
%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
+* Thu Jun 02 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:17.0.0.1-1
+- Update to openjfx 17. libjfxwebkit build is disabled
+
* Tue Mar 08 2022 Nicolas De Amicis <deamicis(a)bluewin.ch> - 3:11.0.9.2-10
- Fix cmake arguments
diff --git a/pom-graphics_antlr.xml b/pom-graphics_antlr.xml
index 920f152..8e5437a 100644
--- a/pom-graphics_antlr.xml
+++ b/pom-graphics_antlr.xml
@@ -34,7 +34,7 @@
<outputDirectory>../build/classes/java/jslc</outputDirectory>
<resources>
<resource>
- <directory>src/jslc/java</directory>
+ <directory>../src/jslc/java</directory>
<excludes>
<exclude>**/*.java</exclude>
<exclude>**/*.rc</exclude>
@@ -46,8 +46,8 @@
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<configuration>
- <sourceDirectory>../src/main/antlr3</sourceDirectory>
<outputDirectory>../build/gensrc/antlr</outputDirectory>
+ <visitor>true</visitor>
</configuration>
<executions>
<execution>
diff --git a/sources b/sources
index c588339..8f6f132 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rt-11.0.9+2.tar.bz2) =
6c0b0a7c8b4b99d9437cc6600774749854ec1cc46acb4d161e442a6e101d4d8cbb19fe158b7c562f40aacfc0b280a69a6c617b660af1c723053694b41dbc0cdf
+SHA512 (jfx-17.0.0.1-1.zip) =
cb289af0ff926f163046732e0736001c1522ce9925371b0fc6c80cb9792fd9edbd98869958452933debddf880224784966358508a2ea6a7e6e1cb6f3f697937b