Accepting request 232358 from home:dimstar:poppler

Fix build with poppler 0.26 - better patch, as it can be unconditionally applied and does a version check of poppler directly... should make it easier to work with upstream

OBS-URL: https://build.opensuse.org/request/show/232358
OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=170

source-poppler-0.26.patch

@@ -0,0 +1,51 @@
+diff -ur texlive-20130620-source/texk/web2c/luatexdir/lua/lepdflib.cc texlive-20130620-source.patched/texk/web2c/luatexdir/lua/lepdflib.cc
+--- texlive-20130620-source/texk/web2c/luatexdir/lua/lepdflib.cc	2013-04-05 13:37:46.000000000 +0200
++++ texlive-20130620-source.patched/texk/web2c/luatexdir/lua/lepdflib.cc	2014-05-01 16:13:08.955638067 +0200
+@@ -23,6 +23,7 @@
+     "$URL: https://foundry.supelec.fr/svn/luatex/tags/beta-0.76.0/source/texk/web2c/luatexdir/lua/lepdflib.cc $";
+ 
+ #include "image/epdf.h"
++#include <cpp/poppler-version.h>
+ 
+ // define DEBUG
+ 
+@@ -65,6 +66,7 @@
+ #define M_PDFRectangle     "PDFRectangle"
+ #define M_Ref              "Ref"
+ #define M_Stream           "Stream"
++#define M_StructTreeRoot   "StructTreeRoot"
+ #define M_XRefEntry        "XRefEntry"
+ #define M_XRef             "XRef"
+ 
+@@ -96,6 +98,7 @@
+ new_poppler_userdata(PDFRectangle);
+ new_poppler_userdata(Ref);
+ new_poppler_userdata(Stream);
++new_poppler_userdata(StructTreeRoot);
+ new_poppler_userdata(XRef);
+ 
+ //**********************************************************************
+@@ -573,7 +576,11 @@
+ 
+ m_poppler_get_GOOSTRING(Catalog, getBaseURI);
+ m_poppler_get_GOOSTRING(Catalog, readMetadata);
++#if ((POPPLER_VERSION_MAJOR > 0) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR > 25) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR == 25 && POPPLER_VERSION_MICRO > 1))
++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
++#else
+ m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
++#endif
+ 
+ static int m_Catalog_findPage(lua_State * L)
+ {
+@@ -2146,7 +2153,11 @@
+ 
+ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+ {
++#if ((POPPLER_VERSION_MAJOR > 0) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR > 25) || (POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR == 25 && POPPLER_VERSION_MICRO > 1))
++    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)

texlive.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Apr 30 20:05:29 UTC 2014 - dimstar@opensuse.org
+
+- Add source-poppler-0.26.patch: Fix build with poppler 0.26:
+  with poppler commit e04cab, there was an API break. Apply patch
+  onlt when building against poppler 0.26 or newer.
+
 -------------------------------------------------------------------
 Fri Jan 31 20:28:55 UTC 2014 - rschweikert@suse.com
 

texlive.spec

@@ -231,6 +231,8 @@ Patch42:        biblatex-encoding.dif
 Patch43:        biber-av.patch
 # PATCH-FIX-UPSTREAM deal with semantic change of Perl Readonly implementation in version 1.04
 Patch44:        biber-noreadonly.diff
+# PATCH-FIX-UPSTREAM source-poppler-0.26.patch dimstar@opensuse.org -- Fix build with Poppler 0.26
+Patch45:        source-poppler-0.26.patch
 Prefix:         %{_bindir}
 
 %{expand: %%global options %(mktemp /tmp/texlive-opts.XXXXXXXX)}
@@ -2294,6 +2296,7 @@ pushd ../biblatex-biber-*
 %patch44 -p1 -b .ro
 popd
 %endif
+%patch45 -p1 -b .poppler-0.26
 
     # Correct FHS paths
     paths=$(find -name cnf-to-paths.awk)