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-puzzle/tanglet: bump to 1.6.1.1 fixing compilation with >=qt*-5.14 #21800

Closed
wants to merge 1 commit into from

Conversation

kobboi
Copy link
Contributor

@kobboi kobboi commented Jul 26, 2021

No new dependencies found in the binary. Existing patch still applies.

@gentoo-bot
Copy link

Pull Request assignment

Submitter: @kobboi
Areas affected: ebuilds
Packages affected: games-puzzle/tanglet

games-puzzle/tanglet: @gentoo/games

Linked bugs

Bugs linked: 804570


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. labels Jul 26, 2021
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-07-26 21:24 UTC
Newest commit scanned: 09fb584
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/d2c7be0069/output.html

Copy link
Contributor

@ionenwks ionenwks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kind of wanted to suggest migration to cmake, but seems the CMakeLists.txt is QT6-only. I guess Qt5 is on its last legs for this package.

More importantly, is this really running as expected for you? I just get a "Unable to read dice from file". Or at least with a blank state, maybe you have old settings that let it work for you?

From a quick look at strace it tried:

29748 access("/usr/bin/data/en/dice", F_OK) = -1 ENOENT (No such file or directory)
29748 access("/usr/share/data/en/dice", F_OK) = -1 ENOENT (No such file or directory)
29748 access("/usr/Resources/data/en/dice", F_OK) = -1 ENOENT (No such file or directory)
29748 openat(AT_FDCWD, "tanglet:en/dice", O_RDONLY|O_CLOEXEC) = -1 ENOENT (No such file or directory)

These paths don't look right, it should be at /usr/share/tanglet/data/en/dice

games-puzzle/tanglet/tanglet-1.6.1.1.ebuild Outdated Show resolved Hide resolved
games-puzzle/tanglet/tanglet-1.6.1.1.ebuild Outdated Show resolved Hide resolved
games-puzzle/tanglet/tanglet-1.6.1.1.ebuild Outdated Show resolved Hide resolved
@kobboi
Copy link
Contributor Author

kobboi commented Jul 27, 2021

@ionenwks Thanks for your feedback. I tested with ebuild, not emerge. I will re-investigate and post an update

kobboi added a commit to kobboi/gentoo that referenced this pull request Jul 27, 2021
@kobboi
Copy link
Contributor Author

kobboi commented Jul 27, 2021

Pretty sure that what happened is: I tested with the patch disabled, then enabled it when I noticed the /usr/local paths and did not properly re-test. I force-pushed a new commit that addresses your points and this time the game is working properly. Note that at the time the compilation (unknown version) was still OK, I remember the game also not working, with similar error messages as you describe above. Likely the patch never worked, or at least not with 1.5.3 (maybe it did with 1.5.2, as per the filename)

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-07-27 17:39 UTC
Newest commit scanned: 417b4e8
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/1c47027936/output.html

"
RDEPEND="${DEPEND}"

PATCHES=( "${FILESDIR}"/${PN}-1.6.1.1-gentoo.patch )
Copy link
Contributor

@ionenwks ionenwks Jul 27, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, hadn't looked at this patch yet, I do see how this happened.

And to be honest, that old -gentoo.patch was all kind of garbage, it also doesn't respect ${EPREFIX}.

You can remove the modified patch and this line entirely, there's a better option.

Edit: patch was likely from back when we were using /usr/games and a hack to make this work, but when migrated back to normal /usr the patch was edited rather than removed.

PATCHES=( "${FILESDIR}"/${PN}-1.6.1.1-gentoo.patch )

src_configure() {
eqmake5 tanglet.pro
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
eqmake5 tanglet.pro
eqmake5 PREFIX="${EPREFIX}/usr" tanglet.pro

Dropping the patch since

 - the first part does not respect ${EPREFIX} and can be replaced with an
   environment variable in the ebuild
 - the other parts are obsolete

Signed-off-by: Christophe Lermytte <gentoo@lermytte.be>
Bug: https://bugs.gentoo.org/804570
Closes: gentoo#21800
@kobboi
Copy link
Contributor Author

kobboi commented Jul 28, 2021

Force-pushed the above suggestion and adapted the commit message accordingly.

Copy link
Contributor

@ionenwks ionenwks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.

@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2021-07-28 22:04 UTC
Newest commit scanned: 3774f6e
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/f3833299b4/output.html

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
4 participants