diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2020-01-22 21:02:05 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-01-23 08:51:30 +0100 |
| commit | 9b4ab9bda41a818832c721933986c9c6e07a6e6c (patch) | |
| tree | 88abf9bbbde738bf43027dcdeb84c066f0037b6d /external/pdfium | |
| parent | 6f943d2d40240b51ab02704c0ad276d4ae3b1f28 (diff) | |
pdfium: don't patch out the COMPONENT_BUILD check, define it
So next time we update, no need to adapt a failing patch.
Change-Id: I785f16047d1decbf922177fdde4bc6aad7cfebfc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87215
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'external/pdfium')
| -rw-r--r-- | external/pdfium/Library_pdfium.mk | 1 | ||||
| -rw-r--r-- | external/pdfium/UnpackedTarball_pdfium.mk | 1 | ||||
| -rw-r--r-- | external/pdfium/visibility.patch.1 | 22 |
3 files changed, 1 insertions, 23 deletions
diff --git a/external/pdfium/Library_pdfium.mk b/external/pdfium/Library_pdfium.mk index e7618791bcb8..3a05bbdaaba5 100644 --- a/external/pdfium/Library_pdfium.mk +++ b/external/pdfium/Library_pdfium.mk @@ -31,6 +31,7 @@ $(eval $(call gb_Library_add_defs,pdfium,\ -DMEMORY_TOOL_REPLACES_ALLOCATOR \ -DUNICODE \ -DWIN32_LEAN_AND_MEAN \ + -DCOMPONENT_BUILD \ )) $(eval $(call gb_Library_set_generated_cxx_suffix,pdfium,cpp)) diff --git a/external/pdfium/UnpackedTarball_pdfium.mk b/external/pdfium/UnpackedTarball_pdfium.mk index ba1a7e994dbf..93d3fede6e3c 100644 --- a/external/pdfium/UnpackedTarball_pdfium.mk +++ b/external/pdfium/UnpackedTarball_pdfium.mk @@ -8,7 +8,6 @@ # pdfium_patches := -pdfium_patches += visibility.patch.1 pdfium_patches += ubsan.patch # Fixes build on our baseline. pdfium_patches += build.patch.1 diff --git a/external/pdfium/visibility.patch.1 b/external/pdfium/visibility.patch.1 deleted file mode 100644 index 14a380bbfa16..000000000000 --- a/external/pdfium/visibility.patch.1 +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/public/fpdfview.h b/public/fpdfview.h -index 0542b0541..2c9a37b4a 100644 ---- a/public/fpdfview.h -+++ b/public/fpdfview.h -@@ -175,7 +175,6 @@ typedef int FPDF_ANNOT_APPEARANCEMODE; - // Dictionary value types. - typedef int FPDF_OBJECT_TYPE; - --#if defined(COMPONENT_BUILD) - // FPDF_EXPORT should be consistent with |export| in the pdfium_fuzzer - // template in testing/fuzzers/BUILD.gn. - #if defined(WIN32) -@@ -191,9 +190,6 @@ typedef int FPDF_OBJECT_TYPE; - #define FPDF_EXPORT - #endif // defined(FPDF_IMPLEMENTATION) - #endif // defined(WIN32) --#else --#define FPDF_EXPORT --#endif // defined(COMPONENT_BUILD) - - #if defined(WIN32) && defined(FPDFSDK_EXPORTS) - #define FPDF_CALLCONV __stdcall |