From 32b43694f4bf14a3dc9d9a0dc4ccf5d33e7a7954 Mon Sep 17 00:00:00 2001 From: The412Banner <205237651+The412Banner@users.noreply.github.com> Date: Fri, 9 Oct 2026 23:13:53 -0400 Subject: [PATCH] Windows components: hide the CJK fonts and PowerShell, which every Proton here ships (#496) Proton Experimental (ARM64), GE-Proton and proton-cachyos all carry Malgun, MS Gothic, YaHei and SimSun in share/fonts and Wine's PowerShell wrapper, so the catalog's cjkfonts and powershell entries would only shadow what is already there. They join gecko and mono in the list the page leaves out. --- .../java/com/droiddeck/launcher/session/WinComponents.kt | 9 +++++++-- .../launcher/session/WinComponentsSupportTest.kt | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt index c62160d0d5..cbe6b7b9c8 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/WinComponents.kt @@ -65,8 +65,13 @@ object WinComponents { private const val MSI_INSTALL = "/usr/local/bin/droiddeck-msi-install" /** Where a downloaded package or installer waits for the installer, inside the runtime so it can read it. */ private const val MSI_CACHE = "$STORE/.packages" - /** Catalog entries Proton already provides newer copies of, which an install would only shadow. */ - private val PROTON_PROVIDES = setOf("gecko", "mono") + /** + * Catalog entries every Proton here already ships, which an install would only shadow: Wine + * Gecko and Mono, the Chinese/Japanese/Korean fonts (Malgun, MS Gothic, YaHei, SimSun are in + * share/fonts of Proton Experimental, GE-Proton and proton-cachyos alike) and Wine's own + * PowerShell wrapper. + */ + private val PROTON_PROVIDES = setOf("gecko", "mono", "cjkfonts", "powershell") /** The keys the catalog nests under "environment" on a few .NET entries. */ private val NESTED_KEYS = setOf("url", "file_name", "file_checksum", "file_size") diff --git a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt index 640bda1afa..e64350cc32 100644 --- a/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/session/WinComponentsSupportTest.kt @@ -92,5 +92,7 @@ class WinComponentsSupportTest { assertEquals(Support.UNSUPPORTED, support(component("gecko", step("install_msi", "url" to "$base/gecko.msi")))) assertEquals(Support.UNSUPPORTED, support(component("mono", step("uninstall"), step("install_msi", "url" to "$base/mono.msi")))) assertEquals(Support.UNSUPPORTED, support(component("mono-10.4.1", step("install_msi", "url" to "$base/mono.msi")))) + assertEquals(Support.UNSUPPORTED, support(component("cjkfonts", step("install_fonts", "url" to "temp/SourceHanSans.ttc")))) + assertEquals(Support.UNSUPPORTED, support(component("powershell", step("copy_file", "file_name" to "profile.ps1", "dest" to "win64")))) } }