1 |
commit: 6c5884ec3131e1fe1f5a339dadc06f8d55c3bb59 |
2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 25 15:57:58 2021 +0000 |
4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 25 15:58:09 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5884ec |
7 |
|
8 |
dev-java/openjfx: bump to 8.1000 ( fictional version ) |
9 |
|
10 |
New backported fixes from https://github.com/jschwartzenberg/openjfx8 |
11 |
|
12 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
13 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
14 |
|
15 |
dev-java/openjfx/Manifest | 4 +-- |
16 |
...07-disable-assembler-on-unsupported-archs.patch | 18 ------------- |
17 |
dev-java/openjfx/files/8/Wno-error.patch | 31 ---------------------- |
18 |
...{openjfx-8.999.ebuild => openjfx-8.1000.ebuild} | 3 +-- |
19 |
4 files changed, 3 insertions(+), 53 deletions(-) |
20 |
|
21 |
diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest |
22 |
index 71a68df134f..46d451a907e 100644 |
23 |
--- a/dev-java/openjfx/Manifest |
24 |
+++ b/dev-java/openjfx/Manifest |
25 |
@@ -8,5 +8,5 @@ DIST lucene-queries-7.1.0.jar 243126 BLAKE2B 166c3efea04c19314be7fd8c1d6b1378b2b |
26 |
DIST lucene-queryparser-7.1.0.jar 384680 BLAKE2B adce2572de9f534323eead31dd30f97b853b2d5e4be6828c415f0c647460c361e00680d856ff9ffbba0fe45c3e4a425d68938a3d2dc01c76491bb65673e120fa SHA512 7151ef899e318679995138262c3450577ae33580708864581dc22a027f43ca4989825d434680925547e3c04ad4453a454e7045f605d7eee0da57d63db978ed68 |
27 |
DIST lucene-sandbox-7.1.0.jar 182914 BLAKE2B 70c795f84d8f0908abe47db77f632eeb6571a77e1445b8ab04a75080cea40e3b8171071965ff7fd9f6d39a450dd33144e922d19c1f07c605de54b45e3e881323 SHA512 6faf9fd9c7c082bf062adb6a28d89447e6e27152eb3f0a325081e5f791196e5440334632ccbf9c458940220676f7e73390a174889d9b7a656d088b3dade5d500 |
28 |
DIST openjfx-11.0.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 |
29 |
-DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893 |
30 |
-DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 |
31 |
+DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d11675a92ecab337c7bda5a1ad72e84d0b35f04ed4252cee24da89b1e7b1b5b8b8b9fea7db93364434800246b87827b21970cc3 SHA512 077392368947cb9da1b5c7e14b641d6edcddd9821eb4f16dbea33e8986568211e93799aca29e70b490c8ef2125d69f8372abd1b1ce428a95420f62ff15c414d6 |
32 |
+DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 |
33 |
|
34 |
diff --git a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch |
35 |
deleted file mode 100644 |
36 |
index 551a1e82ba5..00000000000 |
37 |
--- a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch |
38 |
+++ /dev/null |
39 |
@@ -1,18 +0,0 @@ |
40 |
-Description: Disable assembler in WebKit on unsupported architectures |
41 |
-Author: Emmanuel Bourg <ebourg@××××××.org> |
42 |
-Forwarded: no |
43 |
---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h |
44 |
-+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h |
45 |
-@@ -325,6 +325,12 @@ |
46 |
- #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 |
47 |
- #endif |
48 |
- |
49 |
-+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4) |
50 |
-+#define ENABLE_ASSEMBLER 0 |
51 |
-+#define ENABLE_JIT 0 |
52 |
-+#define ENABLE_YARR_JIT 0 |
53 |
-+#endif |
54 |
-+ |
55 |
- /* ==== OS() - underlying operating system; only to be used for mandated low-level services like |
56 |
- virtual memory, not to choose a GUI toolkit ==== */ |
57 |
- |
58 |
|
59 |
diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch |
60 |
index 208411508d8..edc9389ee9c 100644 |
61 |
--- a/dev-java/openjfx/files/8/Wno-error.patch |
62 |
+++ b/dev-java/openjfx/files/8/Wno-error.patch |
63 |
@@ -73,37 +73,6 @@ index 0bb8a530..38e98303 100644 |
64 |
"-I", file("modules/graphics/src/main/native-glass/monocle/")].flatten(); |
65 |
def monocleLFlags = [extraLFlags, "-ldl", "-lm"].flatten() |
66 |
def glassCFlags = ["-ffast-math"] |
67 |
-diff --git a/buildSrc/linux.gradle b/buildSrc/linux.gradle |
68 |
-index f233b817..0f9d5252 100644 |
69 |
---- a/buildSrc/linux.gradle |
70 |
-+++ b/buildSrc/linux.gradle |
71 |
-@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [ |
72 |
- "com/sun/glass/ui/gtk/*"] |
73 |
- LINUX.glass.glass.nativeSource = ft_gtk_launcher.getFiles() |
74 |
- LINUX.glass.glass.compiler = compiler |
75 |
--LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() |
76 |
-+LINUX.glass.glass.ccFlags = [ccFlags, gtk2CCFlags].flatten() |
77 |
- LINUX.glass.glass.linker = linker |
78 |
- LINUX.glass.glass.linkFlags = [linkFlags, "-lX11", "-ldl" ].flatten() |
79 |
- LINUX.glass.glass.lib = "glass" |
80 |
-@@ -211,7 +211,7 @@ LINUX.glass.glass.lib = "glass" |
81 |
- LINUX.glass.glassgtk2 = [:] |
82 |
- LINUX.glass.glassgtk2.nativeSource = ft_gtk.getFiles() |
83 |
- LINUX.glass.glassgtk2.compiler = compiler |
84 |
--LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags, "-Werror"].flatten() |
85 |
-+LINUX.glass.glassgtk2.ccFlags = [ccFlags, gtk2CCFlags].flatten() |
86 |
- LINUX.glass.glassgtk2.linker = linker |
87 |
- LINUX.glass.glassgtk2.linkFlags = [linkFlags, gtk2LinkFlags ].flatten() |
88 |
- LINUX.glass.glassgtk2.lib = "glassgtk2" |
89 |
-@@ -219,7 +219,7 @@ LINUX.glass.glassgtk2.lib = "glassgtk2" |
90 |
- LINUX.glass.glassgtk3 = [:] |
91 |
- LINUX.glass.glassgtk3.nativeSource = ft_gtk.getFiles() |
92 |
- LINUX.glass.glassgtk3.compiler = compiler |
93 |
--LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags, "-Werror"].flatten() |
94 |
-+LINUX.glass.glassgtk3.ccFlags = [ccFlags, gtk3CCFlags].flatten() |
95 |
- LINUX.glass.glassgtk3.linker = linker |
96 |
- LINUX.glass.glassgtk3.linkFlags = [linkFlags, gtk3LinkFlags ].flatten() |
97 |
- LINUX.glass.glassgtk3.lib = "glassgtk3" |
98 |
diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle |
99 |
index 6bf6196b..ff24207d 100644 |
100 |
--- a/buildSrc/x86egl.gradle |
101 |
|
102 |
diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild |
103 |
similarity index 98% |
104 |
rename from dev-java/openjfx/openjfx-8.999.ebuild |
105 |
rename to dev-java/openjfx/openjfx-8.1000.ebuild |
106 |
index ce6834e5b30..4763fb1c16e 100644 |
107 |
--- a/dev-java/openjfx/openjfx-8.999.ebuild |
108 |
+++ b/dev-java/openjfx/openjfx-8.1000.ebuild |
109 |
@@ -14,7 +14,7 @@ DESCRIPTION="Java OpenJFX 8 client application platform" |
110 |
HOMEPAGE="https://openjfx.io" |
111 |
SRC_URI=" |
112 |
https://hg.openjdk.java.net/${PN}/8u-dev/rt/archive/${EHG_COMMIT}.tar.bz2 -> ${P}.tar.bz2 |
113 |
- https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.xz |
114 |
+ https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2 |
115 |
https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip |
116 |
" |
117 |
|
118 |
@@ -67,7 +67,6 @@ PATCHES=( |
119 |
"${FILESDIR}"/8/0004-Fix-Compilation-Flags.patch |
120 |
"${FILESDIR}"/8/0005-don-t-include-xlocale.h.patch |
121 |
"${FILESDIR}"/8/06-disable-architecture-verification.patch |
122 |
- "${FILESDIR}"/8/07-disable-assembler-on-unsupported-archs.patch |
123 |
"${FILESDIR}"/8/10-javadoc-locale.patch |
124 |
"${FILESDIR}"/8/Wno-error.patch |
125 |
"${FILESDIR}"/8/don-t-force-msse.patch |