From a75b4bbd8b1deb94e4bfa83a5e26f50e2fc5527ef0028149cfd9558cdf09dbcc Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 2 May 2014 04:55:50 +0000 Subject: [PATCH 1/2] 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 | 51 +++++++++++++++++++++++++++++++++++++++ texlive.changes | 7 ++++++ texlive.spec | 3 +++ 3 files changed, 61 insertions(+) create mode 100644 source-poppler-0.26.patch diff --git a/source-poppler-0.26.patch b/source-poppler-0.26.patch new file mode 100644 index 0000000..dd391ab --- /dev/null +++ b/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 + + // 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) diff --git a/texlive.changes b/texlive.changes index bc07e20..4a59a65 100644 --- a/texlive.changes +++ b/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 diff --git a/texlive.spec b/texlive.spec index 32a6b07..699aad9 100644 --- a/texlive.spec +++ b/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) From 929036caa5b6b8cd171f537c67fc0417d00e2c6eba02fccf2326848e1696d116 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Fri, 2 May 2014 08:47:36 +0000 Subject: [PATCH 2/2] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=171 --- texlive.changes | 5 +++++ texlive.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/texlive.changes b/texlive.changes index 4a59a65..cf99dfb 100644 --- a/texlive.changes +++ b/texlive.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/texlive.spec b/texlive.spec index 699aad9..c2ced31 100644 --- a/texlive.spec +++ b/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 @@ -231,8 +233,6 @@ 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)} @@ -2285,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-* @@ -2296,7 +2297,6 @@ 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)