Created attachment 848233 [details] the ebuild The ebuild from games-strategy/freecol-0.11.6-r1 with small changes: 1. Different memory size for java-pkg_dolauncher 2. commons-cli-1.3.patch no longer needed. 3. Different line numbers in "${FILESDIR}"/${P}-gentoo.patch
Created attachment 848235 [details] to replace freecol-0.11.6-gentoo.patch
Created attachment 848907 [details] proposed changes (In reply to tkzv from comment #0) > Created attachment 848233 [details] > the ebuild > [...] - EAPI=8 - HTTPS for HOMEPAGE - avoid redirect of SRC_URI - needs findbugs-annotations - source 11 - java-pkg_clean instead of "rm -v jars/* || die"
(In reply to Volkmar W. Pogatzki from comment #2) > Created attachment 848907 [details] > proposed changes > > (In reply to tkzv from comment #0) > > Created attachment 848233 [details] > > the ebuild > > [...] > > - EAPI=8 > - HTTPS for HOMEPAGE > - avoid redirect of SRC_URI > - needs findbugs-annotations > - source 11 > - java-pkg_clean instead of "rm -v jars/* || die" What is the purpose of findbugs-annotations? Works for me without it. Changing Java version to 11 is definitely needed.
(In reply to tkzv from comment #3) > (In reply to Volkmar W. Pogatzki from comment #2) > [...] > > What is the purpose of findbugs-annotations? Works for me without it. > > [...] Without findbugs-annotations I am getting compile errors: warning: [options] system modules path not set in conjunction with -source 11 src/net/sf/freecol/FreeCol.java:65: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/model/Specification.java:54: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/util/Utils.java:59: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/server/ai/mission/TransportMission.java:58: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/model/Stance.java:25: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/server/model/ServerPlayer.java:113: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/server/control/InGameController.java:144: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/option/AudioMixerOption.java:36: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/util/CachingFunction.java:26: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/common/option/LanguageOption.java:40: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/client/gui/mapviewer/MapViewer.java:52: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^ src/net/sf/freecol/client/gui/ModifierFormat.java:40: error: package edu.umd.cs.findbugs.annotations does not exist import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; ^
(In reply to Volkmar W. Pogatzki from comment #4) > (In reply to tkzv from comment #3) > > (In reply to Volkmar W. Pogatzki from comment #2) > > [...] > > > > What is the purpose of findbugs-annotations? Works for me without it. > > > > [...] > > Without findbugs-annotations I am getting compile errors: > Ah, I see. The files are no longer deleted by rm -v jars/*
(In reply to tkzv from comment #5) > [...]> Ah, I see. The files are no longer deleted by rm -v jars/* And tests in the PR now simplified with JAVA_TEST_RUN_ONLY="net.sf.freecol.AllTests"
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a77562191c39c59311648690f33f285694a6551 commit 7a77562191c39c59311648690f33f285694a6551 Author: Volkmar W. Pogatzki <gentoo@pogatzki.net> AuthorDate: 2023-01-21 09:06:41 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2023-03-11 17:15:07 +0000 games-strategy/freecol: add 1.0.0 Thanks to tkzv (vopros4@inbox.ru) for the excellent ebuild attached to https://bugs.gentoo.org/890497. Some improvements applied here: - EAPI=8 - HTTPS for HOMEPAGE - avoid redirect of SRC_URI - adds findbugs-annotations to CP_DEPEND - switches to source 11 - java-pkg_clean instead of "rm -v jars/* || die" - adds JAVA_PKG_IUSE="doc source test" - switches to java-pkg-simple.eclass for easier handling of tests and javadoc - adds DOCS array - enables tests Closes: https://bugs.gentoo.org/890497 Signed-off-by: Volkmar W. Pogatzki <gentoo@pogatzki.net> Signed-off-by: Sam James <sam@gentoo.org> games-strategy/freecol/Manifest | 1 + games-strategy/freecol/freecol-1.0.0.ebuild | 76 +++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+)
