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.

Sign up for GitHub

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

Jump to bottom

Fix dependencies versions of ProtonUp-Qt #280

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix dependencies versions of ProtonUp-Qt #280

wants to merge 2 commits into from

Conversation

tobiasjakobi
Copy link
Contributor

Commit 164df40 introduced the latest version v2.11.1 of ProtonQt-Up, but the ebuild does no version checking of its dependencies.

Add the missing version information, which comes straight from the project's requirement.txt. This also means we need a ebuild bump for dev-python/steam. The also required VDF lib in version v4.0 was recently added to the Gentoo repo by me: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8878b6fa90a28a6d67cca957b5478ab9f3d0f7b9

@tobiasjakobi
Copy link
Contributor Author

FYI: Download target changes were done due to feedback in this MR (gentoo/gentoo#40115) by Nowa. I guess it's good practice to use the same rules here for GURU.

pastalian
pastalian reviewed Jan 16, 2025
View reviewed changes
Copy link
Contributor

@pastalian pastalian left a comment

Choose a reason for hiding this comment

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

First of all, thank you for taking the time to look into this.

You may have already noticed, but the current dev-python/steam is completely broken, and this bump does not resolve those issues.
If you're familiar with this project, could you also take a look at fixing those issues?

For example, distutils_enable_tests pytest does not pass any tests, and even python3.12 -c 'import steam.client' fails.

dev-python/steam/steam-1.6.1.ebuild Outdated Show resolved Hide resolved
dev-python/steam/steam-1.6.1.ebuild Show resolved Hide resolved
dev-python/steam/steam-1.6.1.ebuild Outdated Show resolved Hide resolved
dev-python/steam/steam-1.6.1.ebuild Outdated Show resolved Hide resolved
games-util/ProtonUp-Qt/ProtonUp-Qt-2.11.1.ebuild Outdated

SRC_URI="
https://github.com/DavidoTek/ProtonUp-Qt/archive/refs/tags/v${PV}.tar.gz
-> ${P}.gh.tar.gz
Copy link
Contributor

Choose a reason for hiding this comment

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

Renaming wouldn't hurt, but the .gh suffix is used to differentiate cases where distfiles are available from multiple sources, like GitHub and PyPI. Since ProtonUp-Qt only distributes its source on GitHub, there's no real need to rename it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK, I've dropped the .gh, but I'm leaving the line break. Is this OK?

Copy link
Contributor

Choose a reason for hiding this comment

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

Uh, it looks like you dropped the .gh from dev-python/steam instead of games-util/ProtonUp-Qt.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh dear, I hope it's fixed now.

@tobiasjakobi
Copy link
Contributor Author

tobiasjakobi commented Jan 17, 2025 •
edited
Loading

@pastalian I'm currently analysing the import situation in the project. You're completely right, stuff doesn't work at the moment. And it looks like the requirements.txt is not complete, because it certainly doesn't list some modules that are required.

@tobiasjakobi
Copy link
Contributor Author

tobiasjakobi commented Jan 17, 2025 •
edited
Loading

Well, this is going to be complicated...

So first of all, I have identified two dependencies that are not tracked through requirements.txt. Which are:

  • dev-python/certifi
  • dev-python/wsproto

Also I can't find any trace of the project using urllib3, so I have removed it. That was the easy part.

Now for the problems:

  • gevent (ebuilds available, but neither upstream nor GURU)
  • gevent-eventemitter (ebuilds available, but again, neither upstram nor GURU)

What saves us here with ProtonUp-Qt is that it just uses a small function from steam.util.appcache and nothing more. gevent looks like a complex beast, so I don't feel comfortable to add it here...

I'm not really sure on how to proceed here. I think maybe it's best to strip out anything else than steam.util from the module and add a big warning message that informs the user about it. Because, like you already said, the module is currently non-functional for most things, in particular for steam.client.

@pastalian
Copy link
Contributor

I'm not really sure on how to proceed here. I think maybe it's best to strip out anything else than steam.util from the module and add a big warning message that informs the user about it. Because, like you already said, the module is currently non-functional for most things, in particular for steam.client.

Yeah, we should output a warning in pkg_postinst. Stripping is probably unnecessary.

@tobiasjakobi
dev-python/steam: add 1.6.1
e32e6b0 
Signed-off-by: Tobias Jakobi <[email protected]>
@tobiasjakobi
games-util/ProtonUp-Qt: fix dependencies of v2.11.1
7e838f3 
Use the version information from the project's requirement.txt
This in particular means using an up-to-date version of both
the steam and the vdf library.

Without these latest libs the application is not able to
access any of the .vdf files of current stable Steam clients
any more.

While at it, at the missing gh part of the download suffix and
break the overly long line.

Signed-off-by: Tobias Jakobi <[email protected]>
@tobiasjakobi
Copy link
Contributor Author

tobiasjakobi commented Jan 17, 2025 •
edited
Loading

I'm not really sure on how to proceed here. I think maybe it's best to strip out anything else than steam.util from the module and add a big warning message that informs the user about it. Because, like you already said, the module is currently non-functional for most things, in particular for steam.client.

Yeah, we should output a warning in pkg_postinst. Stripping is probably unnecessary.

OK, warning message it is then! I've added a short message. Does this suffice, or should we be more verbose here?

At least ProtonUp-Qt seems to be the only ebuild in GURU that uses dev-python/steam.

gentoo-bot pushed a commit that referenced this pull request Jan 18, 2025
@tobiasjakobi @pastalian
games-util/ProtonUp-Qt: fix dependencies of v2.11.1
4c0037b 
Use the version information from the project's requirement.txt
This in particular means using an up-to-date version of both
the steam and the vdf library.

Without these latest libs the application is not able to
access any of the .vdf files of current stable Steam clients
any more.

While at it, at the missing gh part of the download suffix and
break the overly long line.

Signed-off-by: Tobias Jakobi <[email protected]>
Closes: #280
Signed-off-by: Takuya Wakazono <[email protected]>
@pastalian
Copy link
Contributor

Merged to the dev branch. Thank you!

If you’re planning to contribute more to GURU, please check out our wiki and consider joining us:
https://wiki.gentoo.org/wiki/Project:GURU

@tobiasjakobi
Copy link
Contributor Author

@pastalian Thanks, but I think I'm good for now. Now going to back to debugging a nasty GPU crash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pastalian pastalian pastalian left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@tobiasjakobi @pastalian