Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2025-12-06 08:25:01 +01:00
Code Issues Projects Releases Wiki Activity

openjfx: remove, we don't need it

Browse source
This commit is contained in:
Anton Bolshakov 2022-10-02 07:57:06 +08:00
parent 2efb716bb1
commit 56e0c04a19
No known key found for this signature in database
GPG key ID: 32BDCED870788F04
15 changed files with 0 additions and 1129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dev-java/openjfx/Manifest
View file

@ -1,10 +0,0 @@
DIST ST4-4.0.8.jar 239543 BLAKE2B 72d257c6d0f1b3bde0afce805128dd38d8520b2073377bbb995fed3b4e18a3ea69d508d6d7554755ec68bf50940082b896ed89998a5178272d24376404b389c5 SHA512 9877289297cd5b15ad464a19467699387f57c510fe8a476e07e9d2334bd11933f9bdb9c6caa4972d4d4c84b56740c6d885cd39300dd7ce35b7c5bde536238086
DIST antlr4-4.7.2-complete.jar 2079769 BLAKE2B 9407e5096b5943702a1375f568957f35486a80f122bc59c5ec8e899f59214c43ee4ece551d9078de14b7707d85f9306ae99953981c755a1e1205d83412010738 SHA512 e788d28796c8925a158f0a09048590bdcf6730d46dcb8a12b362cbcc80a7ceb76374b2675987c953faecd3cf4a847b1571485a71081a84684170d25d05176a11
DIST gradle-7.0-bin.zip 112554948 BLAKE2B b47ea53ecc103d3ea68cc90d1518490f1f588c937cd20fb99cfa4f2ffa56540ec2d2a1cf28f5b5f7644d55fd4cb2b94d4bce1564ef6b01fbe6b1c2e9a52d850a SHA512 f38aab8a3a7beb214b846d4b5702ceb8d8351a8104774303ab8eea0635ba870242802904709f8e214d297d37e3e20c5f997ca078178234709ef46c4809fff77e
DIST gunit-3.5.2.jar 287425 BLAKE2B 86e759c5bb164758b689d93bef4b6a0bcb39eb9fee28d2a8dc113a4c97e5e8516b55ada87c27738ffa0fc512805caa338d8649f6f5c9ba36490c4c3ebed86fdd SHA512 c9f14dacec2f22f62b7d3849d1c0e9d626b3dc20eb74a85b32f1901f6279b7b84af095107128bcbe80c49ac05448a713309b60d0c3d2f88e0bca8a14690292b2
DIST lucene-core-7.7.3.jar 3089727 BLAKE2B 1614b2512a23e2bffcd9d804c08c1a465818ca56cada99f19e6a8973cd24d9d378d19baec01ec4883e77850f433b81499727dcede718643ed118945fba3b9c2a SHA512 19d5e29d048b6dabd87fba7e5e12fefd443fe1b67ede6644b7c268e290ee8b3c47cb5fe4a90a9e4b140df9325ca6db0c1ee057d5b343f4d3616351d04d6a740a
DIST lucene-grouping-7.7.3.jar 87265 BLAKE2B 36a0c32fbe76dc53e52b62fcdfaeae3acdcd54e76f45eac3a75955b1746bfc4513aecdaca35822a1eb6d247c444f335f43af23dbe0b3ae9f7569326dc20d3d16 SHA512 a0974c199bfb699e4e059290ca81cb765d5e093a3083239cb2b8e6668bf06e6a85c61e0ccba607eedab14760eb1a7595779bed24f51659b6d736b5c7cd900a38
DIST lucene-queries-7.7.3.jar 265142 BLAKE2B 6e9fc6c2ea5744adc4f772133ee83c059435b4ef4785a133bf0973ab7ce7eaaa1314b21d1f4a78de9131338f44d2ffe9c533043308b62e0877f6ff5db19c0af9 SHA512 e2bbb8b4af97b671de1d2d6f5e2f27e7daeb3c660cada6803d7fe839eb92818475489924774f4e710ecae3d7536e4e591f06cb84c597bc16eddd4a0be71b06ea
DIST lucene-queryparser-7.7.3.jar 381935 BLAKE2B dea7a8fb6c9a91a34429f7c98fa025b3229a19f801d0bd97fbee128b22d2bd94721bf02a1818d763d3c13170060109c11c4a67c1de8ad3214031e9d4575a4bb5 SHA512 eed3d5c9b83f740e665eb44fe483f76a1f5cf181fa42e65f5106bebd7026d1518d626e146c2c6c4da46c64e080e6b466c0542c1c9f49bbd46c9c6f0d8e193e6f
DIST lucene-sandbox-7.7.3.jar 279670 BLAKE2B 6ef7d61c62a99a1bf670bb32f6fc5e87d3be9ee73f286ddfb18284f72c0a7df6b92ab46c5fc764ed4aad21838fb73e2dcd0b149d1ee2ab22b8f470f587951f66 SHA512 bf1002e81621e65d4f5f9005be6a10c6bfe202bc19dfa43990f689428a338da2ddb70336de9b0e8c0eb7c15bcd215adc8bb4ea486c28ff3fa0bcd6b8652d4e69
DIST openjfx-17.0.3_p2.tar.gz 59026329 BLAKE2B 6bb54dcbbd1da32149f07c015584741bf23a8d471ad08bb1196a8bc4b36c5e05872ef89ec2c4d681486f23ce04a62a795383b9533c0f2329f469767f0512b040 SHA512 43b97846543e1312861b69f63ec9a000385f152655c6a659ccdaeb15464b8d146f12f1eb31b9c280e31e90b30e46a5ab1ce7564d0f4b24abd2ab72e91cb6ce47

22
dev-java/openjfx/files/11/11.0.9_p0-version.patch
View file

@ -1,22 +0,0 @@
# HG changeset patch
# User jvos
# Date 1597927682 -7200
# Node ID c0fe72db97a8924c906e4237881aa3c1d5669d19
# Parent 38425dc30b9a25d52fbb0548ea1b0d098888aaed
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
@@ -41,7 +41,7 @@
# UPDATE THE FOLLOWING VALUES FOR A NEW RELEASE
jfx.release.major.version=11
jfx.release.minor.version=0
-jfx.release.security.version=8
+jfx.release.security.version=9
jfx.release.patch.version=0
# Note: The release version is now calculated in build.gradle as the

33
dev-java/openjfx/files/11/disable-architecture-verification.patch
View file

@ -1,33 +0,0 @@
From 715ea681d14364be4fb2bdda120f6bf9ebaa9d5e Mon Sep 17 00:00:00 2001
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"
// 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) fail("Unsupported build OS ${OS_NAME}")
if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
fail("Unknown and unsupported build architecture: $OS_ARCH")
@@ -310,7 +311,7 @@ if (IS_WINDOWS && OS_ARCH != "x86" && OS_ARCH != "amd64") {
} else if (IS_LINUX && OS_ARCH != "i386" && OS_ARCH != "amd64") {
fail("Unknown and unsupported build architecture: $OS_ARCH")
}
-
+*/
// Get the JDK_HOME automatically based on the version of Java used to execute gradle. Or, if specified,
// use a user supplied JDK_HOME, STUB_RUNTIME, JAVAC, all of which may be specified
--
2.28.0

13
dev-java/openjfx/files/11/disable-buildSrc-tests.patch
View file

@ -1,13 +0,0 @@
Description: Disables the buildSrc tests to work around a Gradle bug (UnsupportedOperationException: Cannot nest operations in the same thread)
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: not-needed
--- a/buildSrc/build.gradle
+++ b/buildSrc/build.gradle
@@ -81,6 +81,7 @@
// Java 7 but when we switch to 8 this will be needed, and probably again when
// we start building with Java 9.
test {
+ enabled = false;
enableAssertions = true;
testLogging.exceptionFormat = "full";
scanForTestClasses = false;

92
dev-java/openjfx/files/11/don-t-force-msse-11.0.11.patch
View file

@ -1,92 +0,0 @@
From cf60da4cb9429f01b5793b0116651e6766068e7b Mon Sep 17 00:00:00 2001
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 \
-fstack-protector \
-Werror=implicit-function-declaration \
-Werror=trampolines \
- -msse2 \
-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 \
-fstack-protector \
-Werror=implicit-function-declaration \
-Werror=trampolines \
- -msse2 \
-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 \
-DHAVE_STDINT_H \
-DGSTREAMER_LITE \
-DG_DISABLE_DEPRECATED \
- -DOSX \
- -msse2
+ -DOSX
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 \
-DHAVE_CONFIG_H \
-DGSTREAMER_LITE \
-DGST_REMOVE_DISABLED \
- -DOSX \
- -msse2
+ -DOSX
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
-Wformat-security \
-fstack-protector \
-Werror=trampolines \
- -msse2 \
-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 \
-fPIC \
-Werror=implicit-function-declaration \
-DTARGET_OS_MAC=1 \
- -D_GNU_SOURCE \
- -msse2
+ -D_GNU_SOURCE
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os

95
dev-java/openjfx/files/11/don-t-force-msse.patch
View file

@ -1,95 +0,0 @@
From cf60da4cb9429f01b5793b0116651e6766068e7b Mon Sep 17 00:00:00 2001
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 \
-Wformat-security \
-fstack-protector \
-Werror=implicit-function-declaration \
- -msse2 \
-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 \
-Wformat-security \
-fstack-protector \
-Werror=implicit-function-declaration \
- -msse2 \
-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 \
-DHAVE_STDINT_H \
-DGSTREAMER_LITE \
-DG_DISABLE_DEPRECATED \
- -DOSX \
- -msse2
+ -DOSX
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 \
-DHAVE_CONFIG_H \
-DGSTREAMER_LITE \
-DGST_REMOVE_DISABLED \
- -DOSX \
- -msse2
+ -DOSX
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
-Wformat-security \
-fstack-protector \
-Werror=implicit-function-declaration \
- -msse2 \
-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 \
-fPIC \
-Werror=implicit-function-declaration \
-DTARGET_OS_MAC=1 \
- -D_GNU_SOURCE \
- -msse2
+ -D_GNU_SOURCE
ifeq ($(BUILD_TYPE), Release)
CFLAGS += -Os
--
2.28.0

15
dev-java/openjfx/files/11/glibc-compatibility.patch
View file

@ -1,15 +0,0 @@
Description: Fixes the compatibility with the version of glibc in Debian
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: https://bugs.openjdk.java.net/browse/JDK-8211399
--- a/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
+++ b/modules/javafx.web/src/main/native/Source/ThirdParty/libxslt/src/libxslt/xsltlocale.h
@@ -25,9 +25,6 @@
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
-#ifdef HAVE_XLOCALE_H
-#include <xlocale.h>
-#endif
typedef locale_t xsltLocale;
typedef xmlChar xsltLocaleChar;

31
dev-java/openjfx/files/11/gstreamer-CVE-2021-3522.patch
View file

@ -1,31 +0,0 @@
From 8a88e5c1db05ebadfd4569955f6f47c23cdca3c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Wed, 3 Mar 2021 01:08:25 +0000
Subject: [PATCH] tag: id3v2: fix frame size check and potential invalid reads
Check the right variable when checking if there's
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)
if (work->frame_flags & (ID3V2_FRAME_FORMAT_COMPRESSION |
ID3V2_FRAME_FORMAT_DATA_LENGTH_INDICATOR)) {
- if (work->hdr.frame_data_size <= 4)
+ if (frame_data_size <= 4)
return FALSE;
if (ID3V2_VER_MAJOR (work->hdr.version) == 3) {
work->parse_size = GST_READ_UINT32_BE (frame_data);
--
GitLab

227
dev-java/openjfx/files/11/respect-user-cflags-11.0.11.patch
View file

@ -1,227 +0,0 @@
From a28f9aaab759d82384279c16d86bb98ab47412a3 Mon Sep 17 00:00:00 2001
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 }
def commonFlags = [
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
"-fstack-protector",
+ "-Wno-error=cast-function-type",
"-Wextra", "-Wall", "-Wformat-security", "-Wno-unused", "-Wno-parentheses", "-Werror=trampolines"] // warning flags
+commonFlags.addAll(System.getenv("CFLAGS").trim().split(" "))
+
if (!IS_64) {
commonFlags += "-m32"
}
@@ -61,6 +64,8 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
"-z", "relro",
"-Wl,--gc-sections"].flatten()
+linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
+
if (IS_DEBUG_NATIVE) {
linkFlags += "-g"
}
@@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [ccFlags].flatten()
LINUX.iio.linker = linker
-LINUX.iio.linkFlags = [linkFlags].flatten()
+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
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
OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
endif
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -29,13 +29,8 @@ CFLAGS = -fPIC \
-DLINUX \
-DGST_DISABLE_LOADSAVE \
-DGSTREAMER_LITE \
- -ffunction-sections -fdata-sections
-
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
- CFLAGS += -g -Wall
-endif
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -46,11 +41,12 @@ INCLUDES= -I../../../plugins \
-I../../../gstreamer-lite/gstreamer/libs \
$(PACKAGES_INCLUDES)
-LDFLAGS = -L$(BUILD_DIR) \
+LDFLAGS := -L$(BUILD_DIR) \
-lgstreamer-lite \
$(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -30,14 +30,8 @@ CFLAGS = -fPIC \
-DGST_DISABLE_LOADSAVE \
-DGST_DISABLE_GST_DEBUG \
-DGSTREAMER_LITE \
- -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)) \
@@ -47,9 +41,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-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
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS =-fPIC \
+CFLAGS :=-fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -51,13 +51,8 @@ CFLAGS =-fPIC \
-DLINUX \
-DGST_DISABLE_GST_DEBUG \
-DGST_DISABLE_LOADSAVE \
- -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 \
@@ -75,9 +70,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \
PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS = -DTARGET_OS_LINUX=1 \
+CFLAGS := -DTARGET_OS_LINUX=1 \
-D_GNU_SOURCE \
-DGST_REMOVE_DEPRECATED \
-DGST_DISABLE_GST_DEBUG \
@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1 \
-DHAVE_CONFIG_H \
-DJFXMEDIA_JNI_EXPORTS \
-DLINUX \
- -ffunction-sections -fdata-sections
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
@@ -56,21 +57,16 @@ ifdef HOST_COMPILE
-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
$(PACKAGES_INCLUDES)
- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+ LDFLAGS := -Wl,-rpath-link,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
else
CFLAGS += $(EXTRA_CFLAGS)
INCLUDES = $(BASE_INCLUDES)
LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
endif
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
- CFLAGS += -g -Wall -D_DEBUG
-endif
-
ifeq ($(ARCH), x32)
CFLAGS += -m32
LDFLAGS += -m32
--
2.21.0

227
dev-java/openjfx/files/11/respect-user-cflags.patch
View file

@ -1,227 +0,0 @@
From a28f9aaab759d82384279c16d86bb98ab47412a3 Mon Sep 17 00:00:00 2001
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 }
def commonFlags = [
"-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
"-fstack-protector",
+ "-Wno-error=cast-function-type",
"-Wextra", "-Wall", "-Wformat-security", "-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,8 @@ def linkFlags = ["-static-libgcc", "-static-libstdc++", "-shared", commonFlags,
"-z", "relro",
"-Wl,--gc-sections"].flatten()
+linkFlags.addAll(System.getenv("LDFLAGS").trim().split(" "))
+
if (IS_DEBUG_NATIVE) {
linkFlags += "-g"
}
@@ -294,7 +299,7 @@ LINUX.iio.nativeSource = [
LINUX.iio.compiler = compiler
LINUX.iio.ccFlags = [ccFlags].flatten()
LINUX.iio.linker = linker
-LINUX.iio.linkFlags = [linkFlags].flatten()
+LINUX.iio.linkFlags = [linkFlags, "-ljpeg"].flatten()
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
OBJBASE_DIR = $(BUILD_DIR)/obj/plugins/avplugin
endif
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -29,13 +29,8 @@ CFLAGS = -fPIC \
-DLINUX \
-DGST_DISABLE_LOADSAVE \
-DGSTREAMER_LITE \
- -ffunction-sections -fdata-sections
-
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
- CFLAGS += -g -Wall
-endif
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
@@ -46,11 +41,12 @@ INCLUDES= -I../../../plugins \
-I../../../gstreamer-lite/gstreamer/libs \
$(PACKAGES_INCLUDES)
-LDFLAGS = -L$(BUILD_DIR) \
+LDFLAGS := -L$(BUILD_DIR) \
-lgstreamer-lite \
$(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS = -fPIC \
+CFLAGS := -fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -30,14 +30,8 @@ CFLAGS = -fPIC \
-DGST_DISABLE_LOADSAVE \
-DGST_DISABLE_GST_DEBUG \
-DGSTREAMER_LITE \
- -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)) \
@@ -47,9 +41,10 @@ INCLUDES = -I$(SRCBASE_DIR) \
PACKAGES_INCLUDES := $(shell pkg-config --cflags glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs glib-2.0 gobject-2.0)
-LDFLAGS = -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lgstreamer-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
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS =-fPIC \
+CFLAGS :=-fPIC \
-Wformat \
-Wextra \
-Wformat-security \
@@ -51,13 +51,8 @@ CFLAGS =-fPIC \
-DLINUX \
-DGST_DISABLE_GST_DEBUG \
-DGST_DISABLE_LOADSAVE \
- -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 \
@@ -75,9 +70,10 @@ INCLUDES = -I$(BASE_DIR)/plugins \
PACKAGES_INCLUDES := $(shell pkg-config --cflags alsa glib-2.0)
PACKAGES_LIBS := $(shell pkg-config --libs alsa glib-2.0 gobject-2.0 gmodule-2.0 gthread-2.0)
-LDFLAGS = -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
+LDFLAGS := -L$(BUILD_DIR) -lm $(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
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 \
TARGET = $(BUILD_DIR)/lib$(BASE_NAME).so
-CFLAGS = -DTARGET_OS_LINUX=1 \
+CFLAGS := -DTARGET_OS_LINUX=1 \
-D_GNU_SOURCE \
-DGST_REMOVE_DEPRECATED \
-DGST_DISABLE_GST_DEBUG \
@@ -26,7 +26,8 @@ CFLAGS = -DTARGET_OS_LINUX=1 \
-DHAVE_CONFIG_H \
-DJFXMEDIA_JNI_EXPORTS \
-DLINUX \
- -ffunction-sections -fdata-sections
+ -ffunction-sections -fdata-sections \
+ ${CFLAGS}
CPPFLAGS = -fno-rtti -ffunction-sections -fdata-sections
@@ -56,21 +57,16 @@ ifdef HOST_COMPILE
-I$(GSTREAMER_LITE_DIR)/gstreamer/libs \
$(PACKAGES_INCLUDES)
- LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
+ LDFLAGS := -Wl,-rpath-link,\$$ORIGIN -L$(BUILD_DIR) -lgstreamer-lite $(PACKAGES_LIBS) \
-z relro \
- -static-libgcc -static-libstdc++ -Wl,--gc-sections
+ -static-libgcc -static-libstdc++ -Wl,--gc-sections \
+ ${LDFLAGS}
else
CFLAGS += $(EXTRA_CFLAGS)
INCLUDES = $(BASE_INCLUDES)
LDFLAGS = -Wl,-rpath,\$$ORIGIN -L$(BUILD_DIR) $(EXTRA_LDFLAGS)
endif
-ifeq ($(BUILD_TYPE), Release)
- CFLAGS += -Os
-else
- CFLAGS += -g -Wall -D_DEBUG
-endif
-
ifeq ($(ARCH), x32)
CFLAGS += -m32
LDFLAGS += -m32
--
2.21.0

25
dev-java/openjfx/files/11/use-system-swt-jar.patch
View file

@ -1,25 +0,0 @@
From c7a04feac8281cd3e53c8d0215a229bb6cd4fce8 Mon Sep 17 00:00:00 2001
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") {
commonModuleSetup(project, [ 'base', 'graphics' ])
dependencies {
- compile name: SWT_FILE_NAME
+ compile files("__gentoo_swt_jar__")
}
classes {
--
2.21.0

43
dev-java/openjfx/files/11/wno-error-11.0.11.patch
View file

@ -1,43 +0,0 @@
From 9df57c50dcf4b0ac729595600932f844e1f8d4a3 Mon Sep 17 00:00:00 2001
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
LINUX.glass.glass = [:]
LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
LINUX.glass.glass.compiler = compiler
-LINUX.glass.glass.ccFlags = [cppFlags, "-Werror"].flatten()
+LINUX.glass.glass.ccFlags = [cppFlags].flatten()
LINUX.glass.glass.linker = linker
LINUX.glass.glass.linkFlags = IS_STATIC_BUILD? linkFlags : [linkFlags, "-lX11", "-ldl"].flatten()
LINUX.glass.glass.lib = "glass"
@@ -241,7 +241,7 @@ LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles()
LINUX.glass.glassgtk2.compiler = compiler
LINUX.glass.glassgtk2.ccFlags = IS_STATIC_BUILD ?
["-fno-threadsafe-statics", cppFlags, gtk2CCFlags].flatten() :
- [cppFlags, gtk2CCFlags, "-Werror"].flatten()
+ [cppFlags, gtk2CCFlags].flatten()
LINUX.glass.glassgtk2.linker = linker
LINUX.glass.glassgtk2.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk2LinkFlags].flatten()
LINUX.glass.glassgtk2.lib = "glassgtk2"
@@ -251,7 +251,7 @@ LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles()
LINUX.glass.glassgtk3.compiler = compiler
LINUX.glass.glassgtk3.ccFlags = IS_STATIC_BUILD ?
["-fno-threadsafe-statics", cppFlags, gtk3CCFlags].flatten() :
- [cppFlags, gtk3CCFlags, "-Werror"].flatten()
+ [cppFlags, gtk3CCFlags].flatten()
LINUX.glass.glassgtk3.linker = linker
LINUX.glass.glassgtk3.linkFlags = IS_STATIC_BUILD ? linkFlags : [linkFlags, gtk3LinkFlags].flatten()
LINUX.glass.glassgtk3.lib = "glassgtk3"
--
2.34.0

43
dev-java/openjfx/files/11/wno-error.patch
View file

@ -1,43 +0,0 @@
From 737acaff3658663de61813ba877379841e76631e Mon Sep 17 00:00:00 2001
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
LINUX.glass.glass = [:]
LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles()
LINUX.glass.glass.compiler = compiler
-LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten()
LINUX.glass.glass.linker = linker
LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten()
LINUX.glass.glass.lib = "glass"
@@ -231,7 +231,7 @@ LINUX.glass.glass.lib = "glass"
LINUX.glass.glassgtk2 = [:]
LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles()
LINUX.glass.glassgtk2.compiler = compiler
-LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten()
+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten()
LINUX.glass.glassgtk2.linker = linker
LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten()
LINUX.glass.glassgtk2.lib = "glassgtk2"
@@ -239,7 +239,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2"
LINUX.glass.glassgtk3 = [:]
LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles()
LINUX.glass.glassgtk3.compiler = compiler
-LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten()
+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten()
LINUX.glass.glassgtk3.linker = linker
LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten()
LINUX.glass.glassgtk3.lib = "glassgtk3"
--
2.24.1

19
dev-java/openjfx/metadata.xml
View file

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>gyakovlev@gentoo.org</email>
<name>Georgy Yakovlev</name>
</maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
</maintainer>
<longdescription lang="en">
OpenJFX is an open source, next generation client application platform for desktop,
mobile and embedded systems built on Java.
</longdescription>
<use>
<flag name="media">Compile media module, based on gstreamer-minimal (does not pull gstreamer)</flag>
<flag name="source">Install JavaFX sources</flag>
</use>
</pkgmetadata>

234
dev-java/openjfx/openjfx-17.0.3_p2.ebuild
View file

@ -1,234 +0,0 @@
# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
MY_PV="${PV/_p/-}"
#SLOT="${MY_PV%%[.+]*}"
SLOT="11"
#EGRADLE_VER="6.3"
EGRADLE_VER="7.0"
inherit flag-o-matic java-pkg-2 multiprocessing
DESCRIPTION="Java OpenJFX client application platform"
HOMEPAGE="https://openjfx.io"
#https://wiki.openjdk.org/display/OpenJFX/Building+OpenJFX#BuildingOpenJFX-LinuxDesktopBuildLinux
SRC_URI="https://github.com/openjdk/jfx17u/archive/refs/tags/${PV/_p/+}.tar.gz -> ${P}.tar.gz
https://downloads.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-sandbox/7.7.3/lucene-sandbox-7.7.3.jar
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.3/lucene-grouping-7.7.3.jar
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queryparser/7.7.3/lucene-queryparser-7.7.3.jar
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-queries/7.7.3/lucene-queries-7.7.3.jar
https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.3/lucene-core-7.7.3.jar
https://repo.maven.apache.org/maven2/org/antlr/gunit/3.5.2/gunit-3.5.2.jar
https://repo1.maven.org/maven2/org/antlr/antlr4/4.7.2/antlr4-4.7.2-complete.jar
https://repo.maven.apache.org/maven2/org/antlr/ST4/4.0.8/ST4-4.0.8.jar
"
LICENSE="GPL-2-with-classpath-exception"
#WIP, doesn't work yet
#KEYWORDS="-* ~amd64 ~ppc64"
IUSE="cpu_flags_x86_sse2 debug doc source +media"
RDEPEND="
dev-java/swt:4.10[cairo,opengl]
dev-libs/atk
dev-libs/glib:2
dev-libs/libxml2:2
dev-libs/libxslt
media-libs/freetype:2
media-libs/fontconfig:1.0
media-video/ffmpeg:0=
x11-libs/gdk-pixbuf
x11-libs/gtk+:2
x11-libs/gtk+:3
x11-libs/cairo[glib]
x11-libs/libX11
x11-libs/libXtst
x11-libs/libXxf86vm
x11-libs/pango
virtual/jpeg
virtual/opengl
doc? ( dev-java/openjdk:${SLOT}[doc] )
!doc? (
|| (
dev-java/openjdk-bin:${SLOT}
dev-java/openjdk:${SLOT}
)
)
"
DEPEND="${RDEPEND}
app-arch/unzip
app-arch/zip
>=dev-java/ant-core-1.10.7-r1:0
dev-java/antlr:0
dev-java/antlr:3.5
dev-java/hamcrest-core:0
dev-java/stringtemplate:0
virtual/ttf-fonts
virtual/pkgconfig
"
REQUIRED_USE="amd64? ( cpu_flags_x86_sse2 )"
PATCHES=(
"${FILESDIR}"/11/disable-buildSrc-tests.patch
"${FILESDIR}"/11/glibc-compatibility.patch
# "${FILESDIR}"/11/respect-user-cflags-11.0.11.patch
# "${FILESDIR}"/11/use-system-swt-jar.patch
"${FILESDIR}"/11/wno-error-11.0.11.patch
# "${FILESDIR}"/11/don-t-force-msse-11.0.11.patch
"${FILESDIR}"/11/disable-architecture-verification.patch
# "${FILESDIR}"/11/gstreamer-CVE-2021-3522.patch
)
S="${WORKDIR}/jfx17u-${MY_PV}"
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"
}
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
# The nastiness below is necessary while the gentoo-vm USE flag is
# masked. First we call java-pkg-2_pkg_setup if it looks like the
# flag was unmasked against one of the possible build VMs. If not,
# we try finding one of them in their expected locations. This would
# have been slightly less messy if openjdk-bin had been installed to
# /opt/${PN}-${SLOT} or if there was a mechanism to install a VM env
# file but disable it so that it would not normally be selectable.
local vm
for vm in ${JAVA_PKG_WANT_BUILD_VM}; do
if [[ -d ${EPREFIX}/usr/lib/jvm/${vm} ]]; then
java-pkg-2_pkg_setup
return
fi
done
if has_version --host-root dev-java/openjdk:${SLOT}; then
export JAVA_HOME=${EPREFIX}/usr/$(get_libdir)/openjdk-${SLOT}
export JDK_HOME="${JAVA_HOME}"
export ANT_RESPECT_JAVA_HOME=true
else
if [[ ${MERGE_TYPE} != "binary" ]]; then
JDK_HOME=$(best_version --host-root dev-java/openjdk-bin:${SLOT})
[[ -n ${JDK_HOME} ]] || die "Build VM not found!"
JDK_HOME=${JDK_HOME#*/}
JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
export JDK_HOME
export JAVA_HOME="${JDK_HOME}"
export ANT_RESPECT_JAVA_HOME=true
fi
fi
}
src_unpack() {
unpack "${P}.tar.gz"
unpack "gradle-${EGRADLE_VER}-bin.zip"
mkdir "${T}/jars" || die
local line jar
for line in ${SRC_URI}; do
if [[ ${line} =~ (http|https)://[a-zA-Z0-9.-_]*/(maven2|m2|eclipse)/(.*[.]jar)$ ]]; then
jar=$(basename "${BASH_REMATCH[-1]}")
cp -v "${DISTDIR}/${jar}" "${T}/jars/" || die
fi
done
}
src_prepare() {
default
local d="${T}/jars"
java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr
java-pkg_jar-from --build-only --with-dependencies --into "${d}" antlr-3.5
java-pkg_jar-from --build-only --with-dependencies --into "${d}" stringtemplate
java-pkg_jar-from --build-only --with-dependencies --into "${d}" hamcrest-core
sed -i "s#implementation name: SWT_FILE_NAME#implementation files(\"$(java-pkg_getjars swt-4.10)\")#" "${S}"/build.gradle || die
# sed -i "s#implementation name: SWT_FILE_NAME#compile files(\"$(java-pkg_getjars swt-4.10)\")#" "${S}"/build.gradle || die
# sed -i "s#__gentoo_swt_jar__#$(java-pkg_getjars swt-4.10)#" "${S}"/build.gradle || die
}
src_configure() {
append-flags -Wno-error -fcommon
#FIXME: still calls gcc, pkg-config etc by name without chost prefix
#FIXME: should we enable webkit? doubt so
# build is very sensetive to doc presense, take extra steps
if use doc; then
local jdk_doc
if has_version --host-root dev-java/openjdk:${SLOT}[doc]; then
jdk_doc="${EPREFIX}/usr/share/doc/openjdk-${SLOT}/html/api"
fi
[[ -r ${jdk_doc}/element-list ]] || die "JDK Docs not found, terminating build early"
fi
cat <<- _EOF_ > "${S}"/gradle.properties
COMPILE_TARGETS = linux
COMPILE_WEBKIT = false
COMPILE_MEDIA = $(usex media true false)
JDK_DOCS = https://docs.oracle.com/en/java/javase/${SLOT}/docs/api
JDK_DOCS_LINK = $(usex doc "${jdk_doc}" "")
BUILD_LIBAV_STUBS = false
GRADLE_VERSION_CHECK = false
LINT = none
CONF = $(usex debug DebugNative Release)
NUM_COMPILE_THREADS = $(makeopts_jobs)
JFX_DEPS_URL = ${T}/jars
COMPANY_NAME = "Gentoo"
_EOF_
}
src_compile() {
egradle zips $(usex doc "" "--exclude-task javadoc")
}
src_install() {
if ! use source ; then
rm -v build/sdk/lib/src.zip || die
fi
insinto "/usr/$(get_libdir)/${PN}-${SLOT}"
doins -r build/sdk/.
doins build/javafx-exports.zip
if use doc; then
docinto html
dodoc -r build/javadoc/.
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}