aboutsummaryrefslogtreecommitdiffstats
path: root/unmaintained
diff options
context:
space:
mode:
authorMarian Buschsieweke <marian.buschsieweke@ovgu.de>2019-04-08 09:14:03 +0200
committerLeonardo Arena <rnalrd@alpinelinux.org>2019-04-08 08:17:02 +0000
commit432a459dc6e58a9040897a6fb4341c8292f6ff33 (patch)
tree08b6fd80d28cf2218856304c27eed621e57c2836 /unmaintained
parent25bcaa0a0ac2c33bff7f62034243a56cca165c21 (diff)
downloadaports-432a459dc6e58a9040897a6fb4341c8292f6ff33.tar.bz2
aports-432a459dc6e58a9040897a6fb4341c8292f6ff33.tar.xz
unmaintained/texlive --> community/texlive
Diffstat (limited to 'unmaintained')
-rw-r--r--unmaintained/texlive/APKBUILD222
-rw-r--r--unmaintained/texlive/pdftex-poppler-0.71.patch723
-rw-r--r--unmaintained/texlive/texlive.trigger4
3 files changed, 0 insertions, 949 deletions
diff --git a/unmaintained/texlive/APKBUILD b/unmaintained/texlive/APKBUILD
deleted file mode 100644
index 645239b202..0000000000
--- a/unmaintained/texlive/APKBUILD
+++ /dev/null
@@ -1,222 +0,0 @@
-# Contributor: Isaac Dunham <ibid.ag@gmail.com>
-# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
-pkgname=texlive
-pkgver=20180414
-pkgrel=8
-pkgdesc="Comprehensive TeX document production system"
-url="http://tug.org/texlive/"
-arch="all"
-license="GPL"
-depends="perl texmf-dist"
-depends_dev=""
-makedepends="freetype-dev libpng-dev poppler-dev icu-dev harfbuzz-dev
- cairo-dev pixman-dev zziplib-dev libpaper-dev graphite2-dev
- libxmu-dev fontconfig-dev libxaw-dev motif-dev"
-install=""
-triggers="$pkgname.trigger=/usr/share/texmf-dist"
-subpackages="
- $pkgname-dev
- $pkgname-doc
- xdvik:xdvi
- $pkgname-dvi:dvi
- $pkgname-full:meta
- "
-# $pkgname-xetex:xetex # <-- Does not work with poppler-0.71
-# $pkgname-luatex:lua # <-- Does not work with poppler-0.71
-source="
- ftp://ftp.tug.org/texlive/historic/${pkgver:0:4}/texlive-$pkgver-source.tar.xz
- pdftex-poppler-0.71.patch
- "
-builddir="$srcdir"/texlive-${pkgver}-source
-
-_luatex="dvilualatex dviluatex lualollipop"
-_pdftex="amstex cslatex csplain eplain etex jadetex latex lollipop mex
- mllatex mltex pdfetex pdfcslatex pdfcsplain pdfjadetex pdflatex
- pdfmex pdfxmltex texsis utf8mex xmltex"
-_xetex="xelatex xelollipop"
-_dvi="afm2tfm bbox dvigif dvipng dvips epsffit extractres includeres ps2eps psbook psjoin psnup psresize psselect pstops"
-
-preppare() {
- cd "$builddir"
- default_prepare
-
- local folder="texk/web2c/pdftexdir"
- for file in pdftoepdf pdftosrc; do
- cp -pv $folder/$file-poppler0.75.0.cc $folder/$file.cc
- done
-}
-
-build() {
- cd "$builddir"
-
- # LuaTeX is currently broken with poppler 0.71
- EXTRA="--disable-luatex --disable-luatex53 --disable-luajittex --disable-mflua --disable-mfluajit"
- # XeTeX is currently broken with poppler 0.71
- EXTRA="$EXTRA --disable-xetex"
- #if [ "$CARCH" = "ppc64le" ] || [ "$CARCH" = "s390x" ] ; then
- # EXTRA="--disable-luajittex --disable-mfluajit"
- #fi
-
- mkdir -p $builddir/build && cd $builddir/build
- # Disabled luaTeX for now, as it does not compile with poppler-0.71
- ../configure -C \
- --build=$CBUILD \
- --host=$CHOST \
- --prefix=/usr \
- --sysconfdir=/etc \
- --mandir=/usr/share/man \
- --infodir=/usr/share/info \
- --localstatedir=/var \
- --enable-biber \
- --enable-epsfwin \
- --enable-ipc \
- --enable-mftalkwin \
- --enable-regiswin \
- --enable-shared \
- --enable-tektronixwin \
- --enable-unitermwin \
- --enable-xetex \
- --enable-dvipng \
- --enable-dvipsk \
- --enable-ps2eps \
- --enable-psutils \
- --disable-bibtex-x \
- --disable-chktex \
- --disable-cjkutils \
- --disable-detex \
- --disable-dialog \
- --disable-dvi2tty \
- --disable-dvisvgm \
- --disable-largefile \
- --disable-lcdf-typetools \
- --disable-multiplatform \
- --disable-native-texlive-build \
- --disable-pdfopen \
- --disable-ps2pkm \
- --disable-t1utils \
- --disable-tex4htk \
- --disable-ttf2pk2 \
- --disable-vlna \
- --disable-xindy \
- --with-ps=gs \
- --with-banner-add="/Alpine Linux" \
- --with-system-cairo \
- --with-system-freetype2 \
- --with-system-graphite2 \
- --with-system-harfbuzz \
- --with-system-icu \
- --with-system-libpaper \
- --with-system-libpng \
- --with-system-pixman \
- --with-system-poppler \
- --with-system-xpdf \
- --with-system-zlib \
- --with-system-zziplib \
- --with-x-dvi-toolkit=motif \
- --without-texinfo \
- $EXTRA
- make
-}
-
-package() {
- cd "$builddir"/build
-
- make DESTDIR="$pkgdir" install
-
- cp -rf ../texk/tests/TeXLive \
- "$pkgdir"/usr/share/texmf-dist/scripts/texlive
-
- local texcmd; for texcmd in $_pdftex; do
- ln -s pdftex "$pkgdir"/usr/bin/$texcmd
- done
- ln -s eptex "$pkgdir"/usr/bin/platex
- ln -s euptex "$pkgdir"/usr/bin/uplatex
-
- sed -i -e 's:SELFAUTOPARENT:TEXMFROOT:' \
- "$pkgdir"/usr/share/texmf-dist/scripts/texlive/tlmgr.pl
- sed -i -e 's:^\(TEXMFROOT *= *\)$SELFAUTOPARENT$:\1/usr/share:g' \
- "$pkgdir"/usr/share/texmf-dist/web2c/texmf.cnf
-}
-
-xetex() {
- # Split off XeTeX because it depends on graphite/harfbuzz/icu
- pkgdesc="TeX typesetting engine supporting modern typography and bidirectional text"
- depends="$pkgname"
-
- install -d -m 0755 "$subpkgdir"/usr/bin
- mv "$pkgdir"/usr/bin/xetex "$subpkgdir"/usr/bin/
-
- local texcmd; for texcmd in $_xetex; do
- ln -s xetex "$subpkgdir"/usr/bin/$texcmd
- done
-}
-
-meta() {
- pkgdesc="A complete TeX distribution"
- depends="$pkgname $pkgname-doc $pkgname-luatex $pkgname-xetex xdvik $pkgname-dvi texmf-dist-full"
-
- mkdir -p "$subpkgdir"
-}
-
-dvi() {
- pkgdesc="Tools for dvi based workflow (e.g. dvips)"
- depends="$pkgname"
-
- install -d -m 0755 "$subpkgdir"/usr/bin
- for tool in $_dvi; do
- mv "${pkgdir}/usr/bin/${tool}" "${subpkgdir}/usr/bin/"
- done
-}
-
-lua() {
- pkgdesc="LuaTeX is an extended version of pdfTeX, scriptable in Lua"
- depends="bash $pkgname" # lua2dox_filter is a bash script
-
- mkdir -p "$subpkgdir" && cd "$subpkgdir"
-
- install -d -m 0755 usr/bin usr/lib \
- usr/share/texmf-dist/scripts/context/stubs/unix
-
- mv "$pkgdir"/usr/bin/*lua* "$subpkgdir"/usr/bin/
- mv "$pkgdir"/usr/lib/lib*lua*.so.* "$subpkgdir"/usr/lib/
- mv "$pkgdir"/usr/share/texmf-dist/scripts/*lua* \
- "$subpkgdir"/usr/share/texmf-dist/scripts/
- mv "$pkgdir"/usr/share/texmf-dist/scripts/context/stubs/unix/luatools \
- "$subpkgdir"/usr/share/texmf-dist/scripts/context/stubs/unix/luatools
-
- local texcmd; for texcmd in $_luatex
- do ln -s luatex "$subpkgdir"/usr/bin/$texcmd
- done
- cd -
-
-# The following directories are used strictly for Lua scripts:
-# for DIR in
-# usr/share/texmf-dist/scripts/checkcites/ \
-# usr/share/texmf-dist/scripts/getmap/ \
-# usr/share/texmf-dist/scripts/m-tx/ \
-# usr/share/texmf-dist/scripts/musixtex/ \
-# usr/share/texmf-dist/scripts/pmx/ \
-# usr/share/texmf-dist/scripts/pmxchords/ \
-# usr/share/texmf-dist/scripts/ptex2pdf/ ;
-# do
-# mv "$pkgdir"/"$DIR" "$subpkgdir"/usr/share/texmf-dist/scripts/
-# done
-}
-
-xdvi() {
- # currently, xdvi needs a number of files and scripts from texlive;
- # we split it off so that it doesn't drag in X and Motif.
- depends="texlive"
- pkgdesc="Xdvi from texlive, using the texlive libraries"
- provides="xdvi"
-
- mkdir -p "$subpkgdir" && cd "$subpkgdir"
-
- install -d -m 0755 usr/bin usr/share/texmf-dist/
-
- mv "$pkgdir"/usr/bin/xdvi "$pkgdir"/usr/bin/xdvi-* usr/bin/
- mv "$pkgdir"/usr/share/texmf-dist/xdvi usr/share/texmf-dist/
-}
-
-sha512sums="ecac9b8203d2747be7ba7f82d68096d859fb35713276106d7049035dd3a8cfca07f8a8648982f0317b3812f8480db7326714de32f95998e3e6f73571de2aa140 texlive-20180414-source.tar.xz
-eb0dc9db16f491483269e6285deac462f473198872d1ab5d71f75d2a6c99fc6e8828baab07d0ec6e90420e41ceb594402a6c37398943bd343ef5cfc0d171158a pdftex-poppler-0.71.patch"
diff --git a/unmaintained/texlive/pdftex-poppler-0.71.patch b/unmaintained/texlive/pdftex-poppler-0.71.patch
deleted file mode 100644
index b66a7ae872..0000000000
--- a/unmaintained/texlive/pdftex-poppler-0.71.patch
+++ /dev/null
@@ -1,723 +0,0 @@
-diff -rupN texlive-20180414-source-bak/texk/web2c/pdftexdir/pdftoepdf.cc texlive-20180414-source/texk/web2c/pdftexdir/pdftoepdf.cc
---- texlive-20180414-source-bak/texk/web2c/pdftexdir/pdftoepdf.cc 2019-04-05 11:28:07.877526373 +0200
-+++ texlive-20180414-source/texk/web2c/pdftexdir/pdftoepdf.cc 2019-04-05 11:28:31.154094388 +0200
-@@ -1,5 +1,5 @@
- /*
--Copyright 1996-2016 Han The Thanh, <thanh@pdftex.org>
-+Copyright 1996-2017 Han The Thanh, <thanh@pdftex.org>
-
- This file is part of pdfTeX.
-
-@@ -17,6 +17,15 @@ You should have received a copy of the G
- with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-+/*
-+This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
-+https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
-+by Arch Linux. A little modifications are made to avoid a crash for
-+some kind of pdf images, such as figure_missing.pdf in gnuplot.
-+The poppler should be 0.71.0.
-+POPPLER_VERSION should be defined.
-+*/
-+
- /* Do this early in order to avoid a conflict between
- MINGW32 <rpcndr.h> defining 'boolean' as 'unsigned char' and
- <kpathsea/types.h> defining Pascal's boolean as 'int'.
-@@ -39,10 +48,7 @@ with this program. If not, see <http://
- #include <goo/gfile.h>
- #define GString GooString
- #else
--#include <aconf.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
-+#error POPPLER_VERSION should be defined.
- #endif
- #include <assert.h>
-
-@@ -84,31 +90,6 @@ extern integer zround(double);
- #define MASK_SUPPRESS_PTEX_PAGENUMBER 0x04
- #define MASK_SUPPRESS_PTEX_INFODICT 0x08
-
--// PdfObject encapsulates the xpdf Object type,
--// and properly frees its resources on destruction.
--// Use obj-> to access members of the Object,
--// and &obj to get a pointer to the object.
--// It is no longer necessary to call Object::free explicitely.
--
--class PdfObject {
-- public:
-- PdfObject() { // nothing
-- } ~PdfObject() {
-- iObject.free();
-- }
-- Object *operator->() {
-- return &iObject;
-- }
-- Object *operator&() {
-- return &iObject;
-- }
-- private: // no copying or assigning
-- PdfObject(const PdfObject &);
-- void operator=(const PdfObject &);
-- public:
-- Object iObject;
--};
--
- // When copying the Resources of the selected page, all objects are copied
- // recusively top-down. Indirect objects however are not fetched during
- // copying, but get a new object number from pdfTeX and then will be
-@@ -139,7 +120,7 @@ struct UsedEncoding {
-
- static InObj *inObjList;
- static UsedEncoding *encodingList;
--static GBool isInit = gFalse;
-+static bool isInit = false;
-
- // --------------------------------------------------------------------
- // Maintain list of open embedded PDF files
-@@ -212,18 +193,6 @@ static void delete_document(PdfDocument
- delete pdf_doc;
- }
-
--// Replacement for
--// Object *initDict(Dict *dict1){ initObj(objDict); dict = dict1; return this; }
--
--static void initDictFromDict(PdfObject & obj, Dict * dict)
--{
-- obj->initDict(xref);
-- for (int i = 0, l = dict->getLength(); i < l; i++) {
-- Object obj1;
-- obj->dictAdd(copyString(dict->getKey(i)), dict->getValNF(i, &obj1));
-- }
--}
--
- // --------------------------------------------------------------------
-
- static int addEncoding(GfxFont * gfont)
-@@ -320,10 +289,10 @@ static void copyName(char *s)
-
- static void copyDictEntry(Object * obj, int i)
- {
-- PdfObject obj1;
-- copyName(obj->dictGetKey(i));
-+ Object obj1;
-+ copyName((char *)obj->dictGetKey(i));
- pdf_puts(" ");
-- obj->dictGetValNF(i, &obj1);
-+ obj1 = obj->dictGetValNF(i);
- copyObject(&obj1);
- pdf_puts("\n");
- }
-@@ -348,7 +317,7 @@ static void copyFontDict(Object * obj, I
- pdf_puts("<<\n");
- assert(r->type == objFont); // FontDescriptor is in fd_tree
- for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
-- key = obj->dictGetKey(i);
-+ key = (char *)obj->dictGetKey(i);
- if (strncmp("FontDescriptor", key, strlen("FontDescriptor")) == 0
- || strncmp("BaseFont", key, strlen("BaseFont")) == 0
- || strncmp("Encoding", key, strlen("Encoding")) == 0)
-@@ -376,17 +345,17 @@ static void copyStream(Stream * str)
- static void copyProcSet(Object * obj)
- {
- int i, l;
-- PdfObject procset;
-+ Object procset;
- if (!obj->isArray())
- pdftex_fail("PDF inclusion: invalid ProcSet array type <%s>",
- obj->getTypeName());
- pdf_puts("/ProcSet [ ");
- for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
-- obj->arrayGetNF(i, &procset);
-- if (!procset->isName())
-+ procset = obj->arrayGetNF(i);
-+ if (!procset.isName())
- pdftex_fail("PDF inclusion: invalid ProcSet entry type <%s>",
-- procset->getTypeName());
-- copyName(procset->getName());
-+ procset.getTypeName());
-+ copyName((char *)procset.getName());
- pdf_puts(" ");
- }
- pdf_puts("]\n");
-@@ -394,10 +363,29 @@ static void copyProcSet(Object * obj)
-
- #define REPLACE_TYPE1C true
-
-+static bool embeddableFont(Object * fontdesc)
-+{
-+ Object fontfile, ffsubtype;
-+
-+ if (!fontdesc->isDict())
-+ return false;
-+ fontfile = fontdesc->dictLookup("FontFile");
-+ if (fontfile.isStream())
-+ return true;
-+ if (REPLACE_TYPE1C) {
-+ fontfile = fontdesc->dictLookup("FontFile3");
-+ if (!fontfile.isStream())
-+ return false;
-+ ffsubtype = fontfile.streamGetDict()->lookup("Subtype");
-+ return ffsubtype.isName() && !strcmp(ffsubtype.getName(), "Type1C");
-+ }
-+ return false;
-+}
-+
- static void copyFont(char *tag, Object * fontRef)
- {
-- PdfObject fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
-- fontfile, ffsubtype, stemV;
-+ Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
-+ stemV;
- GfxFont *gfont;
- fd_entry *fd;
- fm_entry *fontmap;
-@@ -413,33 +401,39 @@ static void copyFont(char *tag, Object *
- }
- // Only handle included Type1 (and Type1C) fonts; anything else will be copied.
- // Type1C fonts are replaced by Type1 fonts, if REPLACE_TYPE1C is true.
-- if (!fixedinclusioncopyfont && fontRef->fetch(xref, &fontdict)->isDict()
-- && fontdict->dictLookup("Subtype", &subtype)->isName()
-- && !strcmp(subtype->getName(), "Type1")
-- && fontdict->dictLookup("BaseFont", &basefont)->isName()
-- && fontdict->dictLookupNF("FontDescriptor", &fontdescRef)->isRef()
-- && fontdescRef->fetch(xref, &fontdesc)->isDict()
-- && (fontdesc->dictLookup("FontFile", &fontfile)->isStream()
-- || (REPLACE_TYPE1C
-- && fontdesc->dictLookup("FontFile3", &fontfile)->isStream()
-- && fontfile->streamGetDict()->lookup("Subtype",
-- &ffsubtype)->isName()
-- && !strcmp(ffsubtype->getName(), "Type1C")))
-- && (fontmap = lookup_fontmap(basefont->getName())) != NULL) {
-+ fontdict = fontRef->fetch(xref);
-+ fontdesc = Object(objNull);
-+ if (fontdict.isDict()) {
-+ subtype = fontdict.dictLookup("Subtype");
-+ basefont = fontdict.dictLookup("BaseFont");
-+ fontdescRef = fontdict.dictLookupNF("FontDescriptor");
-+ if (fontdescRef.isRef()) {
-+ fontdesc = fontdescRef.fetch(xref);
-+ }
-+ }
-+ if (!fixedinclusioncopyfont && fontdict.isDict()
-+ && subtype.isName()
-+ && !strcmp(subtype.getName(), "Type1")
-+ && basefont.isName()
-+ && fontdescRef.isRef()
-+ && fontdesc.isDict()
-+ && embeddableFont(&fontdesc)
-+ && (fontmap = lookup_fontmap((char *)basefont.getName())) != NULL) {
- // round /StemV value, since the PDF input is a float
- // (see Font Descriptors in PDF reference), but we only store an
- // integer, since we don't want to change the struct.
-- fontdesc->dictLookup("StemV", &stemV);
-- fd = epdf_create_fontdescriptor(fontmap, zround(stemV->getNum()));
-- if (fontdesc->dictLookup("CharSet", &charset) &&
-- charset->isString() && is_subsetable(fontmap))
-- epdf_mark_glyphs(fd, charset->getString()->getCString());
-+ stemV = fontdesc.dictLookup("StemV");
-+ fd = epdf_create_fontdescriptor(fontmap, zround(stemV.getNum()));
-+ charset = fontdesc.dictLookup("CharSet");
-+ if (!charset.isNull() &&
-+ charset.isString() && is_subsetable(fontmap))
-+ epdf_mark_glyphs(fd, (char *)charset.getString()->getCString());
- else
- embed_whole_font(fd);
-- addFontDesc(fontdescRef->getRef(), fd);
-+ addFontDesc(fontdescRef.getRef(), fd);
- copyName(tag);
- gfont = GfxFont::makeFont(xref, tag, fontRef->getRef(),
-- fontdict->getDict());
-+ fontdict.getDict());
- pdf_printf(" %d 0 R ", addFont(fontRef->getRef(), fd,
- addEncoding(gfont)));
- } else {
-@@ -451,24 +445,24 @@ static void copyFont(char *tag, Object *
-
- static void copyFontResources(Object * obj)
- {
-- PdfObject fontRef;
-+ Object fontRef;
- int i, l;
- if (!obj->isDict())
- pdftex_fail("PDF inclusion: invalid font resources dict type <%s>",
- obj->getTypeName());
- pdf_puts("/Font << ");
- for (i = 0, l = obj->dictGetLength(); i < l; ++i) {
-- obj->dictGetValNF(i, &fontRef);
-- if (fontRef->isRef())
-- copyFont(obj->dictGetKey(i), &fontRef);
-- else if (fontRef->isDict()) { // some programs generate pdf with embedded font object
-- copyName(obj->dictGetKey(i));
-+ fontRef = obj->dictGetValNF(i);
-+ if (fontRef.isRef())
-+ copyFont((char *)obj->dictGetKey(i), &fontRef);
-+ else if (fontRef.isDict()) { // some programs generate pdf with embedded font object
-+ copyName((char *)obj->dictGetKey(i));
- pdf_puts(" ");
- copyObject(&fontRef);
- }
- else
- pdftex_fail("PDF inclusion: invalid font in reference type <%s>",
-- fontRef->getTypeName());
-+ fontRef.getTypeName());
- }
- pdf_puts(">>\n");
- }
-@@ -557,7 +551,7 @@ static char *convertNumToPDF(double n)
-
- static void copyObject(Object * obj)
- {
-- PdfObject obj1;
-+ Object obj1;
- int i, l, c;
- Ref ref;
- char *p;
-@@ -571,8 +565,8 @@ static void copyObject(Object * obj)
- } else if (obj->isNum()) {
- pdf_printf("%s", convertNumToPDF(obj->getNum()));
- } else if (obj->isString()) {
-- s = obj->getString();
-- p = s->getCString();
-+ s = (GooString *)obj->getString();
-+ p = (char *)s->getCString();
- l = s->getLength();
- if (strlen(p) == (unsigned int) l) {
- pdf_puts("(");
-@@ -595,14 +589,14 @@ static void copyObject(Object * obj)
- pdf_puts(">");
- }
- } else if (obj->isName()) {
-- copyName(obj->getName());
-+ copyName((char *)obj->getName());
- } else if (obj->isNull()) {
- pdf_puts("null");
- } else if (obj->isArray()) {
- pdf_puts("[");
- for (i = 0, l = obj->arrayGetLength(); i < l; ++i) {
-- obj->arrayGetNF(i, &obj1);
-- if (!obj1->isName())
-+ obj1 = obj->arrayGetNF(i);
-+ if (!obj1.isName())
- pdf_puts(" ");
- copyObject(&obj1);
- }
-@@ -612,9 +606,8 @@ static void copyObject(Object * obj)
- copyDict(obj);
- pdf_puts(">>");
- } else if (obj->isStream()) {
-- initDictFromDict(obj1, obj->streamGetDict());
- pdf_puts("<<\n");
-- copyDict(&obj1);
-+ copyDict(obj->getStream()->getDictObject());
- pdf_puts(">>\n");
- pdf_puts("stream\n");
- copyStream(obj->getStream()->getUndecodedStream());
-@@ -638,9 +631,8 @@ static void writeRefs()
- InObj *r;
- for (r = inObjList; r != 0; r = r->next) {
- if (!r->written) {
-- Object obj1;
- r->written = 1;
-- xref->fetch(r->ref.num, r->ref.gen, &obj1);
-+ Object obj1 = xref->fetch(r->ref.num, r->ref.gen);
- if (r->type == objFont) {
- assert(!obj1.isStream());
- pdfbeginobj(r->num, 2); // \pdfobjcompresslevel = 2 is for this
-@@ -656,7 +648,6 @@ static void writeRefs()
- pdf_puts("\n");
- pdfendobj();
- }
-- obj1.free();
- }
- }
- }
-@@ -673,7 +664,7 @@ static void writeEncodings()
- ("PDF inclusion: CID fonts are not supported"
- " (try to disable font replacement to fix this)");
- }
-- if ((s = ((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
-+ if ((s = (char *)((Gfx8BitFont *) r->font)->getCharName(i)) != 0)
- glyphNames[i] = s;
- else
- glyphNames[i] = notdef;
-@@ -685,14 +676,14 @@ static void writeEncodings()
- #ifdef POPPLER_VERSION
- r->font->decRefCnt();
- #else
-- delete r->font;
-+#error POPPLER_VERSION should be defined.
- #endif
- delete r;
- }
- }
-
- // get the pagebox according to the pagebox_spec
--static PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
-+static const PDFRectangle *get_pagebox(Page * page, int pagebox_spec)
- {
- if (pagebox_spec == pdfboxspecmedia)
- return page->getMediaBox();
-@@ -724,17 +715,17 @@ read_pdf_info(char *image_name, char *pa
- {
- PdfDocument *pdf_doc;
- Page *page;
-- PDFRectangle *pagebox;
-+ const PDFRectangle *pagebox;
- #ifdef POPPLER_VERSION
- int pdf_major_version_found, pdf_minor_version_found;
- #else
-- float pdf_version_found, pdf_version_wanted;
-+#error POPPLER_VERSION should be defined.
- #endif
- // initialize
- if (!isInit) {
- globalParams = new GlobalParams();
-- globalParams->setErrQuiet(gFalse);
-- isInit = gTrue;
-+ globalParams->setErrQuiet(false);
-+ isInit = true;
- }
- // open PDF file
- pdf_doc = find_add_document(image_name);
-@@ -760,19 +751,7 @@ read_pdf_info(char *image_name, char *pa
- }
- }
- #else
-- pdf_version_found = pdf_doc->doc->getPDFVersion();
-- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
-- if (pdf_version_found > pdf_version_wanted + 0.01) {
-- char msg[] =
-- "PDF inclusion: found PDF version <%.1f>, but at most version <%.1f> allowed";
-- if (pdf_inclusion_errorlevel > 0) {
-- pdftex_fail(msg, pdf_version_found, pdf_version_wanted);
-- } else if (pdf_inclusion_errorlevel < 0) {
-- ; /* do nothing */
-- } else { /* = 0, give warning */
-- pdftex_warn(msg, pdf_version_found, pdf_version_wanted);
-- }
-- }
-+#error POPPLER_VERSION should be defined.
- #endif
- epdf_num_pages = pdf_doc->doc->getCatalog()->getNumPages();
- if (page_name) {
-@@ -839,8 +818,8 @@ void write_epdf(void)
- Page *page;
- Ref *pageRef;
- Dict *pageDict;
-- PdfObject contents, obj1, obj2, pageObj, dictObj;
-- PdfObject groupDict;
-+ Object contents, obj1, obj2, pageObj, dictObj;
-+ Object groupDict;
- bool writeSepGroup = false;
- Object info;
- char *key;
-@@ -867,10 +846,10 @@ void write_epdf(void)
- encodingList = 0;
- page = pdf_doc->doc->getCatalog()->getPage(epdf_selected_page);
- pageRef = pdf_doc->doc->getCatalog()->getPageRef(epdf_selected_page);
-- xref->fetch(pageRef->num, pageRef->gen, &pageObj);
-- pageDict = pageObj->getDict();
-+ pageObj = xref->fetch(pageRef->num, pageRef->gen);
-+ pageDict = pageObj.getDict();
- rotate = page->getRotate();
-- PDFRectangle *pagebox;
-+ const PDFRectangle *pagebox;
- // write the Page header
- pdf_puts("/Type /XObject\n");
- pdf_puts("/Subtype /Form\n");
-@@ -886,7 +865,7 @@ void write_epdf(void)
- pdf_printf("/%s.PageNumber %i\n", pdfkeyprefix, (int) epdf_selected_page);
- }
- if ((suppress_ptex_info & MASK_SUPPRESS_PTEX_INFODICT) == 0) {
-- pdf_doc->doc->getDocInfoNF(&info);
-+ info = pdf_doc->doc->getDocInfoNF();
- if (info.isRef()) {
- // the info dict must be indirect (PDF Ref p. 61)
- pdf_printf("/%s.InfoDict ", pdfkeyprefix);
-@@ -942,14 +921,14 @@ void write_epdf(void)
- pdf_puts(stripzeros(s));
-
- // Metadata validity check (as a stream it must be indirect)
-- pageDict->lookupNF("Metadata", &dictObj);
-- if (!dictObj->isNull() && !dictObj->isRef())
-+ dictObj = pageDict->lookupNF("Metadata");
-+ if (!dictObj.isNull() && !dictObj.isRef())
- pdftex_warn("PDF inclusion: /Metadata must be indirect object");
-
- // copy selected items in Page dictionary except Resources & Group
- for (i = 0; pageDictKeys[i] != NULL; i++) {
-- pageDict->lookupNF(pageDictKeys[i], &dictObj);
-- if (!dictObj->isNull()) {
-+ dictObj = pageDict->lookupNF(pageDictKeys[i]);
-+ if (!dictObj.isNull()) {
- pdf_newline();
- pdf_printf("/%s ", pageDictKeys[i]);
- copyObject(&dictObj); // preserves indirection
-@@ -957,8 +936,8 @@ void write_epdf(void)
- }
-
- // handle page group
-- pageDict->lookupNF("Group", &dictObj);
-- if (!dictObj->isNull()) {
-+ dictObj = pageDict->lookupNF("Group");
-+ if (!dictObj.isNull()) {
- if (pdfpagegroupval == 0) {
- // another pdf with page group was included earlier on the
- // same page; copy the Group entry as is. See manual for
-@@ -972,11 +951,36 @@ void write_epdf(void)
- copyObject(&dictObj);
- } else {
- // write Group dict as a separate object, since the Page dict also refers to it
-- pageDict->lookup("Group", &dictObj);
-- if (!dictObj->isDict())
-+ dictObj = pageDict->lookup("Group");
-+ if (!dictObj.isDict())
- pdftex_fail("PDF inclusion: /Group dict missing");
- writeSepGroup = true;
-- initDictFromDict(groupDict, page->getGroup());
-+/*
-+This part is only a single line
-+ groupDict = Object(page->getGroup());
-+in the original patch. In this case, however, pdftex crashes at
-+"delete pdf_doc->doc" in "delete_document()" for inclusion of some
-+kind of pdf images, for example, figure_missing.pdf in gnuplot.
-+A change
-+ groupDict = Object(page->getGroup()).copy();
-+does not improve the situation.
-+The changes below seem to work fine.
-+*/
-+// begin modification
-+ groupDict = pageDict->lookup("Group");
-+ const Dict& dic1 = page->getGroup();
-+ const Dict& dic2 = groupDict.getDict();
-+ // replace dic2 in groupDict with dic1
-+ l = dic2.getLength();
-+ for (i = 0; i < l; i++) {
-+ groupDict.dictRemove(dic2.getKey(i));
-+ }
-+ l = dic1.getLength();
-+ for (i = 0; i < l; i++) {
-+ groupDict.dictAdd((const char *)copyString(dic1.getKey(i)),
-+ dic1.getValNF(i));
-+ }
-+// end modification
- pdf_printf("/Group %ld 0 R\n", (long)pdfpagegroupval);
- }
- }
-@@ -989,28 +993,28 @@ void write_epdf(void)
- pdftex_warn
- ("PDF inclusion: /Resources missing. 'This practice is not recommended' (PDF Ref)");
- } else {
-- initDictFromDict(obj1, page->getResourceDict());
-+ Object *obj1 = page->getResourceDictObject();
- if (!obj1->isDict())
- pdftex_fail("PDF inclusion: invalid resources dict type <%s>",
- obj1->getTypeName());
- pdf_newline();
- pdf_puts("/Resources <<\n");
- for (i = 0, l = obj1->dictGetLength(); i < l; ++i) {
-- obj1->dictGetVal(i, &obj2);
-- key = obj1->dictGetKey(i);
-+ obj2 = obj1->dictGetVal(i);
-+ key = (char *)obj1->dictGetKey(i);
- if (strcmp("Font", key) == 0)
- copyFontResources(&obj2);
- else if (strcmp("ProcSet", key) == 0)
- copyProcSet(&obj2);
- else
-- copyOtherResources(&obj2, key);
-+ copyOtherResources(&obj2, (char *)key);
- }
- pdf_puts(">>\n");
- }
-
- // write the page contents
-- page->getContents(&contents);
-- if (contents->isStream()) {
-+ contents = page->getContents();
-+ if (contents.isStream()) {
-
- // Variant A: get stream and recompress under control
- // of \pdfcompresslevel
-@@ -1021,36 +1025,35 @@ void write_epdf(void)
-
- // Variant B: copy stream without recompressing
- //
-- contents->streamGetDict()->lookup("F", &obj1);
-- if (!obj1->isNull()) {
-+ obj1 = contents.streamGetDict()->lookup("F");
-+ if (!obj1.isNull()) {
- pdftex_fail("PDF inclusion: Unsupported external stream");
- }
-- contents->streamGetDict()->lookup("Length", &obj1);
-- assert(!obj1->isNull());
-+ obj1 = contents.streamGetDict()->lookup("Length");
-+ assert(!obj1.isNull());
- pdf_puts("/Length ");
- copyObject(&obj1);
- pdf_puts("\n");
-- contents->streamGetDict()->lookup("Filter", &obj1);
-- if (!obj1->isNull()) {
-+ obj1 = contents.streamGetDict()->lookup("Filter");
-+ if (!obj1.isNull()) {
- pdf_puts("/Filter ");
- copyObject(&obj1);
- pdf_puts("\n");
-- contents->streamGetDict()->lookup("DecodeParms", &obj1);
-- if (!obj1->isNull()) {
-+ obj1 = contents.streamGetDict()->lookup("DecodeParms");
-+ if (!obj1.isNull()) {
- pdf_puts("/DecodeParms ");
- copyObject(&obj1);
- pdf_puts("\n");
- }
- }
- pdf_puts(">>\nstream\n");
-- copyStream(contents->getStream()->getUndecodedStream());
-+ copyStream(contents.getStream()->getUndecodedStream());
- pdfendstream();
-- } else if (contents->isArray()) {
-+ } else if (contents.isArray()) {
- pdfbeginstream();
-- for (i = 0, l = contents->arrayGetLength(); i < l; ++i) {
-- Object contentsobj;
-- copyStream((contents->arrayGet(i, &contentsobj))->getStream());
-- contentsobj.free();
-+ for (i = 0, l = contents.arrayGetLength(); i < l; ++i) {
-+ Object contentsobj = contents.arrayGet(i);
-+ copyStream(contentsobj.getStream());
- if (i < l - 1)
- pdf_newline(); // add a newline after each stream except the last
- }
-diff -rupN texlive-20180414-source-bak/texk/web2c/pdftexdir/pdftosrc.cc texlive-20180414-source/texk/web2c/pdftexdir/pdftosrc.cc
---- texlive-20180414-source-bak/texk/web2c/pdftexdir/pdftosrc.cc 2019-04-05 11:28:07.877526373 +0200
-+++ texlive-20180414-source/texk/web2c/pdftexdir/pdftosrc.cc 2019-04-05 11:28:47.250692831 +0200
-@@ -16,6 +16,14 @@ GNU General Public License for more deta
- You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-+
-+/*
-+This is based on the patch texlive-poppler-0.59.patch <2017-09-19> at
-+https://git.archlinux.org/svntogit/packages.git/plain/texlive-bin/trunk
-+by Arch Linux. The poppler should be 0.71.0.
-+POPPLER_VERSION should be defined.
-+*/
-+
- #include <w2c/config.h>
-
- #include <stdlib.h>
-@@ -32,10 +40,7 @@ with this program. If not, see <http://
- #include <goo/gmem.h>
- #include <goo/gfile.h>
- #else
--#include <aconf.h>
--#include <GString.h>
--#include <gmem.h>
--#include <gfile.h>
-+#error POPPLER_VERSION should be defined.
- #endif
- #include <assert.h>
-
-@@ -86,31 +91,29 @@ int main(int argc, char *argv[])
- objgen = atoi(argv[3]);
- }
- xref = doc->getXRef();
-- catalogDict.initNull();
-- xref->getCatalog(&catalogDict);
-+ catalogDict = xref->getCatalog();
- if (!catalogDict.isDict("Catalog")) {
- fprintf(stderr, "No Catalog found\n");
- exit(1);
- }
-- srcStream.initNull();
-+ srcStream = Object(objNull);
- if (objnum == 0) {
-- catalogDict.dictLookup("SourceObject", &srcStream);
-+ srcStream = catalogDict.dictLookup("SourceObject");
- static char const_SourceFile[] = "SourceFile";
- if (!srcStream.isStream(const_SourceFile)) {
- fprintf(stderr, "No SourceObject found\n");
- exit(1);
- }
-- srcName.initNull();
-- srcStream.getStream()->getDict()->lookup("SourceName", &srcName);
-+ srcName = srcStream.getStream()->getDict()->lookup("SourceName");
- if (!srcName.isString()) {
- fprintf(stderr, "No SourceName found\n");
- exit(1);
- }
-- outname = srcName.getString()->getCString();
-+ outname = (char *)srcName.getString()->getCString();
- // We cannot free srcName, as objname shares its string.
- // srcName.free();
- } else if (objnum > 0) {
-- xref->fetch(objnum, objgen, &srcStream);
-+ srcStream = xref->fetch(objnum, objgen);
- if (!srcStream.isStream()) {
- fprintf(stderr, "Not a Stream object\n");
- exit(1);
-@@ -160,34 +163,27 @@ int main(int argc, char *argv[])
- int localOffset = 0;
- Guint firstOffset;
-
-- assert(xref->fetch(e->offset, 0, &objStr)->isStream());
-- nObjects = objStr.streamGetDict()->lookup("N", &obj1)->getInt();
-- obj1.free();
-- first = objStr.streamGetDict()->lookup("First", &obj1)->getInt();
-- obj1.free();
-+ objStr = xref->fetch(e->offset, 0);
-+ assert(objStr.isStream());
-+ obj1 = objStr.streamGetDict()->lookup("N");
-+ nObjects = obj1.getInt();
-+ obj1 = objStr.streamGetDict()->lookup("First");
-+ first = obj1.getInt();
- firstOffset = objStr.getStream()->getBaseStream()->getStart() + first;
-
- // parse the header: object numbers and offsets
- objStr.streamReset();
-- obj1.initNull();
-- str = new EmbedStream(objStr.getStream(), &obj1, gTrue, first);
-+ str = new EmbedStream(objStr.getStream(), Object(objNull), true, first);
- lexer = new Lexer(xref, str);
-- parser = new Parser(xref, lexer, gFalse);
-+ parser = new Parser(xref, lexer, false);
- for (n = 0; n < nObjects; ++n) {
-- parser->getObj(&obj1);
-- parser->getObj(&obj2);
-+ obj1 = parser->getObj();
-+ obj2 = parser->getObj();
- if (n == e->gen)
- localOffset = obj2.getInt();
-- obj1.free();
-- obj2.free();
- }
--#if defined(POPPLER_VERSION) || defined(XPDF304)
- while (str->getChar() != EOF) ;
--#else /* xpdf 4.00 */
-- lexer->skipToEOF();
--#endif
- delete parser;
-- objStr.free();
-
- fprintf(outfile, "%.10lu 00000 n\n",
- (long unsigned)(firstOffset + localOffset));
-@@ -198,7 +194,6 @@ int main(int argc, char *argv[])
- s->reset();
- while ((c = s->getChar()) != EOF)
- fputc(c, outfile);
-- srcStream.free();
- }
- if (objnum == 0)
- fprintf(stderr, "Source file extracted to %s\n", outname);
-@@ -207,7 +202,6 @@ int main(int argc, char *argv[])
- else
- fprintf(stderr, "Cross-reference table extracted to %s\n", outname);
- fclose(outfile);
-- catalogDict.free();
- delete doc;
- delete globalParams;
- }
diff --git a/unmaintained/texlive/texlive.trigger b/unmaintained/texlive/texlive.trigger
deleted file mode 100644
index d549354929..0000000000
--- a/unmaintained/texlive/texlive.trigger
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-texhash
-fmtutil-sys --all
-exit 0