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

proton-cachyos: Proton 9.0 port of fastsync.patch #171

Merged
merged 4 commits into from
Mar 30, 2024

Conversation

Username404-59
Copy link
Contributor

@Username404-59 Username404-59 commented Mar 30, 2024

Note: I don't use CachyOS but I ported this on my gentoo machine so I figured I might as well submit it
Needs testing and probably a bit of cleanup

@Username404-59 Username404-59 changed the title proton-cachyos: Proton 9.0 port proton-cachyos: Proton 9.0 port of fastsync.patch Mar 30, 2024
@ptr1337
Copy link
Member

ptr1337 commented Mar 30, 2024

Wow! Thanks for porting.

This is the port of the fastsync patch and not NTSync , right?

I will start testing today.

@Username404-59
Copy link
Contributor Author

Username404-59 commented Mar 30, 2024

This is the port of the fastsync patch and not NTSync , right?

Yes, this is basically just the existing patch with resolved merge conflicts

@ptr1337
Copy link
Member

ptr1337 commented Mar 30, 2024

This is the port of the fastsync patch and not NTSync , right?

Yes, this is basically just the existing patch with resolved merge conflicts

Very cool. I will start locally a build and will test it.
This patch also needs to be rebased, if we want to put it behind a env (e.G disabled as default, enabled via env variable):
https://github.com/CachyOS/CachyOS-PKGBUILDS/blob/master/proton-cachyos/proton-cachyos/disable-fastsync.patch#L47-L55

But I can do this later.

@ptr1337
Copy link
Member

ptr1337 commented Mar 30, 2024

@Username404-59

I have tested it locally and it appears to work correctly, thanks!

Could you also apply this diff:

diff --git a/proton-cachyos/proton-cachyos/PKGBUILD b/proton-cachyos/proton-cachyos/PKGBUILD
index 8a7d1ba..aadb9a8 100644
--- a/proton-cachyos/proton-cachyos/PKGBUILD
+++ b/proton-cachyos/proton-cachyos/PKGBUILD
@@ -8,12 +8,12 @@ _optimize_v3=${_optimize_v3-y}
 _optimize_v4=${_optimize_v4-}
 
 pkgname=proton-cachyos
-_srctag=9.0-20240315
+_srctag=9.0-20240320
 _commit=
 pkgver=9.0
 _geckover=2.47.4
 _monover=9.0.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Compatibility tool for Steam Play based on Wine and additional components, experimental branch with extra CachyOS flavour"
 url="https://github.com/cachyos/proton-cachyos"
 arch=(x86_64 x86_64_v3)
diff --git a/proton-cachyos/proton-cachyos/disable-fastsync.patch b/proton-cachyos/proton-cachyos/disable-fastsync.patch
index af68e42..606c152 100644
--- a/proton-cachyos/proton-cachyos/disable-fastsync.patch
+++ b/proton-cachyos/proton-cachyos/disable-fastsync.patch
@@ -44,12 +44,3 @@ index f93f545f..2e0199f0 100755
          if "nowritewatch" in self.compat_config:
              self.env["WINE_DISABLE_WRITE_WATCH"] = "1"
  
-@@ -1587,6 +1598,8 @@ class Session:
-             f.write("\tWINEESYNC=\"" + self.env["WINEESYNC"] + "\" \\\n")
-         if "WINEFSYNC" in self.env:
-             f.write("\tWINEFSYNC=\"" + self.env["WINEFSYNC"] + "\" \\\n")
-+        if "WINE_DISABLE_FAST_SYNC" in self.env:
-+            f.write("\tWINE_DISABLE_FAST_SYNC=\"" + self.env["WINE_DISABLE_FAST_SYNC"] + "\" \\\n")
-         if "SteamGameId" in self.env:
-             f.write("\tSteamGameId=\"" + self.env["SteamGameId"] + "\" \\\n")
-         if "SteamAppId" in self.env:

@ptr1337
Copy link
Member

ptr1337 commented Mar 30, 2024

Also, would it be possible that you put your gpg key to github?

Currently the commits are signed but not verified.
image

@Username404-59
Copy link
Contributor Author

Also, would it be possible that you put your gpg key to github?

Currently the commits are signed but not verified.

Oh yeah I used one with a different email which is why it's unverified
I'll force-push resigned ones

@Username404-59 Username404-59 marked this pull request as ready for review March 30, 2024 11:05
Copy link
Member

@ptr1337 ptr1337 left a comment

Choose a reason for hiding this comment

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

LGTM

Thanks!

@ptr1337 ptr1337 merged commit 42f8bbb into CachyOS:master Mar 30, 2024
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.

2 participants