diff options
Diffstat (limited to 'dev-java/openjfx/files/11')
-rw-r--r-- | dev-java/openjfx/files/11/0001-c99.patch | 22 | ||||
-rw-r--r-- | dev-java/openjfx/files/11/0002-c99.patch | 18 | ||||
-rw-r--r-- | dev-java/openjfx/files/11/0003-c99.patch | 19 | ||||
-rw-r--r-- | dev-java/openjfx/files/11/respect-cc.patch | 15 | ||||
-rw-r--r-- | dev-java/openjfx/files/11/strip-blank-elements-flags.patch | 29 |
5 files changed, 103 insertions, 0 deletions
diff --git a/dev-java/openjfx/files/11/0001-c99.patch b/dev-java/openjfx/files/11/0001-c99.patch new file mode 100644 index 000000000000..f553d2858801 --- /dev/null +++ b/dev-java/openjfx/files/11/0001-c99.patch @@ -0,0 +1,22 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +commit 42321838b98d2ebb3d8384c88a764ff2b4d70581 +Author: Florian Weimer <fweimer@openjdk.org> +Date: Fri Jun 16 12:19:10 2023 +0000 + + 8307542: Call to FcConfigAppFontAddFile uses wrong prototype, arguments + + Reviewed-by: kcr + +--- a/modules/javafx.graphics/src/main/native-font/pango.c ++++ b/modules/javafx.graphics/src/main/native-font/pango.c +@@ -243,7 +243,7 @@ JNIEXPORT jboolean JNICALL OS_NATIVE(FcConfigAppFontAddFile) + if (text) { + // rc = (jboolean)FcConfigAppFontAddFile(arg0, text); + if (fp) { +- rc = (jboolean)((jboolean (*)(void *, const char *))fp)(arg0, text); ++ rc = (jboolean)((int (*)(void *, const char *))fp)((void *)arg0, text); + } + (*env)->ReleaseStringUTFChars(env, arg1, text); + } diff --git a/dev-java/openjfx/files/11/0002-c99.patch b/dev-java/openjfx/files/11/0002-c99.patch new file mode 100644 index 000000000000..4cdc5ed35e50 --- /dev/null +++ b/dev-java/openjfx/files/11/0002-c99.patch @@ -0,0 +1,18 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +8323078: Incorrect length argument to g_utf8_strlen in pango.c + +Submitted upstream: <https://github.com/openjdk/jfx/pull/1320> + +--- 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, (gssize)pos); + } + + JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8) diff --git a/dev-java/openjfx/files/11/0003-c99.patch b/dev-java/openjfx/files/11/0003-c99.patch new file mode 100644 index 000000000000..8779f882b799 --- /dev/null +++ b/dev-java/openjfx/files/11/0003-c99.patch @@ -0,0 +1,19 @@ +https://bugs.gentoo.org/919413 +https://src.fedoraproject.org/rpms/openjfx/c/9e893037f3a20273c79603220b7a18a44be60fcc?branch=rawhide + +8323077: C type error (incompatible function pointer) in X11GLContext.c + +Submitted upstream: <https://github.com/openjdk/jfx/pull/1319> + +--- 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,8 @@ JNIEXPORT jlong JNICALL Java_com_sun_prism_es2_X11GLContext_nInitialize + dlsym(RTLD_DEFAULT, "glXSwapIntervalSGI"); + + if (ctxInfo->glXSwapIntervalSGI == NULL) { +- ctxInfo->glXSwapIntervalSGI = glXGetProcAddress("glXSwapIntervalSGI"); ++ ctxInfo->glXSwapIntervalSGI = (PFNGLXSWAPINTERVALSGIPROC) ++ glXGetProcAddress((const GLubyte *)"glXSwapIntervalSGI"); + } + + } diff --git a/dev-java/openjfx/files/11/respect-cc.patch b/dev-java/openjfx/files/11/respect-cc.patch new file mode 100644 index 000000000000..85b742f3a630 --- /dev/null +++ b/dev-java/openjfx/files/11/respect-cc.patch @@ -0,0 +1,15 @@ +diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle +index 2295566..ce54c3f 100644 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -214,8 +214,8 @@ setupTools("linux_freetype_tools", + } + ) + +-def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : "${toolchainDir}gcc"; +-def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : "${toolchainDir}g++"; ++def compiler = IS_COMPILE_PARFAIT ? "parfait-gcc" : System.getenv("CC"); ++def linker = IS_STATIC_BUILD ? "ar" : IS_COMPILE_PARFAIT ? "parfait-g++" : System.getenv("CXX"); + + LINUX.glass = [:] + LINUX.glass.variants = ["glass", "glassgtk2", "glassgtk3"] diff --git a/dev-java/openjfx/files/11/strip-blank-elements-flags.patch b/dev-java/openjfx/files/11/strip-blank-elements-flags.patch new file mode 100644 index 000000000000..87f0279979f7 --- /dev/null +++ b/dev-java/openjfx/files/11/strip-blank-elements-flags.patch @@ -0,0 +1,29 @@ +Without this, you'll get bizarre errors where linking fails because it looks for +a literal "" arg. + +https://bugs.gentoo.org/715092 +https://bugs.gentoo.org/719484 +https://bugs.gentoo.org/799227 +https://bugs.gentoo.org/915727 +--- a/buildSrc/linux.gradle ++++ b/buildSrc/linux.gradle +@@ -47,7 +47,8 @@ def commonFlags = [ + "-Wno-error=cast-function-type", + "-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags + +-commonFlags.addAll(System.getenv("CFLAGS").trim().split(" ")) ++commonFlags.addAll(System.getenv("CFLAGS").strip().split(" ")) ++commonFlags.removeAll([""]) + + if (!IS_64) { + commonFlags += "-m32" +@@ -75,7 +76,8 @@ def staticLinkFlags = [].flatten() + + def linkFlags = IS_STATIC_BUILD ? staticLinkFlags : dynamicLinkFlags; + +-linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" ")) ++linkFlags.addAll(System.getenv("LDFLAGS").strip().split(" ")) ++linkFlags.removeAll([""]) + + if (IS_DEBUG_NATIVE) { + linkFlags += "-g" |