summaryrefslogtreecommitdiff
path: root/external/poppler/poppler-mac-fake.patch.1
diff options
context:
space:
mode:
authorKhaled Hosny <khaledhosny@eglug.org>2013-11-03 20:21:01 +0200
committerDavid Tardon <dtardon@redhat.com>2013-11-04 02:31:25 -0600
commit40276b4ceb72f1d070bb1457ed5b403b35ca4deb (patch)
treed3853c906a5732c5d4de226f727cb4a38e58d80a /external/poppler/poppler-mac-fake.patch.1
parentfde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03 (diff)
fdo#70393: move poppler to a subdir of external
Change-Id: I399df92d2b6907c129e18f3a55afeadf02783c14 Reviewed-on: https://gerrit.libreoffice.org/6548 Reviewed-by: David Tardon <dtardon@redhat.com> Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/poppler/poppler-mac-fake.patch.1')
-rw-r--r--external/poppler/poppler-mac-fake.patch.113
1 files changed, 13 insertions, 0 deletions
diff --git a/external/poppler/poppler-mac-fake.patch.1 b/external/poppler/poppler-mac-fake.patch.1
new file mode 100644
index 000000000000..d0b1936658ca
--- /dev/null
+++ b/external/poppler/poppler-mac-fake.patch.1
@@ -0,0 +1,13 @@
+diff -ur poppler.org/poppler/GlobalParams.cc poppler/poppler/GlobalParams.cc
+--- poppler.org/poppler/GlobalParams.cc 2013-07-09 06:24:38.000000000 -0500
++++ poppler/poppler/GlobalParams.cc 2013-07-09 06:25:18.000000000 -0500
+@@ -1327,7 +1327,7 @@
+ return path;
+ }
+
+-#elif WITH_FONTCONFIGURATION_WIN32
++#elif WITH_FONTCONFIGURATION_WIN32 && defined(_WIN32)
+ #include "GlobalParamsWin.cc"
+
+ GooString *GlobalParams::findBase14FontFile(GooString *base14Name, GfxFont *font) {
+