From b9917a2506eaac04568704425503fa871a8733b5 Mon Sep 17 00:00:00 2001 From: fosslinux Date: Mon, 22 Jun 2020 10:16:28 +1000 Subject: [PATCH] New package: texlive-20200406 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: q66 Co-authored-by: Piotr Wójcik --- common/shlibs | 4 + srcpkgs/texlive-BibTeX | 1 + srcpkgs/texlive-ConTeXt | 1 + srcpkgs/texlive-LuaTeX | 1 + srcpkgs/texlive-LuaTeX-devel | 1 + srcpkgs/texlive-PythonTeX | 1 + srcpkgs/texlive-Xdvi | 1 + srcpkgs/texlive-XeTeX | 1 + srcpkgs/texlive-devel | 1 + srcpkgs/texlive-dvi | 1 + srcpkgs/texlive/patches/cross-luajit.patch | 124 ++++++ .../texlive/patches/freetype2-config.patch | 102 +++++ .../patches/kpsewhich-default-progname.patch | 14 + .../texlive/patches/luajit-arch-fixes.patch | 50 +++ srcpkgs/texlive/template | 388 ++++++++++++++++++ 15 files changed, 691 insertions(+) create mode 120000 srcpkgs/texlive-BibTeX create mode 120000 srcpkgs/texlive-ConTeXt create mode 120000 srcpkgs/texlive-LuaTeX create mode 120000 srcpkgs/texlive-LuaTeX-devel create mode 120000 srcpkgs/texlive-PythonTeX create mode 120000 srcpkgs/texlive-Xdvi create mode 120000 srcpkgs/texlive-XeTeX create mode 120000 srcpkgs/texlive-devel create mode 120000 srcpkgs/texlive-dvi create mode 100644 srcpkgs/texlive/patches/cross-luajit.patch create mode 100644 srcpkgs/texlive/patches/freetype2-config.patch create mode 100644 srcpkgs/texlive/patches/kpsewhich-default-progname.patch create mode 100644 srcpkgs/texlive/patches/luajit-arch-fixes.patch create mode 100644 srcpkgs/texlive/template diff --git a/common/shlibs b/common/shlibs index 00a0af53fcb..6569fffdf4e 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3976,4 +3976,8 @@ libselinux.so.1 libselinux-3.0_1 libsepol.so.1 libsepol-3.0_1 libfrrcares.so.0 libfrr-7.3.1_1 libhugetlbfs.so.0 libhugetlbfs-2.22_1 +libkpathsea.so.6 texlive-20200406_1 +libtexluajit.so.2 texlive-LuaTeX-20200406_1 +libtexlua53.so.5 texlive-LuaTeX-20200406_1 +libptexenc.so.1 texlive-20200406_1 libdolphinvcs.so.5 dolphin-plugins-20.04.2_1 diff --git a/srcpkgs/texlive-BibTeX b/srcpkgs/texlive-BibTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-BibTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-ConTeXt b/srcpkgs/texlive-ConTeXt new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-ConTeXt @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-LuaTeX b/srcpkgs/texlive-LuaTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-LuaTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-LuaTeX-devel b/srcpkgs/texlive-LuaTeX-devel new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-LuaTeX-devel @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-PythonTeX b/srcpkgs/texlive-PythonTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-PythonTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-Xdvi b/srcpkgs/texlive-Xdvi new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-Xdvi @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-XeTeX b/srcpkgs/texlive-XeTeX new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-XeTeX @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-devel b/srcpkgs/texlive-devel new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-devel @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive-dvi b/srcpkgs/texlive-dvi new file mode 120000 index 00000000000..c6cca627ba9 --- /dev/null +++ b/srcpkgs/texlive-dvi @@ -0,0 +1 @@ +texlive \ No newline at end of file diff --git a/srcpkgs/texlive/patches/cross-luajit.patch b/srcpkgs/texlive/patches/cross-luajit.patch new file mode 100644 index 00000000000..9655d7683db --- /dev/null +++ b/srcpkgs/texlive/patches/cross-luajit.patch @@ -0,0 +1,124 @@ +--- libs/luajit/native/Makefile.in 2018-09-07 06:40:04.000000000 +1000 ++++ libs/luajit/native/Makefile.in.new 2020-06-07 16:10:40.445000000 +1000 +@@ -154,6 +154,8 @@ + am__v_CC_1 = + CCLD = $(CC) + LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++HOSTCCLD = $(HOSTCC) ++HOSTLINK = $(HOSTCCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + AM_V_CCLD = $(am__v_CCLD_@AM_V@) + am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) + am__v_CCLD_0 = @echo " CCLD " $@; +@@ -413,7 +415,7 @@ + + buildvm$(EXEEXT): $(buildvm_OBJECTS) $(buildvm_DEPENDENCIES) $(EXTRA_buildvm_DEPENDENCIES) + @rm -f buildvm$(EXEEXT) +- $(AM_V_CCLD)$(LINK) $(buildvm_OBJECTS) $(buildvm_LDADD) $(LIBS) ++ $(AM_V_CCLD)$(HOSTLINK) $(buildvm_OBJECTS) $(buildvm_LDADD) $(LIBS) + @LUAJIT_TREE@/src/host/minilua-minilua.$(OBJEXT): \ + @LUAJIT_TREE@/src/host/$(am__dirstamp) \ + @LUAJIT_TREE@/src/host/$(DEPDIR)/$(am__dirstamp) +@@ -459,74 +461,74 @@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` + + @LUAJIT_TREE@/src/host/buildvm-buildvm.o: @LUAJIT_TREE@/src/host/buildvm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.o `test -f '@LUAJIT_TREE@/src/host/buildvm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm.obj: @LUAJIT_TREE@/src/host/buildvm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o: @LUAJIT_TREE@/src/host/buildvm_asm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_asm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.o `test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_asm.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj: @LUAJIT_TREE@/src/host/buildvm_asm.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_asm.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_asm.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_asm.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_asm.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_asm.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_asm.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o: @LUAJIT_TREE@/src/host/buildvm_fold.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_fold.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.o `test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_fold.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj: @LUAJIT_TREE@/src/host/buildvm_fold.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_fold.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_fold.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_fold.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_fold.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_fold.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_fold.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o: @LUAJIT_TREE@/src/host/buildvm_lib.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_lib.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.o `test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_lib.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj: @LUAJIT_TREE@/src/host/buildvm_lib.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_lib.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_lib.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_lib.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_lib.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_lib.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_lib.c'; fi` + + @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o: @LUAJIT_TREE@/src/host/buildvm_peobj.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_peobj.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.o `test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/buildvm_peobj.c + + @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj: @LUAJIT_TREE@/src/host/buildvm_peobj.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` ++@am__fastdepCC_TRUE@ $(AM_V_CC)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Tpo @LUAJIT_TREE@/src/host/$(DEPDIR)/buildvm-buildvm_peobj.Po + @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='@LUAJIT_TREE@/src/host/buildvm_peobj.c' object='@LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` ++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(HOSTCC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(buildvm_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o @LUAJIT_TREE@/src/host/buildvm-buildvm_peobj.obj `if test -f '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; then $(CYGPATH_W) '@LUAJIT_TREE@/src/host/buildvm_peobj.c'; else $(CYGPATH_W) '$(srcdir)/@LUAJIT_TREE@/src/host/buildvm_peobj.c'; fi` + + @LUAJIT_TREE@/src/host/minilua-minilua.o: @LUAJIT_TREE@/src/host/minilua.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(minilua_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT @LUAJIT_TREE@/src/host/minilua-minilua.o -MD -MP -MF @LUAJIT_TREE@/src/host/$(DEPDIR)/minilua-minilua.Tpo -c -o @LUAJIT_TREE@/src/host/minilua-minilua.o `test -f '@LUAJIT_TREE@/src/host/minilua.c' || echo '$(srcdir)/'`@LUAJIT_TREE@/src/host/minilua.c +@@ -914,7 +922,7 @@ + $(buildvm_OBJECTS): buildvm_arch.h + + buildvm_arch.h: minilua$(EXEEXT) $(LUAJIT_TREE)/dynasm/dynasm.lua +- $(AM_V_GEN)./minilua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \ ++ lua $(srcdir)/$(LUAJIT_TREE)/dynasm/dynasm.lua \ + `cat ../dynasm_flags` \ + -o $@ $(srcdir)/$(LUAJIT_TREE)/src/vm_$(DASM_ARCH).dasc + diff --git a/srcpkgs/texlive/patches/freetype2-config.patch b/srcpkgs/texlive/patches/freetype2-config.patch new file mode 100644 index 00000000000..cef6d7532ba --- /dev/null +++ b/srcpkgs/texlive/patches/freetype2-config.patch @@ -0,0 +1,102 @@ +Disables the use of freetype2-config. Does some weird stuff on +i686, armv5tel, ppc*, etc. No harm caused by disabling it +everywhere. + +--- texk/dvipng/configure 2020-06-08 10:00:42.953000000 +1000 ++++ texk/dvipng/configure 2020-06-08 10:00:57.069000000 +1000 +@@ -16432,10 +16432,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- configure 2020-06-08 10:03:04.785000000 +1000 ++++ configure 2020-06-08 10:01:47.902000000 +1000 +@@ -21471,10 +21471,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- libs/gd/configure 2019-03-26 04:27:50.000000000 +1100 ++++ libs/gd/configure 2020-06-08 10:06:28.481000000 +1000 +@@ -5933,10 +5933,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/dvisvgm/configure 2020-03-22 09:04:56.000000000 +1100 ++++ texk/dvisvgm/configure 2020-06-08 10:08:15.384000000 +1000 +@@ -21794,10 +21794,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/xdvik/configure 2020-03-02 06:07:53.000000000 +1100 ++++ texk/xdvik/configure 2020-06-08 10:08:15.731000000 +1000 +@@ -19055,10 +19055,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/web2c/configure 2020-01-17 09:02:50.000000000 +1100 ++++ texk/web2c/configure 2020-06-08 10:08:15.533000000 +1000 +@@ -25346,10 +25346,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then +--- texk/ttf2pk2/configure 2019-03-26 04:27:50.000000000 +1100 ++++ texk/ttf2pk2/configure 2020-06-08 10:08:15.656000000 +1000 +@@ -15265,10 +15265,7 @@ + else + PKG_CONFIG="$ac_cv_prog_PKG_CONFIG" + fi +-if $FT2_CONFIG --ftversion >/dev/null 2>&1; then +- FREETYPE2_INCLUDES=`$FT2_CONFIG --cflags` +- FREETYPE2_LIBS=`$FT2_CONFIG --libs` +-elif $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then ++if $PKG_CONFIG --libs freetype2 >/dev/null 2>&1; then + FREETYPE2_INCLUDES=`$PKG_CONFIG --cflags freetype2` + FREETYPE2_LIBS=`$PKG_CONFIG --libs freetype2` + elif test "x$need_freetype2:$with_system_freetype2" = xyes:yes; then diff --git a/srcpkgs/texlive/patches/kpsewhich-default-progname.patch b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch new file mode 100644 index 00000000000..eecdf544f48 --- /dev/null +++ b/srcpkgs/texlive/patches/kpsewhich-default-progname.patch @@ -0,0 +1,14 @@ +The default progname really should be kpsewhich, and makes a test +pass which otherwise fails. + +--- texk/kpathsea/kpsewhich.c 2020-07-01 19:07:23.592000000 +1000 ++++ texk/kpathsea/kpsewhich.c 2020-07-01 19:07:33.999000000 +1000 +@@ -60,7 +60,7 @@ + boolean must_exist = false; + + /* The program name, for `.PROG' construct in texmf.cnf. (-program) */ +-string progname = NULL; ++string progname = "kpsewhich"; + + /* Safe input and output names to check. (-safe-in-name and -safe-out-name) */ + string safe_in_name = NULL; diff --git a/srcpkgs/texlive/patches/luajit-arch-fixes.patch b/srcpkgs/texlive/patches/luajit-arch-fixes.patch new file mode 100644 index 00000000000..658c0a90aa2 --- /dev/null +++ b/srcpkgs/texlive/patches/luajit-arch-fixes.patch @@ -0,0 +1,50 @@ +Have texluajit recognize ppc64 ELFv2 ABI and therefore emit correct dynasm +stuff. + +Also, fix luajittex crashing on non-x86 64-bit systems (MAP_32BIT only exists +on x86 and defining it on other systems will activate a codepath in luajit +that segfaults). + +Author: q66 + +--- libs/luajit/configure ++++ libs/luajit/configure +@@ -14243,7 +14243,7 @@ else + fi + if grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1; then : + echo '-D P64' >>dynasm_flags +- if test "x$LJHOST" = xLinux; then : ++ if test "x$LJHOST" = xLinux -a "x$LJARCH" = xx64; then : + LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40" + fi + fi +@@ -14294,6 +14294,9 @@ fi + fi + if grep 'LJ_ARCH_PPC32ON64 1' conftest.i >/dev/null 2>&1; then : + echo '-D GPR64' >>dynasm_flags ++fi ++ if grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1; then : ++ echo '-D ELFV2' >>dynasm_flags + fi + if grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1; then : + DASM_ARCH=ppc64 +--- libs/luajit/m4/lj-system.m4 ++++ libs/luajit/m4/lj-system.m4 +@@ -52,7 +52,7 @@ AS_IF([grep 'LJ_LE' conftest.i >/dev/null 2>&1], + [echo '-D ENDIAN_BE' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_BITS 64' conftest.i >/dev/null 2>&1], + [echo '-D P64' >>dynasm_flags +- AS_IF([test "x$LJHOST" = xLinux], ++ AS_IF([test "x$LJHOST" = xLinux -a "x$LJARCH" = xx64], + [LUAJIT_DEFINES="$LUAJIT_DEFINES -DMAP_32BIT=0x40"])]) + AS_IF([grep 'LJ_HASJIT 1' conftest.i >/dev/null 2>&1], + [echo '-D JIT' >>dynasm_flags]) +@@ -84,6 +84,8 @@ AS_CASE([$LJARCH], + [echo '-D ROUND' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_PPC32ON64 1' conftest.i >/dev/null 2>&1], + [echo '-D GPR64' >>dynasm_flags]) ++ AS_IF([grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1], ++ [echo '-D ELFV2' >>dynasm_flags]) + AS_IF([grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1], + [DASM_ARCH=ppc64]) + AS_IF([test "x$LJHOST" = xPS3], diff --git a/srcpkgs/texlive/template b/srcpkgs/texlive/template new file mode 100644 index 00000000000..8aa8208d733 --- /dev/null +++ b/srcpkgs/texlive/template @@ -0,0 +1,388 @@ +# Template file for 'texlive' +pkgname=texlive +version=20200406 +revision=1 +wrksrc="texlive-${version}-source" +build_wrksrc="build" +build_style=gnu-configure +configure_script="../configure" +configure_args=" + --enable-biber + --enable-epsfwin + --enable-ipc + --enable-luajittex + --enable-luajithbtex + --enable-mfluajit + --enable-mfluajit-nowin + --enable-luatex + --enable-luahbtex + --enable-mflua + --enable-mfluajit + --enable-mfluajit-nowin + --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=/VoidLinux + --with-system-cairo + --with-system-freetype2 + --with-system-gd + --with-system-graphite2 + --with-system-gmp + --with-system-harfbuzz + --with-system-icu + --with-system-libpaper + --with-system-libpng + --with-system-mpfr + --with-system-poppler + --with-system-pixman + --with-system-teckit + --with-system-xpdf + --with-system-zlib + --with-system-zziplib + --with-xdvi-x-toolkit=Xaw" +hostmakedepends="pkg-config perl lua52-BitOp texinfo" +makedepends="cairo-devel freetype-devel gd-devel graphite-devel gmp-devel + harfbuzz-devel icu-devel libpaper-devel libpng-devel mpfr-devel + poppler-devel pixman-devel libteckit-devel zlib-devel zziplib-devel + libXaw-devel" +depends="dialog ghostscript perl-Tk texlive-core xbps-triggers>=0.115_1" +short_desc="TeX Live" +maintainer="fosslinux " +license="GPL-2.0-or-later" +homepage="https://www.tug.org/texlive/" +distfiles="ftp://tug.org/texlive/historic/2020/texlive-${version}-source.tar.xz" +checksum=e32f3d08cbbbcf21d8d3f96f2143b64a1f5e4cb01b06b761d6249c8785249078 +python_version=3 + +if [ "$CROSS_BUILD" ] ; then + # Tangle is required for cross compile + hostmakedepends+=" texlive" +fi + +case "$XBPS_TARGET_MACHINE" in + mips*) broken="cannot find libraries" ;; +esac + +build_options="luajit" + +_luajit_host_cc="cc" +if [ "$XBPS_WORDSIZE" != "$XBPS_TARGET_WORDSIZE" ] ; then + case "$XBPS_MACHINE" in + x86_64*) + hostmakedepends+=" cross-i686-linux-musl" + _luajit_host_cc="i686-linux-musl-gcc -static" + ;; + ppc64le*) _luajit_host_cc="broken" ;; # no 32-bit counterpart yet + ppc64*) + hostmakedepends+=" cross-powerpc-linux-musl" + _luajit_host_cc="powerpc-linux-musl-gcc -static" + ;; + *) _luajit_host_cc="broken" ;; + esac +fi + +if [ "${_luajit_host_cc}" != "broken" ] ; then + build_options_default+=" luajit" +fi + +if [ ! "$build_option_luajit" ] ; then + configure_args+=" --disable-luajittex --disable-mfluajit + --disable-mfluajit-nowin --disable-luajithbtex" +else + if [ "${_luajit_host_cc}" = "broken" ] ; then + nocross="Cannot cross compile LuaJIT for different wordsizes" + fi +fi + +case "$XBPS_TARGET_MACHINE" in + aarch64*) DASM_ARCH=arm64 ;; + arm*) DASM_ARCH=arm ;; + mips64*) DASM_ARCH=mips64 ;; + mips*) DASM_ARCH=mips ;; + ppc*) DASM_ARCH=ppc ;; + i686*) DASM_ARCH=x86 ;; + x86_64*) DASM_ARCH=x64 ;; +esac +export DASM_ARCH + +post_extract() { + # pdftex poppler compatibility + cp -pv texk/web2c/pdftexdir/pdftoepdf{-poppler0.76.0,}.cc + cp -pv texk/web2c/pdftexdir/pdftosrc{-poppler0.76.0,}.cc + + mkdir -p "${build_wrksrc}" + cp -rf texk/web2c "${build_wrksrc}/web2c-host" +} + +post_patch() { + pushd "${wrksrc}/libs/luajit/LuaJIT-src" + + # Apply all LuaJIT patches first + for i in ${XBPS_SRCPKGDIR}/LuaJIT/patches/*.patch ; do + # This patch breaks the build + if [ "$(basename ${i})" != "get-rid-of-luajit-version-sym.patch" ] ; then + msg_normal "patching: $(basename ${i})\n" + patch -sNp0 -i ${i} + fi + done + + # Per-architecture patches + # ppc/ppc64: LuaJIT patches + local patchdir + + case "$XBPS_TARGET_MACHINE" in + ppc64*) patchdir="ppc64" ;; + ppc*) patchdir="ppc" ;; + *) popd; return ;; + esac + + for i in ${XBPS_SRCPKGDIR}/LuaJIT/files/patches/${patchdir}/*.patch ; do + msg_normal "patching: $(basename ${i})\n" + patch -sNp0 -i ${i} + done + + popd +} + +pre_configure() { + if [ "$CROSS_BUILD" ] ; then + # For some reason, when cross-building, the configure script has this path + # for freetype2 include: + # /usr/x86_64-linux-musl/usr/x86_64-linux-musl/usr/include/freetype2. + # It shouldn't have two /usr/x86_64-linux-musl's, add it to CPPFLAGS. + CPPFLAGS="-I${XBPS_CROSS_BASE}/usr/include/freetype2" + fi +} + +pre_build() { + if [ -n "$build_option_luajit" ] ; then + export HOST_CC="${_luajit_host_cc}" + export HOSTCC="${_luajit_host_cc}" + if [ -n "$CROSS_BUILD" ] ; then + # LuaJIT configure script does not cross compile correctly + local _cflags=$CFLAGS + local _ldflags=$LDFLAGS + unset CFLAGS LDFLAGS + mkdir -p "${wrksrc}/build/libs/luajit/native" + cd "${wrksrc}/build/libs/luajit/native" + PREFIX=/usr HOST_LUA=lua5.2 HOST_CFLAGS="$XBPS_CFLAGS" \ + HOST_LDFLAGS="$XBPS_LDFLAGS" TARGET_CFLAGS="${_cflags}" \ + TARGET_LDFLAGS="${_ldflags}" CROSS="${XBPS_CROSS_TRIPLET}-" \ + ../../../../libs/luajit/native/configure \ + --build=${XBPS_TRIPLET} \ + --host=${XBPS_CROSS_TRIPLET} \ + --target=${XBPS_CROSS_TRIPLET} + CFLAGS="${_cflags}" + LDFLAGS="${_ldflags}" + # Replace configure script with dummy script + cd "${wrksrc}" + cat > libs/luajit/native/configure << EOF +#!/bin/sh +printf "already complete\\n" +EOF + fi + fi + + # web2c should not be cross + mkdir -p "${wrksrc}/build/texk/web2c/web2c" + cd "${wrksrc}/build/texk/web2c/web2c" + unset CC CXX + CFLAGS="$XBPS_CFLAGS" LDFLAGS="$XBPS_LDFLAGS" RANLIB=ranlib \ + ../../../../texk/web2c/web2c/configure + + # Replace configure script with dummy script + cd "${wrksrc}" + cat > texk/web2c/web2c/configure << EOF +#!/bin/sh +printf "already complete\\n" +EOF +} + +post_install() { + cp -rf ${wrksrc}/texk/tests/TeXLive \ + "${DESTDIR}/usr/share/texmf-dist/scripts/texlive" + sed -i -e 's:^\(TEXMFROOT *= *\)$SELFAUTOPARENT$:\1/usr/share:g' \ + "${DESTDIR}/usr/share/texmf-dist/web2c/texmf.cnf" + # Remove files provided by other texlive-* packages + while IFS=' ' read -r f p ; do + if [ "$p" = "$pkgname" ] && ! [ -e "${DESTDIR}/usr/share/texmf-dist/${f}" ]; then + msg_error "$pkgver: missing file $f\n" + elif [ "$p" != "$pkgname" ] && [ -e "${DESTDIR}/usr/share/texmf-dist/${f}" ]; then + echo "removed $f" + mkdir -p ${DESTDIR}/usr/share/texlive/removed + echo "$f" >> ${DESTDIR}/usr/share/texlive/removed/$pkgname.txt + rm -f "${DESTDIR}/usr/share/texmf-dist/$f" + fi + done < "${XBPS_COMMONDIR}/environment/build-style/texmf/ownership.txt" + for cmd in amstex cslatex csplain eplain etex jadetex latex mex llatex \ + mltex mllatex pdfetex pdfcslatex pdfcsplain pdfjadetex \ + pdflatex pdfmex pdfxmltex texsis utf8mex xmltex ; do + ln -s pdftex "${DESTDIR}/usr/bin/${cmd}" + done + for cmd in lollipop ; do + ln -s tex "${DESTDIR}/usr/bin/${cmd}" + done + ln -s eptex "${DESTDIR}/usr/bin/platex" + ln -s euptex "${DESTDIR}/usr/bin/uplatex" +} + +texlive-XeTeX_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - engine supporting modern typography" + pkg_install() { + vmove usr/bin/xetex + ln -s xetex "${PKGDESTDIR}/usr/bin/xelatex" + } +} + +texlive-dvi_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - tools for dvi based workflow" + pkg_install() { + for i in afm2tfm bbox epsffit extractres includeres ps2eps psbook psjoin \ + psnup psresize psselect pstops ; do + vmove "usr/bin/${i}" + done + vmove usr/bin/dvi* + } +} + +texlive-LuaTeX_package() { + depends="${sourcepkg}>=${version}_${revision} bash" + short_desc+=" - extended pdfTeX using Lua" + pkg_install() { + if [ "$build_option_luajit" ] ; then + for i in luajittex mfluajit mfluajit-nowin luajithbtex texluajit \ + texluajitc ; do + vmove "usr/bin/${i}" + done + fi + for i in checkcites cllualatex cluttex diadia getmapdl l3build luahbtex \ + luaotfload-tool luatools luatex lwarpmk m-tx \ + makeglossaries-lite mflua mflua-nowin musixflx musixtex pmxchords \ + ptex2pdf texlua texluac xindex ; do + vmove "usr/bin/${i}" + done + for i in checkcites cluttex diadia getmap glossaries/makeglossaries-lite.lua \ + l3build luaotfload lwarp m-tx musixtex pmxchords ptex2pdf xindex ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + for i in luatex texlua texluac ; do + vmove "usr/share/man/man1/${i}.1" + done + vmove "usr/lib/libtexlua*.so.*" + for cmd in dvilualatex dviluatex optex ; do + ln -s luatex "${PKGDESTDIR}/usr/bin/${cmd}" + done + ln -s luahbtex "${PKGDESTDIR}/usr/bin/lualatex" + } +} + +texlive-LuaTeX-devel_package() { + depends="${sourcepkg}-devel>=${version}_${revision} + ${sourcepkg}-LuaTeX>=${version}_${revision}" + short_desc+=" - extended pdfTeX using Lua - development files" + pkg_install() { + for i in texlua53 $(vopt_if luajit texluajit); do + vmove "usr/include/${i}" + vmove "usr/lib/lib${i}.a" + vmove "usr/lib/lib${i}.so" + vmove "usr/lib/pkgconfig/${i}.pc" + done + } +} + +texlive-Xdvi_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - displaying DVI files on the X window system" + pkg_install() { + for i in xdvi xdvi-xaw xdvipdfmx ; do + vmove "usr/bin/${i}" + done + vmove usr/share/texmf-dist/xdvi + for i in xdvi xdvipdfmx ; do + vmove "usr/share/man/man1/${i}.1" + done + vmove usr/share/applications/xdvi.desktop + } +} + +texlive-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + for i in kpathsea ptexenc synctex; do + vmove "usr/include/${i}" + vmove "usr/lib/lib${i}.a" + vmove "usr/lib/lib${i}.so" + vmove "usr/lib/pkgconfig/${i}.pc" + done + } +} + +texlive-BibTeX_package() { + depends="${sourcepkg}>=${version}_${revision} bash" + short_desc+=" - reference management software" + pkg_install() { + for i in bbl2bib ctanbib ; do + vmove "usr/bin/${i}" + done + for i in bib2gls bibexport ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + vmove usr/bin/bib* + vmove usr/share/man/man1/bibtex.1 + } +} + +texlive-ConTeXt_package() { + depends="${sourcepkg}>=${version}_${revision} perl ghostscript" + short_desc+=" - alternative general-purpose document processor" + pkg_install() { + for i in context contextjit mptopdf mtxrun mtxrunjit texexec \ + texmfstart dosepsbin epspdf epspdftk purifyeps repstopdf ; do + vmove "usr/bin/${i}" + done + for i in context dosepsbin epspdf epstopdf ps2eps purifyeps ; do + vmove "usr/share/texmf-dist/scripts/${i}" + done + for i in epsffit ps2eps ; do + vmove "usr/share/man/man1/${i}.1" + done + } +} + +texlive-PythonTeX_package() { + depends="${sourcepkg}>=${version}_${revision} python3" + short_desc+=" - executing Python in LaTeX" + pkg_install() { + vmove usr/bin/*pythontex + vmove usr/share/texmf-dist/scripts/pythontex + } +}