summaryrefslogtreecommitdiff
path: root/dev-java/openjfx
diff options
context:
space:
mode:
authorroot <root@alpha.trunkmasters.com>2026-07-15 03:04:45 -0500
committerroot <root@alpha.trunkmasters.com>2026-07-15 03:04:45 -0500
commit2c34c3402bb20be0fbb58513da479b431ecc7320 (patch)
tree53a49676a7aa41b31db56731ff381a8dcce4d2de /dev-java/openjfx
parent22ab5437b999b26eb3960d336dd392ccab062827 (diff)
downloadbaldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.tar.gz
baldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.tar.xz
baldeagleos-repo-2c34c3402bb20be0fbb58513da479b431ecc7320.zip
Adding metadata
Diffstat (limited to 'dev-java/openjfx')
-rw-r--r--dev-java/openjfx/Manifest2
-rw-r--r--dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch14
-rw-r--r--dev-java/openjfx/files/8/0001-Change-Lucene.patch79
-rw-r--r--dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch68
-rw-r--r--dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch23
-rw-r--r--dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch19
-rw-r--r--dev-java/openjfx/files/8/06-disable-architecture-verification.patch21
-rw-r--r--dev-java/openjfx/files/8/10-javadoc-locale.patch21
-rw-r--r--dev-java/openjfx/files/8/99-sysdeps.patch26
-rw-r--r--dev-java/openjfx/files/8/Wno-error.patch68
-rw-r--r--dev-java/openjfx/files/8/disable-online-repos.patch52
-rw-r--r--dev-java/openjfx/files/8/don-t-force-msse.patch38
-rw-r--r--dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch18
-rw-r--r--dev-java/openjfx/files/8/missing-casts.patch22
-rw-r--r--dev-java/openjfx/files/8/respect_flags.patch192
-rw-r--r--dev-java/openjfx/openjfx-8.1000-r2.ebuild196
16 files changed, 0 insertions, 859 deletions
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest
index 63028b364713..924608fcfead 100644
--- a/dev-java/openjfx/Manifest
+++ b/dev-java/openjfx/Manifest
@@ -8,5 +8,3 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b
DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68
DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500
DIST openjfx-11.0.11_p1.tar.bz2 65017753 BLAKE2B ea5834e469bb0bd3a70595a91cc298f6091bc45de4c471ee9d0bcd45700ab3966a3396781ace2666bf94decd1219a83f01b277116cf23baeb6dd34a1a0f44191 SHA512 a1f94b3166aca50344f8af77ec2a5f52be1b0abc1c65fd3ff97f98017377ab772262502af00ad8cd4a6c44281ea459aff43a9cb7e30a1c35b822da8fb39b94fb
-DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6
-DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32
diff --git a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch b/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch
deleted file mode 100644
index 4a482240dc6b..000000000000
--- a/dev-java/openjfx/files/8/0000-Fix-wait-call-in-PosixPlatform.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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;
-
- //TODO Use waitpid instead of wait
--#ifdef LINUX
-- wait(&status);
--#endif
--#ifdef MAC
-+#if defined(LINUX) || defined(MAC)
- wpid = wait(&status);
- #endif
-
diff --git a/dev-java/openjfx/files/8/0001-Change-Lucene.patch b/dev-java/openjfx/files/8/0001-Change-Lucene.patch
deleted file mode 100644
index 58d0c805ccb5..000000000000
--- a/dev-java/openjfx/files/8/0001-Change-Lucene.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- rt-8u202-b02/build.gradle
-+++ rt-8u202-b02-patched/build.gradle
-@@ -3268,38 +3268,38 @@
- // The apps build is Ant based, and gradle lets us "import" ant build.xml
- // into our configuration.
-
-- ant.importBuild 'build.xml'
-+ //ant.importBuild 'build.xml'
-
- // Download the Lucene libraries needed for the Ensemble8 app
-- def luceneVersion = "7.4.0"
-- getConfigurations().create("lucene");
-- dependencies {
-- lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
-- lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
-- lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
-- }
-+ //def luceneVersion = "7.4.0"
-+ //getConfigurations().create("lucene");
-+ //dependencies {
-+ // lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion
-+ // lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion
-+ // lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion
-+ //}
-
- // Copy Lucene libraries into the Ensemble8/lib directory
-- File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
-- def libNames = [ "lucene-core-${luceneVersion}.jar",
-- "lucene-grouping-${luceneVersion}.jar",
-- "lucene-queryparser-${luceneVersion}.jar" ]
--
--
-- task getLucene(type: Copy) {
-- doFirst {
-- ensembleLibDir.mkdirs();
-- }
-- into ensembleLibDir
-- includeEmptyDirs = false
-- configurations.lucene.files.each { f ->
-- libNames.each { name ->
-- if (name == f.getName()) {
-- from f.getPath()
-- }
-- }
-- }
-- }
-+ //File ensembleLibDir = rootProject.file("apps/samples/Ensemble8/lib");
-+ //def libNames = [ "lucene-core-${luceneVersion}.jar",
-+ // "lucene-grouping-${luceneVersion}.jar",
-+ // "lucene-queryparser-${luceneVersion}.jar" ]
-+
-+
-+ //task getLucene(type: Copy) {
-+ // doFirst {
-+ // ensembleLibDir.mkdirs();
-+ // }
-+ // into ensembleLibDir
-+ // includeEmptyDirs = false
-+ // configurations.lucene.files.each { f ->
-+ // libNames.each { name ->
-+ // if (name == f.getName()) {
-+ // from f.getPath()
-+ // }
-+ // }
-+ // }
-+ //}
-
- compileTargets { t ->
- // The apps build is Ant based, and gradle lets us "import" ant apps/build.xml
-@@ -3310,7 +3310,7 @@
- def jfxrtJar = "${rootProject.buildDir}/${sdkDirName}/rt/lib/ext/jfxrt.jar"
-
- def appsJar = project.task("appsJar${t.capital}") {
-- dependsOn(sdk, getLucene)
-+ dependsOn(sdk)
- doLast() {
- ant.properties['targetBld'] = "$t.name"
- if (!rootProject.ext[t.upper].compileSwing) {
-
diff --git a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch b/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch
deleted file mode 100644
index 7095841498a1..000000000000
--- a/dev-java/openjfx/files/8/0003-fix-cast-between-incompatible-function-types.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 36b952bdcdc301a600009308bff90440b6ceab5b Mon Sep 17 00:00:00 2001
-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
-
---- 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() {
- return ctx;
- }
-
--static gboolean dnd_finish_callback() {
-+static gboolean dnd_finish_callback(gpointer data) {
- if (dnd_window) {
- dnd_set_performed_action(
- translate_gdk_action_to_glass(
-@@ -1079,6 +1079,10 @@ gboolean DragView::get_drag_image_offset(int* x, int* y) {
- return offset_set;
- }
-
-+static void on_pixbuf_destroy_notify(guchar *pixels, gpointer data) {
-+ g_free(pixels);
-+}
-+
- GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* height) {
- GdkPixbuf *pixbuf = NULL;
- gboolean is_raw = FALSE;
-@@ -1106,7 +1110,7 @@ GdkPixbuf* DragView::get_drag_image(gboolean* is_raw_image, gint* width, gint* h
- if (data) {
- memcpy(data, (raw + whsz), nraw - whsz);
- pixbuf = gdk_pixbuf_new_from_data(data, GDK_COLORSPACE_RGB, TRUE, 8,
-- w, h, w * 4, (GdkPixbufDestroyNotify) g_free, NULL);
-+ w, h, w * 4, (GdkPixbufDestroyNotify) on_pixbuf_destroy_notify, NULL);
- }
- }
- }
---- 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) {
- }
- }
-
--//Note: this function must return int, despite the fact it doesn't conform to XIMProc type.
--// This is required in documentation of XIM
--static int im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
-+static void im_preedit_start(XIM im_xim, XPointer client, XPointer call) {
- (void)im_xim;
- (void)call;
-
- mainEnv->CallVoidMethod((jobject) client, jViewNotifyPreeditMode, JNI_TRUE);
-- CHECK_JNI_EXCEPTION_RET(mainEnv, -1);
-- return -1; // No restrictions
-+ CHECK_JNI_EXCEPTION(mainEnv);
- }
-
- static void im_preedit_done(XIM im_xim, XPointer client, XPointer call) {
-@@ -234,7 +231,7 @@ void WindowContextBase::enableOrResetIME() {
- return;
- }
-
-- XIMCallback startCallback = {(XPointer) jview, (XIMProc) im_preedit_start};
-+ XIMCallback startCallback = {(XPointer) jview, im_preedit_start};
- XIMCallback doneCallback = {(XPointer) jview, im_preedit_done};
- XIMCallback drawCallback = {(XPointer) jview, im_preedit_draw};
- XIMCallback caretCallback = {(XPointer) jview, im_preedit_caret};
---
-2.17.1
-
diff --git a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch b/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch
deleted file mode 100644
index 17c91ab9ab88..000000000000
--- a/dev-java/openjfx/files/8/0004-Fix-Compilation-Flags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- rt-8u202-b07/buildSrc/linux.gradle
-+++ rt-8u202-b07-patched/buildSrc/linux.gradle
-@@ -54,7 +54,7 @@
- def ccFlags = [
- commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
- "-ffunction-sections", "-fdata-sections",
-- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
-+ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
- def ccFlagsGTK3 = ccFlags
- //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
- def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
-
---- rt-8u202-b07/buildSrc/x86egl.gradle
-+++ rt-8u202-b07-patched/buildSrc/x86egl.gradle
-@@ -99,7 +99,7 @@
- def ccFlags = [
- commonFlags,
- "-I$JDK_HOME/include", "-I$JDK_HOME/include/${jniPlatform}", "-c",
-- IS_DEBUG_NATIVE ? ["-ggdb", "-DVERBOSE"] : ["-O2", "-DNDEBUG"]].flatten()
-+ IS_DEBUG_NATIVE ? ["-ggdb", "-DNDEBUG"] : ["-O2", "-DNDEBUG"]].flatten()
- //ccFlags.addAll(["-Wnon-virtual-dtor", "-Woverloaded-virtual", "-std=c++0x"])
- def linkFlags = ["-shared", commonFlags].flatten()
-
diff --git a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch b/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch
deleted file mode 100644
index cabb36eefe54..000000000000
--- a/dev-java/openjfx/files/8/0005-don-t-include-xlocale.h.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 597f200762be416d5a62f1efd351cba6e47c1c4c Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 30 May 2019 12:07:30 -0700
-Subject: [PATCH] don't include xlocale.h
-
---- 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 @@
-
- #ifdef HAVE_XLOCALE_H
- /* Needed on BSD/OS X for e.g. strtod_l */
--#include <xlocale.h>
-+#include <locale.h>
- #endif
-
- #ifdef G_OS_WIN32
---
-2.21.0
-
diff --git a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch b/dev-java/openjfx/files/8/06-disable-architecture-verification.patch
deleted file mode 100644
index d10e62850c31..000000000000
--- a/dev-java/openjfx/files/8/06-disable-architecture-verification.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Disable the architecture verification which is limited to i386 and amd64
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/build.gradle
-+++ b/build.gradle
-@@ -699,6 +699,7 @@
- // at present building on PI is not supported, but we would only need to make
- // some changes on assumptions on what should be built (like SWT / Swing) and
- // such and we could probably make it work.
-+/*
- if (!IS_MAC && !IS_WINDOWS && !IS_LINUX) logger.error("Unsupported build OS ${OS_NAME}")
- if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
- throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
-@@ -707,6 +708,7 @@
- } else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
- throw new Exception("Unknown and unsupported build architecture: $OS_ARCH")
- }
-+*/
-
- // Sanity check that we actually have a list of compile targets to execute
- if (COMPILE_TARGETS == null || COMPILE_TARGETS == "") {
diff --git a/dev-java/openjfx/files/8/10-javadoc-locale.patch b/dev-java/openjfx/files/8/10-javadoc-locale.patch
deleted file mode 100644
index 39d346a4fb73..000000000000
--- a/dev-java/openjfx/files/8/10-javadoc-locale.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Set the locale of the javadoc to make the build reproducible
-Author: Emmanuel Bourg <ebourg@apache.org>
-Forwarded: no
---- a/build.gradle
-+++ b/build.gradle
-@@ -1218,6 +1218,7 @@
- } else {
- options.links(JDK_DOCS);
- }
-+ options.locale("en");
- options.addBooleanOption("XDignore.symbol.file").setValue(true);
- options.addBooleanOption("Xdoclint:none").setValue(!IS_DOC_LINT);
- options.addBooleanOption("javafx").setValue(true);
-@@ -2769,6 +2770,7 @@
- options.windowTitle("${javadocTitle}")
- options.header("${javadocHeader}")
- options.bottom("${javadocBottom}")
-+ options.locale("en");
- if (BUILD_CLOSED) {
- options.linksOffline(JDK_DOCS, JDK_DOCS_CLOSED);
- } else {
diff --git a/dev-java/openjfx/files/8/99-sysdeps.patch b/dev-java/openjfx/files/8/99-sysdeps.patch
deleted file mode 100644
index abcdbab67ef3..000000000000
--- a/dev-java/openjfx/files/8/99-sysdeps.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/build.gradle
-+++ b/build.gradle
-@@ -1309,6 +1309,7 @@ project(":graphics") {
- antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
- antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3"
- antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
-+ antlr3 group: "antlr", name: "antlr", version: "2.7.7"
- }
-
- // Create a single "native" task which will depend on all the individual native tasks for graphics
---- a/buildSrc/build.gradle
-+++ b/buildSrc/build.gradle
-@@ -82,10 +82,13 @@ getConfigurations().create("antlr3");
-
- dependencies {
- compile group: "org.antlr", name: "antlr", version: "3.1.3"
-+ compile group: "org.antlr", name: "antlr-runtime", version: "3.1.3"
-+ compile group: "org.antlr", name: "stringtemplate", version: "3.2"
- testCompile group: "junit", name: "junit", version: "4.8.2"
- antlr3 group: "org.antlr", name: "antlr-runtime", version: "3.1.3"
- antlr3 group: "org.antlr", name: "stringtemplate", version: "3.2"
- antlr3 group: "org.antlr", name: "antlr", version: "3.1.3"
-+ antlr3 group: "antlr", name: "antlr", version: "2.7.7"
- }
-
- // At the moment the ASM library shipped with Gradle that is used to
diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch
deleted file mode 100644
index 771da0707088..000000000000
--- a/dev-java/openjfx/files/8/Wno-error.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 822bf818933311327c5b73cb1b185484f22f55fb Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sun, 26 Apr 2020 21:15:36 -0700
-Subject: [PATCH] Wno-error
-
---- a/buildSrc/armv5sf.gradle
-+++ b/buildSrc/armv5sf.gradle
-@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
- def glassCFlags = ["-ffast-math"]
---- a/buildSrc/armv6hf.gradle
-+++ b/buildSrc/armv6hf.gradle
-@@ -131,7 +131,6 @@ def extraLFlags = [
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
-
---- a/buildSrc/armv6sf.gradle
-+++ b/buildSrc/armv6sf.gradle
-@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
- def glassCFlags = ["-ffast-math"]
---- a/buildSrc/armv7hf.gradle
-+++ b/buildSrc/armv7hf.gradle
-@@ -131,7 +131,6 @@ def extraLFlags = [
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
-
---- a/buildSrc/armv7sf.gradle
-+++ b/buildSrc/armv7sf.gradle
-@@ -135,7 +135,6 @@ def dfbLFlags = ["-ldl"]
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
- def glassCFlags = ["-ffast-math"]
---- a/buildSrc/x86egl.gradle
-+++ b/buildSrc/x86egl.gradle
-@@ -118,7 +118,6 @@ def extraLFlags = [
- def lensLFlags = [extraLFlags, "-lpthread", "-ludev", "-ldl", "-lm"].flatten()
- def monocleCFlags = [
- extraCFlags,
-- "-Werror",
- "-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten();
- def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten()
-
---
-2.26.2
-
diff --git a/dev-java/openjfx/files/8/disable-online-repos.patch b/dev-java/openjfx/files/8/disable-online-repos.patch
deleted file mode 100644
index 6dd2db128e90..000000000000
--- a/dev-java/openjfx/files/8/disable-online-repos.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/build.gradle
-+++ b/build.gradle
-@@ -1135,17 +1135,17 @@ allprojects {
- // "artifact" in the pattern below. Note that the closed builds use different repositories
- // so if you are debugging a closed-build artifact related build issue, check out the
- // closed gradle file instead.
-- if (!BUILD_CLOSED) {
-- repositories {
-- mavenCentral()
-- ivy {
-- url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
-- layout "pattern", {
-- artifact "[artifact].[ext]"
-- }
-- }
-- }
-- }
-+ // if (!BUILD_CLOSED) {
-+ // repositories {
-+ // mavenCentral()
-+ // ivy {
-+ // url "http://download.eclipse.org/eclipse/updates/4.6/R-4.6.3-201703010400/plugins/"
-+ // layout "pattern", {
-+ // artifact "[artifact].[ext]"
-+ // }
-+ // }
-+ // }
-+ // }
-
- // We want to configure all projects as java projects and use the same compile settings
- // etc, except for the root project which we just want to ignore (and for now media)
-@@ -1785,13 +1785,13 @@ project(":fxpackager") {
- }
- // fxpackager has a dependency on ant in order to build the ant jar,
- // and as such needs to point to the apache binary repository
-- if (!BUILD_CLOSED) {
-- repositories {
-- maven {
-- url "https://repository.apache.org"
-- }
-- }
-- }
-+ // if (!BUILD_CLOSED) {
-+ // repositories {
-+ // maven {
-+ // url "https://repository.apache.org"
-+ // }
-+ // }
-+ // }
-
- dependencies {
- compile group: "org.apache.ant", name: "ant", version: "1.8.2"
diff --git a/dev-java/openjfx/files/8/don-t-force-msse.patch b/dev-java/openjfx/files/8/don-t-force-msse.patch
deleted file mode 100644
index 6cdb19e5a002..000000000000
--- a/dev-java/openjfx/files/8/don-t-force-msse.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 6483d73551590e8036cd5ec6d317e8114b403f36 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Sun, 26 Apr 2020 20:57:39 -0700
-Subject: [PATCH] don't force msse
-
---- 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 \
- -Wformat-security \
- -Werror=implicit-function-declaration \
- -fstack-protector \
-- -msse2 \
- -fbuiltin \
- -DHAVE_STDINT_H \
- -DLINUX \
---- 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 \
- -Wformat-security \
- -Werror=implicit-function-declaration \
- -fstack-protector \
-- -msse2 \
- -fbuiltin \
- -DHAVE_STDINT_H \
- -DLINUX \
---- 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
- -Wformat-security \
- -fstack-protector \
- -Werror=implicit-function-declaration \
-- -msse2 \
- -DGSTREAMER_LITE
-
- INCLUDES = $(BASE_INCLUDES) \
---
-2.26.2
-
diff --git a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch b/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
deleted file mode 100644
index 6fd0a9852012..000000000000
--- a/dev-java/openjfx/files/8/fxpackager-don-t-include-obsolete-sys-sysctl.h.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From 26d59b7c8cc2b40277756f55387606ba8a852b31 Mon Sep 17 00:00:00 2001
-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
-
---- a/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-+++ b/modules/fxpackager/src/main/native/library/common/PosixPlatform.cpp
-@@ -43,7 +43,6 @@
- #include <sys/types.h>
- #include <sys/wait.h>
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <iostream>
- #include <dlfcn.h>
- #include <signal.h>
---
-2.28.0
-
diff --git a/dev-java/openjfx/files/8/missing-casts.patch b/dev-java/openjfx/files/8/missing-casts.patch
deleted file mode 100644
index c3d45f4f07df..000000000000
--- a/dev-java/openjfx/files/8/missing-casts.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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");
- }
-
- }
diff --git a/dev-java/openjfx/files/8/respect_flags.patch b/dev-java/openjfx/files/8/respect_flags.patch
deleted file mode 100644
index b8a0975965a8..000000000000
--- a/dev-java/openjfx/files/8/respect_flags.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From 102cfe6848fe3e67c3d85cca8f3c02c1f316845b Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 25 Mar 2021 10:06:49 -0700
-Subject: [PATCH] respect flags
-
---- a/buildSrc/linux.gradle
-+++ b/buildSrc/linux.gradle
-@@ -46,6 +46,9 @@ def commonFlags = [
- "-fstack-protector",
- "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
-
-+
-+commonFlags.addAll(System.getenv('CFLAGS').trim().split(" "))
-+
- if (!IS_64) {
- commonFlags += "-m32"
- }
-@@ -61,6 +64,7 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
- "-z", "relro",
- "-Wl,--gc-sections"].flatten()
- def defaultLinkFlags = linkFlags.flatten()
-+linkFlags.addAll(System.getenv('LDFLAGS').trim().split(" "))
-
- def toolchainDir
- if (hasProperty('toolchainDir')) {
---- 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
- OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
- endif
-
--CFLAGS = -fPIC \
-+CFLAGS := -fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -34,13 +34,8 @@ CFLAGS = -fPIC \
- -DGST_DISABLE_LOADSAVE \
- -DGSTREAMER_LITE \
- -DG_DISABLE_DEPRECATED \
-- -ffunction-sections -fdata-sections
--
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -g -Wall
--endif
-+ -ffunction-sections -fdata-sections \
-+ ${CFLAGS}
-
- INCLUDES= -I../../../plugins \
- -I../../../plugins/av \
-@@ -50,11 +45,12 @@ INCLUDES= -I../../../plugins \
- -I$(GLIB_DIR)/glib \
- -I$(GLIB_DIR)/gmodule
-
--LDFLAGS = -L$(BUILD_DIR) \
-+LDFLAGS := -L$(BUILD_DIR) \
- -z relro \
- -lgstreamer-lite \
- -lglib-lite \
-- -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+ ${LDFLAGS}
-
- ifneq ($(strip $(LIBAV_DIR)),)
- INCLUDES += -I$(LIBAV_DIR)/include
---- 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 \
-
- TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
--CFLAGS = -fPIC \
-+CFLAGS := -fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -35,14 +35,8 @@ CFLAGS = -fPIC \
- -DGST_DISABLE_GST_DEBUG \
- -DGSTREAMER_LITE \
- -DG_DISABLE_DEPRECATED \
-- -ffunction-sections -fdata-sections
--
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -g -Wall
--endif
--
-+ -ffunction-sections -fdata-sections \
-+ ${CFLAGS}
-
- INCLUDES = -I$(SRCBASE_DIR) \
- $(addprefix -I$(SRCBASE_DIR)/,$(DIRLIST)) \
-@@ -52,9 +46,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
- -I$(GLIB_DIR)/glib \
- -I$(GLIB_DIR)/gmodule
-
--LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
-+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-lite -lglib-lite \
- -z relro \
-- -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+ ${LDFLAGS}
-
- ifeq ($(ARCH), x32)
- CFLAGS += -m32
---- 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 \
- -DMATCH_LIMIT=10000000 \
- -DMATCH_LIMIT_RECURSION=10000000
-
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -g -Wall
--endif
--
- INCLUDES = -I$(SRCBASE_DIR) \
- -I$(SRCBASE_DIR)/glib \
- -I$(SRCBASE_DIR)/build/linux \
- -I$(LIBFFI_DIR)/include
-
--LDFLAGS = -L$(BUILD_DIR) -lffi \
-+LDFLAGS := -L$(BUILD_DIR) -lffi \
- -z relro \
-- -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+ ${LDFLAGS}
-
- ifeq ($(ARCH), x32)
- CFLAGS += -m32
---- 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 \
-
- TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-
--CFLAGS =-fPIC \
-+CFLAGS :=-fPIC \
- -Wformat \
- -Wextra \
- -Wformat-security \
-@@ -56,13 +56,8 @@ CFLAGS =-fPIC \
- -DGST_DISABLE_GST_DEBUG \
- -DGST_DISABLE_LOADSAVE \
- -DG_DISABLE_DEPRECATED \
-- -ffunction-sections -fdata-sections
--
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -g -Wall
--endif
-+ -ffunction-sections -fdata-sections \
-+ ${CFLAGS}
-
- INCLUDES = -I$(BASE_DIR)/plugins \
- -I$(SRCBASE_DIR)/projects/build/linux/common \
-@@ -83,9 +78,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \
- PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa)
- PACKAGES_LIBS := $(shell pkg-config --libs alsa)
-
--LDFLAGS = -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
-+LDFLAGS := -L$(BUILD_DIR) -lm -lglib-lite $(PACKAGES_LIBS) \
- -z relro \
-- -static-libgcc -static-libstdc++ -Wl,--gc-sections
-+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
-+ ${LDFLAGS}
-
- ifeq ($(ARCH), x32)
- CFLAGS += -m32
---- 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 \
- -DHAVE_AS_X86_PCREL \
- -DGSTREAMER_LITE
-
--ifeq ($(BUILD_TYPE), Release)
-- CFLAGS += -Os
--else
-- CFLAGS += -O0 -g -Wall
--endif
--
- INCLUDES = -I$(SRCBASE_DIR)/include
-
- C_SOURCES = src/closures.c \
---
-2.31.0
-
diff --git a/dev-java/openjfx/openjfx-8.1000-r2.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild
deleted file mode 100644
index 303971b7904b..000000000000
--- a/dev-java/openjfx/openjfx-8.1000-r2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 2020-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source"
-
-inherit flag-o-matic java-pkg-2 java-pkg-simple multiprocessing toolchain-funcs
-
-EGRADLE_VER="4.10.3"
-EHG_COMMIT="9f49e3b6147f"
-
-DESCRIPTION="Java OpenJFX 8 client application platform"
-HOMEPAGE="https://openjfx.io"
-SRC_URI="
- https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2
- https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2
- https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
-"
-# eclass overrides it, set back to normal
-S="${WORKDIR}/${P}"
-
-LICENSE="GPL-2-with-classpath-exception"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64"
-IUSE="debug doc media cpu_flags_x86_sse2"
-REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
-RESTRICT="test" # needs junit version we don't have, fragile
-
-DEPEND="
- app-arch/unzip
- >=dev-java/ant-1.10.14:0
- >=dev-java/antlr-2.7.7-r7:0
- dev-java/antlr:3
- dev-java/openjdk:8
- dev-java/stringtemplate:0
- dev-java/swt:4.10[cairo,opengl]
- app-alternatives/yacc
- app-alternatives/lex
- virtual/jdk:1.8
- virtual/pkgconfig
-"
-
-RDEPEND="
- dev-java/swt:4.10[cairo,opengl]
- virtual/jre:1.8
-"
-
-# FIXME: majority of flags are honored, needs a bit more patching
-QA_FLAGS_IGNORED=".*"
-
-JAVA_PKG_WANT_BUILD_VM="openjdk-8"
-JAVA_PKG_WANT_SOURCE="1.8"
-JAVA_PKG_WANT_TARGET="1.8"
-
-PATCHES=(
- "${FILESDIR}"/8/99-sysdeps.patch
- "${FILESDIR}"/8/disable-online-repos.patch
- "${FILESDIR}"/8/respect_flags.patch
- "${FILESDIR}"/8/0000-Fix-wait-call-in-PosixPlatform.patch
- "${FILESDIR}"/8/0001-Change-Lucene.patch
- "${FILESDIR}"/8/0003-fix-cast-between-incompatible-function-types.patch
- "${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch
- "${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch
- "${FILESDIR}"/8/06-disable-architecture-verification.patch
- "${FILESDIR}"/8/10-javadoc-locale.patch
- "${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() {
- local GRADLE_HOME="${WORKDIR}/gradle-${EGRADLE_VER}"
- local gradle="${GRADLE_HOME}/bin/gradle"
- local gradle_args=(
- --info
- --stacktrace
- --no-build-cache
- --no-daemon
- --offline
- --gradle-user-home "${T}/gradle_user_home"
- --project-cache-dir "${T}/gradle_project_cache"
- )
-
- export GRADLE_HOME
-
- # FIXME: build.gradle believes $ANT_HOME/bin/ant shoud exist
- unset ANT_HOME
-
- einfo "gradle "${gradle_args[@]}" ${@}"
- # TERM needed, otherwise gradle may fail on terms it does not know about
- TERM="xterm" "${gradle}" "${gradle_args[@]}" ${@} || die "gradle failed"
-}
-
-src_unpack() {
- default
- mv -v "rt-${EHG_COMMIT}" "${P}" || die
-}
-
-src_prepare() {
- eapply "${WORKDIR}/${P}-backports"
- default
-
- # this will create local jar storage to be used as ivy repo
- local d="${T}/jars"
- mkdir "${d}" || die
-
- # we need jars subdir in every prokect so gradle can find them
- # only system jars, no bundling
- local target targets
- targets=(
- jars
- buildSrc/jars
- modules/{base,builders,controls,extensions,fxml}/jars
- modules/{graphics,jmx,media,swing,swt,web,fxpackager}/jars
- )
- einfo "Copying system jars"
- for target in ${targets[@]}; do
- ln -vs "${T}/jars" "${target}" || die
- done
-
- local swt_file_name="$(java-pkg_getjars swt-4.10)"
- java-pkg_jar-from --build-only --into "${d}" ant ant.jar ant-1.8.2.jar
- java-pkg_jar-from --build-only --into "${d}" ant ant-launcher.jar ant-launcher-1.8.2.jar
- java-pkg_jar-from --build-only --into "${d}" antlr antlr.jar antlr-2.7.7.jar
- java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-tool.jar antlr-3.1.3.jar
- java-pkg_jar-from --build-only --into "${d}" antlr-3 antlr-runtime.jar antlr-runtime-3.1.3.jar
- java-pkg_jar-from --build-only --into "${d}" stringtemplate stringtemplate.jar stringtemplate-3.2.jar
- sed -i "s#compile name: SWT_FILE_NAME#compile files(\"${swt_file_name}\")#" "${S}"/build.gradle || die
-
- sed -i 's/-rpath/-rpath-link/g' modules/media/src/main/native/jfxmedia/projects/linux/Makefile || die
-}
-
-src_configure() {
- # see gradle.properties.template in ${S}
- cat <<- _EOF_ > "${S}"/gradle.properties
- COMPILE_TARGETS = linux
- GRADLE_VERSION_CHECK = false
- COMPILE_AVPLUGIN = $(usex media true false)
- COMPILE_MEDIA = $(usex media true false)
- COMPILE_WEBKIT = false
- BUILD_JAVADOC = $(usex doc true false)
- BUILD_SRC_ZIP = $(usex source true false)
- FULL_TEST = false
- CONF = $(usex debug DebugNative Release)
- NUM_COMPILE_THREADS = $(makeopts_jobs)
- _EOF_
-
- local repostring='
- repositories {
- ivy {
- url file("${projectDir}/jars")
- layout "pattern", {
- artifact "[artifact]-[revision].[ext]"
- artifact "[artifact].[ext]"
- }
- }
- mavenLocal()
- }'
-
- cat <<- _EOF_ > "${S}"/buildSrc/gentoo.gradle
- ${repostring}
- _EOF_
-
- cat <<- _EOF_ > "${S}"/gentoo.gradle
- ${repostring}
- allprojects {
- ${repostring}
- }
- _EOF_
-
- echo "apply from: 'gentoo.gradle'" >> build.gradle || die
- echo "apply from: 'gentoo.gradle'" >> buildSrc/build.gradle || die
- sed -i 's/mavenCentral/mavenLocal/g' build.gradle || die
- sed -i 's/mavenCentral/mavenLocal/g' buildSrc/build.gradle || die
- einfo "Configured with the following settings:"
- cat gradle.properties || die
-
-}
-
-src_compile() {
- append-cflags '-fcommon'
- tc-export_build_env CC CXX PKG_CONFIG
- rm -r tests buildSrc/src/test || die
- egradle openExportLinux
-}
-
-src_install() {
- local dest="/usr/$(get_libdir)/openjdk-${SLOT}"
- local ddest="${ED}${dest}"
- dodir "${dest}"
- pushd build/export/sdk > /dev/null || die
- cp -pPRv * "${ddest}" || die
- popd > /dev/null || die
-}