Compare commits

..

No commits in common. "4d5c828d4c06c1f1588e8dfc0b11a18a2d29e8b2" and "ccb5e1767f43dd5795064704b2013b724e5a4bbf" have entirely different histories.

7 changed files with 26 additions and 45 deletions

View File

@ -3,14 +3,14 @@
%global xmvn_bootstrap 0
Name: openjfx
Version: 11.0.18.0
Release: 3
Version: 11.0.3
Release: 4
Summary: Rich client application platform for Java
License: GPL v2 with exceptions and BSD
URL: http://openjdk.java.net/projects/openjfx/
Source0: https://github.com/openjdk/jfx11u/archive/refs/tags/11.0.18+0.tar.gz
Source0: hg.openjdk.java.net/openjfx/11/rt/archive/rt-11.0.3+1.tar.bz2
Source1: pom-base.xml
Source2: pom-controls.xml
Source3: pom-fxml.xml
@ -42,7 +42,7 @@ Source28: pom-web.xml
Source29: build.xml
Source30: settings.xml
ExclusiveArch: x86_64 aarch64 ppc64le loongarch64
ExclusiveArch: x86_64 aarch64
Requires: java-11-openjdk
Requires: javapackages-tools
@ -53,7 +53,7 @@ BuildRequires: ant
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: libstdc++-static
BuildRequires: mvn(org.antlr:antlr4-maven-plugin)
BuildRequires: mvn(antlr:antlr)
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.18+0
%setup -q -n rt-11.0.3+1
#Drop *src/test folders
rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/
@ -130,6 +130,7 @@ 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
@ -145,31 +146,16 @@ 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.md
%doc README
%files devel
%{openjfxdir}/
%license LICENSE
%license ADDITIONAL_LICENSE_INFO
%license ASSEMBLY_EXCEPTION
%doc README.md
%doc README
%changelog
* Tue May 21 2024 Pengda Dou <doupengda@loongson.cn> - 11.0.18.0-3
- add loongarch64 to ExclusiveArch
* Mon Mar 11 2024 xurui <rui.xu@shingroup.cn> - 11.0.18.0-2
- Add ppc64le support for openjfx11
* Wed Dec 20 2022 Noah <hedongbo@huawei.com> - 11.0.18.0-1
- update to openjfx-11.0.18+0
* Wed Jul 21 2021 Noah <hedongbo@huawei.com> - 11.0.3-6
- change maven repository to huawei cloud
* Mon Jun 21 2021 Benshuai5D <zhangyunbo7@huawei.com> - 11.0.3-5
- add openjfx11.yaml
* Tue Mar 23 2021 Noah <hedongbo@huawei.com> - 11.0.3-4
- change maven repository to ali cloud
- add settings.xml to source

View File

@ -1,5 +0,0 @@
---
version_control: git
src_repo: https://github.com/openjdk/jfx11u
tag_prefix:
seperator: "."

View File

@ -9,13 +9,13 @@
<dependencies>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4</artifactId>
<version>4.7.2</version>
<artifactId>antlr</artifactId>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<version>4.7.2</version>
<artifactId>antlr-runtime</artifactId>
<version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
@ -48,8 +48,8 @@
<plugins>
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.7.2</version>
<artifactId>antlr3-maven-plugin</artifactId>
<version>3.5.2</version>
<configuration>
<sourceDirectory>../src/main/antlr3</sourceDirectory>
<outputDirectory>../build/gensrc/antlr</outputDirectory>
@ -58,7 +58,7 @@
<execution>
<id>antlr</id>
<goals>
<goal>antlr4</goal>
<goal>antlr</goal>
</goals>
</execution>
</executions>

View File

@ -93,7 +93,7 @@
</execution>
</executions>
<configuration>
<target>
<tasks>
<copy todir="../../target/classes/com/sun/prism/shader">
<fileset dir="../mvn-prism/target/classes/com/sun/prism/shader">
<include name="**/*.class"/>
@ -114,7 +114,7 @@
<include name="**/*.class"/>
</fileset>
</copy>
</target>
</tasks>
</configuration>
</plugin>
<plugin>

View File

@ -60,11 +60,11 @@
</execution>
</executions>
<configuration>
<target>
<tasks>
<copy todir="src/main/java">
<fileset dir="src/main/native/Source/WebCore/bindings/java/dom3/java"/>
</copy>
</target>
</tasks>
</configuration>
</plugin>
</plugins>

View File

@ -4,10 +4,10 @@
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<mirrors>
<mirror>
<id>huaweicloud</id>
<mirrorOf>central</mirrorOf>
<name>central repo</name>
<url>https://mirrors.huaweicloud.com/repository/maven/</url>
<id>aliyun-central</id>
<mirrorOf>*</mirrorOf>
<name>aliyun central</name>
<url>https://maven.aliyun.com/repository/central</url>
</mirror>
</mirrors>
</settings>