Commit 2b15f227 authored by J0WI's avatar J0WI Committed by Rasmus Thomsen
Browse files

community/texlive: upgrade to 20200406

parent 0669049a
Pipeline #32161 failed with stages
in 55 seconds
# Contributor: Isaac Dunham <ibid.ag@gmail.com>
# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
pkgname=texlive
pkgver=20190410
pkgrel=15
pkgver=20200406
pkgrel=0
pkgdesc="Comprehensive TeX document production system"
url="https://tug.org/texlive/"
arch="all !mips64"
arch="all !mips64 !s390x" # luatex fails on s390x
license="GPL-2.0-or-later AND GPL-3.0-or-later"
options="!check" # no unit tests provided
depends="perl texmf-dist>=2018.50036"
makedepends="freetype-dev libpng-dev poppler-dev icu-dev harfbuzz-dev
cairo-dev pixman-dev zziplib-dev libpaper-dev graphite2-dev
......@@ -22,15 +23,9 @@ subpackages="
$pkgname-xetex:xetex
$pkgname-luatex:lua
"
# Source for poppler patches - https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
source="
ftp://ftp.tug.org/texlive/historic/${pkgver:0:4}/texlive-$pkgver-source.tar.xz
poppler-084.patch
poppler-086.patch
"
source="https://ftp.tu-chemnitz.de/pub/tug/historic/systems/texlive/${pkgver:0:4}/texlive-$pkgver-source.tar.xz"
builddir="$srcdir"/texlive-$pkgver-source
options="!check" # No unit tests provided
_luatex="dvilualatex dviluatex lualollipop lualatex"
_pdftex="amstex cslatex csplain eplain etex jadetex latex lollipop mex
......@@ -39,23 +34,23 @@ _pdftex="amstex cslatex csplain eplain etex jadetex latex lollipop mex
_xetex="xelatex xelollipop"
_dvi="afm2tfm bbox dvigif dvipng dvips epsffit extractres includeres ps2eps psbook psjoin psnup psresize psselect pstops"
# Each poppler version recently broke the API, so special treatment is required
_poppler_ver=0.86.0
prepare() {
default_prepare
# Each poppler version recently broke the API, so special treatment is required
local folder="texk/web2c/pdftexdir"
for file in pdftoepdf pdftosrc; do
cp -pv $folder/$file-poppler$_poppler_ver.cc $folder/$file.cc
done
cp -pv $folder/pdftoepdf-poppler0.86.0.cc $folder/pdftoepdf.cc
cp -pv $folder/pdftosrc-poppler0.83.0.cc $folder/pdftosrc.cc
}
build() {
if [ "$CARCH" = "ppc64le" ] || [ "$CARCH" = "s390x" ] ; then
EXTRA="--disable-luajittex --disable-mfluajit"
fi
mkdir -p $builddir/build && cd $builddir/build
# builders keep failing when -jN == nproc
export MAKEFLAGS="$MAKEFLAGS -j$((JOBS<16 ? JOBS : 16))"
# fixme: detect systemzziplib
#--with-system-zziplib \ fixme detect systemzziplib
../configure -C \
--build=$CBUILD \
--host=$CHOST \
......@@ -109,15 +104,13 @@ build() {
--with-system-poppler \
--with-system-xpdf \
--with-system-zlib \
--with-system-zziplib \
--with-x-dvi-toolkit=motif \
--without-texinfo \
$EXTRA
--without-texinfo
make
}
package() {
cd build
cd $builddir/build
make DESTDIR="$pkgdir" install
......@@ -219,6 +212,4 @@ xdvi() {
mv "$pkgdir"/usr/share/texmf-dist/xdvi usr/share/texmf-dist/
}
sha512sums="7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e texlive-20190410-source.tar.xz
7fe31112bb860c742289a465e7eb4ba8672261ca022fb377cfdbcbd00d7bb39ac744144505ce73bcefa07656cd3f470aa0e3bda05b5018accbd1549f2a974b20 poppler-084.patch
87673c5ce942059adb75b6d47af605dc9d6e29080268e2557ec63f2292f639dd60c2539c649ae9b0137f379c37b5adffb3695055317710477866946c238ab5d5 poppler-086.patch"
sha512sums="65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477 texlive-20200406-source.tar.xz"
From cf05aae9685e5c6a46b4313e7bfce49edc6f51f9 Mon Sep 17 00:00:00 2001
From: Mikle Kolyada <zlogene@gentoo.org>
Date: Tue, 31 Dec 2019 11:29:30 +0300
Subject: [PATCH] poppler-0.84 compat
Upstream report: https://tug.org/pipermail/tex-k/2019-December/003096.html
Signed-off-by: Mikle Kolyada <zlogene@gentoo.org>
---
texk/web2c/pdftexdir/utils.c | 1 -
texk/web2c/xetexdir/XeTeX_ext.c | 3 +++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/texk/web2c/pdftexdir/utils.c b/texk/web2c/pdftexdir/utils.c
index c93a8781..6f866e76 100644
--- a/texk/web2c/pdftexdir/utils.c
+++ b/texk/web2c/pdftexdir/utils.c
@@ -33,7 +33,6 @@ with this program. If not, see <http://www.gnu.org/licenses/>.
#include "ptexlib.h"
#include <png.h>
#ifdef POPPLER_VERSION
-#include <poppler-config.h>
#define xpdfVersion POPPLER_VERSION
#define xpdfString "poppler"
#else
diff --git a/texk/web2c/xetexdir/XeTeX_ext.c b/texk/web2c/xetexdir/XeTeX_ext.c
index 4968ee41..0aee4ee3 100644
--- a/texk/web2c/xetexdir/XeTeX_ext.c
+++ b/texk/web2c/xetexdir/XeTeX_ext.c
@@ -38,7 +38,10 @@ authorization from the copyright holders.
#include <w2c/config.h>
+#ifndef POPPLER_VERSION
#include <poppler-config.h>
+#endif
+
#include <png.h>
#include <zlib.h>
#include <graphite2/Font.h>
--
2.24.1
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment