From ba7a238ca9c95cb73dc1040bfe42d78dd6970126 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 8 Feb 2024 15:59:10 +0000 Subject: gentoo auto-resync : 08:02:2024 - 15:59:10 --- dev-java/Manifest.gz | Bin 60166 -> 60164 bytes dev-java/openjfx/Manifest | 2 +- dev-java/openjfx/openjfx-8.1000-r1.ebuild | 195 ------------------------------ dev-java/openjfx/openjfx-8.1000-r2.ebuild | 195 ++++++++++++++++++++++++++++++ 4 files changed, 196 insertions(+), 196 deletions(-) delete mode 100644 dev-java/openjfx/openjfx-8.1000-r1.ebuild create mode 100644 dev-java/openjfx/openjfx-8.1000-r2.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 09ef2f1a2d7b..1f1847a1be5c 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/openjfx/Manifest b/dev-java/openjfx/Manifest index 8b5a11dfb56d..9a6467e2943c 100644 --- a/dev-java/openjfx/Manifest +++ b/dev-java/openjfx/Manifest @@ -39,5 +39,5 @@ DIST openjfx-8.1000-backports.tar.bz2 9142182 BLAKE2B 58ea420ec015c49d2755105a3d DIST openjfx-8.1000.tar.bz2 62286455 BLAKE2B c9a714a618d9ae02768dae6128756d64b2b6299a36a6ad9828bf2213dc641cbbcaa2d3f3e0b4913bb60893419a2d5c730ca2db88f759bbd94b3e83112199278c SHA512 6049730b72e569939fed3d62b46a409e949b4c2309f4355253c8c891799c7fb5138e20aa217454fbbd78b1dd99c254b34b3fe6c9cbb35854bd8656993655bf32 EBUILD openjfx-11.0.11_p1-r1.ebuild 6572 BLAKE2B 0ef177a2b7de0722455433cc89535bc9a0f5c25be7260488e6e08859f375ade524b56469881b15cdb4a8359b5b23b2eef0b526c0a28b25ed04d7d67a29153f86 SHA512 65827cc97c0b6c56a7e4e186321542229bf9de5ff673309beb2ee7b4d37e004b07628eb0bdd251f9b8eee4f70e15eaec3b0a7724c3dfe47ab03372d4a9eb22ce EBUILD openjfx-11.0.9_p0-r1.ebuild 6538 BLAKE2B 06a23d77d9190f339d4d52f918328c2d8cbfc6d113e06f700110fe0a04b305e913fe2557cb3efadacbeddc7ba69fa05f87c3198d05065e50c6d48cacf637bfed SHA512 a7b77c4f065a121b22874eb613e101d3708037776b85134ba411f07c25c1c160e7b0d55b057676e94e11f70a89944dc8587c2a1f453c1a32f1699b951fc12ee3 -EBUILD openjfx-8.1000-r1.ebuild 5595 BLAKE2B 917efd625cc8acfde589803f4de067ee4ce014b1a804c0f15f78feb6c69d8e7eb802a6157b44c11d6fa2004c6355b293dfa3d1b29867a8eb4e2346f93c16bc36 SHA512 ce9d500583b9663fefcb33a3aa5f60693951053776e4b1222eaab212fb67dc9ed830eb1cd3d3d078be01db64f5abd714d30eb39cd146bac132b3767b043d9605 +EBUILD openjfx-8.1000-r2.ebuild 5582 BLAKE2B 0071331e7290b18814249581f7733a01f5ce312656e623da110c7774db335f7a09178c6cbb46c5102a35545e3e890d6b98937c9ba552f2845fa0d86990d3daa6 SHA512 4af920664da56da987c1a031b6797817e9432a7d717245c9669fd3a63bf92a3f0b0b56b96394dc7ded612dfacdb8fc1c5d1df082152e75fd179ca7f5961e7c49 MISC metadata.xml 679 BLAKE2B 6197810f33cab61e844a41acb183754f4034020116507ae07db6ab81cf91e9088a4359b6c37d85de9130d835ad12f33da597f514248d6abe000ab2f5a1127627 SHA512 81e44c868178fb48e8182bc7b4eae21abd43ac561f0d819617d8fb1b5ed69d2cc02c2b97790ac957a3c9c07083c3ad93744294b52b971955a521596eb2421b0b diff --git a/dev-java/openjfx/openjfx-8.1000-r1.ebuild b/dev-java/openjfx/openjfx-8.1000-r1.ebuild deleted file mode 100644 index 65f972f14ebe..000000000000 --- a/dev-java/openjfx/openjfx-8.1000-r1.ebuild +++ /dev/null @@ -1,195 +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-core-1.8.2: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 -) - -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-core ant.jar ant-1.8.2.jar - java-pkg_jar-from --build-only --into "${d}" ant-core 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 -} diff --git a/dev-java/openjfx/openjfx-8.1000-r2.ebuild b/dev-java/openjfx/openjfx-8.1000-r2.ebuild new file mode 100644 index 000000000000..ef27aefdb985 --- /dev/null +++ b/dev-java/openjfx/openjfx-8.1000-r2.ebuild @@ -0,0 +1,195 @@ +# 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 +) + +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 +} -- cgit v1.2.3