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

Update runtime, rework dependencies #161

Merged
merged 8 commits into from
Jan 1, 2025
Merged

Conversation

PunkPangolin
Copy link
Contributor

Update runtime to 24.08.
Remove python3-setuptools-scm and perl as they are part of the runtime.
Replace p7zip with build from p7zip-project, since development is now happening there. This follows several other flathub manifests. Question: Should it perhaps be replaced with upstream 7zip?
Update components and add x-checker data for some.

@flathubbot
Copy link
Contributor

Started test build 167424

@flathubbot
Copy link
Contributor

Build 167424 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/150522/com.github.Matoking.protontricks.flatpakref

@PunkPangolin PunkPangolin marked this pull request as ready for review December 12, 2024 00:00
@flathubbot
Copy link
Contributor

Started test build 167427

@flathubbot
Copy link
Contributor

Build 167427 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/150525/com.github.Matoking.protontricks.flatpakref

@Matoking
Copy link
Collaborator

Thanks for the pull request!

Winetricks recommends 7zip over p7zip starting with the following commit:

Winetricks/winetricks@4302a8d

Going by that, updating it should be OK. p7zip specifically should not be required by anything else.

@flathubbot
Copy link
Contributor

Started test build 169077

@flathubbot
Copy link
Contributor

Build 169077 failed

@flathubbot
Copy link
Contributor

Started test build 169078

@flathubbot
Copy link
Contributor

Build 169078 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/152165/com.github.Matoking.protontricks.flatpakref

@PunkPangolin
Copy link
Contributor Author

Fix #164

@flathubbot
Copy link
Contributor

Started test build 169084

@PunkPangolin
Copy link
Contributor Author

PunkPangolin commented Dec 17, 2024

Thanks for the pull request!

Winetricks recommends 7zip over p7zip starting with the following commit:

Winetricks/winetricks@4302a8d

Going by that, updating it should be OK. p7zip specifically should not be required by anything else.

Should the flatpak then be updated to use upstream winetricks? Currently the build uses your fork. However, the symlink to z7a should achieve compatibility in any case.

The latest upstream version of winetricks works for me, but I get a ton of warnings about 64-bit prefixes.

@flathubbot
Copy link
Contributor

Build 169084 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/152171/com.github.Matoking.protontricks.flatpakref

@Matoking
Copy link
Collaborator

Should the flatpak then be updated to use upstream winetricks? Currently the build uses your fork. However, the symlink to z7a should achieve compatibility in any case.

The latest upstream version of winetricks works for me, but I get a ton of warnings about 64-bit prefixes.

The fork has a few minor patches to make it work more nicely with Proton and the Flatpak sandbox (disabling the continuous 64-bit prefix warnings is one of the patches). They can be found here:

https://github.com/Matoking/winetricks/commits/snapshot-2023-08-16-pt

I'll look into updating the fork, as it seems a bit overdue.

@flathubbot
Copy link
Contributor

Started test build 169477

@flathubbot
Copy link
Contributor

Build 169477 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/152574/com.github.Matoking.protontricks.flatpakref

@flathubbot
Copy link
Contributor

Started test build 169493

@flathubbot
Copy link
Contributor

Build 169493 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/152590/com.github.Matoking.protontricks.flatpakref

@PunkPangolin
Copy link
Contributor Author

Should the flatpak then be updated to use upstream winetricks? Currently the build uses your fork. However, the symlink to z7a should achieve compatibility in any case.
The latest upstream version of winetricks works for me, but I get a ton of warnings about 64-bit prefixes.

The fork has a few minor patches to make it work more nicely with Proton and the Flatpak sandbox (disabling the continuous 64-bit prefix warnings is one of the patches). They can be found here:

https://github.com/Matoking/winetricks/commits/snapshot-2023-08-16-pt

I'll look into updating the fork, as it seems a bit overdue.

Is your fork being used for anything other than flatpak? If not, we could change the flatpak build to the latest upstream release (which is also almost a year old) and patch in your commits.
I have tested your commits as patches on the latest upstream release and the latest dev commit. The renaming ones work fine, and the fix for spaces in names has been merged upstream.
Disabling 64bit warnings works differently now, but is easy to do:

diff --git a/src/winetricks b/src/winetricks
index 1cadad562..df6727abc 100755
--- a/src/winetricks
+++ b/src/winetricks
@@ -5177,7 +5177,7 @@ winetricks_set_wineprefix()
                 echo "${W_TMP_EARLY}/no_win64_warnings exists, not issuing 64-bit prefix warning"
                 W_NO_WIN64_WARNINGS=1
             else
-                W_NO_WIN64_WARNINGS=0
+                W_NO_WIN64_WARNINGS=1
             fi
         fi
 

I tried to fix upstream issue 2183 but could not find an easy way. Maybe it is possible to remove the arch detection and hardcode it in?

But that is probably beyond the scope of this PR. I have also switched to using unrar-free (as suggested by winetricks) and the symlinks to unrar and 7za should solve possible compatibility issues.

@Matoking
Copy link
Collaborator

Should the flatpak then be updated to use upstream winetricks? Currently the build uses your fork. However, the symlink to z7a should achieve compatibility in any case.
The latest upstream version of winetricks works for me, but I get a ton of warnings about 64-bit prefixes.

The fork has a few minor patches to make it work more nicely with Proton and the Flatpak sandbox (disabling the continuous 64-bit prefix warnings is one of the patches). They can be found here:
https://github.com/Matoking/winetricks/commits/snapshot-2023-08-16-pt
I'll look into updating the fork, as it seems a bit overdue.

Is your fork being used for anything other than flatpak? If not, we could change the flatpak build to the latest upstream release (which is also almost a year old) and patch in your commits. I have tested your commits as patches on the latest upstream release and the latest dev commit. The renaming ones work fine, and the fix for spaces in names has been merged upstream. Disabling 64bit warnings works differently now, but is easy to do:

diff --git a/src/winetricks b/src/winetricks
index 1cadad562..df6727abc 100755
--- a/src/winetricks
+++ b/src/winetricks
@@ -5177,7 +5177,7 @@ winetricks_set_wineprefix()
                 echo "${W_TMP_EARLY}/no_win64_warnings exists, not issuing 64-bit prefix warning"
                 W_NO_WIN64_WARNINGS=1
             else
-                W_NO_WIN64_WARNINGS=0
+                W_NO_WIN64_WARNINGS=1
             fi
         fi
 

I tried to fix upstream issue 2183 but could not find an easy way. Maybe it is possible to remove the arch detection and hardcode it in?

But that is probably beyond the scope of this PR. I have also switched to using unrar-free (as suggested by winetricks) and the symlinks to unrar and 7za should solve possible compatibility issues.

Maintaining the fork as a separate repository instead of separate patch files was done mostly for being more convenient. There's also the possibility of having Protontricks download a patched copy of Winetricks automatically and use that, but that would involve plenty of work and possibly introduce confusion with the system Winetricks, so I haven't pursued it.

Anyway, aside from the 7zz -> 7zcommand rename (7zz supports all formats going by 7-Zip's docs here), the pull request as-is looks ready to merge, with further improvements possible to do in additional PRs.

Winetricks uses the `7z` executable.
@flathubbot
Copy link
Contributor

Started test build 171414

@flathubbot
Copy link
Contributor

Build 171414 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/154517/com.github.Matoking.protontricks.flatpakref

@Matoking Matoking merged commit 13d5632 into flathub:master Jan 1, 2025
1 check passed
@Matoking
Copy link
Collaborator

Matoking commented Jan 1, 2025

I've merged the pull request after adding a 7z -> 7zz symlink as 7z is what Winetricks uses in the try_7z call.

Thanks for the pull request!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants