summaryrefslogtreecommitdiff
path: root/libre/texlive-bin-libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-12 00:11:20 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-12 00:11:20 -0300
commitccb16fe5fb0ed87b6207cc93ea1efea0dd628632 (patch)
tree4dc6c105fbf55d628fef34f7187fb2efebca5dde /libre/texlive-bin-libre
parent92306b387305e9962be2e72b85a0a187db26f3f8 (diff)
downloadabslibre-ccb16fe5fb0ed87b6207cc93ea1efea0dd628632.tar.gz
abslibre-ccb16fe5fb0ed87b6207cc93ea1efea0dd628632.tar.bz2
abslibre-ccb16fe5fb0ed87b6207cc93ea1efea0dd628632.zip
texlive-bin-libre-2013.30973-10: poppler rebuild, fetch patch from upstream
Diffstat (limited to 'libre/texlive-bin-libre')
-rw-r--r--libre/texlive-bin-libre/PKGBUILD10
-rw-r--r--libre/texlive-bin-libre/poppler-0.26.patch104
2 files changed, 110 insertions, 4 deletions
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 7d35d83e9..783aef934 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209906 2014-04-08 07:50:23Z fyan $
+# $Id: PKGBUILD 211863 2014-04-28 15:07:05Z jgc $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
@@ -6,11 +6,11 @@
pkgname=texlive-bin-libre
pkgver=2013.30973
-pkgrel=9
+pkgrel=10
pkgdesc="TeX Live binaries, without biber binaries (Parabola rebranded)"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
-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,9 +23,11 @@ url='http://tug.org/texlive/'
install="texlive.install"
source=('fix-fontforge-encoding.patch'
"http://mirrors.kernel.org/archlinux/other/texlive/texlive-bin-source-${pkgver}.tar.xz"
+ poppler-0.26.patch
)
md5sums=('bfb9716aa00c86c08cd31e5b32edeb98'
- '0a8ffd5c0002a080a4202057b1f106c6')
+ '0a8ffd5c0002a080a4202057b1f106c6'
+ '65f5eef04fdf65fe8ff2df873509c855')
build() {
cd "$srcdir"
diff --git a/libre/texlive-bin-libre/poppler-0.26.patch b/libre/texlive-bin-libre/poppler-0.26.patch
new file mode 100644
index 000000000..fde123f62
--- /dev/null
+++ b/libre/texlive-bin-libre/poppler-0.26.patch
@@ -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;