gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-java/openjfx: added missing casts + scrubbed patches

Browse Source 
Closes: https://bugs.gentoo.org/926331
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
This commit is contained in:
Miroslav Šulc
2024-07-05 10:27:22 +02:00
parent b7b17f0f19
commit df78126aff
24 changed files with 59 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dev-java/openjfx/files/11/11.0.9_p0-version.patch
View File

@@ -7,9 +7,8 @@
8252067: Change JavaFX release version in 11-dev to 11.0.9
Reviewed-by: kcr
diff -r 38425dc30b9a -r c0fe72db97a8 build.properties
--- a/build.properties Thu Aug 20 10:24:03 2020 +0200
+++ b/build.properties Thu Aug 20 14:48:02 2020 +0200
--- a/build.properties
+++ b/build.properties
@@ -41,7 +41,7 @@
# UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
jfx.release.major.version=11

6
dev-java/openjfx/files/11/disable-architecture-verification.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 19 Sep 2020 18:38:05 -0700
Subject: [PATCH] disable architecture verification
---
build.gradle | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 66a4b3c..f66ee01 100644
--- a/build.gradle
+++ b/build.gradle
@@ -302,6 +302,7 @@ ext.MAVEN_GROUP_ID = "org.openjfx"

21
dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch
View File

@@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 19 Sep 2020 18:30:58 -0700
Subject: [PATCH] don't force -msse
---
.../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
.../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 -
.../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +--
.../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +--
.../src/main/native/jfxmedia/projects/linux/Makefile | 1 -
.../src/main/native/jfxmedia/projects/mac/Makefile | 3 +--
6 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index 682f1da..6222e29 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -24,7 +24,6 @@ CFLAGS = -fPIC \
@@ -24,8 +13,6 @@ index 682f1da..6222e29 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index c2cd04d..bb815fe 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -21,7 +21,6 @@ CFLAGS = -fPIC \
@@ -36,8 +23,6 @@ index c2cd04d..bb815fe 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
index 9f80434..659ab1c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
@@ -30,8 +30,7 @@ CFLAGS += -fPIC \
@@ -50,8 +35,6 @@ index 9f80434..659ab1c 100644
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
index 2020404..34bdf42 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
@@ -51,8 +51,7 @@ CFLAGS += -fPIC \
@@ -64,8 +47,6 @@ index 2020404..34bdf42 100644
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
index aaef98e..f5b06c6 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -42,7 +42,6 @@ ifdef HOST_COMPILE
@@ -76,8 +57,6 @@ index aaef98e..f5b06c6 100644
-DGSTREAMER_LITE
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
index 5ffd9ea..a7b3ddb 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
@@ -30,8 +30,7 @@ CFLAGS += -pipe \

21
dev-java/openjfx/files/11/don-t-force-msse.patch
View File

@@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 19 Sep 2020 18:30:58 -0700
Subject: [PATCH] don't force -msse
---
.../src/main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
.../main/native/gstreamer/projects/linux/fxplugins/Makefile | 1 -
.../src/main/native/gstreamer/projects/mac/fxplugins/Makefile | 3 +--
.../main/native/gstreamer/projects/mac/gstreamer-lite/Makefile | 3 +--
.../src/main/native/jfxmedia/projects/linux/Makefile | 1 -
.../src/main/native/jfxmedia/projects/mac/Makefile | 3 +--
6 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index f27b9479..4e229f20 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -23,7 +23,6 @@ CFLAGS := -fPIC \
@@ -24,8 +13,6 @@ index f27b9479..4e229f20 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index 627865f9..a4d99299 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -20,7 +20,6 @@ CFLAGS := -fPIC \
@@ -36,8 +23,6 @@ index 627865f9..a4d99299 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
index 9f80434d..659ab1c1 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/fxplugins/Makefile
@@ -30,8 +30,7 @@ CFLAGS += -fPIC \
@@ -50,8 +35,6 @@ index 9f80434d..659ab1c1 100644
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
index 2020404c..34bdf42c 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/mac/gstreamer-lite/Makefile
@@ -51,8 +51,7 @@ CFLAGS += -fPIC \
@@ -64,8 +47,6 @@ index 2020404c..34bdf42c 100644
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
index c9500236..175be13e 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -43,7 +43,6 @@ ifdef HOST_COMPILE
@@ -76,8 +57,6 @@ index c9500236..175be13e 100644
-DGSTREAMER_LITE
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
index 5ffd9eac..a7b3ddbb 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/mac/Makefile
@@ -30,8 +30,7 @@ CFLAGS += -pipe \

6
dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch
View File

@@ -9,12 +9,6 @@ enough data left to read the frame size.
Closes https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/issues/876
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/1066>
---
gst-libs/gst/tag/id3v2frames.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gst-libs/gst/tag/id3v2frames.c b/gst-libs/gst/tag/id3v2frames.c
index 8e9f78254..f39659bf7 100644
--- a/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c
+++ b/modules/javafx.media/src/main/native/gstreamer/gstreamer-lite/gst-plugins-base/gst-libs/gst/tag/id3v2frames.c
@@ -109,7 +109,7 @@ id3v2_parse_frame (ID3TagsWorking * work)

31
dev-java/openjfx/files/11/missing-casts.patch Normal file
View File

@@ -0,0 +1,31 @@
--- 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)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text);
}
(*env)->ReleaseStringUTFChars(env, arg1, text);
}
@@ -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)(const gchar *)pos);
}
JNIEXPORT jlong JNICALL OS_NATIVE(g_1utf16_1to_1utf8)
--- 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 = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI");
}
}

2
dev-java/openjfx/files/11/respect-cc.patch
View File

@@ -1,5 +1,3 @@
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",

18
dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch
View File

@@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 1 Jun 2019 00:12:55 -0700
Subject: [PATCH] respect user cflags
---
buildSrc/linux.gradle | 7 ++++++-
.../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++----------
.../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++-----------
.../projects/linux/gstreamer-lite/Makefile | 16 ++++++----------
.../native/jfxmedia/projects/linux/Makefile | 16 ++++++----------
5 files changed, 30 insertions(+), 42 deletions(-)
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index 7a7cbc72..6705a0f3 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String }
@@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644
LINUX.iio.lib = "javafx_iio"
LINUX.prismES2 = [:]
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index 450b55d3..f27b9479 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644
ifneq ($(strip $(LIBAV_DIR)),)
INCLUDES += -I$(LIBAV_DIR)/include
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index 1e58d4d3..627865f9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -14,7 +14,7 @@ DIRLIST = progressbuffer \
@@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
index 5baa30a1..ddf0e521 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \
@@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
index ecbd859f..5881cf53 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -17,7 +17,7 @@ DIRLIST = jni \

18
dev-java/openjfx/files/11/respect-user-cflags.patch
View File

@@ -3,16 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 1 Jun 2019 00:12:55 -0700
Subject: [PATCH] respect user cflags
---
buildSrc/linux.gradle | 7 ++++++-
.../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++----------
.../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++-----------
.../projects/linux/gstreamer-lite/Makefile | 16 ++++++----------
.../native/jfxmedia/projects/linux/Makefile | 16 ++++++----------
5 files changed, 30 insertions(+), 42 deletions(-)
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index 7a7cbc72..6705a0f3 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -44,8 +44,11 @@ LINUX.library = { name -> return "lib${name}.so" as String }
@@ -45,8 +35,6 @@ index 7a7cbc72..6705a0f3 100644
LINUX.iio.lib = "javafx_iio"
LINUX.prismES2 = [:]
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index 450b55d3..f27b9479 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -17,7 +17,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -89,8 +77,6 @@ index 450b55d3..f27b9479 100644
ifneq ($(strip $(LIBAV_DIR)),)
INCLUDES += -I$(LIBAV_DIR)/include
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index 1e58d4d3..627865f9 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -14,7 +14,7 @@ DIRLIST = progressbuffer \
@@ -132,8 +118,6 @@ index 1e58d4d3..627865f9 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
index 5baa30a1..ddf0e521 100644
--- a/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ b/modules/javafx.media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -37,7 +37,7 @@ DIRLIST = gstreamer/gst \
@@ -174,8 +158,6 @@ index 5baa30a1..ddf0e521 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
index ecbd859f..5881cf53 100644
--- a/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/javafx.media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -17,7 +17,7 @@ DIRLIST = jni \

6
dev-java/openjfx/files/11/use-system-swt-jar.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sat, 1 Jun 2019 00:36:04 -0700
Subject: [PATCH] use system swt jar
---
build.gradle | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.gradle b/build.gradle
index 1e414b7..3d967bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2477,7 +2477,7 @@ project(":swt") {

6
dev-java/openjfx/files/11/wno-error-11.0.11.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Wed, 17 Nov 2021 19:52:13 -0800
Subject: [PATCH] no -Werror
---
buildSrc/linux.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index 00a3bca..2295566 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -231,7 +231,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g

6
dev-java/openjfx/files/11/wno-error.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Thu, 19 Mar 2020 09:50:22 -0700
Subject: [PATCH] remove werror
---
buildSrc/linux.gradle | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index 7a7cbc7..6955155 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -223,7 +223,7 @@ FileTree ft_gtk = fileTree("${project(":graphics").projectDir}/src/main/native-g

4
dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch
View File

@@ -1,5 +1,5 @@
--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-10-29 16:26:04.000000000 +0100
+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp 2018-11-27 15:34:52.170181958 +0100
--- rt-8u202-b02/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+++ rt-8u202-b02-patched/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
@@ -232,10 +232,7 @@
pid_t wpid = 0;

9
dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch
View File

@@ -3,13 +3,6 @@ From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 21 Jun 2018 15:57:01 +0100
Subject: [PATCH 4/4] fix cast between incompatible function types
---
modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp | 8 ++++++--
.../src/main/native-glass/gtk/glass_window_ime.cpp | 9 +++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
index f85b1dae..3b9225f7 100644
--- a/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
+++ b/modules/graphics/src/main/native-glass/gtk/glass_dnd.cpp
@@ -556,7 +556,7 @@ static GdkDragContext *get_drag_context() {
@@ -41,8 +34,6 @@ index f85b1dae..3b9225f7 100644
}
}
}
diff --git a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
index 82e54d11..51af2a6a 100644
--- a/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
+++ b/modules/graphics/src/main/native-glass/gtk/glass_window_ime.cpp
@@ -122,15 +122,12 @@ bool WindowContextBase::filterIME(GdkEvent * event) {

6
dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Thu, 30 May 2019 12:07:30 -0700
Subject: [PATCH] don't include xlocale.h
---
.../gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
index 72dc1301..32669789 100644
--- a/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
+++ b/modules/media/src/main/native/gstreamer/3rd_party/glib/glib-2.56.1/glib/gstrfuncs.c
@@ -39,7 +39,7 @@

4
dev-java/openjfx/files/8/99-sysdeps.patch
View File

@@ -1,5 +1,3 @@
diff --git a/build.gradle b/build.gradle
index 0914d7d..6bd9e78 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1309,6 +1309,7 @@ project(":graphics") {
@@ -10,8 +8,6 @@ index 0914d7d..6bd9e78 100644
}
// Create a single "native" task which will depend on all the individual native tasks for graphics
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
index 25f88d1..642450d 100644
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -82,10 +82,13 @@ getConfigurations().create("antlr3");

22
dev-java/openjfx/files/8/Wno-error.patch
View File

@@ -3,18 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sun, 26 Apr 2020 21:15:36 -0700
Subject: [PATCH] Wno-error
---
buildSrc/armv5sf.gradle | 1 -
buildSrc/armv6hf.gradle | 1 -
buildSrc/armv6sf.gradle | 1 -
buildSrc/armv7hf.gradle | 1 -
buildSrc/armv7sf.gradle | 1 -
buildSrc/linux.gradle | 6 +++---
buildSrc/x86egl.gradle | 1 -
7 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/buildSrc/armv5sf.gradle b/buildSrc/armv5sf.gradle
index ee154182..bee6003e 100644
--- a/buildSrc/armv5sf.gradle
+++ b/buildSrc/armv5sf.gradle
@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
@@ -25,8 +13,6 @@ index ee154182..bee6003e 100644
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
def glassCFlags = ["-ffast-math"]
diff --git a/buildSrc/armv6hf.gradle b/buildSrc/armv6hf.gradle
index dfdff237..0f090f23 100644
--- a/buildSrc/armv6hf.gradle
+++ b/buildSrc/armv6hf.gradle
@@ -131,7 +131,6 @@ def extraLFlags = [
@@ -37,8 +23,6 @@ index dfdff237..0f090f23 100644
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
diff --git a/buildSrc/armv6sf.gradle b/buildSrc/armv6sf.gradle
index ee6615f0..6ebbdd90 100644
--- a/buildSrc/armv6sf.gradle
+++ b/buildSrc/armv6sf.gradle
@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
@@ -49,8 +33,6 @@ index ee6615f0..6ebbdd90 100644
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
def glassCFlags = ["-ffast-math"]
diff --git a/buildSrc/armv7hf.gradle b/buildSrc/armv7hf.gradle
index e75bf8a9..092be817 100644
--- a/buildSrc/armv7hf.gradle
+++ b/buildSrc/armv7hf.gradle
@@ -131,7 +131,6 @@ def extraLFlags = [
@@ -61,8 +43,6 @@ index e75bf8a9..092be817 100644
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
diff --git a/buildSrc/armv7sf.gradle b/buildSrc/armv7sf.gradle
index 0bb8a530..38e98303 100644
--- a/buildSrc/armv7sf.gradle
+++ b/buildSrc/armv7sf.gradle
@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
@@ -73,8 +53,6 @@ index 0bb8a530..38e98303 100644
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
def glassCFlags = ["-ffast-math"]
diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle
index 6bf6196b..ff24207d 100644
--- a/buildSrc/x86egl.gradle
+++ b/buildSrc/x86egl.gradle
@@ -118,7 +118,6 @@ def extraLFlags = [

2
dev-java/openjfx/files/8/disable-online-repos.patch
View File

@@ -1,5 +1,3 @@
diff --git a/build.gradle b/build.gradle
index df82f63..3f920b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1135,17 +1135,17 @@ allprojects {

13
dev-java/openjfx/files/8/don-t-force-msse.patch
View File

@@ -3,15 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Sun, 26 Apr 2020 20:57:39 -0700
Subject: [PATCH] don't force msse
---
.../main/native/gstreamer/projects/linux/avplugin/Makefile | 1 -
.../native/gstreamer/projects/linux/fxplugins/Makefile | 1 -
.../media/src/main/native/jfxmedia/projects/linux/Makefile | 1 -
modules/web/src/main/native/Tools/Scripts/webkitdirs.pm | 7 -------
4 files changed, 10 deletions(-)
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index df9f7f21..f82f0537 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -28,7 +28,6 @@ CFLAGS = -fPIC \
@@ -22,8 +13,6 @@ index df9f7f21..f82f0537 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index fd3847d0..3887ac6d 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -25,7 +25,6 @@ CFLAGS = -fPIC \
@@ -34,8 +23,6 @@ index fd3847d0..3887ac6d 100644
-fbuiltin \
-DHAVE_STDINT_H \
-DLINUX \
diff --git a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
index 3d089501..10fad68f 100644
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -44,7 +44,6 @@ ifdef HOST_COMPILE

6
dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
View File

@@ -3,12 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Fri, 18 Sep 2020 21:43:57 -0700
Subject: [PATCH] fxpackager: don't include obsolete sys/sysctl.h
---
.../fxpackager/src/main/native/library/common/PosixPlatform.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
index 5ea3bc6..b5d167b 100644
--- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
@@ -43,7 +43,6 @@

22
dev-java/openjfx/files/8/missing-casts.patch Normal file
View File

@@ -0,0 +1,22 @@
--- a/modules/graphics/src/main/native-font/pango.c
+++ b/modules/graphics/src/main/native-font/pango.c
@@ -225,7 +225,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)((jboolean (*)(void *, const char *))fp)((void *)(intptr_t)arg0, text);
}
(*env)->ReleaseStringUTFChars(env, arg1, text);
}
--- a/modules/graphics/src/main/native-prism-es2/x11/X11GLContext.c
+++ b/modules/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 = (PFNGLXSWAPINTERVALSGIPROC)glXGetProcAddress("glXSwapIntervalSGI");
}
}

21
dev-java/openjfx/files/8/respect_flags.patch
View File

@@ -3,17 +3,6 @@ From: Georgy Yakovlev <gyakovlev@gentoo.org>
Date: Thu, 25 Mar 2021 10:06:49 -0700
Subject: [PATCH] respect flags
---
buildSrc/linux.gradle | 4 ++++
.../gstreamer/projects/linux/avplugin/Makefile | 16 ++++++----------
.../gstreamer/projects/linux/fxplugins/Makefile | 17 ++++++-----------
.../gstreamer/projects/linux/glib-lite/Makefile | 11 +++--------
.../projects/linux/gstreamer-lite/Makefile | 16 ++++++----------
.../gstreamer/projects/linux/libffi/Makefile | 6 ------
6 files changed, 25 insertions(+), 45 deletions(-)
diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle
index a8886c16..e2397a54 100644
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -46,6 +46,9 @@ def commonFlags = [
@@ -34,8 +23,6 @@ index a8886c16..e2397a54 100644
def toolchainDir
if (hasProperty('toolchainDir')) {
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
index f82f0537..01e069b1 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -22,7 +22,7 @@ TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
@@ -78,8 +65,6 @@ index f82f0537..01e069b1 100644
ifneq ($(strip $(LIBAV_DIR)),)
INCLUDES += -I$(LIBAV_DIR)/include
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
index 3887ac6d..99c82718 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -19,7 +19,7 @@ DIRLIST = progressbuffer \
@@ -121,8 +106,6 @@ index 3887ac6d..99c82718 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
index c5b4b0a6..b0e6d6f9 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
@@ -40,20 +40,15 @@ CFLAGS += -fPIC \
@@ -149,8 +132,6 @@ index c5b4b0a6..b0e6d6f9 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
index 8634b559..109375f5 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -41,7 +41,7 @@ DIRLIST = gstreamer/gst \
@@ -191,8 +172,6 @@ index 8634b559..109375f5 100644
ifeq ($(ARCH), x32)
CFLAGS += -m32
diff --git a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
index 62f1b802..54e0a63b 100644
--- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
@@ -20,12 +20,6 @@ CFLAGS += -c \

1
dev-java/openjfx/openjfx-11.0.11_p1-r3.ebuild
View File

@@ -83,6 +83,7 @@ PATCHES=(
"${FILESDIR}"/11/ffmpeg5.patch
"${FILESDIR}"/11/respect-cc.patch
"${FILESDIR}"/11/strip-blank-elements-flags.patch
"${FILESDIR}"/11/missing-casts.patch
)
egradle() {

1
dev-java/openjfx/openjfx-8.1000-r2.ebuild
View File

@@ -67,6 +67,7 @@ PATCHES=(
"${FILESDIR}"/8/Wno-error.patch
"${FILESDIR}"/8/don-t-force-msse.patch
"${FILESDIR}"/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
"${FILESDIR}"/8/missing-casts.patch
)
egradle() {