games-roguelike/dwarf-fortress: add version 0.47.04, bugfix #17940

sveneusewig · 2020-10-15T20:07:32Z

The bug has already been confirmed but has not yet been fixed.
The changes for the bug fix were posted by the user Cheaterman
https://www.bay12games.com/dwarves/mantisbt/view.php?id=11564

Signed-off-by: Sven Eusewig sveneusewig@yahoo.de
Bug: https://bugs.gentoo.org/729002
Package-Manager: Portage-3.0.4, Repoman-3.0.1

The bug has already been confirmed but has not yet been fixed. The changes for the bug fix were posted by the user Cheaterman https://www.bay12games.com/dwarves/mantisbt/view.php?id=11564 Signed-off-by: Sven Eusewig <sveneusewig@yahoo.de> Bug: https://bugs.gentoo.org/729002 Package-Manager: Portage-3.0.4, Repoman-3.0.1

gentoo-bot · 2020-10-15T20:08:08Z

Pull Request assignment

Submitter: @sveneusewig
Areas affected: ebuilds
Packages affected: games-roguelike/dwarf-fortress

games-roguelike/dwarf-fortress: @gentoo/games

Linked bugs

Bugs linked: 729002

In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide

gentoo-repo-qa-bot · 2020-10-15T20:21:20Z

Pull request CI report

Report generated at: 2020-10-15 20:21 UTC
Newest commit scanned: a7aa4f5
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/bb9c686e5c/output.html

Cheaterman · 2020-10-15T20:42:45Z

Thank you :-) 👍

sveneusewig · 2020-11-02T17:00:41Z

@Cheaterman , @chewi
Who else needs to know?

DarthGandalf

This also closes https://bugs.gentoo.org/717752 so please add it to commit message

DarthGandalf · 2020-11-22T20:27:44Z

games-roguelike/dwarf-fortress/dwarf-fortress-0.47.04.ebuild

@@ -43,6 +43,9 @@ RESTRICT="strip"
 src_prepare() {
 	rm -f libs/*.so* || die


Please remove -f

DarthGandalf · 2020-11-22T20:29:02Z

games-roguelike/dwarf-fortress/dwarf-fortress-0.47.04.ebuild

@@ -1,12 +1,12 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2

-EAPI=6
+EAPI=7


In EAPI 7 BDEPEND should be split from DEPEND

I add this: BDEPEND="virtual/pkgconfig" and remove "virtual/pkgconfig" from DEPEND.

Bug: https://bugs.gentoo.org/729002 Reviewed-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sven Eusewig <sveneusewig@yahoo.de>

gentoo-repo-qa-bot · 2020-12-11T17:43:46Z

Pull request CI report

Report generated at: 2020-12-11 17:43 UTC
Newest commit scanned: cf30ca8
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/56ed3c2f80/output.html

chewi

This isn't new but I really don't like how the launcher for this game just copies the entire thing into HOME. Is this really the only way it can work? I don't have the energy to argue with upstream about it.

chewi · 2020-12-27T22:15:09Z

games-roguelike/dwarf-fortress/dwarf-fortress-0.47.04.ebuild

 	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
+
+	eapply "${FILESDIR}/${P}-segfault-fix-729002.patch"


eapply is generally frowned upon now. You should be able to use PATCHES instead.

Ok. I remove this there.

chewi · 2020-12-27T23:25:51Z

games-roguelike/dwarf-fortress/dwarf-fortress-0.47.04.ebuild

@@ -31,8 +31,8 @@ RDEPEND="media-libs/glew:0
 DEPEND="${RDEPEND}
 	media-libs/libsndfile
 	media-libs/openal
-	sys-libs/ncurses-compat:5[unicode]
-	virtual/pkgconfig"
+	sys-libs/ncurses-compat:5[unicode]"


I know you haven't changed this but ncurses-compat in DEPEND doesn't make any sense. This package does not install any headers. I can see that the sources are hardcoded to load libncurses.so.5. This is really bad if you're building with the headers from libncurses.so.6. I can see that it falls back to libncurses.so but that's no use if it finds .so.5 first. The fact that it builds means it must be compatible with .so.6 so I guess you should patch renderer_curses.cpp accordingly. This whole thing is really horrible though.

Let's see what I can find. In the worst case it looks like this:
https://i.imgur.com/Kx4NvI4.gif

chewi · 2020-12-27T23:34:05Z

This isn't new but I really don't like how the launcher for this game just copies the entire thing into HOME. Is this really the only way it can work? I don't have the energy to argue with upstream about it.

Ah sorry, I now realise this launcher script is our own. 😨 Presumably it was done like this for a reason though. Please find out whether it's still necessary.

libgraphics.so now opens libncursesw.so.6 first before libncursesw.so.5 and others. DEPEND on ncurses-combat has been replaced to ncurses. Bug: https://bugs.gentoo.org/729002 Reviewed-by: James Le Cuirot <chewi@aura-online.co.uk> Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sven Eusewig <sveneusewig@yahoo.de>

gentoo-repo-qa-bot · 2020-12-31T17:33:52Z

Pull request CI report

Report generated at: 2020-12-31 17:33 UTC
Newest commit scanned: 954787d
Status: ✅ good

There are existing issues already. Please look into the report to make sure none of them affect the packages in question:
https://qa-reports.gentoo.org/output/gentoo-ci/96b38fd85f/output.html

rayment · 2021-02-01T20:46:14Z

You may want to update this to 0.47.05 now that it's out. I've tested your patch in the new version with a custom libgraphic build and it still works.

sveneusewig · 2021-02-02T15:36:44Z

I'm making a new pull request.

gentoo-bot added assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Oct 15, 2020

robbat2 added the hacktoberfest-accepted label Oct 30, 2020

DarthGandalf reviewed Nov 22, 2020

View reviewed changes

games-roguelike/dwarf-fortress: split BDEPEND from DEPEND

cf30ca8

Bug: https://bugs.gentoo.org/729002 Reviewed-by: Alexey Sokolov <alexey+gentoo@asokolov.org> Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sven Eusewig <sveneusewig@yahoo.de>

chewi suggested changes Dec 27, 2020

View reviewed changes

sveneusewig closed this Apr 3, 2021

sveneusewig deleted the games-roguelike/dwarf-fortress branch April 3, 2021 09:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

games-roguelike/dwarf-fortress: add version 0.47.04, bugfix #17940

games-roguelike/dwarf-fortress: add version 0.47.04, bugfix #17940

sveneusewig commented Oct 15, 2020

gentoo-bot commented Oct 15, 2020

gentoo-repo-qa-bot commented Oct 15, 2020

Cheaterman commented Oct 15, 2020

sveneusewig commented Nov 2, 2020

DarthGandalf left a comment

DarthGandalf Nov 22, 2020

sveneusewig Nov 25, 2020

DarthGandalf Nov 22, 2020

sveneusewig Nov 25, 2020

gentoo-repo-qa-bot commented Dec 11, 2020

chewi left a comment

chewi Dec 27, 2020

sveneusewig Dec 28, 2020

chewi Dec 27, 2020

sveneusewig Dec 28, 2020

chewi commented Dec 27, 2020

gentoo-repo-qa-bot commented Dec 31, 2020

rayment commented Feb 1, 2021

sveneusewig commented Feb 2, 2021

		@@ -43,6 +43,9 @@ RESTRICT="strip"
		src_prepare() {
		rm -f libs/.so \|\| die

		sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp \|\| die

		eapply "${FILESDIR}/${P}-segfault-fix-729002.patch"

games-roguelike/dwarf-fortress: add version 0.47.04, bugfix #17940

games-roguelike/dwarf-fortress: add version 0.47.04, bugfix #17940

Conversation

sveneusewig commented Oct 15, 2020

gentoo-bot commented Oct 15, 2020

Pull Request assignment

Linked bugs

gentoo-repo-qa-bot commented Oct 15, 2020

Pull request CI report

Cheaterman commented Oct 15, 2020

sveneusewig commented Nov 2, 2020

DarthGandalf left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

gentoo-repo-qa-bot commented Dec 11, 2020

Pull request CI report

chewi left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

chewi commented Dec 27, 2020

gentoo-repo-qa-bot commented Dec 31, 2020

Pull request CI report

rayment commented Feb 1, 2021

sveneusewig commented Feb 2, 2021