external/poppler/StaticLibrary_poppler.mk | 2
external/poppler/UnpackedTarball_poppler.mk | 1
external/poppler/inc/pch/precompiled_poppler.cxx | 12 +++
external/poppler/inc/pch/precompiled_poppler.hxx | 81 +++++++++++++++++++++++
external/poppler/pch.patch.0 | 11 +++
5 files changed, 107 insertions(+)
New commits:
commit b33bd288111fc07177b3dc36c3b2f8d60a5dec19
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Wed Nov 3 15:17:58 2021 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Wed Nov 3 18:48:16 2021 +0100
PCH for external/poppler
Change-Id: Ic534528d9aeab103d93dc2a627e15460766aec2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124653
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/external/poppler/StaticLibrary_poppler.mk
b/external/poppler/StaticLibrary_poppler.mk
index 3cc0a95e3617..81f0376c7919 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -11,6 +11,8 @@ $(eval $(call gb_StaticLibrary_StaticLibrary,poppler))
$(eval $(call gb_StaticLibrary_use_unpacked,poppler,poppler))
+$(eval $(call
gb_StaticLibrary_set_precompiled_header,poppler,external/poppler/inc/pch/precompiled_poppler))
+
$(eval $(call gb_StaticLibrary_use_external,poppler,libjpeg))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,poppler))
diff --git a/external/poppler/UnpackedTarball_poppler.mk
b/external/poppler/UnpackedTarball_poppler.mk
index 68fd06d9403b..04fdfc228573 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -13,6 +13,7 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
$(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-config.patch.1 \
+ external/poppler/pch.patch.0 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/inc/pch/precompiled_poppler.cxx
b/external/poppler/inc/pch/precompiled_poppler.cxx
new file mode 100644
index 000000000000..5b97c67a777a
--- /dev/null
+++ b/external/poppler/inc/pch/precompiled_poppler.cxx
@@ -0,0 +1,12 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#include "precompiled_poppler.hxx"
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/external/poppler/inc/pch/precompiled_poppler.hxx
b/external/poppler/inc/pch/precompiled_poppler.hxx
new file mode 100644
index 000000000000..0b2824d753c9
--- /dev/null
+++ b/external/poppler/inc/pch/precompiled_poppler.hxx
@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+/*
+ This file has been autogenerated by update_pch.sh. It is possible to edit it
+ manually (such as when an include file has been moved/renamed/removed). All
such
+ manual changes will be rewritten by the next run of update_pch.sh (which
presumably
+ also fixes all possible problems, so it's usually better to use it).
+
+ Generated on 2021-11-03 15:11:24 using:
+ ./bin/update_pch external/poppler poppler --cutoff=1 --exclude:system
--include:module --include:local
+
+ If after updating build fails, use the following command to locate
conflicting headers:
+ ./bin/update_pch_bisect ./external/poppler/inc/pch/precompiled_poppler.hxx
"make external/poppler.build" --find-conflicts
+*/
+
+#include <sal/config.h>
+#if PCH_LEVEL >= 1
+#include <algorithm>
+#include <array>
+#include <cassert>
+#include <cctype>
+#include <cerrno>
+#include <cfloat>
+#include <climits>
+#include <clocale>
+#include <cmath>
+#include <config.h>
+#include <csignal>
+#include <cstdarg>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <ctime>
+#include <gdir.h>
+#include <gfile.h>
+#include <glibc.h>
+#include <gmem.h>
+#include <grandom.h>
+#include <gstrtod.h>
+#include <limits>
+#include <memory>
+#include <poppler-config.h>
+#include <random>
+#include <regex>
+#include <set>
+#include <vector>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
+#include <fofi/FoFiIdentifier.h>
+#include <fofi/FoFiTrueType.h>
+#include <fofi/FoFiType1.h>
+#include <fofi/FoFiType1C.h>
+#include <goo/GooCheckedOps.h>
+#include <goo/GooLikely.h>
+#include <goo/GooString.h>
+#include <goo/GooTimer.h>
+#include <goo/gdir.h>
+#include <goo/gfile.h>
+#include <goo/glibc.h>
+#include <goo/gmem.h>
+#include <goo/grandom.h>
+#include <goo/gstrtod.h>
+#include <poppler/Error.h>
+#include <splash/SplashTypes.h>
+#include <sys/stat.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/external/poppler/pch.patch.0 b/external/poppler/pch.patch.0
new file mode 100644
index 000000000000..89b165f53511
--- /dev/null
+++ b/external/poppler/pch.patch.0
@@ -0,0 +1,11 @@
+--- ./goo/gdir.h.sav 2021-01-02 17:54:42.000000000 +0100
++++ ./goo/gdir.h 2021-11-03 15:16:04.306277081 +0100
+@@ -37,6 +37,8 @@
+
+ #include "poppler-config.h"
+
++#include "gfile.h"
++
+ class GooString;
+
+ //------------------------------------------------------------------------
