From 388aaa96306058add4e6b18e7f923bea06cd49f5 Mon Sep 17 00:00:00 2001 From: "Volkmar W. Pogatzki" Date: Thu, 5 Jan 2023 11:24:59 +0100 Subject: net-p2p/biglybt: disable DorkBoxUpdaterPlugin - disables DorkBoxUpdaterPlugin - avoids InaccessibleObjectException on startup Signed-off-by: Volkmar W. Pogatzki Closes: https://github.com/gentoo/gentoo/pull/28970 Signed-off-by: Florian Schmaus --- net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild | 121 -------------------- net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild | 127 +++++++++++++++++++++ ...lybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch | 10 ++ 3 files changed, 137 insertions(+), 121 deletions(-) delete mode 100644 net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild create mode 100644 net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild create mode 100644 net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch (limited to 'net-p2p') diff --git a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild deleted file mode 100644 index dfe931337994..000000000000 --- a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Skeleton command: -# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz --slot 0 --keywords "~amd64" --ebuild biglybt-3.2.0.0.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="com.biglybt:biglybt-core:3.1.0.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Feature-filled Bittorrent client based on the Azureus open source project" -HOMEPAGE="https://www.biglybt.com" -SRC_URI="https://github.com/BiglySoftware/BiglyBT/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc64" - -# Common dependencies -# POM: core/pom.xml -# commons-cli:commons-cli:1.4 -> >=dev-java/commons-cli-1.5.0:1 - -CP_DEPEND=" - dev-java/commons-cli:1 - dev-java/swt:4.10 -" - -# Compile dependencies -# POM: core/pom.xml -# org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:4.9 -> !!!groupId-not-found!!! -# POM: core/pom.xml -# test? org.assertj:assertj-core:3.12.1 -> !!!suitable-mavenVersion-not-found!!! -# test? org.junit.jupiter:junit-jupiter:5.4.0 -> !!!groupId-not-found!!! - -# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8 -# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \ -# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND} -" - -RDEPEND=" - >=virtual/jre-1.8:* - ${CP_DEPEND} -" - -DOCS=( - CODING_GUIDELINES.md - CONTRIBUTING.md - ChangeLog.txt - README.md - TRANSLATE.md -) - -PATCHES=( - "${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch" - "${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch" -) - -S="${WORKDIR}/BiglyBT-${PV}" - -src_prepare() { - default - # AENameServiceDescriptor fails to compile with jdk >= 11 - # "error: package sun.net.spi.nameservice does not exist" - rm -r core/src/com/biglybt/core/util/spi/AENameServiceDescriptor.java || die - - cp -r core/{src,resources} || die - find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" - - cp -r uis/{src,resources} || die - find uis/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" -} - -src_compile() { - einfo "Compiling module \"core\"" - JAVA_ENCODING="8859_1" - JAVA_JAR_FILENAME="biglybt-core.jar" - JAVA_RESOURCE_DIRS="core/resources" - JAVA_SRC_DIR="core/src" - java-pkg-simple_src_compile - JAVA_GENTOO_CLASSPATH_EXTRA="biglybt-core.jar" - - einfo "Compiling module \"uis\"" - JAVA_JAR_FILENAME="BiglyBT.jar" - JAVA_LAUNCHER_FILENAME="${PN}" - JAVA_MAIN_CLASS="com.biglybt.ui.Main" - JAVA_RESOURCE_DIRS="uis/resources" - JAVA_SRC_DIR="uis/src" - java-pkg-simple_src_compile - - if use doc; then - einfo "Compiling javadocs" - JAVA_SRC_DIR=( - "core/src" - "uis/src" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile - fi -} - -src_install() { - java-pkg_dojar "biglybt-core.jar" - java-pkg_dojar "BiglyBT.jar" - java-pkg_dolauncher "biglybt" --main com.biglybt.ui.Main - - if use doc; then - java-pkg_dojavadoc target/api - fi - - if use source; then - java-pkg_dosrc "core/src/*" - java-pkg_dosrc "uis/src/*" - fi - default -} diff --git a/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild new file mode 100644 index 000000000000..8847795e7c12 --- /dev/null +++ b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild @@ -0,0 +1,127 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom core/pom.xml --download-uri https://github.com/BiglySoftware/BiglyBT/archive/v3.2.0.0.tar.gz --slot 0 --keywords "~amd64" --ebuild biglybt-3.2.0.0.ebuild + +EAPI=8 + +JAVA_PKG_IUSE="doc source" +MAVEN_ID="com.biglybt:biglybt-core:3.1.0.1" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Feature-filled Bittorrent client based on the Azureus open source project" +HOMEPAGE="https://www.biglybt.com" +SRC_URI="https://github.com/BiglySoftware/BiglyBT/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc64" + +# Common dependencies +# POM: core/pom.xml +# commons-cli:commons-cli:1.4 -> >=dev-java/commons-cli-1.5.0:1 + +CP_DEPEND=" + dev-java/commons-cli:1 + dev-java/swt:4.10 +" + +# Compile dependencies +# POM: core/pom.xml +# org.eclipse.swt:org.eclipse.swt.gtk.linux.x86_64:4.9 -> !!!groupId-not-found!!! +# POM: core/pom.xml +# test? org.assertj:assertj-core:3.12.1 -> !!!suitable-mavenVersion-not-found!!! +# test? org.junit.jupiter:junit-jupiter:5.4.0 -> !!!groupId-not-found!!! + +# Due to removal of AENameServiceDescriptor it would fail to start under jdk:1.8 +# StartServer ERROR: unable to bind to 127.0.0.1:6880 listening for passed torrent info: \ +# sun.net.spi.nameservice.NameServiceDescriptor: Provider com.biglybt.core.util.spi.AENameServiceDescriptor not found +DEPEND=" + >=virtual/jdk-11:* + ${CP_DEPEND} +" + +RDEPEND=" + >=virtual/jre-1.8:* + ${CP_DEPEND} +" + +DOCS=( + CODING_GUIDELINES.md + CONTRIBUTING.md + ChangeLog.txt + README.md + TRANSLATE.md +) + +PATCHES=( + "${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch" + "${FILESDIR}/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch" + "${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch" +) + +S="${WORKDIR}/BiglyBT-${PV}" + +src_prepare() { + default + # AENameServiceDescriptor fails to compile with jdk >= 11 + # https://github.com/BiglySoftware/BiglyBT/pull/2611 + # "error: package sun.net.spi.nameservice does not exist" + rm -r core/src/com/biglybt/core/util/spi || die + + sed \ + -e '/enable.update/s:true:false: ' \ + -i core/src/com/biglybt/pifimpl/update/PluginUpdatePlugin.java || die + + cp -r core/{src,resources} || die + find core/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" + + cp -r uis/{src,resources} || die + find uis/resources -type f -name '*.java' -exec rm -rf {} + || die "deleting classes failed" +} + +src_compile() { + einfo "Compiling module \"core\"" + JAVA_ENCODING="8859_1" + JAVA_JAR_FILENAME="biglybt-core.jar" + JAVA_RESOURCE_DIRS="core/resources" + JAVA_SRC_DIR="core/src" + java-pkg-simple_src_compile + JAVA_GENTOO_CLASSPATH_EXTRA="biglybt-core.jar" + + einfo "Compiling module \"uis\"" + JAVA_JAR_FILENAME="BiglyBT.jar" + JAVA_LAUNCHER_FILENAME="${PN}" + JAVA_MAIN_CLASS="com.biglybt.ui.Main" + JAVA_RESOURCE_DIRS="uis/resources" + JAVA_SRC_DIR="uis/src" + java-pkg-simple_src_compile + + if use doc; then + einfo "Compiling javadocs" + JAVA_SRC_DIR=( + "core/src" + "uis/src" + ) + JAVA_JAR_FILENAME="ignoreme.jar" + java-pkg-simple_src_compile + fi +} + +src_install() { + java-pkg_dojar "biglybt-core.jar" + java-pkg_dojar "BiglyBT.jar" + java-pkg_dolauncher "biglybt" --main com.biglybt.ui.Main + + if use doc; then + java-pkg_dojavadoc target/api + fi + + if use source; then + java-pkg_dosrc "core/src/*" + java-pkg_dosrc "uis/src/*" + fi + default +} diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch new file mode 100644 index 000000000000..a1db6dce78ed --- /dev/null +++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch @@ -0,0 +1,10 @@ +--- a/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java ++++ b/uis/src/com/biglybt/ui/swt/systray/SystemTraySWT.java +@@ -124,7 +124,6 @@ public class SystemTraySWT + SystemTraySWT.core = core; + gm = core.getGlobalManager(); + if (Constants.isUnix) { +- ensureDorkBoxPlugin(core); + } + } + }); -- cgit v1.2.3-65-gdbad