winehq upstream wine

[mrshmllow]

Summary by CodeRabbit

• Chores

  • Upgraded Wine upstream to 11.6 and added support for the new source.
  • Bumped runtime revision to 9.
  • Consolidated wineboot invocation.

• Bug Fixes / Migration

  • Improved prefix initialization and migration handling.
  • Gate Mono/WinMetadata installation to v2 prefixes and added cleanup for older prefixes.

[MichailiK]

quite blurry by default on the usual 96 dpi display...

[coderabbitai]

Actionable comments posted: 1

🧹 Nitpick comments (2)

flake.nix (1)

28-31: Drop the now-unused elemental-wine-source input.

Now that the Wine source is switched to inputs.wine, keeping inputs.elemental-wine-source around is redundant and adds lockfile/dependency churn.

♻️ Proposed cleanup

-    elemental-wine-source = {
-      url = "gitlab:ElementalWarrior/wine?host=gitlab.winehq.org&ref=affinity-photo3-wine9.13-part3";
-      flake = false;
-    };
-
     wine = {
       url = "gitlab:wine/wine?host=gitlab.winehq.org&ref=wine-11.3";
       flake = false;
     };

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@flake.nix` around lines 28 - 31, Remove the now-unused elemental-wine-source
flake input and any references to it, leaving only the new wine input (the wine
= { url = "gitlab:wine/wine?host=gitlab.winehq.org&ref=wine-11.3"; flake =
false; } block) in inputs; update any uses of elemental-wine-source to use
inputs.wine and run your flake/lockfile update so the lockfile no longer
contains elemental-wine-source.

packages/common.nix (1)

133-139: Prefer rm -f and fix the typo in the cleanup note.

rm ... || true can be simplified, and the comment has a typo (“tonn” → “ton”). This keeps the migration block cleaner.

🧹 Proposed cleanup

-                   # since modern wine, >= 11, these cause a tonn of problems.
-                   rm "${affinityPath}/drive_c/windows/system32/WinMetadata/Windows.Services.winmd" || true
-                   rm "${affinityPath}/drive_c/windows/system32/WinMetadata/Windows.System.winmd" || true
+                   # since modern wine, >= 11, these cause a ton of problems.
+                   rm -f "${affinityPath}/drive_c/windows/system32/WinMetadata/Windows.Services.winmd"
+                   rm -f "${affinityPath}/drive_c/windows/system32/WinMetadata/Windows.System.winmd"

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@packages/common.nix` around lines 133 - 139, In the migration block guarded
by the condition if [[ "$prefixRevision" -le 8 && "$type" == "v2" ]]; then,
simplify the cleanup of WinMetadata files by replacing the two lines that use rm
".../Windows.Services.winmd" || true and rm ".../Windows.System.winmd" || true
with rm -f on those paths (use the existing affinityPath variable), and correct
the comment text from “tonn” to “ton”. Ensure the comment reads “since modern
wine, >= 11, these cause a ton of problems.”

🤖 Prompt for all review comments with AI agents

Verify each finding against the current code and only fix it if needed.

Inline comments:
In `@packages/common.nix`:
- Around line 36-38: latestRevision was incremented to "9" but no one-time
migration was added to correct display scaling for existing prefixes, so add a
deterministic DPI migration step tied to revision "9": update the migration
verbs list (where "latestRevision" and "verbs" are declared) to include a new
migration entry that runs once for revision-9 and applies the display-scaling
fix (detect 96 DPI prefixes and adjust stored scale/bitmap flags or rewrite
prefix metadata accordingly), ensuring the migration runs before normal startup
and is idempotent; reference the same migration registration structure around
latestRevision and verbs to implement this new DPI-prefixed migration.

---

Nitpick comments:
In `@flake.nix`:
- Around line 28-31: Remove the now-unused elemental-wine-source flake input and
any references to it, leaving only the new wine input (the wine = { url =
"gitlab:wine/wine?host=gitlab.winehq.org&ref=wine-11.3"; flake = false; } block)
in inputs; update any uses of elemental-wine-source to use inputs.wine and run
your flake/lockfile update so the lockfile no longer contains
elemental-wine-source.

In `@packages/common.nix`:
- Around line 133-139: In the migration block guarded by the condition if [[
"$prefixRevision" -le 8 && "$type" == "v2" ]]; then, simplify the cleanup of
WinMetadata files by replacing the two lines that use rm
".../Windows.Services.winmd" || true and rm ".../Windows.System.winmd" || true
with rm -f on those paths (use the existing affinityPath variable), and correct
the comment text from “tonn” to “ton”. Ensure the comment reads “since modern
wine, >= 11, these cause a ton of problems.”

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 5fcbb4bc-e443-40d7-910d-d782d436ba85

📥 Commits

Reviewing files that changed from the base of the PR and between d4bf4ed and d2b6ee7.

⛔ Files ignored due to path filters (1)

• flake.lock is excluded by !**/*.lock

📒 Files selected for processing (3)

• flake.nix
• packages/common.nix
• packages/wine/default.nix

[mrshmllow]

I have bisected the blurriness issue down to https://gitlab.winehq.org/wine/wine/-/commit/bdc2fc0c8fc19da4a550c0d9448f7bcad2f40ab1

[mrshmllow]

Closed in favor of #127