From fd466e4d3bba9123a37ec883ff2bd46e548fac2a Mon Sep 17 00:00:00 2001
From: Nicolas De Amicis <deamicis@bluewin.ch>
Date: Oct 06 2020 12:54:55 +0000
Subject: Adding web module


---

diff --git a/build.xml b/build.xml
index e09f7e3..13ab3e5 100755
--- a/build.xml
+++ b/build.xml
@@ -2,11 +2,13 @@
   <!-- set global properties for this build -->
   <property file="build.properties"/>
   
-  <property name="file.versioninfo"	value="VersionInfo.java"/>
-  <property name="src.versioninfo"	value="modules/javafx.base/src/main/version-info"/>
-  <property name="dst.versioninfo"	value="modules/javafx.base/src/main/java/com/sun/javafx/runtime"/>
+  <property name="file.versioninfo"	 value="VersionInfo.java"/>
+  <property name="src.versioninfo"	 value="modules/javafx.base/src/main/version-info"/>
+  <property name="dst.versioninfo"	 value="modules/javafx.base/src/main/java/com/sun/javafx/runtime"/>
+  <property name="dst.webpageconfig" value="modules/javafx.web/src/main/native/Source/WebCore/platform/java"/>
+  <property name="file.webpageconfig"	 value="WebPageConfig.h.in"/>
   
-  <target name="replaceVersionInfo" depends="prepare,replaceReleaseVersion">
+  <target name="replaceVersionInfo" depends="prepare,replaceReleaseVersion,replaceJFXWebVersion">
 	  <echo message="RELEASE_SUFFIX="/>
 	  <replace file="${dst.versioninfo}/${file.versioninfo}" token="@RELEASE_SUFFIX@" value=""/>
 	  <tstamp>
@@ -50,6 +52,12 @@
 	  </replace>
   </target>
   
+  <target name="replaceJFXWebVersion">
+	  <echo message="RELEASE_VERSION=${jfx.release.major.version}"/>
+	  <replace file="${dst.webpageconfig}/${file.webpageconfig}" token="@JAVAFX_RELEASE_VERSION@" value="${jfx.release.major.version}"/>
+	  <replace file="${dst.webpageconfig}/${file.webpageconfig}" token="#cmakedefine" value="#define"/>
+  </target>
+  
   <target name="prepare">
 	  <copy file="${src.versioninfo}/${file.versioninfo}" tofile="${dst.versioninfo}/${file.versioninfo}"/>
   </target>
diff --git a/openjfx.spec b/openjfx.spec
index b16c39f..8a2a286 100644
--- a/openjfx.spec
+++ b/openjfx.spec
@@ -1,8 +1,9 @@
 %global openjfxdir %{_jvmdir}/%{name}
+%global rtdir rt-11.0.3+1
 
 Name:           openjfx
 Version:        11.0.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Rich client application platform for Java
 
 License:        GPL v2 with exceptions and BSD
@@ -42,11 +43,11 @@ Source29:       build.xml
 ExclusiveArch:  x86_64
 
 Requires:       java-11-openjdk	
-Requires:       javapackages-tools
 
+BuildRequires:  javapackages-tools
 BuildRequires:  java-11-openjdk-devel
 BuildRequires:  maven-local
-BuildRequires:	ant
+BuildRequires:  ant
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
 BuildRequires:  libstdc++-static
@@ -67,12 +68,18 @@ BuildRequires:  pkgconfig(libjpeg)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(gl)
 
+BuildRequires:  cmake
+BuildRequires:  gperf
+BuildRequires:  perl
+BuildRequires:  python27
+BuildRequires:  ruby-devel
+
 %description
 JavaFX/OpenJFX is a set of graphics and media APIs that enables Java
 developers to design, create, test, debug, and deploy rich client
 applications that operate consistently across diverse platforms.
 
-The media and web module have been removed due to missing dependencies.
+The media module have been removed due to missing dependencies.
 
 %package devel
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -85,7 +92,7 @@ Summary: OpenJFX development tools and libraries
 %global debug_package %{nil}
 
 %prep
-%setup -q -n rt-11.0.3+1
+%setup -q -n %{rtdir}
 
 #Drop *src/test folders
 rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/
@@ -134,12 +141,17 @@ 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_build}
+strip -g %{_builddir}/%{rtdir}/%_target_platform/lib/libjfxwebkit.so
+
 %install
 
 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}
 
 %files
 %dir %{openjfxdir}
@@ -157,8 +169,11 @@ cp -a modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja
 %doc README
 
 %changelog
+* Tue Oct 06 2020 Nicolas De Amicis <deamicis@bluewin.ch> - 11.0.3-2
+- Adding web module
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.0.3-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
-* Wed Aug 14 2019 Nicolas De Amicis - 11.0.3-0
+* Wed Aug 14 2019 Nicolas De Amicis <deamicis@bluewin.ch> - 11.0.3-0
 - Initial packaging
diff --git a/pom-web.xml b/pom-web.xml
index d25fb49..da78d79 100644
--- a/pom-web.xml
+++ b/pom-web.xml
@@ -38,6 +38,14 @@
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<release>11</release>
+					<compilerArgs>
+						<arg>-g:source,lines,vars</arg>
+						<arg>-proc:none</arg>
+						<arg>-XDuseUnsharedTable=true</arg>
+						<arg>-nowarn</arg>
+						<arg>-h</arg>
+						<arg>modules/javafx.web/build/gensrc/headers/javafx.web/</arg>
+					</compilerArgs>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -50,19 +58,40 @@
 				<artifactId>maven-antrun-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>copy-dom3</id>
 						<phase>process-resources</phase>
 						<goals>
 							<goal>run</goal>
 						</goals>
+						<configuration>
+							<tasks>
+								<copy todir="src/main/java">
+									<fileset dir="src/main/native/Source/WebCore/bindings/java/dom3/java"/>
+								</copy>
+							</tasks>
+						</configuration>
+					</execution>
+					<execution>
+						<id>build-jfxwebkit</id>
+						<phase>process-classes</phase>
+						<goals>
+							<goal>run</goal>
+						</goals>
+						<configuration>
+							<tasks>
+								<copy todir="src/main/native/Source/WebCore/bridge/jni/jsc">
+									<fileset dir="build/gensrc/headers/javafx.web"/>
+								</copy>
+								<copy todir="src/main/native/WebKitBuild/Release/DerivedSources/ForwardingHeaders/wtf/unicode/java">
+									<fileset dir="build/gensrc/headers/javafx.web"/>
+								</copy>
+								<copy todir="src/main/native/Source/WebCore/platform/graphics/java">
+									<fileset dir="build/gensrc/headers/javafx.web"/>
+								</copy>
+							</tasks>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<tasks>
-						<copy todir="src/main/java">
-							<fileset dir="src/main/native/Source/WebCore/bindings/java/dom3/java"/>
-						</copy>
-					</tasks>
-				</configuration>
 			</plugin>
 		</plugins>
 	</build>