Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ValveSoftware/Proton.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gofman <pgofman@codeweavers.com>2021-04-23 14:12:03 +0300
committerAndrew Eikum <aeikum@codeweavers.com>2021-04-27 21:40:50 +0300
commit8ddd3c36a1a8b9281f2c7c4388f57983612f4f8d (patch)
treede2b01d1624fcf3d78f4caaf634415a9d93742a0
parente1885f84966c04b69bdb630e2a2e051abb9e750d (diff)
proton: Link tahoma.ttf to Windows/Fonts.
CW-Bug-Id: 18862
-rwxr-xr-xproton19
1 files changed, 11 insertions, 8 deletions
diff --git a/proton b/proton
index 15ad0acd..66aa3646 100755
--- a/proton
+++ b/proton
@@ -154,6 +154,7 @@ class Proton:
self.lib_dir = self.path("dist/lib/")
self.lib64_dir = self.path("dist/lib64/")
self.fonts_dir = self.path("dist/share/fonts/")
+ self.wine_fonts_dir = self.path("dist/share/wine/fonts/")
self.version_file = self.path("version")
self.default_pfx_dir = self.path("dist/share/default_pfx/")
self.user_settings_file = self.path("user_settings.py")
@@ -392,19 +393,21 @@ class CompatData:
def create_fonts_symlinks(self):
fontsmap = [
- ( "LiberationSans-Regular.ttf", "arial.ttf" ),
- ( "LiberationSans-Bold.ttf", "arialbd.ttf" ),
- ( "LiberationSerif-Regular.ttf", "times.ttf" ),
- ( "LiberationMono-Regular.ttf", "cour.ttf" ),
- ( "LiberationMono-Bold.ttf", "courbd.ttf" ),
- ( "SourceHanSansSCRegular.otf", "msyh.ttf" ),
+ ( g_proton.fonts_dir, "LiberationSans-Regular.ttf", "arial.ttf" ),
+ ( g_proton.fonts_dir, "LiberationSans-Bold.ttf", "arialbd.ttf" ),
+ ( g_proton.fonts_dir, "LiberationSerif-Regular.ttf", "times.ttf" ),
+ ( g_proton.fonts_dir, "LiberationMono-Regular.ttf", "cour.ttf" ),
+ ( g_proton.fonts_dir, "LiberationMono-Bold.ttf", "courbd.ttf" ),
+ ( g_proton.fonts_dir, "SourceHanSansSCRegular.otf", "msyh.ttf" ),
+
+ ( g_proton.wine_fonts_dir, "tahoma.ttf", "tahoma.ttf" ),
]
windowsfonts = self.prefix_dir + "/drive_c/windows/Fonts"
makedirs(windowsfonts)
for p in fontsmap:
- lname = os.path.join(windowsfonts, p[1])
- fname = os.path.join(g_proton.fonts_dir, p[0])
+ lname = os.path.join(windowsfonts, p[2])
+ fname = os.path.join(p[0], p[1])
if os.path.lexists(lname):
if os.path.islink(lname):
os.remove(lname)