diff options
| author | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-06-04 00:22:20 -0400 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2018-06-04 12:36:28 -0400 |
| commit | 27d2af28ae72c8fde8a5d1bcd5cd921d570a4f13 (patch) | |
| tree | b1f40b0a8963b4fd8aeff1ed5b51c2916995a915 /external/pdfium/freetype.patch.1 | |
| parent | 82bff3752764752d4f2f863d6252950125218182 (diff) | |
Revert "pdfium: update to 3426"
Temporarily revert the PDFium upgrade to fix
build (a number of PDFium patches will follow
this commit, which only apply on the previous
PDFium version).
This will be re-applied after a number of commits.
This reverts commit 56195a4d0bbb21edeed1cea7a45283141c733f18.
Diffstat (limited to 'external/pdfium/freetype.patch.1')
| -rw-r--r-- | external/pdfium/freetype.patch.1 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/external/pdfium/freetype.patch.1 b/external/pdfium/freetype.patch.1 new file mode 100644 index 000000000000..90f230c54e69 --- /dev/null +++ b/external/pdfium/freetype.patch.1 @@ -0,0 +1,18 @@ +Upstream provides this define from the commandline, but while this define is +needed for fxge, it breaks the build for the bundled freetype. gbuild doesn't +support having different defines within the same Library, so just patch the +single translation unit that actually needs the define. + +Long-term perhaps the solution is to enable freetype on all platforms inside +LO, then we don't have to build freetype as part of pdfium, so we can let +gbuild define this from the commandline. + +diff --git a/core/fxge/freetype/fx_freetype.cpp b/core/fxge/freetype/fx_freetype.cpp +index 0ae207b02..879bf5ab9 100644 +--- a/core/fxge/freetype/fx_freetype.cpp ++++ b/core/fxge/freetype/fx_freetype.cpp +@@ -1,3 +1,4 @@ ++#define DEFINE_PS_TABLES + // Copyright 2014 PDFium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. |