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);
