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 /tail_build | |
| 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 'tail_build')
| -rw-r--r-- | tail_build/prj/build.lst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst index b55ee2cd605b..653adf9a9d76 100644 --- a/tail_build/prj/build.lst +++ b/tail_build/prj/build.lst @@ -1,2 +1,2 @@ -tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland ZLIB:zlib external solenv soltools NULL +tb tail_build : BERKELEYDB:berkeleydb CAIRO:cairo CPPUNIT:cppunit EXPAT:expat ICU:icu JPEG:jpeg LIBXML2:libxml2 libxmlsec LIBXSLT:libxslt MOZ:moz NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland XPDF:xpdf ZLIB:zlib external solenv soltools NULL tb tail_build\prj nmake - all tb_prj NULL |