* [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/, net-p2p/biglybt/files/
@ 2023-01-08 9:40 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2023-01-08 9:40 UTC (permalink / raw
To: gentoo-commits
commit: 388aaa96306058add4e6b18e7f923bea06cd49f5
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jan 5 10:24:59 2023 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Sun Jan 8 09:35:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=388aaa96
net-p2p/biglybt: disable DorkBoxUpdaterPlugin
- disables DorkBoxUpdaterPlugin
- avoids InaccessibleObjectException on startup
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/28970
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
.../{biglybt-3.2.0.0-r1.ebuild => biglybt-3.2.0.0-r2.ebuild} | 8 +++++++-
.../files/biglybt-3.2.0.0-disable-DorkBoxUpdaterPlugin.patch | 10 ++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
similarity index 91%
rename from net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild
rename to net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
index dfe931337994..8847795e7c12 100644
--- a/net-p2p/biglybt/biglybt-3.2.0.0-r1.ebuild
+++ b/net-p2p/biglybt/biglybt-3.2.0.0-r2.ebuild
@@ -58,6 +58,7 @@ DOCS=(
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"
)
@@ -66,8 +67,13 @@ 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/AENameServiceDescriptor.java || die
+ 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"
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);
+ }
+ }
+ });
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/, net-p2p/biglybt/files/
@ 2024-06-20 8:03 Florian Schmaus
0 siblings, 0 replies; 3+ messages in thread
From: Florian Schmaus @ 2024-06-20 8:03 UTC (permalink / raw
To: gentoo-commits
commit: 53b34d6375e2eaf1ae8c65c7bd90a5e1e7984479
Author: gentoo-setan <gentoo-setan <AT> protonmail <DOT> com>
AuthorDate: Fri May 31 19:21:19 2024 +0000
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Thu Jun 20 08:02:50 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b34d63
net-p2p/biglybt: update to 3.6.0.0, add icon, and more changes
1. Improved src_install()
2. Removed issue template from DOC
3. Introduced more ${PN}
4. Swapped src_prepare's sed for a patch
5. Removed JAVA_ENCODING="8859_1" from src_compile
6. Modernized Javadoc (thanks vaukai!)
Signed-off-by: gentoo-setan <gentoo-setan <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36929
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
net-p2p/biglybt/Manifest | 1 +
net-p2p/biglybt/biglybt-3.6.0.0.ebuild | 102 +++++++++++++++++++++
...iglybt-3.6.0.0-disable-PluginUpdatePlugin.patch | 32 +++++++
3 files changed, 135 insertions(+)
diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
index 648c013cd649..3390d228d952 100644
--- a/net-p2p/biglybt/Manifest
+++ b/net-p2p/biglybt/Manifest
@@ -1 +1,2 @@
DIST biglybt-3.5.0.0.tar.gz 41499459 BLAKE2B a08bfa560a72297a6ef21aed1bf4dc278e6c1e8b28b7adfb9bd880d8a6bcec1875b2ff8f3c95e9a05a41be5f14ba7ec66d775f53b78ee4a6bb88a295906f75e2 SHA512 1345ca1b49615be6d7e4ffb883ac5a60ed31af1dbf29a45d5d03ab56fb37d3f47d36abdffe990d264bda5fe5d3f90a3e2ad64373f1fe16fa23feb1ba8b70dd15
+DIST biglybt-3.6.0.0.tar.gz 43972902 BLAKE2B 76995d3d5f24f054690e609d2be7bd822f6c8573b6627bcf380c3a93be86265f4ca827c2991db65ef39c9f3f79b0cd8e0aebce492571a36bf237c95fc3d6cc54 SHA512 b56beb006ab813efa2ab2aff8563a04675e677ea70fe6ef72062e2d38ec753749b36740ae87f851739cb1389948a916273cb6ffb65758e651d0701a7f6237afd
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0.ebuild
new file mode 100644
index 000000000000..9cacc9c9454c
--- /dev/null
+++ b/net-p2p/biglybt/biglybt-3.6.0.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# No tests, #839681
+JAVA_PKG_IUSE="doc source"
+MAVEN_PROVIDES="com.${PN}:${PN}-core:${PV} com.${PN}:${PN}-ui:${PV}"
+
+inherit desktop java-pkg-2 java-pkg-simple xdg
+
+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"
+S="${WORKDIR}/BiglyBT-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+CP_DEPEND="
+ dev-java/commons-cli:1
+ dev-java/swt:4.27
+"
+
+# 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
+# Restricting to jdk:11 for https://bugs.gentoo.org/888859
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-11:*"
+
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+DOCS=(
+ CODING_GUIDELINES.md
+ CONTRIBUTING.md
+ ChangeLog.txt
+ README.md
+ TRANSLATE.md
+)
+
+JAVADOC_SRC_DIRS=( {core,uis}/src )
+
+PATCHES=(
+ "${FILESDIR}/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch"
+ "${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
+ "${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch"
+ "${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ # AENameServiceDescriptor fails to compile with jdk >= 11
+ # "error: package sun.net.spi.nameservice does not exist"
+ # https://github.com/BiglySoftware/BiglyBT/pull/2611
+ rm -r core/src/com/biglybt/core/util/spi || die
+# rm -r core/src/META-INF || 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_JAR_FILENAME="${PN}-core.jar"
+ JAVA_RESOURCE_DIRS="core/resources"
+ JAVA_SRC_DIR="core/src"
+ java-pkg-simple_src_compile
+ JAVA_GENTOO_CLASSPATH_EXTRA="${PN}-core.jar"
+
+ einfo "Compiling module \"uis\""
+ JAVA_JAR_FILENAME="BiglyBT.jar"
+ JAVA_LAUNCHER_FILENAME="${PN}"
+ JAVA_MAIN_CLASS="com.${PN}.ui.Main"
+ JAVA_RESOURCE_DIRS="uis/resources"
+ JAVA_SRC_DIR="uis/src"
+ java-pkg-simple_src_compile
+
+ if use doc; then
+ einfo "Creating javadoc"
+ JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}"
+ ejavadoc
+ fi
+}
+
+src_install() {
+ java-pkg-simple_src_install
+
+ make_desktop_entry "${PN}" BiglyBT "${PN}" "Network;FileTransfer"
+
+ 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.6.0.0-disable-PluginUpdatePlugin.patch b/net-p2p/biglybt/files/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch
new file mode 100644
index 000000000000..a736a191b129
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch
@@ -0,0 +1,32 @@
+--- a/core/src/com/biglybt/pifimpl/update/PluginUpdatePlugin.java
++++ b/core/src/com/biglybt/pifimpl/update/PluginUpdatePlugin.java
+@@ -99,7 +99,7 @@ PluginUpdatePlugin
+
+ final PluginConfig plugin_config = plugin_interface.getPluginconfig();
+
+- boolean enabled = plugin_config.getPluginBooleanParameter( "enable.update", true );
++ boolean enabled = plugin_config.getPluginBooleanParameter( "enable.update", false );
+
+ model.setConfigSectionID(PLUGIN_CONFIGSECTION_ID);
+ model.getStatus().setText( enabled?"Running":"Optional checks disabled" );
+@@ -130,7 +130,7 @@ PluginUpdatePlugin
+
+ BasicPluginConfigModel config = ui_manager.createBasicPluginConfigModel(ConfigSection.SECTION_PLUGINS, PLUGIN_CONFIGSECTION_ID);
+
+- config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", true );
++ config.addBooleanParameter2( "enable.update", "Plugin.pluginupdate.enablecheck", false );
+
+ plugin_interface.addEventListener(
+ new PluginEventListener()
+@@ -563,7 +563,7 @@ PluginUpdatePlugin
+ try{
+ if ( (!mandatory) &&
+ (ids_to_check == null ) && // allow custom actions through
+- (!plugin_interface.getPluginconfig().getPluginBooleanParameter( "enable.update", true ))){
++ (!plugin_interface.getPluginconfig().getPluginBooleanParameter( "enable.update", false ))){
+
+ return( num_updates_found );
+ }
+--
+2.44.2
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/, net-p2p/biglybt/files/
@ 2024-09-12 5:17 Miroslav Šulc
0 siblings, 0 replies; 3+ messages in thread
From: Miroslav Šulc @ 2024-09-12 5:17 UTC (permalink / raw
To: gentoo-commits
commit: f1c399d9d33e4c84ffb88cfe59b5268a43d93382
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 05:17:26 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 05:17:36 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1c399d9
net-p2p/biglybt: fixed ambiguous call with commons-cli >= 1.7.0
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{biglybt-3.6.0.0-r2.ebuild => biglybt-3.6.0.0-r3.ebuild} | 1 +
net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
similarity index 98%
rename from net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild
rename to net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
index 3bd27ae401f8..05df130f4bb3 100644
--- a/net-p2p/biglybt/biglybt-3.6.0.0-r2.ebuild
+++ b/net-p2p/biglybt/biglybt-3.6.0.0-r3.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
"${FILESDIR}/biglybt-3.2.0.0-disable-shared-plugins.patch"
"${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.patch"
"${FILESDIR}/biglybt-3.6.0.0-disable-PluginUpdatePlugin.patch"
+ "${FILESDIR}/biglybt-3.6.0.0-fix-ambiguous.patch"
)
src_prepare() {
diff --git a/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch
new file mode 100644
index 000000000000..8464f866570a
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.6.0.0-fix-ambiguous.patch
@@ -0,0 +1,11 @@
+--- a/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java
++++ b/uis/src/com/biglybt/ui/console/multiuser/commands/UserCommand.java
+@@ -187,7 +187,7 @@ public class UserCommand extends IConsoleCommand {
+
+ UserProfile profile = new UserProfile(userName, userType);
+ profile.setPassword(password);
+- String defaultSaveDirectory = commandLine.getOptionValue('d', null);
++ String defaultSaveDirectory = commandLine.getOptionValue('d', (String) null);
+ profile.setDefaultSaveDirectory(defaultSaveDirectory);
+
+ getUserManager().addUser(profile);
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-09-12 5:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-06-20 8:03 [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/, net-p2p/biglybt/files/ Florian Schmaus
-- strict thread matches above, loose matches on Subject: below --
2024-09-12 5:17 Miroslav Šulc
2023-01-08 9:40 Florian Schmaus
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox