diff options
Diffstat (limited to 'Build/source/texk/web2c/luatexdir')
-rw-r--r-- | Build/source/texk/web2c/luatexdir/ChangeLog | 1 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/am/libluatex.am | 4 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/fake/StructTreeRoot.h | 16 | ||||
-rw-r--r-- | Build/source/texk/web2c/luatexdir/image/epdf.h | 34 |
4 files changed, 37 insertions, 18 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog index e73de6add38..efbe06d3135 100644 --- a/Build/source/texk/web2c/luatexdir/ChangeLog +++ b/Build/source/texk/web2c/luatexdir/ChangeLog @@ -1,6 +1,7 @@ 2013-12-12 Peter Breitenlohner <peb@mppmu.mpg.de> * image/epdf.h, lua/lepdflib.cc: Adapt for poppler-0.25.x. + * fake/StructTreeRoot.h (new): Provide 0.24.4 compatibility. 2013-12-08 Akira Kakuto <kakuto@fuk.kindai.ac.jp> diff --git a/Build/source/texk/web2c/luatexdir/am/libluatex.am b/Build/source/texk/web2c/luatexdir/am/libluatex.am index 7c23a7c1eda..f43a66131ec 100644 --- a/Build/source/texk/web2c/luatexdir/am/libluatex.am +++ b/Build/source/texk/web2c/luatexdir/am/libluatex.am @@ -22,6 +22,10 @@ libluatex_a_CPPFLAGS += $(LUA_INCLUDES) libluatex_a_CPPFLAGS += -DSYNCTEX_ENGINE_H='<synctex-luatex.h>' -I$(srcdir)/synctexdir libluatex_a_CXXFLAGS = # $(WARNING_CXXFLAGS) +## compatibility between poppler versions <=0.24.0 and >-0.25.0 +libluatex_a_CPPFLAGS += -I$(srcdir)/luatexdir/fake +EXTRA_DIST += luatexdir/fake/StructTreeRoot.h + ## from luatexdir ## libluatex_web = diff --git a/Build/source/texk/web2c/luatexdir/fake/StructTreeRoot.h b/Build/source/texk/web2c/luatexdir/fake/StructTreeRoot.h new file mode 100644 index 00000000000..a491a40f3dd --- /dev/null +++ b/Build/source/texk/web2c/luatexdir/fake/StructTreeRoot.h @@ -0,0 +1,16 @@ +// fake/StructRootTree.h: compatibility between poppler versions +// +// Copyright (C) 2013 Peter Breitenlohner <tex-live@tug.org> +// You may freely use, modify and/or distribute this file. + +// poppler 0.25.0 and later have a header <StructRootTree.h> and declare +// StructRootTree *Catalog::getStructRootTree() +// whereas poppler 0.24.4 and before have no such header and declare +// Object *Catalog::getStructRootTree(). + +// We always #include <StructRootTree.h> from image/epdf.h and for +// poppler 0.24.4 this file defines GETSTRUCTTREEROOT_RETURNS_OBJECT +// used in lua/lepdflib.cc to distinguish the different versions. + +#define GETSTRUCTTREEROOT_RETURNS_OBJECT 1 + diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h index 257dfd7eac6..efc8f9201a1 100644 --- a/Build/source/texk/web2c/luatexdir/image/epdf.h +++ b/Build/source/texk/web2c/luatexdir/image/epdf.h @@ -40,24 +40,22 @@ extern "C" { # include <goo/GooString.h> # include <goo/gmem.h> # include <goo/gfile.h> -# include "Object.h" -# include "Stream.h" -# include "Gfx.h" -# include "Annot.h" -# include "Array.h" -# include "Dict.h" -# include "XRef.h" -# include "Catalog.h" -#ifndef GETSTRUCTTREEROOT_RETURNS_OBJECT -# include "StructTreeRoot.h" -#endif -# include "Link.h" -# include "Page.h" -# include "GfxFont.h" -# include "PDFDoc.h" -# include "GlobalParams.h" -# include "Error.h" -# include "FileSpec.h" +# include <Object.h> +# include <Stream.h> +# include <Gfx.h> +# include <Annot.h> +# include <Array.h> +# include <Dict.h> +# include <XRef.h> +# include <Catalog.h> +# include <StructTreeRoot.h> +# include <Link.h> +# include <Page.h> +# include <GfxFont.h> +# include <PDFDoc.h> +# include <GlobalParams.h> +# include <Error.h> +# include <FileSpec.h> extern "C" { |