[arch-commits] Commit in texlive-bin/trunk (PKGBUILD poppler-0.26.patch)

Jan de Groot jgc at nymeria.archlinux.org
Mon Apr 28 15:07:05 UTC 2014


    Date: Monday, April 28, 2014 @ 17:07:05
  Author: jgc
Revision: 211863

upgpkg: texlive-bin 2013.30973-10

Poppler rebuild, fetch patch from upstream

Added:
  texlive-bin/trunk/poppler-0.26.patch
Modified:
  texlive-bin/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   12 ++++-
 poppler-0.26.patch |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-28 14:19:09 UTC (rev 211862)
+++ PKGBUILD	2014-04-28 15:07:05 UTC (rev 211863)
@@ -4,12 +4,12 @@
 
 pkgname=texlive-bin
 pkgver=2013.30973
-pkgrel=9
+pkgrel=10
 _biber_ver=1.8 # for biblatex 2.8 only.
 pkgdesc="TeX Live binaries"
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler>=0.24.4'
+depends=('cairo' 'pixman' 'graphite' 't1lib' 'gd' 'poppler'
          'libsigsegv' 'zziplib' 'libpng' 'libjpeg' 'freetype2'
          'icu' 'harfbuzz' 'harfbuzz-icu')
 makedepends=('perl' 'clisp' 'ffcall')
@@ -23,6 +23,7 @@
         "http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
         "http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/${_biber_ver}/binaries/Linux/biber-linux_x86_64.tar.gz"
         "http://downloads.sourceforge.net/project/biblatex-biber/biblatex-biber/${_biber_ver}/binaries/Linux/biber-linux_x86_32.tar.gz"
+        poppler-0.26.patch
 )
 noextract=(biber-linux_x86_64.tar.gz
            biber-linux_x86_32.tar.gz)
@@ -29,8 +30,13 @@
 md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
          '0a8ffd5c0002a080a4202057b1f106c6'
          '64715ade77a7d659fd43be8773ebfdb9'
-         '1011bee56611d55a1818a8698afdc6ed')
+         '1011bee56611d55a1818a8698afdc6ed'
+         '65f5eef04fdf65fe8ff2df873509c855')
 
+prepare() {
+   cd source
+   patch -Np2 -i ../poppler-0.26.patch
+}
 build() {
    cd "$srcdir"
 

Added: poppler-0.26.patch
===================================================================
--- poppler-0.26.patch	                        (rev 0)
+++ poppler-0.26.patch	2014-04-28 15:07:05 UTC (rev 211863)
@@ -0,0 +1,104 @@
+--- trunk/source/texk/web2c/luatexdir/image/epdf.h	2013/01/20 19:58:26	4559
++++ trunk/source/texk/web2c/luatexdir/image/epdf.h	2014/01/02 15:35:31	4718
+@@ -40,21 +40,22 @@
+ #  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"
+-#  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" {
+ 
+@@ -81,8 +82,8 @@
+ #  include "utils/avlstuff.h"
+ #  include "pdf/pdftypes.h"
+ 
+-#  include "lua52/lua.h"
+-#  include "lua52/lauxlib.h"
++#  include "lua.h"
++#  include "lauxlib.h"
+ 
+     /* pdfgen.w */
+     extern int ten_pow[10];
+--- trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc	2013/04/05 10:54:08	4629
++++ trunk/source/texk/web2c/luatexdir/lua/lepdflib.cc	2014/01/02 15:35:31	4718
+@@ -65,6 +65,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 +97,7 @@
+ new_poppler_userdata(PDFRectangle);
+ new_poppler_userdata(Ref);
+ new_poppler_userdata(Stream);
++new_poppler_userdata(StructTreeRoot);
+ new_poppler_userdata(XRef);
+ 
+ //**********************************************************************
+@@ -573,7 +575,11 @@
+ 
+ m_poppler_get_GOOSTRING(Catalog, getBaseURI);
+ m_poppler_get_GOOSTRING(Catalog, readMetadata);
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+ m_poppler_get_poppler(Catalog, Object, getStructTreeRoot);
++#else
++m_poppler_get_poppler(Catalog, StructTreeRoot, getStructTreeRoot);
++#endif
+ 
+ static int m_Catalog_findPage(lua_State * L)
+ {
+@@ -2146,14 +2152,22 @@
+ 
+ static int m_PDFDoc_getStructTreeRoot(lua_State * L)
+ {
++#ifdef GETSTRUCTTREEROOT_RETURNS_OBJECT
+     Object *obj;
++#else
++    StructTreeRoot *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 GETSTRUCTTREEROOT_RETURNS_OBJECT
+         uout = new_Object_userdata(L);
++#else
++        uout = new_StructTreeRoot_userdata(L);
++#endif
+         uout->d = obj;
+         uout->pc = uin->pc;
+         uout->pd = uin->pd;




More information about the arch-commits mailing list