Accepting request 232401 from Publishing:TeXLive

OBS-URL: https://build.opensuse.org/request/show/232401
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=18

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,15 @@
+-------------------------------------------------------------------
+Fri May  2 08:40:22 UTC 2014 - werner@suse.de
+
+- Correct patch number scheme of latest change
+
+-------------------------------------------------------------------
+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

@@ -19,7 +19,7 @@
 %define texlive_version 2013
 %define texlive_previous 2011
 %define texlive_release 20130620
-%define texlive_noarch  81
+%define texlive_noarch  83
 %define texlive_source  texlive-20130620-source
 
 %define __perl_requires		%{nil}
@@ -221,6 +221,8 @@ Patch20:        source-asymptote.dif
 Patch21:        source-bnc856363.dif
 # PATCH-FIX-UPSTREAM Do not be fooled on big endian and
 Patch22:        source-dvipdfmx.dif
+# PATCH-FIX-UPSTREAM source-poppler-0.26.patch dimstar@opensuse.org -- Fix build with Poppler 0.26
+Patch23:        source-poppler-0.26.patch
 # PATCH-FIX-UPSTREAM build with perl 5.18.0
 Patch40:        biber-dev.patch
 # PATCH-EXTEND-UPSTREAM Use always system CA certificates
@@ -2283,6 +2285,7 @@ This package is required by the package texlive-biber-bin.
 %patch20 -p0 -b .asymptote
 %patch21 -p0 -b .bnc856363
 %patch22 -p0 -b .be
+%patch23 -p1 -b .poppler-0.26
 %patch0
 %if %{with buildbiber}
 pushd ../biblatex-biber-*