Merge pull request #4556 from termux/texlive-update

texlive: add some files to base texlive package

packages/texlive/build.sh

@@ -3,7 +3,7 @@ TERMUX_PKG_DESCRIPTION="TeX Live is a distribution of the TeX typesetting system
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_MAINTAINER="Henrik Grimler @Grimler91"
 TERMUX_PKG_VERSION=20190410
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_REVISION=2
 TERMUX_PKG_SRCURL=ftp://ftp.tug.org/texlive/historic/${TERMUX_PKG_VERSION:0:4}/texlive-${TERMUX_PKG_VERSION}-texmf.tar.xz
 TERMUX_PKG_SHA256=c2ec974abc98b91995969e7871a0b56dbc80dd8508113ffcff6923e912c4c402
 TERMUX_PKG_DEPENDS="perl, texlive-bin (>= 20190410)"

packages/texlive/fmtutil.cnf.patch

@@ -1,7 +1,30 @@
-We've disabled luajittex when building the binaries, so lets prevent texlive from trying to generate formats for it.
---- src/texmf-dist/web2c/fmtutil.cnf	2016-05-15 01:17:09.000000000 +0000
-+++ ../fmtutil.cnf	2017-05-31 05:20:32.516130878 +0000
-@@ -82,7 +82,7 @@
+--- ./texmf-dist/web2c/fmtutil.cnf.orig	2019-03-23 02:25:33.000000000 +0100
++++ ./texmf-dist/web2c/fmtutil.cnf	2019-11-16 23:15:23.708911302 +0100
+@@ -39,7 +39,7 @@
+ #
+ # from aleph:
+ aleph aleph - *aleph.ini
+-lamed aleph language.dat *lambda.ini
++#! lamed aleph language.dat *lambda.ini
+ #
+ # from amstex:
+ amstex pdftex - -translate-file=cp227.tcx *amstex.ini
+@@ -64,11 +64,11 @@
+ pdfcsplain luatex - -etex csplain.ini
+ #
+ # from eplain:
+-eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
++#! eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
+ #
+ # from jadetex:
+-jadetex pdftex language.dat *jadetex.ini
+-pdfjadetex pdftex language.dat *pdfjadetex.ini
++#! jadetex pdftex language.dat *jadetex.ini
++#! pdfjadetex pdftex language.dat *pdfjadetex.ini
+ #
+ # from latex-bin:
+ latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
+@@ -83,7 +83,7 @@
  # from luatex:
  luatex luatex language.def,language.dat.lua luatex.ini
  dviluatex luatex language.def,language.dat.lua dviluatex.ini
@@ -10,3 +33,38 @@ We've disabled luajittex when building the binaries, so lets prevent texlive fro
  #
  # from metafont:
  mf mf-nowin - -translate-file=cp227.tcx mf.ini
+@@ -109,11 +109,11 @@
+ pdfetex pdftex language.def -translate-file=cp227.tcx *pdfetex.ini
+ #
+ # from platex:
+-platex eptex language.dat *platex.ini
++#! platex eptex language.dat *platex.ini
+ #
+ # from ptex:
+ ptex ptex - ptex.ini
+-eptex eptex language.def *eptex.ini
++#! eptex eptex language.def *eptex.ini
+ #
+ # from tex:
+ tex tex - tex.ini
+@@ -122,16 +122,16 @@
+ texsis pdftex - -translate-file=cp227.tcx texsis.ini
+ #
+ # from uplatex:
+-uplatex euptex language.dat *uplatex.ini
++#! uplatex euptex language.dat *uplatex.ini
+ #
+ # from uptex:
+ uptex uptex - uptex.ini
+-euptex euptex language.def *euptex.ini
++#! euptex euptex language.def *euptex.ini
+ #
+ # from xetex:
+ xetex xetex language.def -etex xetex.ini
+ xelatex xetex language.dat -etex xelatex.ini
+ #
+ # from xmltex:
+-xmltex pdftex language.dat *xmltex.ini
+-pdfxmltex pdftex language.dat *pdfxmltex.ini
++#! xmltex pdftex language.dat *xmltex.ini
++#! pdfxmltex pdftex language.dat *pdfxmltex.ini

packages/texlive/parse_tlpdb.py

@@ -130,8 +130,9 @@ pkg_dict = parse_tlpdb_to_dict(tlpdb)
 
 if len(sys.argv) > 2 and sys.argv[-1] == "print_names":
     """Generate dependencies to put into TERMUX_SUBPKG_DEPENDS"""
-    # Strip latex and basic since those collections are part of termux package "texlive"
-    dependencies = ["texlive-"+pkg for pkg in get_conflicting_pkgs(sys.argv[1]) if not pkg in ["latex", "basic"]];
+    # Strip latex, basic, dehyph-exptl and hyphen-afrikaans since those are part of termux package "texlive"
+    pkgs_in_texlive = ["latex", "basic", "dehyph-exptl", "hyphen-afrikaans"]
+    dependencies = ["texlive-"+pkg for pkg in get_conflicting_pkgs(sys.argv[1]) if not pkg in pkgs_in_texlive]
     if len(dependencies) > 0:
         print("texlive, "+", ".join(dependencies))
     else:

packages/texlive/texmf.cnf.patch

@@ -1,5 +1,5 @@
---- ../texmf.cnf.orig	2018-04-30 17:07:05.796733785 +0000
-+++ ./texmf-dist/web2c/texmf.cnf	2018-04-30 17:36:18.883441637 +0000
+--- ./texmf-dist/web2c/texmf.cnf.orig	2019-03-25 23:15:36.000000000 +0100
++++ ./texmf-dist/web2c/texmf.cnf	2019-11-16 22:20:04.812702472 +0100
 @@ -58,7 +58,7 @@
  % SELFAUTOPARENT (its grandparent = /usr/local/texlive/YYYY), and
  % SELFAUTOGRANDPARENT (its great-grandparent = /usr/local/texlive).
@@ -18,7 +18,7 @@
  
  % TEXMFSYSVAR, where *-sys store cached runtime data.
  TEXMFSYSVAR = $TEXMFROOT/texmf-var
-@@ -524,6 +524,9 @@
+@@ -538,6 +538,9 @@
  $SELFAUTODIR/share/texmf-local/web2c,\
  $SELFAUTODIR/share/texmf-dist/web2c,\
  $SELFAUTODIR/share/texmf/web2c,\