commit: 6c5884ec3131e1fe1f5a339dadc06f8d55c3bb59 Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Sun Apr 25 15:57:58 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Sun Apr 25 15:58:09 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5884ec
dev-java/openjfx: bump to 8.1000 ( fictional version ) New backported fixes from https://github.com/jschwartzenberg/openjfx8 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> dev-java/openjfx/Manifest | 4 +-- ...07-disable-assembler-on-unsupported-archs.patch | 18 ------------- dev-java/openjfx/files/8/Wno-error.patch | 31 ---------------------- ...{openjfx-8.999.ebuild => openjfx-8.1000.ebuild} | 3 +-- 4 files changed, 3 insertions(+), 53 deletions(-) diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 71a68df134f..46d451a907e 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -8,5 +8,5 @@ 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.9_p0.tar.bz2 64148934 BLAKE2B 317fb1c9ea99816ecbd8ab64ed3a6ad0aaa319bedd17bf71ee192c5e610fea14611f3938302f1caf666980bcc7d4787f770e36aec1884a73dac3ddba8e1a878f SHA512 8b6d339131f096b4490d7a8c4a20c15362b4f6c6aa4ddd74f610f3b5a8b8c7aac3ab123dcdd5488cc37dc38f1536ce1db95286f4233ee4db1845d1bd560b2236 -DIST openjfx-8.999-backports.tar.xz 2794912 BLAKE2B cdcef2e443dce274b90ce5d0d148e7d10e73eebd9a62ec1514bc13017defa624ce6486f00de80f03d055d2294c9656de9bd3965bb07393d4397a201023a52a69 SHA512 eabbce2f230ef37d392d564d272a95d0f5225cfad0441268b020200e63fbb15b1883df3f21b5f75e34e8b2cf61bc3d843451315a51f1ec2cd487abaae3ee7893 -DIST openjfx-8.999.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 +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/07-disable-assembler-on-unsupported-archs.patch b/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch deleted file mode 100644 index 551a1e82ba5..00000000000 --- a/dev-java/openjfx/files/8/07-disable-assembler-on-unsupported-archs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: Disable assembler in WebKit on unsupported architectures -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/modules/web/src/main/native/Source/WTF/wtf/Platform.h -+++ b/modules/web/src/main/native/Source/WTF/wtf/Platform.h -@@ -325,6 +325,12 @@ - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - -+#if !CPU(ARM_THUMB2) && !CPU(ARM_TRADITIONAL) && !CPU(MIPS) && !CPU(X86) && !CPU(X86_64) && !CPU(SH4) -+#define ENABLE_ASSEMBLER 0 -+#define ENABLE_JIT 0 -+#define ENABLE_YARR_JIT 0 -+#endif -+ - /* ==== OS() - underlying operating system; only to be used for mandated low-level services like - virtual memory, not to choose a GUI toolkit ==== */ - diff --git a/dev-java/openjfx/files/8/Wno-error.patch b/dev-java/openjfx/files/8/Wno-error.patch index 208411508d8..edc9389ee9c 100644 --- a/dev-java/openjfx/files/8/Wno-error.patch +++ b/dev-java/openjfx/files/8/Wno-error.patch @@ -73,37 +73,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/linux.gradle b/buildSrc/linux.gradle -index f233b817..0f9d5252 100644 ---- a/buildSrc/linux.gradle -+++ b/buildSrc/linux.gradle -@@ -203,7 +203,7 @@ LINUX.glass.javahInclude = [ - "com/sun/glass/ui/gtk/*"] - 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" -@@ -211,7 +211,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" -@@ -219,7 +219,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" diff --git a/buildSrc/x86egl.gradle b/buildSrc/x86egl.gradle index 6bf6196b..ff24207d 100644 --- a/buildSrc/x86egl.gradle diff --git a/dev-java/openjfx/openjfx-8.999.ebuild b/dev-java/openjfx/openjfx-8.1000.ebuild similarity index 98% rename from dev-java/openjfx/openjfx-8.999.ebuild rename to dev-java/openjfx/openjfx-8.1000.ebuild index ce6834e5b30..4763fb1c16e 100644 --- a/dev-java/openjfx/openjfx-8.999.ebuild +++ b/dev-java/openjfx/openjfx-8.1000.ebuild @@ -14,7 +14,7 @@ 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.xz + https://dev.gentoo.org/~gyakovlev/distfiles/${P}-backports.tar.bz2 https://services.gradle.org/distributions/gradle-${EGRADLE_VER}-bin.zip " @@ -67,7 +67,6 @@ PATCHES=( "${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/07-disable-assembler-on-unsupported-archs.patch "${FILESDIR}"/8/10-javadoc-locale.patch "${FILESDIR}"/8/Wno-error.patch "${FILESDIR}"/8/don-t-force-msse.patch
