[Bug 40312] New: Please look for builtin *.fon fonts in fontdir

https://bugs.winehq.org/show_bug.cgi?id=40312

Bug ID: 40312
           Summary: Please look for builtin *.fon fonts in fontdir
           Product: Wine
           Version: 1.9.4
          Hardware: x86
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: gdi32
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

Created attachment 53956
  --> https://bugs.winehq.org/attachment.cgi?id=53956
Workaround for dlls/gdi32/freetype.c

Hi,

in Makefile.in Wine sets fontdir = ${datadir}/wine/fonts. But changing this
value seems to have no effect. At least dlls/gdi32/freetype.c looks for the
built-in Wine *.fon fonts in ${datadir}/wine/fonts. So it doesn't find them if
they are in a changed $fontdir.

I suggest to first check fontdir explicitly, before falling back to the default
value.

Background:

In Debian we ship both the stable and the development version of wine (wine and
wine-development). These are installed in different subfolders, e.g.
/usr/share/wine and /usr/share/wine-development (where wine and
wine-development are part of datadir, and "wine/" is stripped from the variable
value).

So vanilla wine has:
datadir=/usr/share
fontdir=${datadir}/wine/fonts

But Debian has (simplified example):
datadir=/usr/share/wine[-development]
fontdir=${datadir}/fonts

Further we'd like to use the same fonts folder for both wine and
wine-development:
fontdir=/usr/share/wine/fonts

I attached my primitive workaround to get this working (obviously this is not a
patch for Wine).