Frogging-Family / wine-tkg-git

The wine-tkg build systems, to create custom Wine and Proton builds
861 stars 156 forks source link

Build failed, when protonify is true #1060

Closed Mracobes9 closed 1 year ago

Mracobes9 commented 1 year ago

Hello. I tried to make build, but got error -> Applying proton-tkg-staging.patch ==> ОШИБКА: Patch application has failed. The error was logged to /home/mracobes/wine-tkg/wine-tkg-git/wine-tkg-git/prepare.log for your convenience. My profile is default-tkg. My customisation config customization.cfg.txt My prepare log prepare.log

csutcliff commented 1 year ago
diff --git a/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/staging/proton-tkg-staging.patch b/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/staging/proton-tkg-staging.patch
index f2514194..ac6e4b02 100644
--- a/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/staging/proton-tkg-staging.patch
+++ b/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/staging/proton-tkg-staging.patch
@@ -1332,15 +1332,15 @@ index 43268221936..f39d6f0cd7b 100644
      return ret;
  }

-@@ -2652,7 +2652,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
+@@ -2894,7 +2894,7 @@ static enum fill_status fill_networkadapter( struct table *table, const struct e
          rec->index                = aa->u.s.IfIndex;
          rec->interface_index      = aa->u.s.IfIndex;
          rec->mac_address          = get_mac_address( aa->PhysicalAddress, aa->PhysicalAddressLength );
 -        rec->manufacturer         = L"The Wine Project";
 +        rec->manufacturer         = L"The Proton Project";
+         rec->netconnection_id     = NULL; /* FIXME Windows seems to fill this when it's connected and in use */
          rec->name                 = wcsdup( aa->FriendlyName );
-         rec->netconnection_status = get_connection_status( aa->OperStatus );
-         rec->physicaladapter      = physical;
+         rec->netenabled           = connection_status ? -1 : 0;
 @@ -3475,7 +3475,7 @@ static enum fill_status fill_operatingsystem( struct table *table, const struct
      rec->lastbootuptime         = get_lastbootuptime();
      rec->localdatetime          = get_localdatetime();

proton-tkg-staging.patch needs to be adjusted due to b4280a486f7308fd1da260cd5b48b7d9e3c747c5 in wine.

ryanmusante commented 1 year ago

You're awesome as always, TK! Thanks!

Mracobes9 commented 1 year ago

Thank you, @Tk-Glitch