diff --git a/javafx.graphics-adapt-to-gcc14.patch b/javafx.graphics-adapt-to-gcc14.patch new file mode 100644 index 0000000000000000000000000000000000000000..b3e789767a5ced2d657b39e6150261bbe7b06b6e --- /dev/null +++ b/javafx.graphics-adapt-to-gcc14.patch @@ -0,0 +1,26 @@ +diff --git a/modules/javafx.graphics/src/main/native-font/pango.c b/modules/javafx.graphics/src/main/native-font/pango.c +index e29955754c74..f5f46aaccee2 100644 +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -402,7 +402,7 @@ JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf8_1strlen) + (JNIEnv *env, jclass that, jlong str, jlong pos) + { + if (!str) return 0; +- return (jlong)g_utf8_strlen((const gchar *)str, (const gchar *)pos); ++ return (jlong)g_utf8_strlen((const gchar *)str, pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) +diff --git a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +index f3fdf6107d73..cb815675b2b7 100644 +--- a/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c ++++ b/modules/javafx.graphics/src/main/native-prism-es2/x11/X11GLContext.c +@@ -275,7 +275,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (int (*)(int))glXGetProcAddress("glXSwapIntervalSGI"); + } + + } diff --git a/openjfx.spec b/openjfx.spec index e658e1c544c86af6c76d8e9eff9a5bd67876ebba..febbe7410c61ffd226c66727065c6edf66e230c4 100644 --- a/openjfx.spec +++ b/openjfx.spec @@ -4,7 +4,7 @@ Name: openjfx Version: 11.0.18.0 -Release: 4 +Release: 5 Summary: Rich client application platform for Java License: GPL v2 with exceptions and BSD @@ -40,6 +40,7 @@ Source26: pom-swing.xml Source27: pom-swt.xml Source28: pom-web.xml Source29: build.xml +Patch0: javafx.graphics-adapt-to-gcc14.patch ExclusiveArch: x86_64 aarch64 ppc64le loongarch64 riscv64 @@ -81,7 +82,7 @@ Summary: OpenJFX development tools and libraries %global debug_package %{nil} %prep -%setup -q -n rt-11.0.18+0 +%autosetup -n rt-11.0.18+0 -p1 #Drop *src/test folders rm -rf modules/javafx.{base,controls,fxml,graphics,media,swing,swt,web}/src/test/ @@ -153,6 +154,9 @@ cp -a modules/javafx.graphics/mvn-lib{decora,javafx_font,javafx_font_freetype,ja %doc README.md %changelog +* Mon Nov 03 2025 laokz - 11.0.18.0-5 +- Some C code adapt to gcc14 + * Wed Nov 27 2024 Dingli Zhang - 11.0.18.0-4 - Add support for riscv64 - Fix changelog date error