public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/files/, net-p2p/biglybt/
@ 2023-01-05  9:23 Sam James
  0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-01-05  9:23 UTC (permalink / raw
  To: gentoo-commits

commit:     e365f9443478d4231a21377c3718a2f9b19dd7ad
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Mon Jan  2 11:30:26 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan  5 09:22:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e365f944

net-p2p/biglybt: disable SWTUpdateChecker

Closes: https://bugs.gentoo.org/889032
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-p2p/biglybt/biglybt-3.2.0.0.ebuild                 |  7 ++++++-
 .../biglybt-3.2.0.0-disable-SWTUpdateChecker.patch     | 10 ++++++++++
 .../files/biglybt-3.2.0.0-disable-shared-plugins.patch | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/net-p2p/biglybt/biglybt-3.2.0.0.ebuild b/net-p2p/biglybt/biglybt-3.2.0.0.ebuild
index 1bc1a2708f1c..67831c7d368b 100644
--- a/net-p2p/biglybt/biglybt-3.2.0.0.ebuild
+++ b/net-p2p/biglybt/biglybt-3.2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Skeleton command:
@@ -53,6 +53,11 @@ DOCS=(
 	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() {

diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch
new file mode 100644
index 000000000000..b801a20c93c2
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-SWTUpdateChecker.patch
@@ -0,0 +1,10 @@
+--- a/uis/src/com/biglybt/ui/swt/updater2/SWTUpdateChecker.java
++++ b/uis/src/com/biglybt/ui/swt/updater2/SWTUpdateChecker.java
+@@ -65,7 +65,6 @@ public class SWTUpdateChecker implements UpdatableComponent
+   public static void
+   initialize()
+   {
+-  	PluginInitializer.getDefaultInterface().getUpdateManager().registerUpdatableComponent(new SWTUpdateChecker(),true);
+   }
+ 
+   public SWTUpdateChecker() {

diff --git a/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch
new file mode 100644
index 000000000000..fe110d590692
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.2.0.0-disable-shared-plugins.patch
@@ -0,0 +1,18 @@
+--- a/uis/src/com/biglybt/ui/swt/plugininstaller/IPWFilePanel.java
++++ b/uis/src/com/biglybt/ui/swt/plugininstaller/IPWFilePanel.java
+@@ -162,12 +162,12 @@ public class IPWFilePanel extends AbstractWizardPanel<InstallPluginWizard> {
+   }
+   
+ 	public boolean 
+-	isNextEnabled() 
++	isFinishEnabled()
+ 	{
+ 	   return valid;
+ 	}
+ 	
+-	public IWizardPanel<InstallPluginWizard> getNextPanel() {
+-	   return new IPWInstallModePanel(wizard,this);
++	public IWizardPanel<InstallPluginWizard> getFinishPanel() {
++	   return new IPWFinishPanel(wizard,this);
+ 	}
+ }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/files/, net-p2p/biglybt/
@ 2023-12-07 12:53 Miroslav Šulc
  0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2023-12-07 12:53 UTC (permalink / raw
  To: gentoo-commits

commit:     64a68d6ed5b29c4a4397952bcc0b95678e548e99
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Nov 16 12:29:22 2023 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Dec  7 12:51:42 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64a68d6e

net-p2p/biglybt: add 3.5.0.0

Bug: https://bugs.gentoo.org/888859
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/33844
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 net-p2p/biglybt/Manifest                           |   1 +
 net-p2p/biglybt/biglybt-3.5.0.0.ebuild             | 109 +++++++++++++++++++++
 .../files/biglybt-3.5.0.0-Entities.javadoc.patch   |  18 ++++
 3 files changed, 128 insertions(+)

diff --git a/net-p2p/biglybt/Manifest b/net-p2p/biglybt/Manifest
index d6d4e78241e0..476ea77fc01e 100644
--- a/net-p2p/biglybt/Manifest
+++ b/net-p2p/biglybt/Manifest
@@ -1 +1,2 @@
 DIST biglybt-3.4.0.0.tar.gz 41402302 BLAKE2B c10832a62efa517981572b91fb99854ee45743c0a2e9fd30d6548a09aeaa47fbcbdb6f6392285f5bd59eb99d4b50b98ddfce2ecf2092b205ca69901b5668a8d3 SHA512 401d0674f03d0da88d3dd3521c3c67cd3471b9858c326fc3cb908f96bb90b156eedee6dfa909606aade0862fe18cbf987d83cf48295e3ee5dc056c260708e05b
+DIST biglybt-3.5.0.0.tar.gz 41499459 BLAKE2B a08bfa560a72297a6ef21aed1bf4dc278e6c1e8b28b7adfb9bd880d8a6bcec1875b2ff8f3c95e9a05a41be5f14ba7ec66d775f53b78ee4a6bb88a295906f75e2 SHA512 1345ca1b49615be6d7e4ffb883ac5a60ed31af1dbf29a45d5d03ab56fb37d3f47d36abdffe990d264bda5fe5d3f90a3e2ad64373f1fe16fa23feb1ba8b70dd15

diff --git a/net-p2p/biglybt/biglybt-3.5.0.0.ebuild b/net-p2p/biglybt/biglybt-3.5.0.0.ebuild
new file mode 100644
index 000000000000..4aa34f1c0021
--- /dev/null
+++ b/net-p2p/biglybt/biglybt-3.5.0.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2023 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.biglybt:biglybt-core:3.5.0.0 com.biglybt:biglybt-ui:3.5.0.0"
+
+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"
+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
+	issue_template.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"
+	"${FILESDIR}/biglybt-3.5.0.0-Entities.javadoc.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
+
+	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
+		JAVADOC_ARGS="-source 8"
+		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-simple_src_install
+
+	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.5.0.0-Entities.javadoc.patch b/net-p2p/biglybt/files/biglybt-3.5.0.0-Entities.javadoc.patch
new file mode 100644
index 000000000000..f196530ce156
--- /dev/null
+++ b/net-p2p/biglybt/files/biglybt-3.5.0.0-Entities.javadoc.patch
@@ -0,0 +1,18 @@
+https://bugs.gentoo.org/888859
+--- a/core/src/org/apache/commons/lang/Entities.java
++++ b/core/src/org/apache/commons/lang/Entities.java
+@@ -23,10 +23,10 @@ import java.util.TreeMap;
+  * <p>Provides HTML and XML entity utilities.</p>
+  *
+  * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
+- * @see </br><a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
+- * @see </br><a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
+- * @see </br><a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
+- * @see </br><a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
++ * @see <br /><a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
++ * @see <br /><a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
++ * @see <br /><a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
++ * @see <br /><a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
+  *
+  * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
+  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-12-07 12:53 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-05  9:23 [gentoo-commits] repo/gentoo:master commit in: net-p2p/biglybt/files/, net-p2p/biglybt/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-12-07 12:53 Miroslav Šulc

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox