blob: d3f28a194ccc72cad8365430b1aa840835920b0e (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-04-21 18:48:31 UTC
+++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp
@@ -18,7 +18,7 @@
#include "third_party/base/cxx17_backports.h"
#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \
- !defined(OS_ASMJS)
+ !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD)
#error "Included on the wrong platform"
#endif
@@ -166,9 +166,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf
std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override {
auto pInfo = std::make_unique<CFX_LinuxFontInfo>();
if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) {
- pInfo->AddPath("/usr/share/fonts");
- pInfo->AddPath("/usr/share/X11/fonts/Type1");
- pInfo->AddPath("/usr/share/X11/fonts/TTF");
+ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/Type1");
+ pInfo->AddPath("/usr/X11R6/lib/X11/fonts/TTF");
pInfo->AddPath("/usr/local/share/fonts");
}
return pInfo;
|