diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-11-13 10:27:21 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-11-13 10:28:15 +0200 |
| commit | 97d8b882210c5a7f3bf6b3d53bfef1fb9a487acf (patch) | |
| tree | 9ca1404bdfc4fb13339d57ff3db39e369b7c9f9d /config_host.mk.in | |
| parent | 39f9eb0d856293a974e2f024b29dca20068af073 (diff) | |
Revert "fdo#38878 upgrade xpdf to poppler"
Also revert my two minor follow-up popper commits.
Poppler doesn't build on Mac OS X. It uses fontconfig, and we don't
depend on that on the Mac.
There is a patch from 2009
http://lists.freedesktop.org/archives/poppler/2009-July/004932.html
(actual patch at
http://lists.freedesktop.org/archives/poppler/attachments/20090712/f3b154d0/attachment-0001.obj
) that makes poppler not use fontconfig on the Mac, but it was never
upstreamed.
And that patch uses the obsolete ATSUI API, which we want to stop
using in LO code, not introduce new uses of.
This reverts commit 39f9eb0d856293a974e2f024b29dca20068af073.
This reverts commit 0941c211858416f6117548e093b428b64785f98a.
This reverts commit a6e9bb4c7bad649cb44efaeef67fa18090348c53.
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index b5c233a3f6e8..57db3f38250b 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -494,7 +494,6 @@ export PLATFORMID=@PLATFORMID@ export PNG_TARBALL=@PNG_TARBALL@ export POPPLER_CFLAGS=$(gb_SPACE)@POPPLER_CFLAGS@ export POPPLER_LIBS=$(gb_SPACE)@POPPLER_LIBS@ -export POPPLER_TARBALL=@POPPLER_TARBALL@ export POSTGRESQL_INC=@POSTGRESQL_INC@ export POSTGRESQL_LIB=@POSTGRESQL_LIB@ export POSTGRESQL_TARBALL=@POSTGRESQL_TARBALL@ @@ -705,6 +704,7 @@ export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@ export WPS_TARBALL=@WPS_TARBALL@ export XINERAMA_LINK=@XINERAMA_LINK@ export XMLLINT=@XMLLINT@ +export XPDF_TARBALL=@XPDF_TARBALL@ export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@ export XRANDR_DLOPEN=@XRANDR_DLOPEN@ export XRANDR_LIBS=$(gb_SPACE)@XRANDR_LIBS@ |