Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0e71a725ea62ee8c8fe733393250bb056a09bb3
commit a0e71a725ea62ee8c8fe733393250bb056a09bb3 Author: DeX77 <[email protected]> Date: Thu Jun 22 10:49:57 2017 +0200 texlive-20170520-1-x86_64 * version bump diff --git a/source/xapps-extra/texlive/FrugalBuild b/source/xapps-extra/texlive/FrugalBuild index bf3d9da..44c43ea 100644 --- a/source/xapps-extra/texlive/FrugalBuild +++ b/source/xapps-extra/texlive/FrugalBuild @@ -13,33 +13,31 @@ : ${USE_EFONTS="n"} pkgname=texlive -pkgver=20160523 -pkgextra="b" -pkgrel=9 +pkgver=20170520 +pkgextraver="-source" +pkgrel=1 pkgdesc="A complete TeX distribution" archs=('x86_64') depends=('t1lib' 'gd>=2.1.1' 'ncurses>=6.0-3' 'poppler>=0.53.0' 'icu4c>=58.1' 'zlib>=1.2.8' 'graphite2' 'zziplib' 'libpaper' 'harfbuzz') rodepends=('ghostscript' 'perl' 'texlive-kpathsea' 'texlive-ptexen' 'texlive-lua') makedepends=('clisp' 'ffcall' 'x11-protos') url='http://tug.org/texlive/' -source=(http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2016/$pkgname-$pkgver$pkgextra-source.tar.xz \ - http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2016/$pkgname-$pkgver$pkgextra-texmf.tar.xz \ - http://ftp.math.utah.edu/pub/tex/historic/systems/texlive/2016/$pkgname-$pkgver-extra.tar.xz \ - texmf-do-not-reset-root-home.patch do-not-reset-root-home.patch \ +source=(http://www.bothelp.net/mirrors/ctan/systems/texlive/Source/texlive-${pkgver}-source.tar.xz \ texmf.cnf \ texmfcnf.lua \ 09-texlive.conf) -up2date="Flasttar ftp://tug.org/historic/systems/texlive/2016/ | sed 's/_source//' | sed 's/_texmf//' | sed 's/_extra//'" +up2date="Flasttar http://www.bothelp.net/mirrors/ctan/systems/texlive/Source/"; groups=('xapps-extra') -conflicts=('tetex' 'tetex-kpathsea' "$pkgname-ptex") +conflicts=('tetex' 'tetex-kpathsea' "$pkgname-ptex" \ + "$pkgname-formats-extra" "$pkgname-latex3" \ + "$pkgname-plain" "$pkgname-extra" \ + "$pkgname-templates-extra" "$pkgname-omega" \ + "$pkgname-lang-extra" "$pkgname-lang-cyrillic" ) + provides=("${conflicts[@]}") replaces=("${conflicts[@]}") -sha1sums=('bd0d58067b6eb269ef35992434646d5b08d504b4' \ - '062f593cc31f46bafe3786959efcf75fcffafd82' \ - 'e6759cf3b7520a1815dc4c9c1109235fd25c199d' \ - '4c633bfd2359d1365273ee187b5d6f92cbdb145b' \ - '6fcc128ae95c9bc77784ce832945e9b2a086573b' \ +sha1sums=('44f5ece5f12078f4b95ab9fa5c012711f5d8f9e8' \ '4fec5aa2a4eb504d96b802bd11376270658f923f' \ '438b6ea0f2ee6813bed725a24313db1408189f0d' \ 'bf7ba21d45bee78657105a5f2c5e7e24b8614859') @@ -73,27 +71,19 @@ Fconfopts+=" \ --with-system-harfbuzz \ --enable-shared \ --with-clisp-runtime=default \ - --enable-xindy --disable-xindy-rules --disable-xindy-docs" - -#TODO: harfbuzz need to be recompiled with --with-graphite2=yes to be included here - use harfbuzz in TL source tree for now + --enable-xindy \ + --disable-xindy-rules \ + --disable-xindy-docs" subpkgs=("$pkgname-xindy" "$pkgname-bibtex-extra" "$pkgname-misc" - "$pkgname-formats-extra" - "$pkgname-templates-extra" "$pkgname-pstricks" "$pkgname-sciences" "$pkgname-htmlxml" "$pkgname-graphics" "$pkgname-latex-extra" - "$pkgname-lang-cyrillic" - "$pkgname-lang-extra" "$pkgname-utils" - "$pkgname-extra" - "$pkgname-omega" - "$pkgname-latex3" - "$pkgname-plain" "$pkgname-kpathsea" "$pkgname-ptexen" "$pkgname-synctex" @@ -102,44 +92,31 @@ subpkgs=("$pkgname-xindy" subdescs=('Xindy package for TeX Live' 'Extra Bibtex Styles for TeX Live' 'Miscellaneous packages for TeX Live' - 'Extra Tex formats for Tex Live' - 'Extra publications templates for Tex Live' 'Extra PsTricks packages for TeX Live' 'Extra science packages for TeX Live' 'XML/HTML packages for TeX Live' 'Graphics packages for TeX Live' 'Extra Latex packages for TeX Live' - 'Cyrillic language support for TeX Live' - 'Extra languages support for TeX Live' 'Utilities for TeX Live' - 'Extra packages (generic, ..) for TeX Live' - 'A 16-bit extended TeX' - 'LaTeX3 packages for TeX Live' - 'Plain Tex packages for TeX Live' 'Libkpathsea' 'Libptexen' 'libsynctex' 'TeX Live Lua' ) -subdepends=('libsigsegv' '' '' '' '' '' '' '' '' '' '' '' 'texlive-kpathsea texlive-ptexen texlive-synctex' '' '' '' '' '' '' 'zlib>=1.2.8-4' 'libgcc>=5.3.0') +subdepends=('libsigsegv' '' '' '' '' '' '' '' 'texlive-kpathsea texlive-ptexen texlive-synctex' '' '' 'zlib>=1.2.8-4' 'libgcc>=5.3.0') subrodepends=("$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" \ - "$pkgname=$pkgver" "" "" "" "") -subgroups=('xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' \ - 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' \ + "$pkgname=$pkgver" "$pkgname=$pkgver" \ + "$pkgname=$pkgver" "$pkgname=$pkgver" "$pkgname=$pkgver" "" "" "" "") +subgroups=('xapps-extra' 'xapps-extra' 'xapps-extra' \ 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' 'xapps-extra' \ - 'xlib' 'xlib-extra' 'xlib-extra' 'xlib-extra') -subarchs=('x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' \ - 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' \ - 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64') -subinstall=("$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" \ + 'xapps-extra' 'xlib' 'xlib-extra' 'xlib-extra' 'xlib-extra') +subarchs=('x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' \ + 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' 'x86_64' ) +subinstall=("$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" \ "$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" \ - "$pkgname-pkg.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" "$pkgname-pkg.install" \ - "$pkgname-pkg.install" "$pkgname-pkg.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" \ - "$pkgname-pkg.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg-nomaps.install" "" "" "" "") + "$pkgname-pkg.install" "$pkgname-pkg-nomaps.install" "$pkgname-pkg.install" \ + "$pkgname-pkg.install" "$pkgname-pkg-nomaps.install" "" "" "" ) -subreplaces=("" "" "" "" "" "" "" "" "" "" "" "" "dvi2tty" "" "" "" "" "" "" "" "" ) +subreplaces=("" "" "" "" "" "" "" "" "dvi2tty" "" "" "" "" ) if Fuse $USE_DOCS; then subpkgs=("${subpkgs[@]}" "$pkgname-docs") @@ -187,16 +164,10 @@ subconflicts=("${subreplaces[@]}") build() { - if [ "${CARCH}" = "x86_64" ]; then - export CFLAGS="${CFLAGS} -fPIC" - export CXXFLAGS="${CXXFLAGS} -fPIC" - fi - - Fcd $pkgname-$pkgver-texmf - Fpatch texmf-do-not-reset-root-home.patch + export CFLAGS="${CFLAGS} -fPIC" + export CXXFLAGS="${CXXFLAGS} -fPIC" - cd ../$pkgname-$pkgver-source || Fdie - Fpatch do-not-reset-root-home.patch + Fcd ## remove original ls-R from texmf, that fix conflict with previous texlive @@ -212,10 +183,6 @@ build() { ## remove useless source files rm -rf $Fsrcdir/$pkgname-$pkgver-texmf/texmf-dist/source || Fdie - # copy tlpkg package (needed by udpmap and fmtutil) - Fcp $pkgname-$pkgver-extra/tlpkg usr/share/ - # copy the extra packages - Fcp $pkgname-$pkgver-texmf/texmf-dist/* usr/share/texmf-dist/ ## install the config file with correct paths for kpathsea Finstall 644 texmf.cnf usr/share/texmf-dist/web2c/ @@ -645,7 +612,6 @@ fi done done ## always be carefull with the above lists, this one can broke context =) - Fsplit $pkgname-latex-extra usr/share/texmf-dist/tex/latex/stubs ## graphics related packages for i in asyfig autoarea bardiag cachepic circuitikz curve curve2e curves dcpic diagmac2 doc-pictex \ diff --git a/source/xapps-extra/texlive/do-not-reset-root-home.patch b/source/xapps-extra/texlive/do-not-reset-root-home.patch deleted file mode 100644 index e1eac78..0000000 --- a/source/xapps-extra/texlive/do-not-reset-root-home.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur texlive-20160523-source/texk/texlive/linked_scripts/texlive/fmtutil.pl texlive-20160523-source-p/texk/texlive/linked_scripts/texlive/fmtutil.pl ---- texlive-20160523-source/texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-04-26 19:41:35.000000000 +0200 -+++ texlive-20160523-source-p/texk/texlive/linked_scripts/texlive/fmtutil.pl 2016-07-17 18:56:55.301267647 +0200 -@@ -65,7 +65,7 @@ - # sudo sometimes does not reset the home dir of root, check on that - # see more comments at the definition of the function itself - # this function checks by itself whether it is running on windows or not --reset_root_home(); -+#reset_root_home(); - - chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); - chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); diff --git a/source/xapps-extra/texlive/texmf-do-not-reset-root-home.patch b/source/xapps-extra/texlive/texmf-do-not-reset-root-home.patch deleted file mode 100644 index 8653f64..0000000 --- a/source/xapps-extra/texlive/texmf-do-not-reset-root-home.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur texlive-20160523-texmf/texmf-dist/scripts/texlive/fmtutil.pl texlive-20160523-texmf-p/texmf-dist/scripts/texlive/fmtutil.pl ---- texlive-20160523-texmf/texmf-dist/scripts/texlive/fmtutil.pl 2016-04-22 15:16:07.000000000 +0200 -+++ texlive-20160523-texmf-p/texmf-dist/scripts/texlive/fmtutil.pl 2016-07-17 18:57:20.671268023 +0200 -@@ -65,7 +65,7 @@ - # sudo sometimes does not reset the home dir of root, check on that - # see more comments at the definition of the function itself - # this function checks by itself whether it is running on windows or not --reset_root_home(); -+#reset_root_home(); - - chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`); - chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`); _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
