Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 #26127

Closed
wants to merge 2 commits into from
Closed

games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 #26127

wants to merge 2 commits into from

Conversation

redstrate
Copy link
Contributor

@redstrate redstrate commented Jun 29, 2022

Let's try this again! I saw that #20721 was at a standstill, but it's been sitting for over a year and took it as a chance to clean it up enough so we can merge it, especially since it's so close! Here's a quick rundown of the major changes in case you don't want to dig around the 3 separate changelists that are built up now:

  • Updated to latest game version (47.05)
  • Moved to EAPI 8.
  • Dropped MY_PN.
  • Added glew:0= and zlib:= binding operators, although I'm not sure the actual significance of these (slots maybe?)
  • Moved pkgconfig to BDEPEND.
  • Removed games_dir global variable
  • Added a basic desktop entry file called "Dwarf Fortress" that launches dwarf-fortress.
    • Right now it's missing an icon, it's not too important but I'd like to include one eventually. Or for a future contributor to add :-)
  • Removed strip restriction.
  • Removed some redundant comments in the ebuild. Things are moved around so they make a lot more sense.
  • Support prefixes, including the necessary changes to the post message to clarify.
  • Use the readme eclass to now print the post message, with the added benefit that it's readable later in /usr/share/doc!
  • Added patches to fix some upstream bugs.
    • The patches are cleaned up, removed the comments, and the relevant bug information is now living inside the header so it's more clearer what exactly they're fixing.
    • Some line ending weirdness cropped up, so I tried to stamp it out. If possible, try testing it without my sed line ending fix and see if it might not be needed.

For those familiar with the past PRs, there are a few things I did not change:

  • Kept the current package description since that's the one they provide on the website.
  • I didn't include any of the ncurses changes (yet) mostly because I personally don't use the ncurses interface, I would like someone more experienced to bring those changes. This PR is big enough as it is!

All of the previous authors are also added as co-authors, since they did most of the work.

Closes: #20721
Bug: https://bugs.gentoo.org/729002
Bug: https://bugs.gentoo.org/717752

@gentoo-bot gentoo-bot added assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Jun 29, 2022
@redstrate redstrate changed the title games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 [please reassign] games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 Jun 29, 2022
@gentoo-bot gentoo-bot changed the title [please reassign] games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 games-roguelike/dwarf-fortress: add 0.47.05, drop 0.44.12 Jun 29, 2022
@gentoo-bot
Copy link

Pull Request assignment

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

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

Linked bugs

Bugs linked: 717752, 729002


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

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot 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. and removed assigned PR successfully assigned to the package maintainer(s). no bug found No Bug/Closes found in the commits. labels Jun 29, 2022
redstrate and others added 2 commits June 28, 2022 20:38
Signed-off-by: Joshua Goins <josh@redstrate.com>
Co-authored-by: Sven Eusewig <sveneusewig@yahoo.de>
Co-authored-by: Wolfgang E. Sanyer <ezzieyguywuf@gmail.com>
Bug: https://bugs.gentoo.org/729002
Bug: https://bugs.gentoo.org/717752
Signed-off-by: Joshua Goins <josh@redstrate.com>
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2022-06-29 00:49 UTC
Newest commit scanned: e3dd7ab
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/47e0ebab41/output.html

@thesamesam thesamesam requested a review from chewi June 30, 2022 21:46
@rayment
Copy link
Contributor

rayment commented Jul 1, 2022

Any chance we can get build support without GTK in this or a later ebuild?

I forked this repo by svenstaro last year and made GTK a soft dep and have been using a custom ebuild ever since (that is, given how outdated the current build is). Some very few changes in this repo simply change the fullscreen dialog to either ncurses or a simple stdin check rather than having to pull all of GTK to respond yes or no.

I'll probably make a post on bugs.gentoo.org in any case...

@redstrate
Copy link
Contributor Author

Any chance we can get build support without GTK in this or a later ebuild?

I forked this repo by svenstaro last year and made GTK a soft dep and have been using a custom ebuild ever since (that is, given how outdated the current build is). Some very few changes in this repo simply change the fullscreen dialog to either ncurses or a simple stdin check rather than having to pull all of GTK to respond yes or no.

I'll probably make a post on bugs.gentoo.org in any case...

I would totally be up for making a non-GTK build, but I recommend filing a wish list bug and me or another contributor can create a new MR. I decided to leave those kind of changes out of this for now so we at least have an updated game version in ::gentoo.

@rayment
Copy link
Contributor

rayment commented Jul 3, 2022

I would totally be up for making a non-GTK build, but I recommend filing a wish list bug and me or another contributor can create a new MR. I decided to leave those kind of changes out of this for now so we at least have an updated game version in ::gentoo.

Wonderful. I'll wait for this to merge and then we can go from there.

@ionenwks ionenwks self-requested a review July 6, 2022 01:58
@gentoo-bot gentoo-bot closed this in 1906473 Jul 6, 2022
@ionenwks
Copy link
Contributor

ionenwks commented Jul 6, 2022

Thanks!

Added some extra finishing touches myself, see commit 3144840 and commit 076b3ec for details.

Do send more PRs as need be as I don't play/know this well myself. Hope I didn't overlook anything.

@rayment
Copy link
Contributor

rayment commented Jul 6, 2022

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR.
Projects
None yet
5 participants