summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Build/source/texk/web2c/ChangeLog5
-rw-r--r--Build/source/texk/web2c/c-auto.in3
-rwxr-xr-xBuild/source/texk/web2c/configure53
-rw-r--r--Build/source/texk/web2c/configure.ac21
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/luatexdir/image/epdf.h6
-rw-r--r--Build/source/texk/web2c/luatexdir/lua/lepdflib.cc28
7 files changed, 14 insertions, 109 deletions
diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog
index 1aeba1e8e89..a44c8ecbd8f 100644
--- a/Build/source/texk/web2c/ChangeLog
+++ b/Build/source/texk/web2c/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Drop check for <StructTreeRoot.h>, we now
+ require poppler 0.30 better.
+
2015-08-10 Peter Breitenlohner <peb@mppmu.mpg.de>
* pltotf.ch, vptovf.ch: Send also real numbers to stderr,
diff --git a/Build/source/texk/web2c/c-auto.in b/Build/source/texk/web2c/c-auto.in
index b75d2f66d53..8166e0e43af 100644
--- a/Build/source/texk/web2c/c-auto.in
+++ b/Build/source/texk/web2c/c-auto.in
@@ -181,9 +181,6 @@
/* Define to 1 if you have the `strrchr' function. */
#undef HAVE_STRRCHR
-/* Define to 1 if you have the <StructTreeRoot.h> header file. */
-#undef HAVE_STRUCTTREEROOT_H
-
/* Define to 1 if `st_mtim' is a member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_MTIM
diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure
index c437e42f3c2..c2bd3d449fa 100755
--- a/Build/source/texk/web2c/configure
+++ b/Build/source/texk/web2c/configure
@@ -24457,59 +24457,6 @@ else
KPATHSEA_PATHS_H='${top_builddir}/..'
fi
-
-# Check of poppler 0.25 or better
-case $with_system_poppler in #(
- yes) :
- eval CPPFLAGS=\"$POPPLER_INCLUDES \$CPPFLAGS\"
-eval LIBS=\"$POPPLER_LIBS \$LIBS\"
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link="./libtool --mode=link --tag=CXX $ac_link"
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for StructTreeRoot.h (poppler 0.25 or better)" >&5
-$as_echo_n "checking for StructTreeRoot.h (poppler 0.25 or better)... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdio.h>
-#include <StructTreeRoot.h>
-int
-main ()
-{
-PDFDoc *doc;
- Dict *dict;
- StructTreeRoot root(doc, dict);
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
- kpse_cv_have_StructTreeRoot_h=yes
-else
- kpse_cv_have_StructTreeRoot_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_StructTreeRoot_h" >&5
-$as_echo "$kpse_cv_have_StructTreeRoot_h" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_link="./libtool --mode=link --tag=CC $ac_link"
- ;; #(
- *) :
- kpse_cv_have_StructTreeRoot_h=yes ;;
-esac
-if test "x$kpse_cv_have_StructTreeRoot_h" = xyes; then
-
-$as_echo "#define HAVE_STRUCTTREEROOT_H 1" >>confdefs.h
-
-fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac
index d26347741f9..cc52b7cc7ff 100644
--- a/Build/source/texk/web2c/configure.ac
+++ b/Build/source/texk/web2c/configure.ac
@@ -283,27 +283,6 @@ else
KPATHSEA_PATHS_H='${top_builddir}/..'
fi
AC_SUBST([KPATHSEA_PATHS_H])
-
-# Check of poppler 0.25 or better
-AS_CASE([$with_system_poppler],
- [yes], [dnl
-KPSE_ADD_FLAGS([poppler])
-AC_LANG_PUSH([C++])
-AC_MSG_CHECKING([for StructTreeRoot.h (poppler 0.25 or better)])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdio.h>
-#include <StructTreeRoot.h>]],
- [[PDFDoc *doc;
- Dict *dict;
- StructTreeRoot root(doc, dict);]])],
- [kpse_cv_have_StructTreeRoot_h=yes],
- [kpse_cv_have_StructTreeRoot_h=no])
-AC_MSG_RESULT([$kpse_cv_have_StructTreeRoot_h])
-AC_LANG_POP([C++])],
- [kpse_cv_have_StructTreeRoot_h=yes])
-if test "x$kpse_cv_have_StructTreeRoot_h" = xyes; then
- AC_DEFINE([HAVE_STRUCTTREEROOT_H], 1,
- [Define to 1 if you have the <StructTreeRoot.h> header file.])
-fi
KPSE_RESTORE_FLAGS
dnl Write output here, instead of putting a zillion -D's on the command line.
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 6daa5d94ac8..dce4f32ceea 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,4 +1,9 @@
-2015-08-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+2015-08-29 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * image/epdf.h, lua/lepdflib.cc: Drop HAVE_STRUCTTREEROOT_H,
+ we now require poppler 0.30 better.
+
+2015-08-28 Peter Breitenlohner <peb@mppmu.mpg.de>
* am/libluatex.am: Enable g++ warnings.
* image/epdf.h, image/pdftoepdf.w, lua/lepdflib.cc: Avoid most
diff --git a/Build/source/texk/web2c/luatexdir/image/epdf.h b/Build/source/texk/web2c/luatexdir/image/epdf.h
index c7f475eaa95..2c9d5db53e5 100644
--- a/Build/source/texk/web2c/luatexdir/image/epdf.h
+++ b/Build/source/texk/web2c/luatexdir/image/epdf.h
@@ -1,7 +1,7 @@
/* epdf.h
Copyright 1996-2006 Han The Thanh <thanh@pdftex.org>
- Copyright 2006-2012 Taco Hoekwater <taco@luatex.org>
+ Copyright 2006-2015 Taco Hoekwater <taco@luatex.org>
This file is part of LuaTeX.
LuaTeX is free software; you can redistribute it and/or modify it under
@@ -47,9 +47,7 @@ extern "C" {
# include <Dict.h>
# include <XRef.h>
# include <Catalog.h>
-# ifdef HAVE_STRUCTTREEROOT_H
-# include <StructTreeRoot.h>
-# endif
+# include <StructTreeRoot.h>
# include <Link.h>
# include <Page.h>
# include <GfxFont.h>
diff --git a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
index 1616dad3c76..079bfd986f8 100644
--- a/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
+++ b/Build/source/texk/web2c/luatexdir/lua/lepdflib.cc
@@ -1,6 +1,6 @@
/* lepdflib.cc
- Copyright 2009-2013 Taco Hoekwater <taco@luatex.org>
+ Copyright 2009-2015 Taco Hoekwater <taco@luatex.org>
Copyright 2009-2013 Hartmut Henkel <hartmut@luatex.org>
This file is part of LuaTeX.
@@ -64,11 +64,9 @@ static const char *ErrorCodeNames[] = { "None", "OpenFile", "BadCatalog",
#define M_PDFRectangle "epdf.PDFRectangle"
#define M_Ref "epdf.Ref"
#define M_Stream "epdf.Stream"
-#ifdef HAVE_STRUCTTREEROOT_H
#define M_StructElement "epdf.StructElement"
#define M_Attribute "epdf.Attribute"
#define M_TextSpan "epdf.TextSpan"
-#endif
#define M_StructTreeRoot "epdf.StructTreeRoot"
#define M_XRefEntry "epdf.XRefEntry"
#define M_XRef "epdf.XRef"
@@ -101,11 +99,9 @@ new_poppler_userdata(Page);
new_poppler_userdata(PDFRectangle);
new_poppler_userdata(Ref);
new_poppler_userdata(Stream);
-#ifdef HAVE_STRUCTTREEROOT_H
new_poppler_userdata(StructElement);
new_poppler_userdata(Attribute);
new_poppler_userdata(TextSpan);
-#endif
new_poppler_userdata(StructTreeRoot);
new_poppler_userdata(XRef);
@@ -157,7 +153,6 @@ static int l_new_Array(lua_State * L)
return 1;
}
-#ifdef HAVE_STRUCTTREEROOT_H
static int l_new_Attribute(lua_State * L)
{
Attribute::Type t;
@@ -326,9 +321,6 @@ static int l_AttributeOwner_Type(lua_State * L) {
}
-#endif
-
-
static int l_new_Dict(lua_State * L)
{
udstruct *uxref, *uout;
@@ -370,12 +362,10 @@ static int l_new_PDFRectangle(lua_State * L)
static const struct luaL_Reg epdflib_f[] = {
{"open", l_open_PDFDoc},
{"Array", l_new_Array},
-#ifdef HAVE_STRUCTTREEROOT_H
{"Attribute", l_new_Attribute},
{"StructElement_Type", l_StructElement_Type},
{"Attribute_Type", l_Attribute_Type},
{"AttributeOwner_Type",l_AttributeOwner_Type},
-#endif
{"Dict", l_new_Dict},
{"Object", l_new_Object},
{"PDFRectangle", l_new_PDFRectangle},
@@ -782,11 +772,7 @@ static int m_Catalog_getPageRef(lua_State * L)
m_poppler_get_GOOSTRING(Catalog, getBaseURI);
m_poppler_get_GOOSTRING(Catalog, readMetadata);
-#ifdef HAVE_STRUCTTREEROOT_H
m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
-#else
-m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
-#endif
static int m_Catalog_findPage(lua_State * L)
{
@@ -2360,22 +2346,14 @@ static int m_PDFDoc_readMetadata(lua_State * L)
static int m_PDFDoc_getStructTreeRoot(lua_State * L)
{
-#ifdef HAVE_STRUCTTREEROOT_H
StructTreeRoot *obj;
-#else
- Object *obj;
-#endif
udstruct *uin, *uout;
uin = (udstruct *) luaL_checkudata(L, 1, M_PDFDoc);
if (uin->pd != NULL && uin->pd->pc != uin->pc)
pdfdoc_changed_error(L);
if (((PdfDocument *) uin->d)->doc->getCatalog()->isOk()) {
obj = ((PdfDocument *) uin->d)->doc->getStructTreeRoot();
-#ifdef HAVE_STRUCTTREEROOT_H
uout = new_StructTreeRoot_userdata(L);
-#else
- uout = new_Object_userdata(L);
-#endif
uout->d = obj;
uout->pc = uin->pc;
uout->pd = uin->pd;
@@ -2740,7 +2718,6 @@ static const struct luaL_Reg Stream_m[] = {
{NULL, NULL} // sentinel
};
-#ifdef HAVE_STRUCTTREEROOT_H
//**********************************************************************
// TextSpan
@@ -3294,7 +3271,6 @@ static const struct luaL_Reg StructTreeRoot_m[] = {
{"__tostring", m_StructTreeRoot__tostring},
{NULL, NULL} // sentinel
};
-#endif
//**********************************************************************
// XRef
@@ -3431,12 +3407,10 @@ int luaopen_epdf(lua_State * L)
setfuncs_meta(PDFRectangle);
setfuncs_meta(Ref);
setfuncs_meta(Stream);
-#ifdef HAVE_STRUCTTREEROOT_H
setfuncs_meta(Attribute);
setfuncs_meta(StructElement);
setfuncs_meta(StructTreeRoot);
setfuncs_meta(TextSpan);
-#endif
setfuncs_meta(XRef);
setfuncs_meta(XRefEntry);
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-12 09:14:58 +0000