.

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=194
2016-02-01 16:10:03 +00:00 · 2016-02-01 16:10:03 +00:00 · a778dc57cb
commit a778dc57cb
parent 816eee71e1
23 changed files with 2062 additions and 564 deletions
--- a/biber-certs.dif
+++ b/biber-certs.dif
@ -0,0 +1,48 @@
+---
+ Build.PL  |    1 -
+ META.json |    1 -
+ META.yml  |    1 -
+ bin/biber |    2 ++
+ 4 files changed, 2 insertions(+), 3 deletions(-)
+
+--- Build.PL
+++ Build.PL	2016-01-29 09:02:36.740221776 +0000
+@@ -53,7 +53,6 @@ my $builder = $class->new(
+         'List::AllUtils' => 0,
+         'List::MoreUtils' => 0,
+         'List::MoreUtils::XS' => 0,
+-        'Mozilla::CA' =>  '20141217',
+         'Regexp::Common' => 0,
+         'Log::Log4perl' => 0,
+         'Unicode::Collate' => '1.12',
+--- META.json
+++ META.json	2016-01-29 09:03:02.755699411 +0000
+@@ -45,7 +45,6 @@
+             "List::MoreUtils" : "0",
+             "List::MoreUtils::XS" : "0",
+             "Log::Log4perl" : "0",
+-            "Mozilla::CA" : "20141217",
+             "Regexp::Common" : "0",
+             "Text::BibTeX" : "0.70",
+             "Text::Roman" : "0",
+--- META.yml
+++ META.yml	2016-01-29 09:03:12.131511153 +0000
+@@ -115,7 +115,6 @@ requires:
+   List::MoreUtils: 0
+   List::MoreUtils::XS: 0
+   Log::Log4perl: 0
+-  Mozilla::CA: 20141217
+   Regexp::Common: 0
+   Text::BibTeX: 0.70
+   Text::Roman: 0
+--- bin/biber
+++ bin/biber	2016-01-29 09:09:32.127880732 +0000
+@@ -93,6 +93,8 @@ GetOptions(
+           ) or pod2usage(-verbose => 0,
+                          -exitval => EXIT_ERROR);
+ 
+$opts->{'ssl-nointernalca'} = 1;
+
+ # verbose > 1 uses external perldoc, this doesn't work with PAR::Packer binaries
+ # so use "-noperldoc" to use built-in POD::Text
+ if (exists $opts->{'help'}) {
--- a/biber-decode.diff
+++ b/biber-decode.diff
@ -1,63 +0,0 @@
-# perl-5.20.0 contains an Encode::decode_utf8 version that no
-# longer short-circuits if the input is already utf8. Instead,
-# it dies with a 'Cannot decode string with wide characters'
-# error message.
---
- lib/Biber/Input/file/bibtex.pm |    5 +++--
- lib/Biber/Output/bibtex.pm     |    3 ++-
- lib/Biber/Utils.pm             |    4 ++--
- 3 files changed, 7 insertions(+), 5 deletions(-)
-
--- lib/Biber/Utils.pm
-+++ lib/Biber/Utils.pm	2014-07-15 16:17:58.000000000 +0000
-@@ -147,7 +147,7 @@ sub locate_biber_file {
-       chomp $found;
-       $found =~ s/\cM\z//xms; # kpsewhich in cygwin sometimes returns ^M at the end
-       # filename can be UTF-8 and run3() isn't clever with UTF-8
-      return decode_utf8($found);
-+      return Encode::is_utf8($found) ? $found : decode_utf8($found);
-     }
-     else {
-       $logger->debug("Could not find '$filename' via kpsewhich");
-@@ -935,7 +935,7 @@ sub parse_date {
- =cut
- 
- sub biber_decode_utf8 {
-  return NFD(decode_utf8(shift));# Unicode NFD boundary
-+  return NFD(Encode::is_utf8($_[0]) ? $_[0] : decode_utf8($_[0]));# Unicode NFD boundary
- }
- 
- =head2 out
--- lib/Biber/Input/file/bibtex.pm
-+++ lib/Biber/Input/file/bibtex.pm	2014-07-15 16:15:57.000000000 +0000
-@@ -605,7 +605,8 @@ sub _literal {
- # URI fields
- sub _uri {
-   my ($bibentry, $entry, $f) = @_;
-  my $value = NFC(decode_utf8($entry->get($f)));# Unicode NFC boundary (before hex encoding)
-+  my $value = $entry->get($f);
-+  $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
-   my ($field, $form, $lang) = $f =~ m/$fl_re/xms;
- 
-   # If there are some escapes in the URI, unescape them
-@@ -613,7 +614,7 @@ sub _uri {
-     $value =~ s/\\%/%/g; # just in case someone BibTeX escaped the "%"
-     # This is what uri_unescape() does but it's faster
-     $value =~ s/%([0-9A-Fa-f]{2})/chr(hex($1))/eg;
-    $value = NFC(decode_utf8($value));# Unicode NFC boundary (before hex encoding)
-+    $value = NFC(Encode::is_utf8($value) ? $value : decode_utf8($value)); # Unicode NFC boundary (before hex encoding)
-   }
- 
-   $value = URI->new($value)->as_string;
--- lib/Biber/Output/bibtex.pm
-+++ lib/Biber/Output/bibtex.pm	2015-03-26 11:32:20.345519079 +0000
-@@ -100,7 +100,8 @@ sub set_output_entry {
-       next if first {lc($f) eq $_}  ('xdata', 'crossref');
-     }
- 
-    my $value = decode_utf8($be->get_rawfield($f));
-+    my $value = $be->get_rawfield($f);
-+    $value = decode_utf8($value) unless Encode::is_utf8($value);
-     $acc .= ' ' x Biber::Config->getoption('output_indent');
-     $acc .= $casing->($f);
-     $acc .= ' ' x ($max_field_len - Unicode::GCString->new($f)->length) if Biber::Config->getoption('output_align');
--- a/biber-noreadonly.diff
+++ b/biber-noreadonly.diff
@ -1,30 +0,0 @@
-# Perl Readonly semantics changed with version 1.04. Readonly variable are
-# readonly across contexts and thus unregistration of namespaces fails if
-# the namespace variable is readoonly as the unregistration attempts to
-# modify the value
-diff -ru biblatex-biber-1.7.org/lib/Biber/Input/file/biblatexml.pm biblatex-biber-1.7/lib/Biber/Input/file/biblatexml.pm
---
- lib/Biber/Input/file/biblatexml.pm |    5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
--- lib/Biber/Input/file/biblatexml.pm
-+++ lib/Biber/Input/file/biblatexml.pm	2014-01-31 19:25:36.000000000 +0000
-@@ -23,7 +23,6 @@ use Log::Log4perl qw(:no_extra_logdie_me
- use List::AllUtils qw( uniq );
- use XML::LibXML;
- use XML::LibXML::Simple;
-use Readonly;
- use Data::Dump qw(dump);
- use Unicode::Normalize;
- use Unicode::GCString;
-@@ -32,8 +31,8 @@ use URI;
- my $logger = Log::Log4perl::get_logger('main');
- my $orig_key_order = {};
- 
-Readonly::Scalar our $BIBLATEXML_NAMESPACE_URI => 'http://biblatex-biber.sourceforge.net/biblatexml';
-Readonly::Scalar our $NS => 'bltx';
-+our $BIBLATEXML_NAMESPACE_URI = 'http://biblatex-biber.sourceforge.net/biblatexml';
-+our $NS = 'bltx';
- 
- # Determine handlers from data model
- my $dm = Biber::Config->get_dm;
--- a/biber-perl-5.22.dif
+++ b/biber-perl-5.22.dif
@ -1,6 +1,12 @@
--- lib/Biber/Input/file/bibtex.pm	2013-10-18 22:42:29.000000000 +0200
-+++ lib/Biber/Input/file/bibtex.pm	2015-07-14 13:57:35.656475620 +0200
-@@ -696,7 +696,7 @@ 
+---
+ lib/Biber/Input/file/bibtex.pm |    2 +-
+ lib/Biber/LaTeX/Recode.pm      |    6 +++---
+ lib/Biber/Utils.pm             |    2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm	2016-01-28 14:20:30.716207168 +0000
+@@ -759,7 +759,7 @@ sub _name {
     # Check for malformed names in names which aren't completely escaped
 
     # Too many commas
@ -9,43 +15,33 @@
       my @commas = $name =~ m/,/g;
       if ($#commas > 1) {
         biber_warn("Name \"$name\" has too many commas: skipping name", $bibentry);
--- lib/Biber/LaTeX/Recode.pm	2013-10-18 22:42:29.000000000 +0200
-+++ lib/Biber/LaTeX/Recode.pm	2015-07-14 14:01:37.700350317 +0200
-@@ -198,13 +198,13 @@ 
-         $text =~ s/\\not\\($re)/$map->{$1}/ge if $re;
+--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm	2016-01-28 14:28:16.754860744 +0000
+@@ -230,13 +230,13 @@ sub latex_decode {
+         $text =~ s/\\not\\($re)/$map->{$1}/ge;
       }
       elsif ($type eq 'superscripts') {
-        $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge if $re;
-+        $text =~ s/\\textsuperscript\{($re)}/$map->{$1}/ge if $re;
+-        $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge;
+        $text =~ s/\\textsuperscript\{($re)\}/$map->{$1}/ge;
       }
-      elsif ($type eq 'cmssuperscripts') {
-        $text =~ s/\\textsuperscript{\\($re)}/$map->{$1}/ge if $re;
-+      elsif ($type eq 'cmdsuperscripts') {
-+        $text =~ s/\\textsuperscript\{\\($re)}/$map->{$1}/ge if $re;
+       elsif ($type eq 'cmdsuperscripts') {
+-        $text =~ s/\\textsuperscript{\\($re)}/$map->{$1}/ge;
+        $text =~ s/\\textsuperscript\{\\($re)\}/$map->{$1}/ge;
       }
       elsif ($type eq 'dings') {
 -        $text =~ s/\\ding{([2-9AF][0-9A-F])}/$map->{$1}/ge;
-+        $text =~ s/\\ding\{([2-9AF][0-9A-F])}/$map->{$1}/ge;
+        $text =~ s/\\ding\{([2-9AF][0-9A-F])\}/$map->{$1}/ge;
       }
-     }
- 
-@@ -246,7 +246,7 @@ 
-     ## remove {} around letter+combining mark(s)
-     ## by default we skip that, as it would destroy constructions like \foo{\`e}
-     if ($strip_outer_braces) {
-        $text =~ s/{(\PM\pM+)}/$1/g;
-+        $text =~ s/\{(\PM\pM+)}/$1/g;
-     }
- 
-     $logger->trace("String in latex_decode() now -> '$text'");
--- lib/Biber/Utils.pm	2013-10-18 22:42:29.000000000 +0200
-+++ lib/Biber/Utils.pm	2015-07-14 13:57:35.657475629 +0200
-@@ -474,7 +474,7 @@ 
+       elsif ($type eq 'letters') {
+         $text =~ s/\\($re)(?:\{\}|\s+|\b)/$map->{$1}/ge;
+--- lib/Biber/Utils.pm
+++ lib/Biber/Utils.pm	2016-01-28 14:29:04.213908808 +0000
+@@ -436,7 +436,7 @@ sub reduce_array {
 
 sub remove_outer {
   my $str = shift;
 -  $str =~ s/^{(\X+)}$/$1/;
-+  $str =~ s/^\{(\X+)}$/$1/;
+  $str =~ s/^\{(\X+)\}$/$1/;
   return $str;
 }
 
--- a/biber-perl-unicode-normalize.dif
+++ b/biber-perl-unicode-normalize.dif
@ -0,0 +1,15 @@
+---
+ Build.PL  |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- Build.PL
+++ Build.PL	2016-01-29 09:48:51.588482256 +0000
+@@ -56,7 +56,7 @@ my $builder = $class->new(
+         'Regexp::Common' => 0,
+         'Log::Log4perl' => 0,
+         'Unicode::Collate' => '1.12',
+-        'Unicode::Normalize' => '<= 1.17',# 1.18 removes XS and is too slow
+        'Unicode::Normalize' => '1.23',
+         'Unicode::GCString' => 0,
+         'Encode::EUCJPASCII' => 0,
+         'Encode::JIS2K' => 0,
--- a/biber-skip-bibtex-forms.dif
+++ b/biber-skip-bibtex-forms.dif
@ -0,0 +1,17 @@
+Compare https://github.com/plk/biber/commit/a92bba540afb3b20826b405f09032dd908915391
+
+---
+ t/bcfvalidation.t |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- t/bcfvalidation.t
+++ t/bcfvalidation.t	2016-01-29 10:30:28.006347949 +0000
+@@ -4,7 +4,7 @@ use warnings;
+ use utf8;
+ no warnings 'utf8';
+ 
+-use Test::More tests => 44;
+use Test::More tests => 43;
+ use XML::LibXML;
+ use Biber;
+ chdir('t');
--- a/biblatex-biber-1.8.tar.xz
+++ b/biblatex-biber-1.8.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e227d8cc5c2aed77583acfa5fd9543ea7d3ab9a66f3421681ea7b9fc00979e7
-size 1004116
--- a/biblatex-biber-2.1.tar.xz
+++ b/biblatex-biber-2.1.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bdfb11a432063bcb25fc7bf37a6701c1ae6e5850be387aafc35aaf6a4cd01223
+size 974108
--- a/biblatex-encoding.dif
+++ b/biblatex-encoding.dif
@ -5,32 +5,32 @@
 3 files changed, 3 insertions(+)

 --- lib/Biber/Output/base.pm
-+++ lib/Biber/Output/base.pm	2013-08-08 09:42:55.000000000 +0000
-@@ -5,6 +5,7 @@ use warnings;
- 
- use Biber::Entry;
+++ lib/Biber/Output/base.pm	2016-01-28 14:18:54.154145820 +0000
+@@ -7,6 +7,7 @@ use Biber::Entry;
+ use Biber::Utils;
+ use Encode;
 use IO::File;
 +use PerlIO::encoding;
 use Text::Wrap;
 $Text::Wrap::columns = 80;
 use Log::Log4perl qw( :no_extra_logdie_message );
 --- lib/Biber/Output/bbl.pm
-+++ lib/Biber/Output/bbl.pm	2013-08-08 09:43:01.000000000 +0000
-@@ -10,6 +10,7 @@ use Biber::Entry;
- use Biber::Utils;
+++ lib/Biber/Output/bbl.pm	2016-01-28 14:19:09.785831193 +0000
+@@ -11,6 +11,7 @@ use Biber::Utils;
+ use Encode;
 use List::AllUtils qw( :all );
 use IO::File;
 +use PerlIO::encoding;
 use Log::Log4perl qw( :no_extra_logdie_message );
 use Text::Wrap;
- $Text::Wrap::columns = 80;
+ use Unicode::Normalize;
 --- lib/Biber/Output/dot.pm
-+++ lib/Biber/Output/dot.pm	2013-08-08 09:43:07.000000000 +0000
+++ lib/Biber/Output/dot.pm	2016-01-28 14:19:20.617613177 +0000
@@ -10,6 +10,7 @@ use Biber::Entry;
 use Biber::Utils;
 use List::AllUtils qw( :all );
 use IO::File;
 +use PerlIO::encoding;
 use Log::Log4perl qw( :no_extra_logdie_message );
+ use Unicode::Normalize;
 my $logger = Log::Log4perl::get_logger('main');
- 
--- a/source-asymptote-gs9.15.dif
+++ b/source-asymptote-gs9.15.dif
@ -1,37 +0,0 @@
-The device epswrite is gone with ghostscript 9.15 and the
-eps2write has to be used officially. Only the new device
-seems to not very handy with latex (boo#912398).
-
---
- utils/asymptote/runlabel.in |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
--- utils/asymptote/runlabel.in
-+++ utils/asymptote/runlabel.in	2015-01-11 15:41:30.000000000 +0000
-@@ -111,7 +111,7 @@ array *readpath(const string& psname, bo
- #else
-   const string null="/dev/null";
- #endif
-  cmd.push_back("-sDEVICE=epswrite");
-+  cmd.push_back("-sDEVICE=eps2write");
-   cmd.push_back("-sOutputFile="+null);
-   cmd.push_back(stripDir(psname));
-   iopipestream gs(cmd,"gs","Ghostscript");
-@@ -309,7 +309,7 @@ patharray2 *_texpath(stringarray *s, pen
-       cmd.push_back("-dNOPAUSE");
-       cmd.push_back("-dBATCH");
-       if(safe) cmd.push_back("-dSAFER");
-      cmd.push_back("-sDEVICE=epswrite");
-+      cmd.push_back("-sDEVICE=eps2write");
-       cmd.push_back("-sOutputFile=-");
-       cmd.push_back(pdfname);
-       iopipestream gs(cmd,"gs","Ghostscript");
-@@ -398,7 +398,7 @@ patharray2 *textpath(stringarray *s, pen
-   cmd2.push_back("-dBATCH");
-   cmd2.push_back("-P");
-   if(safe) cmd2.push_back("-dSAFER");
-  cmd2.push_back("-sDEVICE=epswrite");
-+  cmd2.push_back("-sDEVICE=eps2write");
-   cmd2.push_back("-sOutputFile=-");
-   cmd2.push_back("-");
-   iopipestream gs(cmd2,"gs","Ghostscript");
--- a/source-configure.dif
+++ b/source-configure.dif
@ -10,7 +10,7 @@
 8 files changed, 2 insertions(+), 35 deletions(-)

 --- configure.ac
-+++ configure.ac	2011-09-13 14:11:39.000000000 +0000
+++ configure.ac	2016-01-28 11:52:53.618390612 +0000
@@ -126,9 +126,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
 if test "x$syslib_status" = xno; then
   AC_MSG_ERROR([some requested system libraries failed])
@ -22,8 +22,8 @@
 
 AM_CONDITIONAL([cross], [test "x$cross_compiling" = xyes])
 --- configure
-+++ configure	2015-03-26 09:27:45.318018917 +0000
-@@ -5087,12 +5087,6 @@ if test "${with_libgs_libdir+set}" = set
+++ configure	2016-01-28 11:52:53.622390531 +0000
+@@ -5155,12 +5155,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
 
 
@ -36,7 +36,7 @@
 ## texk/gsftopk/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/gsftopk/
 ## configure options and TL libraries required for gsftopk
 # Check whether --enable-gsftopk was given.
-@@ -21190,9 +21184,6 @@ fi
+@@ -22006,9 +22000,6 @@ fi
 if test "x$syslib_status" = xno; then
   as_fn_error $? "some requested system libraries failed" "$LINENO" 5
 fi
@ -47,8 +47,8 @@
 LIBS=$kpse_save_LIBS
 
 --- libs/configure
-+++ libs/configure	2015-03-26 09:28:44.382019625 +0000
-@@ -4337,12 +4337,6 @@ if test "${with_libgs_libdir+set}" = set
+++ libs/configure	2016-01-28 11:52:53.622390531 +0000
+@@ -4399,12 +4399,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
 
 
@ -62,8 +62,8 @@
 ## configure options and TL libraries required for gsftopk
 # Check whether --enable-gsftopk was given.
 --- texk/configure
-+++ texk/configure	2015-03-26 09:37:13.349518912 +0000
-@@ -4350,12 +4350,6 @@ if test "${with_libgs_libdir+set}" = set
+++ texk/configure	2016-01-28 11:52:53.626390451 +0000
+@@ -4409,12 +4409,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
 
 
@ -77,29 +77,29 @@
 ## configure options and TL libraries required for gsftopk
 # Check whether --enable-gsftopk was given.
 --- texk/dvipdfm-x/configure.ac
-+++ texk/dvipdfm-x/configure.ac	2015-03-26 09:30:34.909518259 +0000
+++ texk/dvipdfm-x/configure.ac	2016-01-28 11:55:07.943684633 +0000
@@ -6,7 +6,7 @@ dnl   This file is free software; the co
 dnl   gives unlimited permission to copy and/or distribute it,
 dnl   with or without modifications, as long as this notice is preserved.
 dnl
-AC_INIT([dvipdfm-x (TeX Live)], [20140317], [tex-k@tug.org])
-+AC_INIT([dvipdfmx (TeX Live)], [20140317], [tex-k@tug.org])
+-AC_INIT([dvipdfm-x (TeX Live)], [20150315], [tex-k@tug.org])
+AC_INIT([dvipdfmx (TeX Live)], [20150315], [tex-k@tug.org])
 AC_PREREQ([2.65])
 AC_CONFIG_SRCDIR([agl.c])
 AC_CONFIG_AUX_DIR([../../build-aux])
 --- texk/dvipdfm-x/configure
-+++ texk/dvipdfm-x/configure	2015-03-26 09:36:34.993519313 +0000
-@@ -7892,7 +7892,7 @@ fi
+++ texk/dvipdfm-x/configure	2016-01-28 11:56:07.878477380 +0000
+@@ -8082,7 +8082,7 @@ fi
 
 
 # Define the identity of the package.
 - PACKAGE='dvipdfm-x--tex-live-'
 + PACKAGE='dvipdfmx'
-  VERSION='20140317'
+  VERSION='20150315'
 
 
 --- texk/dvisvgm/ac/libgs.ac
-+++ texk/dvisvgm/ac/libgs.ac	2011-09-13 14:12:03.000000000 +0000
+++ texk/dvisvgm/ac/libgs.ac	2016-01-28 11:52:53.630390370 +0000
@@ -4,6 +4,3 @@ dnl Copyright (C) 2009 Peter Breitenlohn
 dnl You may freely use, modify and/or distribute this file.
 dnl
@ -108,8 +108,8 @@
 -  AC_MSG_ERROR([you can not use system libraries for a native TeX Live build])
 -fi
 --- utils/configure
-+++ utils/configure	2015-03-26 09:37:31.906018530 +0000
-@@ -4329,12 +4329,6 @@ if test "${with_libgs_libdir+set}" = set
+++ utils/configure	2016-01-28 11:52:53.630390370 +0000
+@@ -4391,12 +4391,6 @@ if test "${with_libgs_libdir+set}" = set
 fi
 
 
--- a/source-dvipng.dif
+++ b/source-dvipng.dif
@ -1,11 +1,15 @@
--- texk/dvipng/dvipng-1.14/vf.c
-+++ texk/dvipng/dvipng-1.14/vf.c	2010-04-12 14:35:53.414925428 +0000
+---
+ texk/dvipng/dvipng-1.15/vf.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- texk/dvipng/dvipng-1.15/vf.c
+++ texk/dvipng/dvipng-1.15/vf.c	2016-01-28 12:28:40.787060207 +0000
@@ -115,7 +115,7 @@ void InitVF(struct font_entry * tfontp)
-     tcharptr->tfmw = (int32_t) 
+     tcharptr->tfmw = (int32_t)
       ((int64_t) tcharptr->tfmw * tfontp->s / (1 << 20));
     DEBUG_PRINT(DEBUG_VF,(" (%d)",tcharptr->tfmw));
 -    if (c >= NFNTCHARS) /* Only positive for now */
-+    if (c < 0  || c >= NFNTCHARS) /* Only positive for now */
+    if (c < 0 || c >= NFNTCHARS) /* Only positive for now */
       Fatal("VF font %s exceeds char numbering limit",tfontp->name);
     tfontp->chr[c] = tcharptr;
     tcharptr->data=position;
--- a/source-dviutils.dif
+++ b/source-dviutils.dif
@ -19,10 +19,10 @@
 17 files changed, 142 insertions(+), 70 deletions(-)

 --- m4/kpse-kpathsea-flags.m4
-+++ m4/kpse-kpathsea-flags.m4	2015-03-26 09:47:05.605560584 +0000
-@@ -19,7 +19,7 @@
- AC_DEFUN([KPSE_KPATHSEA_FLAGS],
- [AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
+++ m4/kpse-kpathsea-flags.m4	2016-01-28 11:58:51.275186516 +0000
+@@ -16,7 +16,7 @@
+ AC_DEFUN([KPSE_KPATHSEA_FLAGS], [dnl
+ AC_REQUIRE([KPSE_SAVE_FLAGS])[]dnl
 _KPSE_TEXLIB_FLAGS([kpathsea], [kpathsea], [lt],
 -                   [-IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
 +                   [-IBLD/texk/kpathsea -ISRC/texk/kpathsea -IBLD/texk -ISRC/texk], [BLD/texk/kpathsea/libkpathsea.la], [],
@ -30,7 +30,7 @@
                    [${top_builddir}/../kpathsea/paths.h])
 m4_if(m4_index([ $1 ], [ no-debug ]), [-1],
 --- texk/seetexk/a4toa5
-+++ texk/seetexk/a4toa5	2010-11-12 11:50:40.000000000 +0000
+++ texk/seetexk/a4toa5	2016-01-28 11:57:08.353259330 +0000
@@ -0,0 +1,26 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -59,9 +59,9 @@
 +#
 +exec  dvitodvi -q '2:707@0(-5.5mm,-10mm)+1(190mm,-10mm)' $1 $2
 --- texk/seetexk/configure
-+++ texk/seetexk/configure	2012-06-12 14:08:20.000000000 +0000
-@@ -14570,7 +14570,7 @@ if test "x$with_kpathsea_libdir" != x &&
-   KPATHSEA_LIBS="-L$with_kpathsea_libdir $KPATHSEA_LIBS"
+++ texk/seetexk/configure	2016-01-28 12:00:06.457668521 +0000
+@@ -14881,7 +14881,7 @@ elif test "x$need_kpathsea:$with_system_
+   as_fn_error $? "did not find kpathsea" "$LINENO" 5
 fi
 else
 -  KPATHSEA_INCLUDES="-I$kpse_BLD/texk -I$kpse_SRC/texk"
@ -70,7 +70,7 @@
   KPATHSEA_DEPEND='${top_builddir}/../kpathsea/libkpathsea.la'
   KPATHSEA_RULE='# Rebuild libkpathsea
 --- texk/seetexk/dvibook.c
-+++ texk/seetexk/dvibook.c	2009-08-28 14:13:33.000000000 +0000
+++ texk/seetexk/dvibook.c	2016-01-28 11:57:08.357259249 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
 extern int   optind;
 #endif
@ -99,7 +99,7 @@
  * You may get lint warnings about sprintf's return value.
  * Older versions of 4BSD have `char *sprintf()'.  ANSI and
 --- texk/seetexk/dviconcat.c
-+++ texk/seetexk/dviconcat.c	2015-03-26 09:48:14.217518786 +0000
+++ texk/seetexk/dviconcat.c	2016-01-28 11:57:08.357259249 +0000
@@ -40,6 +40,8 @@ extern char *optarg;
 extern int optind;
 #endif
@ -121,7 +121,7 @@
 
 /*
 --- texk/seetexk/dviselect.c
-+++ texk/seetexk/dviselect.c	2015-03-26 09:48:41.726020097 +0000
+++ texk/seetexk/dviselect.c	2016-01-28 11:57:08.357259249 +0000
@@ -54,7 +54,10 @@ extern int optind;
 #include "gripes.h"
 #include "search.h"
@ -154,7 +154,7 @@
 	pl = (struct pagelist *)malloc(sizeof *pl);
 	if (pl == NULL)
 --- texk/seetexk/dvitodvi.c
-+++ texk/seetexk/dvitodvi.c	2012-04-13 14:45:18.000000000 +0000
+++ texk/seetexk/dvitodvi.c	2016-01-28 11:57:08.361259168 +0000
@@ -43,6 +43,7 @@ extern char *optarg;
 extern int   optind;
 #endif
@ -271,7 +271,7 @@
 	HandleDVIFile();
 	if (WritingPage)
 --- texk/seetexk/error.c
-+++ texk/seetexk/error.c	2015-03-26 09:49:34.658018778 +0000
+++ texk/seetexk/error.c	2016-01-28 12:01:25.872063944 +0000
@@ -29,7 +29,12 @@
 #include <config.h>
 #endif
@ -283,7 +283,7 @@
 +#include <c-auto.h>
 +#include <errno.h>
 
- #include "types.h"		/* for HAVE_VPRINTF */
+ #include "types.h"
 #include "error.h"
@@ -37,20 +42,11 @@
 
@ -307,7 +307,7 @@
 static char *
 strerror (int errnum)
 --- texk/seetexk/gripes.h
-+++ texk/seetexk/gripes.h	2010-11-12 11:55:39.000000000 +0000
+++ texk/seetexk/gripes.h	2016-01-28 11:57:08.361259168 +0000
@@ -28,16 +28,17 @@ extern const char *DVIFileName;
  * Declarations for the various gripes.
  */
@ -337,7 +337,7 @@
 +void GripeUndefinedOp(int n) __NR__;
 void GripeBadGlyph(i32 c, struct font *f);
 --- texk/seetexk/gripes0.c
-+++ texk/seetexk/gripes0.c	2015-03-26 09:50:17.725518659 +0000
+++ texk/seetexk/gripes0.c	2016-01-28 11:57:08.361259168 +0000
@@ -28,10 +28,8 @@
 #include "error.h"
 #include "gripes.h"
@ -377,7 +377,7 @@
 +	exit(0); /* NOTREACHED */
 }
 --- texk/seetexk/gripes1.c
-+++ texk/seetexk/gripes1.c	2015-03-26 09:50:41.873518821 +0000
+++ texk/seetexk/gripes1.c	2016-01-28 11:57:08.361259168 +0000
@@ -29,6 +29,7 @@
 #include "font.h"
 #include "gripes.h"
@ -459,7 +459,7 @@
 
 /*
 --- texk/seetexk/mydvichk
-+++ texk/seetexk/mydvichk	2010-11-12 11:50:40.000000000 +0000
+++ texk/seetexk/mydvichk	2016-01-28 11:57:08.361259168 +0000
@@ -0,0 +1,12 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -474,7 +474,7 @@
 +
 +exit(0)
 --- texk/seetexk/odd2even
-+++ texk/seetexk/odd2even	2010-11-12 11:50:40.000000000 +0000
+++ texk/seetexk/odd2even	2016-01-28 11:57:08.361259168 +0000
@@ -0,0 +1,22 @@
 +#!/bin/csh -f
 +# 1993 (c) Werner Fink <Werner.Fink@itap.physik.uni-stuttgart.de>
@ -499,7 +499,7 @@
 +
 +exit 0
 --- texk/seetexk/search.c
-+++ texk/seetexk/search.c	2009-08-28 14:13:33.000000000 +0000
+++ texk/seetexk/search.c	2016-01-28 11:57:08.361259168 +0000
@@ -34,6 +34,7 @@
  * it runs in increasing-key-value sequence).
  */
@ -520,7 +520,7 @@
 SCreate(unsigned int dsize)
 {
 --- texk/seetexk/seek.c
-+++ texk/seetexk/seek.c	2009-08-28 14:13:33.000000000 +0000
+++ texk/seetexk/seek.c	2016-01-28 11:57:08.361259168 +0000
@@ -43,6 +43,10 @@
 #endif
 
@ -547,7 +547,7 @@
 /*
  * Make and return a version of `f' on which fseek works (unconditionally).
 --- texk/seetexk/tempfile.c
-+++ texk/seetexk/tempfile.c	2009-08-28 14:13:33.000000000 +0000
+++ texk/seetexk/tempfile.c	2016-01-28 11:57:08.361259168 +0000
@@ -25,6 +25,7 @@
 #endif
 
@ -568,7 +568,7 @@
 
 #include "tempfile.h"
 --- texk/seetexk/types.h
-+++ texk/seetexk/types.h	2015-03-26 09:52:09.921518904 +0000
+++ texk/seetexk/types.h	2016-01-28 11:57:08.361259168 +0000
@@ -58,7 +58,7 @@
  *
  * (The bcopy provided in lib/bcopy.c does handle overlap.)
--- a/source-lacheck.dif
+++ b/source-lacheck.dif
@ -1,14 +1,14 @@
 ---
- texk/lacheck/lacheck-1.26/lacheck.l |    1 +
+ utils/lacheck/lacheck.l |    1 +
 1 file changed, 1 insertion(+)

--- texk/lacheck/lacheck-1.26/lacheck.l
-+++ texk/lacheck/lacheck-1.26/lacheck.l	2008-03-05 13:59:37.000000000 +0000
+--- utils/lacheck/lacheck.l
+++ utils/lacheck/lacheck.l	2016-01-28 12:07:17.472961598 +0000
@@ -119,6 +119,7 @@
 
 #include <stdio.h>
 #include <string.h>
 +#include <unistd.h>
 
- #if defined(WIN32) && !defined(__MINGW32__)
- #include <win32lib.h>
+ /* #include <sys/param.h> */
+ 
--- a/source-missed-scripts.dif
+++ b/source-missed-scripts.dif
--- a/source-overflow.dif
+++ b/source-overflow.dif
@ -1,3 +1,7 @@
+---
+ utils/lacheck/lacheck.test |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
 |--- texk/web2c/eptexdir/eptex.ech
 |+++ texk/web2c/eptexdir/eptex.ech	2012-04-16 08:31:14.564665420 +0000
 |@@ -300,10 +300,13 @@ othercases goto next_p
@ -15,13 +19,13 @@
 | @z
 | 
 | @x e-pTeX: ifcsname l.28620
--- texk/lacheck/lacheck.test
-+++ texk/lacheck/lacheck.test	2012-04-16 09:22:42.763712955 +0000
+--- utils/lacheck/lacheck.test
+++ utils/lacheck/lacheck.test	2016-01-28 12:25:40.958687909 +0000
@@ -6,5 +6,6 @@
- ./lacheck $srcdir/$LACHECK_TREE/test.tex | \
- 	sed -e "s!$srcdir/$LACHECK_TREE/test.tex!./test.tex!g" >test.out || exit 1
+ ./lacheck $srcdir/test.tex | \
+ 	sed -e "s!$srcdir/test.tex!./test.tex!g" >test.out || exit 1
 
-diff $srcdir/$LACHECK_TREE/test.old test.out || exit 1
-+test -e $srcdir/$LACHECK_TREE/test.old || > $srcdir/$LACHECK_TREE/test.old
-+diff $srcdir/$LACHECK_TREE/test.old test.out || true
+-diff $srcdir/test.old test.out || exit 1
+test -e $srcdir/test.old || > $srcdir/test.old
+diff $srcdir/test.old test.out || true
 
--- a/source-warns.dif
+++ b/source-warns.dif
@ -1,19 +1,28 @@
 ---
- libs/icu/icu-53.1/source/i18n/decNumber.h          |   22 ++++++++++++---------
- libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp |    4 +--
- libs/lua52/Makefile.in                             |    2 -
- libs/teckit/TECkit-2.5.3/source/Compiler.cpp       |   17 +++++++++-------
- texk/chktex/chktex-1.7.2/FindErrs.c                |    2 -
- texk/makeindexk/genind.h                           |   16 ++++++++++++++-
- texk/makeindexk/mkind.h                            |   20 ++++++++++++++++---
- texk/makeindexk/scanid.h                           |   16 ++++++++++++++-
- texk/makeindexk/scanst.h                           |   16 ++++++++++++++-
- texk/ps2pkm/t1funcs.c                              |    2 -
- texk/ps2pkm/token.c                                |    2 -
- 11 files changed, 91 insertions(+), 28 deletions(-)
+ libs/gmp/Makefile.in                         |    2 +-
+ libs/icu/icu-55.1/source/i18n/decNumber.h    |   22 +++++++++++++---------
+ libs/lua52/Makefile.in                       |    4 ++--
+ libs/mpfr/Makefile.in                        |    2 +-
+ libs/teckit/TECkit-2.5.4/source/Compiler.cpp |   17 ++++++++++-------
+ texk/makeindexk/genind.h                     |   16 +++++++++++++++-
+ texk/makeindexk/mkind.h                      |   20 +++++++++++++++++---
+ texk/makeindexk/scanid.h                     |   16 +++++++++++++++-
+ texk/makeindexk/scanst.h                     |   16 +++++++++++++++-
+ 9 files changed, 89 insertions(+), 26 deletions(-)

--- libs/icu/icu-53.1/source/i18n/decNumber.h
-+++ libs/icu/icu-53.1/source/i18n/decNumber.h	2010-11-16 10:35:02.000000000 +0000
+--- libs/gmp/Makefile.in
+++ libs/gmp/Makefile.in	2016-01-29 14:37:58.791563686 +0000
+@@ -294,7 +294,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+ am__v_lt_1 = 
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+--- libs/icu/icu-55.1/source/i18n/decNumber.h
+++ libs/icu/icu-55.1/source/i18n/decNumber.h	2016-01-28 12:14:31.336201296 +0000
@@ -54,26 +54,30 @@
   /* For ICU, use one digit per byte, to make it easier to emulate the
    * old DigitList interface on top of a decNumber
@ -54,23 +63,25 @@
   /* The number of units needed is ceil(DECNUMDIGITS/DECDPUN)         */
   #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
 
--- libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp
-+++ libs/icu/icu-53.1/source/tools/pkgdata/pkgdata.cpp	2012-04-13 15:09:27.000000000 +0000
-@@ -2072,9 +2072,9 @@ static void loadLists(UPKGOptions *o, UE
-     findDirname(progname, cmdBuf, 1024, &status);
-     if(U_SUCCESS(status)) {
-       if (cmdBuf[0] != 0) {
-          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
-+          uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
-       }
-      uprv_strncat(cmdBuf, cmd, 1023);
-+      uprv_strncat(cmdBuf, cmd, strlen(cmd));
-       
-       if(verbose) {
-         fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
 --- libs/lua52/Makefile.in
-+++ libs/lua52/Makefile.in	2015-03-26 14:44:10.323096423 +0000
-@@ -180,7 +180,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+++ libs/lua52/Makefile.in	2016-01-28 12:16:33.057744260 +0000
+@@ -201,11 +201,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
+ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+ 	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+ 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CFLAGS) $(XCFLAGS)
+ AM_V_CC = $(am__v_CC_@AM_V@)
+ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+ am__v_CC_0 = @echo "  CC      " $@;
+--- libs/mpfr/Makefile.in
+++ libs/mpfr/Makefile.in	2016-01-29 14:38:34.666839862 +0000
+@@ -232,7 +232,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
 am__v_lt_1 = 
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@ -79,9 +90,9 @@
 AM_V_CC = $(am__v_CC_@AM_V@)
 am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
 am__v_CC_0 = @echo "  CC      " $@;
--- libs/teckit/TECkit-2.5.3/source/Compiler.cpp
-+++ libs/teckit/TECkit-2.5.3/source/Compiler.cpp	2009-08-28 15:16:33.000000000 +0000
-@@ -1451,13 +1451,16 @@ Compiler::Compiler(const char* txt, UInt
+--- libs/teckit/TECkit-2.5.4/source/Compiler.cpp
+++ libs/teckit/TECkit-2.5.4/source/Compiler.cpp	2016-01-28 12:14:31.340201216 +0000
+@@ -1449,13 +1449,16 @@ Compiler::Compiler(const char* txt, UInt
 				if (dest != 0) {
 					int	result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
 					if (result == Z_OK) {
@ -105,19 +116,8 @@
 					}
 					else
 						free(dest);
--- texk/chktex/chktex-1.7.2/FindErrs.c
-+++ texk/chktex/chktex-1.7.2/FindErrs.c	2015-03-26 14:59:06.597518850 +0000
-@@ -1171,7 +1171,7 @@ int CheckSilentRegex(void)
-             tmp = stpcpy(tmp, SilentCase.Stack.Data[i]);
-             *tmp++ = '|';
-         }
-        tmp = stpcpy(--tmp, ")");
-+        tmp = stpcpy((tmp-1), ")");
- 
-         SilentRegex = malloc( sizeof(regex_t) );
-         rc = regcomp(SilentRegex, pattern, REGEX_FLAGS);
 --- texk/makeindexk/genind.h
-+++ texk/makeindexk/genind.h	2009-08-28 15:18:03.000000000 +0000
+++ texk/makeindexk/genind.h	2016-01-28 12:14:31.340201216 +0000
@@ -25,6 +25,20 @@
  *
  */
@ -149,7 +149,7 @@
 }
 
 --- texk/makeindexk/mkind.h
-+++ texk/makeindexk/mkind.h	2009-08-28 15:20:13.000000000 +0000
+++ texk/makeindexk/mkind.h	2016-01-28 12:14:31.340201216 +0000
@@ -244,6 +244,20 @@ extern int mk_getc (FILE *str);
 #define STREQ(A, B)  (strcmp(A, B) == 0)
 #define STRNEQ(A, B) (strcmp(A, B) != 0)
@ -192,7 +192,7 @@
     EXIT(1); \
 }
 --- texk/makeindexk/scanid.h
-+++ texk/makeindexk/scanid.h	2009-08-28 15:21:10.000000000 +0000
+++ texk/makeindexk/scanid.h	2016-01-28 12:14:31.340201216 +0000
@@ -112,6 +112,20 @@
     idx_ec++; \
 }
@ -224,7 +224,7 @@
 }
 
 --- texk/makeindexk/scanst.h
-+++ texk/makeindexk/scanst.h	2009-08-28 15:21:39.000000000 +0000
+++ texk/makeindexk/scanst.h	2016-01-28 12:14:31.340201216 +0000
@@ -158,6 +158,20 @@
     put_dot = FALSE; \
 }
@ -255,25 +255,3 @@
     sty_ec++; \
     put_dot = FALSE; \
 }
--- texk/ps2pkm/t1funcs.c
-+++ texk/ps2pkm/t1funcs.c	2010-05-18 09:19:07.000000000 +0000
-@@ -242,7 +242,7 @@ int Type1OpenScalable (ev, ppFont, flags
-                else {
-                        h = w = 0;
-                        area->xmin = area->xmax = 0;
-                       area->ymax = area->ymax = 0;
-+                       area->ymin = area->ymax = 0;
-                }
-  
-                glyphs[i].metrics.leftSideBearing  = area->xmin;
--- texk/ps2pkm/token.c
-+++ texk/ps2pkm/token.c	2009-08-28 15:16:33.000000000 +0000
-@@ -108,7 +108,7 @@ static DOUBLE P10(exponent)
-   if (exponent < 0) {
-     power = 0.1;
-     value = (exponent & 1 ? power : 1.0);
-    exponent = -(++exponent >> 1); /* portable C for -(exponent/2) */
-+    exponent = -((exponent+1) >> 1); /* portable C for -(exponent/2) */
-   }
-   else {
-     power = 10.0;
--- a/source-x11r7.dif
+++ b/source-x11r7.dif
@ -3,8 +3,8 @@
 1 file changed, 6 insertions(+)

 --- texk/xdvik/xdvi.h
-+++ texk/xdvik/xdvi.h	2008-09-24 15:43:29.000000000 +0000
-@@ -196,6 +196,12 @@ extern unsigned long time_start, time_en
+++ texk/xdvik/xdvi.h	2016-01-28 12:20:33.976881969 +0000
+@@ -194,6 +194,12 @@ extern unsigned long time_start, time_en
 #include <inttypes.h>
 #endif
 
--- a/source.dif
+++ b/source.dif
@ -1,5 +1,5 @@
 ---
- libs/icu/icu-53.1/source/common/Makefile.in                   |    2 
+ libs/icu/icu-55.1/source/common/Makefile.in                   |    2 
 reautoconf                                                    |    2 
 texk/dviljk/dvi2xx.c                                          |   11 
 texk/kpathsea/c-fopen.h                                       |    6 
@ -7,41 +7,30 @@
 texk/kpathsea/cnf-to-paths.awk                                |    2 
 texk/kpathsea/db.c                                            |   13 
 texk/kpathsea/mktex.opt                                       |   39 +-
- texk/kpathsea/mktexlsr                                        |   46 ++
+ texk/kpathsea/mktexlsr                                        |   43 ++
 texk/kpathsea/progname.c                                      |    4 
 texk/kpathsea/texmf.cnf                                       |  173 +++++-----
- texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc |    3 
- texk/ps2pkm/pk2bm.c                                           |   34 +
- texk/texlive/linked_scripts/musixtex/musixtex.lua             |   16 
- texk/texlive/tl_scripts/fmtutil-sys.sh                        |    1 
+ texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc |    3 
+ texk/ps2pk/pk2bm.c                                            |   34 +
+ texk/texlive/linked_scripts/musixtex/musixtex.lua             |   19 -
+ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh            |    1 
+ texk/texlive/linked_scripts/texlive/fmtutil.pl                |   12 
+ texk/texlive/linked_scripts/texlive/updmap-sys.sh             |    1 
 texk/texlive/tl_scripts/fmtutil.cnf                           |   17 
- texk/texlive/tl_scripts/fmtutil.sh                            |   16 
 texk/texlive/tl_scripts/texconfig-dialog.sh                   |   14 
 texk/texlive/tl_scripts/texconfig-sys.sh                      |    1 
 texk/texlive/tl_scripts/texconfig.sh                          |   35 --
 texk/texlive/tl_scripts/texlinks.sh                           |   53 ++-
- texk/texlive/tl_scripts/updmap-sys.sh                         |    1 
 texk/web2c/Makefile.in                                        |    7 
 texk/web2c/window/regis.c                                     |    8 
 texk/web2c/window/x11-Xlib.c                                  |    8 
 texk/web2c/window/x11-Xt.c                                    |    4 
 texk/xdvik/psgs.c                                             |   22 +
 texk/xdvik/xdvi-sh.in                                         |   19 -
- 28 files changed, 369 insertions(+), 191 deletions(-)
+ 28 files changed, 366 insertions(+), 190 deletions(-)

--- reautoconf
-+++ reautoconf	2009-09-03 10:53:28.000000000 +0000
-@@ -83,7 +83,7 @@ echo "$0:               TL_AUTOHEADER, T
- 
- # Give users a chance to quit here
- # and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
-$do_cmd sleep 5
-+# $do_cmd sleep 5
- 
- AUTOCONF=$TL_AUTOCONF
- AUTOHEADER=$TL_AUTOHEADER
--- libs/icu/icu-53.1/source/common/Makefile.in
-+++ libs/icu/icu-53.1/source/common/Makefile.in	2011-12-09 11:43:35.000000000 +0000
+--- libs/icu/icu-55.1/source/common/Makefile.in
+++ libs/icu/icu-55.1/source/common/Makefile.in	2016-01-28 12:50:28.396797608 +0000
@@ -67,7 +67,7 @@ DEFS += -DU_COMMON_IMPLEMENTATION
 LDFLAGS += $(LDFLAGSICUUC)
 
@ -51,8 +40,19 @@
 
 # for icu data location
 ifeq ($(PKGDATA_MODE),common)
+--- reautoconf
+++ reautoconf	2016-01-28 12:49:38.777793040 +0000
+@@ -83,7 +83,7 @@ echo "$0:               TL_AUTOHEADER, T
+ 
+ # Give users a chance to quit here
+ # and set TL_AUTOCONF, TL_AUTOHEADER, TL_AUTOMAKE, and/or TL_ACLOCAL
+-$do_cmd sleep 5
+# $do_cmd sleep 5
+ 
+ AUTOCONF=$TL_AUTOCONF
+ AUTOHEADER=$TL_AUTOHEADER
 --- texk/dviljk/dvi2xx.c
-+++ texk/dviljk/dvi2xx.c	2013-06-28 11:26:08.000000000 +0000
+++ texk/dviljk/dvi2xx.c	2016-01-28 12:50:28.396797608 +0000
@@ -168,7 +168,18 @@ main(int argc, char *argv[])
 
   setbuf(ERR_STREAM, NULL);
@ -73,7 +73,7 @@
   G_progname = kpse_program_name;
 #else
 --- texk/kpathsea/c-fopen.h
-+++ texk/kpathsea/c-fopen.h	2010-11-12 17:02:18.000000000 +0000
+++ texk/kpathsea/c-fopen.h	2016-01-28 12:50:28.400797527 +0000
@@ -38,17 +38,17 @@
 
 /* How to open a binary file for reading:  */
@ -96,7 +96,7 @@
 
 /* How to switch an already open file handle to binary mode.
 --- texk/kpathsea/c-memstr.h
-+++ texk/kpathsea/c-memstr.h	2015-03-26 10:45:40.246018846 +0000
+++ texk/kpathsea/c-memstr.h	2016-01-28 12:50:28.400797527 +0000
@@ -37,6 +37,7 @@
 
 /* For ancient systems that lack the system V/ANSI version of the
@ -113,7 +113,7 @@
 +
 #endif /* not KPATHSEA_C_MEMSTR_H */
 --- texk/kpathsea/cnf-to-paths.awk
-+++ texk/kpathsea/cnf-to-paths.awk	2011-09-13 16:11:30.000000000 +0000
+++ texk/kpathsea/cnf-to-paths.awk	2016-01-28 12:50:28.400797527 +0000
@@ -37,7 +37,7 @@
   val = $0;
   sub(/^.*=[ \t]*/, "", val);
@ -124,8 +124,8 @@
   if (val ~ /\$SELFAUTO/) {
     # Replace all semicolons with colons in the SELFAUTO paths we're keeping.
 --- texk/kpathsea/db.c
-+++ texk/kpathsea/db.c	2012-04-13 15:32:18.000000000 +0000
-@@ -94,7 +94,8 @@ db_build (kpathsea kpse, hash_table_type
+++ texk/kpathsea/db.c	2016-01-28 12:50:28.400797527 +0000
+@@ -92,7 +92,8 @@ db_build (kpathsea kpse, hash_table_type
   unsigned len = strlen (db_filename) - sizeof (DB_NAME) + 1; /* Keep the /. */
   string top_dir = (string)xmalloc (len + 1);
   string cur_dir = NULL; /* First thing in ls-R might be a filename.  */
@ -135,7 +135,7 @@
 #if defined(WIN32)
   string pp;
 #endif
-@@ -102,7 +103,15 @@ db_build (kpathsea kpse, hash_table_type
+@@ -100,7 +101,15 @@ db_build (kpathsea kpse, hash_table_type
   strncpy (top_dir, db_filename, len);
   top_dir[len] = 0;
 
@ -153,8 +153,8 @@
       len = strlen (line);
 
 --- texk/kpathsea/mktex.opt
-+++ texk/kpathsea/mktex.opt	2012-05-14 11:26:00.000000000 +0000
-@@ -37,10 +37,11 @@ if test "$DOSISH" = "no"; then SEP=':';
+++ texk/kpathsea/mktex.opt	2016-01-28 12:50:28.400797527 +0000
+@@ -38,10 +38,11 @@ if test "$DOSISH" = "no"; then SEP=':';
 # TEMPDIR needs to be unique to each process because of the possibility of two
 # people running dvips (or whatever) simultaneously.
 if test -n "$TMPDIR"; then
@ -168,7 +168,7 @@
 
 # We want to output only filenames to standard output, but it's too
 # error-prone to write the scripts that way, so we direct stdout here.
-@@ -48,17 +49,23 @@ STDOUT="$TEMPDIR/mt$$.out"
+@@ -49,17 +50,23 @@ STDOUT="$TEMPDIR/mt$$.out"
 
 # We will change search paths to include $KPSE_DOT. This is necessary
 # since we cd to $TEMPDIR.
@ -196,7 +196,7 @@
 cd "$TEMPDIR" || exit 1
 
 # The alternative location for fonts.  The directory need not exist,
-@@ -68,6 +75,11 @@ if test -z "$MT_VARTEXFONTS"; then
+@@ -69,6 +76,11 @@ if test -z "$MT_VARTEXFONTS"; then
   echo "$0: VARTEXFONTS is not defined.  Defaulting to \`$KPSE_DOT'." >&2
   MT_VARTEXFONTS='$KPSE_DOT'
 fi
@ -208,7 +208,7 @@
 
 # The supporting scripts:
 : ${MT_MKTEXNAM=`kpsewhich --format='web2c files' mktexnam`}
-@@ -108,9 +120,18 @@ fi
+@@ -109,9 +121,18 @@ fi
 : ${MAG=1.0}
 : ${ps_to_pk=gsftopk} # some prefer ps2pk
 
@ -231,18 +231,8 @@
 # Cache values that may be useful for recursive calls.
 export MT_MKTEX_OPT MT_MKTEX_CNF 
 --- texk/kpathsea/mktexlsr
-+++ texk/kpathsea/mktexlsr	2015-03-26 10:55:12.495280597 +0000
-@@ -36,6 +36,9 @@ Kpathsea manual available at http://tug.
- Report bugs to tex-k@tug.org.
- "
- 
-+MKTEXLSR=true; export MKTEXLSR
-+set -o noclobber
-+
- # MS-DOS and MS-Windows define $COMSPEC or $ComSpec and use `;' to separate
- # directories in path lists whereas Unix uses `:'.  Make an exception for
- # Cygwin, which pretends to be UNIX.
-@@ -51,6 +54,9 @@ if test "$DOSISH" = "no"; then SEP=':';
+++ texk/kpathsea/mktexlsr	2016-01-28 12:50:28.400797527 +0000
+@@ -58,6 +58,9 @@ if test "$DOSISH" = "no"; then SEP=':';
 # be done before kpsewhich can be called, and thus cannot be put into
 # mktex.opt.
 dirname=`echo $0 | sed 's%/*[^/][^/]*$%%'`
@ -252,7 +242,7 @@
 case $dirname in
   "") # Do nothing
       ;;
-@@ -134,6 +140,7 @@ old_ls_R_magic='% ls-R -- maintained by
+@@ -141,6 +144,7 @@ old_ls_R_magic='% ls-R -- maintained by
   shift
 }
 
@ -260,7 +250,7 @@
 for TEXMFLS_R in "$@"; do
   # Prepend cwd if the directory was relative.
   case "$TEXMFLS_R" in
-@@ -163,12 +170,23 @@ for TEXMFLS_R in "$@"; do
+@@ -170,12 +174,23 @@ for TEXMFLS_R in "$@"; do
   # want to be silent if the directory doesn't exist, since the ls-R
   # path ordinarily contains many nonexistent directories.
   test -d "$db_dir" || continue
@ -286,7 +276,7 @@
   elif test -s "$db_file" \
        && test "x`sed '1s/
$//;1q' \"$db_file\"`" != "x$ls_R_magic" \
        && test "x`sed '1s/
$//;1q' \"$db_file\"`" != "x$old_ls_R_magic"; then
-@@ -179,8 +197,13 @@ for TEXMFLS_R in "$@"; do
+@@ -186,8 +201,13 @@ for TEXMFLS_R in "$@"; do
   # Skip if we cannot write the file:
   kpseaccess -w "$db_file" || { echo "$progname: $db_file: no write permission, skipping..." >&2; continue; }
 
@ -302,7 +292,7 @@
     || { echo "$progname: $db_dir_tmp: could not create directory, skipping..." >&2; continue; }
   db_file_tmp="$db_dir_tmp/lsR$$.tmp"
   rm -f "$db_file_tmp"
-@@ -188,7 +211,9 @@ for TEXMFLS_R in "$@"; do
+@@ -195,7 +215,9 @@ for TEXMFLS_R in "$@"; do
   $verbose && echo "$progname: Updating $db_file... "
   $dry_run && continue
   
@ -313,7 +303,7 @@
 
   # The main task. We put ./: in the output, so top-level files can be
   # found via ls-R. Probably irrelevant in practice.  The sed command
-@@ -202,15 +227,20 @@ for TEXMFLS_R in "$@"; do
+@@ -209,15 +231,20 @@ for TEXMFLS_R in "$@"; do
   vc_dirs='\.\(bzr\|git\|hg\|svn\)\|_darcs'
   (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \
    | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^'$vc_dirs'$/d;' \
@ -338,7 +328,7 @@
 done
 
 --- texk/kpathsea/progname.c
-+++ texk/kpathsea/progname.c	2013-06-28 10:56:25.000000000 +0000
+++ texk/kpathsea/progname.c	2016-01-28 12:50:28.400797527 +0000
@@ -668,9 +668,9 @@ kpathsea_set_program_name (kpathsea kpse
   /* SELFAUTODIR is actually the parent of the invocation directory,
      and SELFAUTOPARENT the grandparent.  This is how teTeX did it.  */
@ -352,7 +342,7 @@
   sdir_greatgrandparent = xdirname (sdir_grandparent);
   kpathsea_xputenv (kpse, "SELFAUTOGRANDPARENT", fix_selfdir (sdir_greatgrandparent));
 --- texk/kpathsea/texmf.cnf
-+++ texk/kpathsea/texmf.cnf	2015-03-26 11:08:53.473519865 +0000
+++ texk/kpathsea/texmf.cnf	2016-01-28 12:57:16.760604615 +0000
@@ -54,32 +54,32 @@
 TEXMFROOT = $SELFAUTOPARENT
 
@ -384,16 +374,16 @@
 +TEXMFHOME = $HOME/texmf
 
 % TEXMFVAR, where texconfig/updmap/fmtutil store cached runtime data.
-TEXMFVAR = ~/.texlive2014/texmf-var
+-TEXMFVAR = ~/.texlive2015/texmf-var
 +TEXMFVAR = ${TEXMFSYSVAR}
 
 % TEXMFCONFIG, where texconfig/updmap/fmtutil store configuration data.
-TEXMFCONFIG = ~/.texlive2014/texmf-config
+-TEXMFCONFIG = ~/.texlive2015/texmf-config
 +TEXMFCONFIG = ${TEXMFSYSCONFIG}
 
 % List all the texmf trees. For an explanation of what they are, see the
 % TeX Live manual.
-@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2014/texmf-confi
+@@ -91,7 +91,7 @@ TEXMFCONFIG = ~/.texlive2015/texmf-confi
 % should take precedence over distribution files -- although it is
 % generally a source of confusion to have different versions of a
 % package installed, whatever the trees, so try to avoid it.
@ -474,7 +464,7 @@
 
 % LuaTeX.
 TEXINPUTS.lualatex      = .;$TEXMF/tex/{lualatex,latex,luatex,generic,}//
-@@ -230,18 +230,18 @@ BSTINPUTS.pbibtex       = .;$TEXMF/{pbib
+@@ -235,18 +235,18 @@ BSTINPUTS.pbibtex       = .;$TEXMF/{pbib
 TEXINPUTS.context       = .;$TEXMF/tex/{context,plain,generic}//
 
 % jadetex.
@ -499,7 +489,7 @@
 
 % Earlier entries override later ones, so put this generic one last.
 TEXINPUTS               = .;$TEXMF/tex/{$progname,generic,}//
-@@ -250,7 +250,7 @@ TEXINPUTS               = .;$TEXMF/tex/{
+@@ -255,7 +255,7 @@ TEXINPUTS               = .;$TEXMF/tex/{
 TTF2TFMINPUTS =                 .;$TEXMF/ttf2pk//
 
 % Metafont, MetaPost inputs.
@ -508,7 +498,7 @@
 MPINPUTS = .;$TEXMF/metapost//
 
 % Dump files (fmt/base/mem) for vir{tex,mf,mp} to read.
-@@ -260,31 +260,31 @@ MPINPUTS = .;$TEXMF/metapost//
+@@ -265,31 +265,31 @@ MPINPUTS = .;$TEXMF/metapost//
 % We repeat the same definition three times because of the way fmtutil
 % is implemented; if we use ${TEXFORMATS}, the mpost/mf/etc. formats
 % will not be found.
@ -547,7 +537,7 @@
 
 % Similarly for the GF format, which only remains in existence because
 % Metafont outputs it (and MF isn't going to change).
-@@ -294,7 +294,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
+@@ -299,7 +299,7 @@ GFFONTS = .;$TEXMF/fonts/gf/$MAKETEX_MOD
 GLYPHFONTS = .;$TEXMF/fonts
 
 % A place to puth everything that doesn't fit the other font categories.
@ -556,7 +546,7 @@
 
 % font name map files.  This isn't just fonts/map// because ConTeXt
 % wants support for having files with the same name in the different
-@@ -376,8 +376,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
+@@ -381,8 +381,8 @@ MPSUPPORT = .;$TEXMF/metapost/support
 % For xdvi to find mime.types and .mailcap, if they do not exist in
 % ~.  These are single directories, not paths.
 % (But the default mime.types, at least, may well suffice.)
@ -567,7 +557,7 @@
 
 % Default settings for the fontconfig library as used by the Windows
 % versions of xetex/xdvipdfmx.  Not used by xetex on Unixish systems.
-@@ -396,10 +396,10 @@ WEBINPUTS = .;$TEXMF/web//
+@@ -401,10 +401,10 @@ WEBINPUTS = .;$TEXMF/web//
 CWEBINPUTS = .;$TEXMF/cweb//
 
 % Omega-related fonts and other files.
@ -582,7 +572,7 @@
 OTPINPUTS = .;$TEXMF/omega/otp//
 OCPINPUTS = .;$TEXMF/omega/ocp//
 
-@@ -481,33 +481,34 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
+@@ -486,33 +486,34 @@ RUBYINPUTS   = .;$TEXMF/scripts/{$progna
 % since we don't want to scatter ../'s throughout the value.  Hence we
 % explicitly list every directory.  Arguably more understandable anyway.
 %
@ -644,7 +634,7 @@
 %
 % For reference, here is the old brace-using definition:
 %TEXMFCNF = {$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-@@ -780,3 +781,33 @@ max_cols.gftype = 8191
+@@ -789,3 +790,33 @@ max_cols.gftype = 8191
 % Guess input encoding (SJIS vs. Unicode, etc.) in pTeX and friends?
 % Default is 0, to not guess.
 guess_input_kanji_encoding = 1
@ -678,8 +668,8 @@
 +hash_extra.jadetex = 25000
 +pool_size.jadetex = 500000
 +save_size.jadetex = 15000
--- texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc
-+++ texk/lcdf-typetools/lcdf-typetools-2.100/otftotfm/otftotfm.cc	2015-03-26 10:44:15.243270846 +0000
+--- texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc
+++ texk/lcdf-typetools/lcdf-typetools-2.104/otftotfm/otftotfm.cc	2016-01-28 12:50:28.404797448 +0000
@@ -67,6 +67,9 @@
 # include <io.h>
 #endif
@ -690,9 +680,9 @@
 using namespace Efont;
 
 #define VERSION_OPT		301
--- texk/ps2pkm/pk2bm.c
-+++ texk/ps2pkm/pk2bm.c	2013-06-28 11:14:36.000000000 +0000
-@@ -39,7 +39,6 @@
+--- texk/ps2pk/pk2bm.c
+++ texk/ps2pk/pk2bm.c	2016-01-28 12:50:43.484494922 +0000
+@@ -45,7 +45,6 @@
 
 static quarterword lsbf(quarterword u);
 static void dots(quarterword u, int n);
@ -700,7 +690,7 @@
 
 int main(int argc, char *argv[])
 {
-@@ -48,7 +47,7 @@ int main(int argc, char *argv[])
+@@ -54,7 +53,7 @@ int main(int argc, char *argv[])
    halfword *word;
    chardesc cd;
    const char *myname = "pk2bm";
@ -709,7 +699,7 @@
 	
    while (--argc > 0 && (*++argv)[0] == '-') {
       done=0;
-@@ -56,26 +55,36 @@ int main(int argc, char *argv[])
+@@ -62,26 +61,36 @@ int main(int argc, char *argv[])
          switch (c) {
       	 case 'c':
       	    if (*++argv[0] == '\0') {
@ -752,7 +742,7 @@
       	    }
       	    w = atoi(argv[0]);
 	    done=1;
-@@ -92,7 +101,7 @@ int main(int argc, char *argv[])
+@@ -98,7 +107,7 @@ int main(int argc, char *argv[])
       	 }
    }
 
@ -761,7 +751,7 @@
       printf("Usage: %s [-bh] {-c char|-o octchar} [-W width -H height] pkfile\n", myname);
       exit(1);
    }
-@@ -210,10 +219,3 @@ dots(quarterword u, int n)
+@@ -216,10 +225,3 @@ dots(quarterword u, int n)
    }
 }
 
@ -773,8 +763,8 @@
 -   return octal & 0xff;
 -}
 --- texk/texlive/linked_scripts/musixtex/musixtex.lua
-+++ texk/texlive/linked_scripts/musixtex/musixtex.lua	2013-07-29 15:22:59.000000000 +0000
-@@ -74,11 +74,21 @@ if #arg == 0 then
+++ texk/texlive/linked_scripts/musixtex/musixtex.lua	2016-01-28 12:53:55.300646630 +0000
+@@ -83,12 +83,23 @@ if #arg == 0 then
   os.exit(0)
 end
 
@ -786,30 +776,85 @@
 -tex = "etex"  
 +if base == "pdfmusixtex" then
 +  tex = "pdfetex"  
+  dvips = ""
 +  dvi = ""
 +  ps2pdf = ""
 +else
 +  tex = "etex"  
-+  dvi = "dvips"
+  dvips = "dvips -e0 "
+  dvi = dvips
 +  ps2pdf = "ps2pdf"
 +end
 musixflx = "musixflx"
-dvi = "dvips"
+-dvips = "dvips -e0 "
+-dvi = dvips
 -ps2pdf = "ps2pdf"
 intermediate = 1
 passes = 2
- 
--- texk/texlive/tl_scripts/fmtutil-sys.sh
-+++ texk/texlive/tl_scripts/fmtutil-sys.sh	2013-07-31 13:01:24.000000000 +0000
-@@ -26,4 +26,5 @@ TEXMFVAR="$v"
- TEXMFCONFIG="$c"
- export TEXMFVAR TEXMFCONFIG
+ index = 0
+--- texk/texlive/linked_scripts/texlive/fmtutil-sys.sh
+++ texk/texlive/linked_scripts/texlive/fmtutil-sys.sh	2016-01-28 12:52:30.270352571 +0000
+@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
 
 +umask 022
- exec fmtutil ${1+"$@"}
+ exec fmtutil --sys ${1+"$@"}
+--- texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ texk/texlive/linked_scripts/texlive/fmtutil.pl	2016-01-28 14:13:50.388260141 +0000
+@@ -283,10 +283,17 @@ sub callback_build_formats {
+   my $disabled = 0;
+   my $nobuild = 0;
+   my $notavail = 0;
+  my $uid, $gid;
+   #
+   # set up a tmp dir
+   my $tmpdir = File::Temp::tempdir(CLEANUP => 1);
+   #my $tmpdir = File::Temp::tempdir();
+  if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+    my $cnt = chown $uid, $gid, $tmpdir;
+    die "could not create directory $tmpdir" if $cnt <= 0;
+    $cnt = chmod 0770, $tmpdir;
+    die "could not create directory $tmpdir" if $cnt <= 0;
+  }
+   # set up destination directory
+   $opts{'fmtdir'} || ( $opts{'fmtdir'} = "$texmfvar/web2c" ) ;
+   TeXLive::TLUtils::mkdirhier($opts{'fmtdir'}) if (! -d $opts{'fmtdir'});
+@@ -443,6 +450,7 @@ sub rebuild_one_format {
+   # check for existence of ini file before doing anything else
+   if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
+     # we didn't find the ini file, skip
+    return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
+     print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
+     # The original script just skipped it but in TeX Live we expect that
+     # all activated formats are also buildable, thus return failure.
+@@ -493,11 +501,15 @@ sub rebuild_one_format {
+         ",$opts{'no-error-if-no-engine'}," =~ m/,$eng,/) {
+       return $FMT_NOTAVAIL;
+     } else {
+      return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
+       print_deferred_error("not building $fmt due to missing engine $eng.\n");
+       return $FMT_FAILURE;
+     }
+   }
+ 
+  if ($ENV{batchmode} eq "yes") {
+    texargs="\\batchmode \\input $texargs" if $eng eq "tex" || $eng eq "ptex";
+  }
+   print_verbose("running \`$eng -ini $tcxflag $jobswitch $prgswitch $texargs' ...\n");
+ 
+   {
+--- texk/texlive/linked_scripts/texlive/updmap-sys.sh
+++ texk/texlive/linked_scripts/texlive/updmap-sys.sh	2016-01-28 12:52:43.190093368 +0000
+@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
+ # hack around a bug in zsh:
+ test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+ 
+umask 022
+ exec updmap --sys ${1+"$@"}
 --- texk/texlive/tl_scripts/fmtutil.cnf
-+++ texk/texlive/tl_scripts/fmtutil.cnf	2015-03-26 11:13:51.701530846 +0000
-@@ -45,10 +45,11 @@ amstex pdftex - -translate-file=cp227.tc
+++ texk/texlive/tl_scripts/fmtutil.cnf	2016-01-28 12:50:57.572212297 +0000
+@@ -46,10 +46,11 @@ amstex pdftex - -translate-file=cp227.tc
 # from context:
 cont-en pdftex cont-usr.tex -8bit *cont-en.mkii
 cont-en xetex cont-usr.tex -8bit *cont-en.mkii
@ -825,7 +870,7 @@
 #
 # from cslatex:
 cslatex pdftex - -etex cslatex.ini
-@@ -64,8 +65,8 @@ pdfcsplain luatex - -etex csplain.ini
+@@ -65,8 +66,8 @@ pdfcsplain luatex - -etex csplain.ini
 eplain pdftex language.dat -translate-file=cp227.tcx *eplain.ini
 #
 # from jadetex:
@ -836,7 +881,7 @@
 #
 # from latex-bin:
 latex pdftex language.dat -translate-file=cp227.tcx *latex.ini
-@@ -132,5 +133,5 @@ xetex xetex language.def -etex xetex.ini
+@@ -133,5 +134,5 @@ xetex xetex language.def -etex xetex.ini
 xelatex xetex language.dat -etex xelatex.ini
 #
 # from xmltex:
@ -844,55 +889,9 @@
 -pdfxmltex pdftex language.dat *pdfxmltex.ini
 +xmltex pdftex language.dat -translate-file=cp227.tcx *xmltex.ini
 +pdfxmltex pdftex language.dat -translate-file=cp227.tcx *pdfxmltex.ini
--- texk/texlive/tl_scripts/fmtutil.sh
-+++ texk/texlive/tl_scripts/fmtutil.sh	2012-06-20 09:56:15.000000000 +0000
-@@ -163,7 +163,12 @@ setupTmpDir()
- 
-   trap 'cleanup 1' 1 2 3 7 13 15
-   needsCleanup=true
-  (umask 077; mkdir "$tmpdir") \
-+  if test "$(id -u 2> /dev/null)" = 0 && getent group mktex > /dev/null 2>&1 ; then
-+    mkdir -m 0700 "$tmpdir" && chown nobody:mktex "$tmpdir" && chmod 2770 "$tmpdir" \
-+      || abort "could not create directory \`$tmpdir'"
-+    return
-+  fi
-+  mkdir -m 0700 "$tmpdir" \
-     || abort "could not create directory \`$tmpdir'"
- }
- 
-@@ -425,7 +430,7 @@ main()
-   verboseFlag=true
-   noAbortFlag=false
-   # eradicate double slashes to avoid kpathsea expansion.
-  tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$$ | sed s,//,/,g`
-+  tmpdir=`echo ${TMPDIR-${TEMP-${TMP-/tmp}}}/$progname.$RANDOM | sed s,//,/,g`
- 
-   # mktexfmtMode: if called as mktexfmt, set to true. Will echo the
-   # first generated filename after successful generation to stdout then
-@@ -751,6 +756,7 @@ run_initex()
-     *)               prgswitch=-progname=$format;;
-   esac
- 
-+  type -p "$engine" &> /dev/null || return
-   rm -f $fmtfile
- 
-   # Check for infinite recursion before running the iniTeX:
-@@ -776,6 +782,12 @@ run_initex()
-     fi
-   fi
- 
-+  test "$batchmode" = "yes" && {
-+    case "$engine" in
-+      tex|ptex)
-+	texargs="\\batchmode \\input $texargs"
-+    esac
-+  }
-   verboseMsg "$progname: running \`$engine -ini  $tcxflag $jobswitch $prgswitch $texargs' ..."
- 
-   # run in a subshell to get a local effect of TEXPOOL manipulation:
 --- texk/texlive/tl_scripts/texconfig-dialog.sh
-+++ texk/texlive/tl_scripts/texconfig-dialog.sh	2009-09-02 12:47:26.000000000 +0000
-@@ -150,7 +150,14 @@ termCtl()
+++ texk/texlive/tl_scripts/texconfig-dialog.sh	2016-01-28 12:55:50.682331687 +0000
+@@ -154,7 +154,14 @@ termCtl()
 ###############################################################################
 menuMain()
 {
@ -900,18 +899,18 @@
 +  rows="$(stty size)"
 +  columns=${rows##* }
 +  rows=${rows%% *}
-+  test -n "$rows"	|| rows=0
-+  test -n "$columns"	|| columns=0
+  test -n "$rows"      || rows=0
+  test -n "$columns"   || columns=0
 +
 +  if test $rows -lt 24 -a $columns -lt 80 ; then
 +    cat <<-'eof'
 	The interactive texconfig utility will be started now. Make sure
 	your screen has at least 24 rows and 80 columns. If texconfig
- 	crashes now, you can still set up your teTeX system using the
-@@ -159,8 +166,9 @@ menuMain()
- 
- 	The interactive mode works best with a real vt100 terminal or
- 	inside an xterm window.
+ 	crashes now, you can still set up your TeX system using the
+@@ -166,8 +173,9 @@ menuMain()
+ 	
+ 	More likely these days, you're better off using tlmgr.
+ 	See http://tug.org/texlive/tlmgr.html.
 -eof
 -  termCtl readln
 +	eof
@ -921,16 +920,16 @@
   while :; do
     logMessage='view logfile'
 --- texk/texlive/tl_scripts/texconfig-sys.sh
-+++ texk/texlive/tl_scripts/texconfig-sys.sh	2013-07-31 13:02:15.000000000 +0000
-@@ -28,4 +28,5 @@ TEXMFVAR="$v"
+++ texk/texlive/tl_scripts/texconfig-sys.sh	2016-01-28 12:51:01.132140878 +0000
+@@ -30,4 +30,5 @@ TEXMFVAR="$v"
 TEXMFCONFIG="$c"
 export TEXMFVAR TEXMFCONFIG
 
 +umask 022
 exec texconfig ${1+"$@"}
 --- texk/texlive/tl_scripts/texconfig.sh
-+++ texk/texlive/tl_scripts/texconfig.sh	2009-09-02 12:47:26.000000000 +0000
-@@ -37,7 +37,7 @@ envVars="
+++ texk/texlive/tl_scripts/texconfig.sh	2016-01-28 12:51:01.132140878 +0000
+@@ -40,7 +40,7 @@ envVars="
   TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
   TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
 "
@ -939,7 +938,7 @@
 needsCleanup=false
 lastUpdatedFile=
 
-@@ -1007,21 +1007,6 @@ For more information about these \`featu
+@@ -1010,21 +1010,6 @@ For more information about these \`featu
       ;;
 
     formats)
@ -961,7 +960,7 @@
       setupTmpDir
       echo "$progname: analyzing old configuration..." >&2
       fmtutil --catcfg > $tmpdir/pre
-@@ -1047,22 +1032,6 @@ EOM
+@@ -1050,22 +1035,6 @@ EOM
 
     # "hyphen FORMAT"
     hyphen)
@ -984,7 +983,7 @@
       tcBatchHyphenFormat=$2
       formatsForHyphen=`getFormatsForHyphen`
       formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@  @'`
-@@ -1314,7 +1283,7 @@ Valid PAPER settings:
+@@ -1317,7 +1286,7 @@ Valid PAPER settings:
       ;;
 
     rehash)
@ -994,8 +993,8 @@
     
     # 
 --- texk/texlive/tl_scripts/texlinks.sh
-+++ texk/texlive/tl_scripts/texlinks.sh	2009-09-02 12:47:26.000000000 +0000
-@@ -106,7 +106,7 @@ setupTmpDir()
+++ texk/texlive/tl_scripts/texlinks.sh	2016-01-28 12:51:01.132140878 +0000
+@@ -100,7 +100,7 @@ setupTmpDir()
 
   trap 'cleanup 1' 1 2 3 7 13 15
   needsCleanup=true
@ -1004,7 +1003,7 @@
     || abort "could not create directory \`$tmpdir'"
 }
 
-@@ -114,16 +114,18 @@ setupTmpDir()
+@@ -108,16 +108,18 @@ setupTmpDir()
 # search a binary along $PATH:
 check_for_binary()
 {
@ -1033,7 +1032,7 @@
 }
 
 
-@@ -214,8 +216,22 @@ search_symlinkdir()
+@@ -208,8 +210,22 @@ search_symlinkdir()
 upd_symlinkdir()
 {
   search_symlinkdir || return 0
@ -1058,7 +1057,7 @@
   done
 }
 
-@@ -280,12 +296,12 @@ main()
+@@ -274,12 +290,12 @@ main()
   test -f "$cnf_file" || abort "config file \`$cnf' not found"
 
 
@ -1074,7 +1073,7 @@
 
   if test -z "$dirs"; then
     if test $multiplatform = true; then
-@@ -306,13 +322,16 @@ main()
+@@ -300,13 +316,16 @@ main()
     # cnf_file_ln.$$ has lines with "format engine" pairs
     set x `cat cnf_file_ln.$$`; shift
     while test $# != 0; do
@ -1092,17 +1091,9 @@
       test "x$fmt" = "x$engine" && continue
       if test -f "$d/$engine$exeext"; then
         case $unlink in
--- texk/texlive/tl_scripts/updmap-sys.sh
-+++ texk/texlive/tl_scripts/updmap-sys.sh	2013-07-31 13:02:45.000000000 +0000
-@@ -27,4 +27,5 @@ test -n "${ZSH_VERSION+set}" && alias -g
- # TEXMFCONFIG="$c"
- # export TEXMFVAR TEXMFCONFIG
- 
-+umask 022
- exec updmap --sys ${1+"$@"}
 --- texk/web2c/Makefile.in
-+++ texk/web2c/Makefile.in	2011-12-09 14:00:23.000000000 +0000
-@@ -3449,7 +3449,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
+++ texk/web2c/Makefile.in	2016-01-28 12:51:34.395473549 +0000
+@@ -3656,7 +3656,7 @@ libmd5_a_SOURCES = libmd5/md5.c libmd5/m
 md5main_CPPFLAGS = -I$(srcdir)/libmd5
 md5main_SOURCES = libmd5/md5main.c
 md5main_LDADD = libmd5.a
@ -1111,7 +1102,7 @@
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-@@ -3496,6 +3496,11 @@ w2c/c-auto.h: w2c/stamp-h1
+@@ -3703,6 +3703,11 @@ w2c/c-auto.h: w2c/stamp-h1
 w2c/stamp-h1: $(srcdir)/c-auto.in $(top_builddir)/config.status
 	@rm -f w2c/stamp-h1
 	cd $(top_builddir) && $(SHELL) ./config.status w2c/c-auto.h
@ -1124,7 +1115,7 @@
 	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
 	rm -f w2c/stamp-h1
 --- texk/web2c/window/regis.c
-+++ texk/web2c/window/regis.c	2009-09-02 12:47:27.000000000 +0000
+++ texk/web2c/window/regis.c	2016-01-28 12:51:34.399473469 +0000
@@ -64,12 +64,14 @@ void mf_regis_blankrectangle (screencol
                               screenrow top,
                               screenrow bottom)
@ -1144,7 +1135,7 @@
 		left,bottom,ESCAPE);
 }
 --- texk/web2c/window/x11-Xlib.c
-+++ texk/web2c/window/x11-Xlib.c	2015-03-26 11:10:29.029519103 +0000
+++ texk/web2c/window/x11-Xlib.c	2016-01-28 12:51:34.411473228 +0000
@@ -73,6 +73,8 @@ static XWMHints wm_hints = {
 #define BORDER_WIDTH 1 /* Should get this from resource. */
 #define DEFAULT_X_POSITION 0
@ -1171,7 +1162,7 @@
 
     /* Look up the geometry for this window. (Section 10.2 Obtaining X
 --- texk/web2c/window/x11-Xt.c
-+++ texk/web2c/window/x11-Xt.c	2009-09-02 12:47:27.000000000 +0000
+++ texk/web2c/window/x11-Xt.c	2016-01-28 12:51:34.411473228 +0000
@@ -18,8 +18,8 @@
 
 #define PLANE 0
@ -1184,7 +1175,7 @@
 static Display *mf_display;
 static Window mf_window;
 --- texk/xdvik/psgs.c
-+++ texk/xdvik/psgs.c	2009-09-02 12:47:27.000000000 +0000
+++ texk/xdvik/psgs.c	2016-01-28 12:51:34.415473148 +0000
@@ -34,6 +34,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include <sys/time.h>	/* for timeval */
 
@ -1222,7 +1213,7 @@
     GS_pid = vfork();
     if (GS_pid == 0) {	/* child */
 --- texk/xdvik/xdvi-sh.in
-+++ texk/xdvik/xdvi-sh.in	2009-09-02 12:47:27.000000000 +0000
+++ texk/xdvik/xdvi-sh.in	2016-01-28 12:51:34.415473148 +0000
@@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
--- a/texlive-20140525-source.tar.xz
+++ b/texlive-20140525-source.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e3c86ed2231ae08ea041c10513b1767f14680bb114c5ec2fe984f3f78bcf52d5
-size 39180252
--- a/texlive-20150521-source.tar.xz
+++ b/texlive-20150521-source.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
+size 45459552
--- a/texlive.changes
+++ b/texlive.changes
@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Thu Jan 28 10:52:36 UTC 2016 - werner@suse.de
+
+- Update to TeXLive 2015 (timestamp 20150521 revision 26946)
+  * Remove the now included patches
+    biber-decode.diff
+    biber-noreadonly.diff
+    biblatex-biber-1.8.tar.xz
+    source-asymptote-gs9.15.dif
+  * Readd patch biber-certs.dif
+    as we do not ship perls Motilla:CA
+  * Add upstream patches
+    biber-perl-unicode-normalize.dif
+    biber-skip-bibtex-forms.dif
+  * Add patch source-missed-scripts.dif to work around missed
+    symbolic linked scripts
+  * Adopted the following patches
+    biber-perl-5.22.dif
+    biblatex-encoding.dif
+    source-configure.dif
+    source-dvipng.dif
+    source-dviutils.dif
+    source-lacheck.dif
+    source-overflow.dif
+    source-warns.dif
+    source-x11r7.dif
+    source.dif
+
 -------------------------------------------------------------------
 Tue Jul 14 14:25:04 UTC 2015 - werner@suse.de

--- a/texlive.spec
+++ b/texlive.spec
@ -1,7 +1,7 @@
 #
 # spec file for package texlive
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,11 +16,11 @@
 #


-%define texlive_version  2014
-%define texlive_previous 2013
-%define texlive_release  20140525
-%define texlive_noarch   97
-%define texlive_source   texlive-20140525-source
+%define texlive_version  2015
+%define texlive_previous 2014
+%define texlive_release  20150521
+%define texlive_noarch   101
+%define texlive_source   texlive-20150521-source

 %define __perl_requires		%{nil}
 %define __os_install_post	/usr/lib/rpm/brp-compress \\\
@ -181,19 +181,22 @@ BuildRequires:  perl(PAR::Packer)
 %endif
 BuildRequires:  perl(Readonly::XS)
 BuildRequires:  perl(Regexp::Common)
+BuildRequires:  perl(Test::Differences)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(Test::Pod) >= 1.22
 BuildRequires:  perl(Test::Pod::Coverage) >= 1.08
 BuildRequires:  perl(Text::BibTeX) >= 0.62
+BuildRequires:  perl(Text::Roman)
 BuildRequires:  perl(Unicode::Collate) >= 0.89
 BuildRequires:  perl(Unicode::GCString)
+BuildRequires:  perl(Unicode::Normalize) >= 1.23
 BuildRequires:  perl(XML::LibXML::Simple)
 BuildRequires:  perl(XML::LibXSLT)
 BuildRequires:  perl(XML::Writer::String)
 %endif
 # Download at ftp://tug.org/texlive/historic/%{texlive_version}/
 Source0:        %{texlive_source}.tar.xz
-Source3:        biblatex-biber-1.8.tar.xz
+Source3:        biblatex-biber-2.1.tar.xz
 Source4:        cnf-to-paths.awk
 Source30:       texlive-rpmlintrc
 Source50:       public.c
@ -206,8 +209,6 @@ Patch5:         source-texdoc.dif
 Patch6:         source-dviutils.dif
 Patch7:         source-xdvik-events.dif
 Patch8:         source-psutils.dif
-# PATCH-FIX-SUSE The ghostscript device epswrite has to replaced with eps2write (boo#912398)
-Patch9:         source-asymptote-gs9.15.dif
 Patch10:        source-poppler.dif
 Patch11:        source-lacheck.dif
 Patch12:        source-warns.dif
@ -218,14 +219,17 @@ Patch15:        source-overflow.dif
 Patch17:        source-64.dif
 Patch18:        source-a2ping.dif
 Patch19:        source-dvipng.dif
+Patch20:        source-missed-scripts.dif
 # PATCH-FIX-SUSE Make biber work with our perl
 Patch42:        biblatex-encoding.dif
 # PATCH-FIX-SUSE Make biber work with perl 5.22
 Patch43:        biber-perl-5.22.dif
-# PATCH-FIX-SUSE deal with semantic change of Perl Readonly implementation in version 1.04
-Patch44:        biber-noreadonly.diff
-# PATCH-FIX-SUSE deal with semantic change of Perl's Encode::decode_utf8 in perl-5.20.0
-Patch45:        biber-decode.diff
+# PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
+Patch44:        biber-certs.dif
+# PATCH-FIX-UPSTREAM Use newer Unicode::Normalize as this supports XS again
+Patch45:        biber-perl-unicode-normalize.dif
+# PATCH-FIX-UPSTREAM Removed old forms tests
+Patch46:        biber-skip-bibtex-forms.dif
 Prefix:         %{_bindir}
 Provides:       pdfjam = %{version}
 Obsoletes:      pdfjam < %{version}
@ -327,7 +331,7 @@ Prefix:         %{_bindir}
 Binary files of adhocfilelist

 %package afm2pl-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of afm2pl
 License:        LPPL-1.0
@ -340,7 +344,7 @@ Prefix:         %{_bindir}
 Binary files of afm2pl

 %package aleph-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of aleph
 License:        LPPL-1.0
@ -379,7 +383,7 @@ Prefix:         %{_bindir}
 Binary files of arara

 %package asymptote-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34084
+Version:        %{texlive_version}.%{texlive_release}.svn37459
 Release:        0
 Summary:        Binary files of asymptote
 License:        LPPL-1.0
@ -405,7 +409,7 @@ Prefix:         %{_bindir}
 Binary files of authorindex

 %package biber-bin
-Version:        %{texlive_version}.%{texlive_release}.svn32012
+Version:        %{texlive_version}.%{texlive_release}.svn37327
 Release:        0
 Summary:        Binary files of biber
 License:        LPPL-1.0
@ -421,6 +425,7 @@ Requires:       perl(Biber) >= %{texlive_version}.%{texlive_release}
 Requires:       perl(LWP::UserAgent)
 Requires:       perl(Text::BibTeX)
 %endif
+BuildArch:      noarch
 Recommends:     texlive-biber >= %{texlive_version}
 Prefix:         %{_bindir}

@ -441,7 +446,7 @@ Prefix:         %{_bindir}
 Binary files of bibexport

 %package bibtex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of bibtex
 License:        LPPL-1.0
@ -454,7 +459,7 @@ Prefix:         %{_bindir}
 Binary files of bibtex

 %package bibtex8-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of bibtex8
 License:        LPPL-1.0
@ -467,7 +472,7 @@ Prefix:         %{_bindir}
 Binary files of bibtex8

 %package bibtexu-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of bibtexu
 License:        LPPL-1.0
@ -519,7 +524,7 @@ Prefix:         %{_bindir}
 Binary files of checkcites

 %package chktex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of chktex
 License:        LPPL-1.0
@ -531,8 +536,21 @@ Prefix:         %{_bindir}
 %description chktex-bin
 Binary files of chktex

+%package cjk-gs-integrate-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37223
+Release:        0
+Summary:        Binary files of cjk-gs-integrate
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-cjk-gs-integrate >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description cjk-gs-integrate-bin
+Binary files of cjk-gs-integrate
+
 %package cjkutils-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36924
 Release:        0
 Summary:        Binary files of cjkutils
 License:        LPPL-1.0
@ -571,6 +589,19 @@ Prefix:         %{_bindir}
 %description convbkmk-bin
 Binary files of convbkmk

+%package crossrefware-bin
+Version:        %{texlive_version}.%{texlive_release}.svn35401
+Release:        0
+Summary:        Binary files of crossrefware
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-crossrefware >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description crossrefware-bin
+Binary files of crossrefware
+
 %package cslatex-bin
 Version:        %{texlive_version}.%{texlive_release}.svn3006
 Release:        0
@ -624,7 +655,7 @@ Prefix:         %{_bindir}
 Binary files of ctanupload

 %package ctie-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of ctie
 License:        LPPL-1.0
@ -637,7 +668,7 @@ Prefix:         %{_bindir}
 Binary files of ctie

 %package cweb-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of cweb
 License:        LPPL-1.0
@ -676,7 +707,7 @@ Prefix:         %{_bindir}
 Binary files of de-macro

 %package detex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of detex
 License:        LPPL-1.0
@ -689,7 +720,7 @@ Prefix:         %{_bindir}
 Binary files of detex

 %package devnag-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of devnag
 License:        LPPL-1.0
@ -701,6 +732,20 @@ Prefix:         %{_bindir}
 %description devnag-bin
 Binary files of devnag

+%package diadia-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37645
+Release:        0
+Summary:        Binary files of diadia
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+BuildArch:      noarch
+Recommends:     texlive-diadia >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description diadia-bin
+Binary files of diadia
+
 %package dosepsbin-bin
 Version:        %{texlive_version}.%{texlive_release}.svn24759
 Release:        0
@ -715,7 +760,7 @@ Prefix:         %{_bindir}
 Binary files of dosepsbin

 %package dtl-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dtl
 License:        LPPL-1.0
@ -754,7 +799,7 @@ Prefix:         %{_bindir}
 Binary files of dviasm

 %package dvicopy-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dvicopy
 License:        LPPL-1.0
@ -767,7 +812,7 @@ Prefix:         %{_bindir}
 Binary files of dvicopy

 %package dvidvi-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dvidvi
 License:        LPPL-1.0
@ -780,7 +825,7 @@ Prefix:         %{_bindir}
 Binary files of dvidvi

 %package dviljk-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dviljk
 License:        LPPL-1.0
@ -795,7 +840,7 @@ Prefix:         %{_bindir}
 Binary files of dviljk

 %package dvipdfmx-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34199
+Version:        %{texlive_version}.%{texlive_release}.svn37207
 Release:        0
 Summary:        Binary files of dvipdfmx
 License:        LPPL-1.0
@ -810,7 +855,7 @@ Prefix:         %{_bindir}
 Binary files of dvipdfmx

 %package dvipng-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn37100
 Release:        0
 Summary:        Binary files of dvipng
 License:        LPPL-1.0
@ -823,7 +868,7 @@ Prefix:         %{_bindir}
 Binary files of dvipng

 %package dvipos-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dvipos
 License:        LPPL-1.0
@ -836,7 +881,7 @@ Prefix:         %{_bindir}
 Binary files of dvipos

 %package dvips-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33655
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of dvips
 License:        LPPL-1.0
@ -849,7 +894,7 @@ Prefix:         %{_bindir}
 Binary files of dvips

 %package dvisvgm-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33784
+Version:        %{texlive_version}.%{texlive_release}.svn37257
 Release:        0
 Summary:        Binary files of dvisvgm
 License:        LPPL-1.0
@ -979,7 +1024,7 @@ Prefix:         %{_bindir}
 Binary files of fontools

 %package fontware-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of fontware
 License:        LPPL-1.0
@ -1004,8 +1049,21 @@ Prefix:         %{_bindir}
 %description fragmaster-bin
 Binary files of fragmaster

+%package getmap-bin
+Version:        %{texlive_version}.%{texlive_release}.svn34971
+Release:        0
+Summary:        Binary files of getmap
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-getmap >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description getmap-bin
+Binary files of getmap
+
 %package glossaries-bin
-Version:        %{texlive_version}.%{texlive_release}.svn6881
+Version:        %{texlive_version}.%{texlive_release}.svn37813
 Release:        0
 Summary:        Binary files of glossaries
 License:        LPPL-1.0
@ -1018,7 +1076,7 @@ Prefix:         %{_bindir}
 Binary files of glossaries

 %package gsftopk-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of gsftopk
 License:        LPPL-1.0
@ -1071,7 +1129,7 @@ Prefix:         %{_bindir}
 Binary files of kotex-utils

 %package kpathsea-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn37207
 Release:        0
 Summary:        Binary files of kpathsea
 License:        LPPL-1.0
@ -1091,7 +1149,7 @@ Prefix:         %{_bindir}
 Binary files of kpathsea

 %package lacheck-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn37340
 Release:        0
 Summary:        Binary files of lacheck
 License:        LPPL-1.0
@ -1209,7 +1267,7 @@ Prefix:         %{_bindir}
 Binary files of latexpand

 %package lcdftypetools-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of lcdftypetools
 License:        LPPL-1.0
@ -1318,7 +1376,7 @@ Prefix:         %{_bindir}
 Binary files of lua2dox

 %package luaotfload-bin
-Version:        %{texlive_version}.%{texlive_release}.svn30313
+Version:        %{texlive_version}.%{texlive_release}.svn34647
 Release:        0
 Summary:        Binary files of luaotfload
 License:        LPPL-1.0
@ -1331,7 +1389,7 @@ Prefix:         %{_bindir}
 Binary files of luaotfload

 %package luatex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn37340
 Release:        0
 Summary:        Binary files of luatex
 License:        LPPL-1.0
@ -1344,7 +1402,7 @@ Prefix:         %{_bindir}
 Binary files of luatex

 %package m-tx-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of m-tx
 License:        LPPL-1.0
@ -1356,8 +1414,21 @@ Prefix:         %{_bindir}
 %description m-tx-bin
 Binary files of m-tx

+%package make4ht-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37750
+Release:        0
+Summary:        Binary files of make4ht
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-make4ht >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description make4ht-bin
+Binary files of make4ht
+
 %package makeindex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of makeindex
 License:        LPPL-1.0
@ -1396,7 +1467,7 @@ Prefix:         %{_bindir}
 Binary files of mathspic

 %package metafont-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of metafont
 License:        LPPL-1.0
@ -1409,7 +1480,7 @@ Prefix:         %{_bindir}
 Binary files of metafont

 %package metapost-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33655
+Version:        %{texlive_version}.%{texlive_release}.svn37340
 Release:        0
 Summary:        Binary files of metapost
 License:        LPPL-1.0
@ -1449,7 +1520,7 @@ Prefix:         %{_bindir}
 Binary files of mf2pt1

 %package mfware-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of mfware
 License:        LPPL-1.0
@ -1540,7 +1611,7 @@ Prefix:         %{_bindir}
 Binary files of multibibliography

 %package musixtex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn22187
+Version:        %{texlive_version}.%{texlive_release}.svn37026
 Release:        0
 Summary:        Binary files of musixtex
 License:        LPPL-1.0
@ -1555,8 +1626,21 @@ Prefix:         %{_bindir}
 %description musixtex-bin
 Binary files of musixtex

+%package musixtnt-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37035
+Release:        0
+Summary:        Binary files of musixtnt
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-musixtnt >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description musixtnt-bin
+Binary files of musixtnt
+
 %package omegaware-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of omegaware
 License:        LPPL-1.0
@ -1571,7 +1655,7 @@ Prefix:         %{_bindir}
 Binary files of omegaware

 %package patgen-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of patgen
 License:        LPPL-1.0
@ -1596,6 +1680,19 @@ Prefix:         %{_bindir}
 %description pax-bin
 Binary files of pax

+%package pdfbook2-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37537
+Release:        0
+Summary:        Binary files of pdfbook2
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-pdfbook2 >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description pdfbook2-bin
+Binary files of pdfbook2
+
 %package pdfcrop-bin
 Version:        %{texlive_version}.%{texlive_release}.svn14387
 Release:        0
@ -1623,7 +1720,7 @@ Prefix:         %{_bindir}
 Binary files of pdfjam

 %package pdftex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34181
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of pdftex
 License:        LPPL-1.0
@ -1636,7 +1733,7 @@ Prefix:         %{_bindir}
 Binary files of pdftex

 %package pdftools-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of pdftools
 License:        LPPL-1.0
@ -1714,7 +1811,7 @@ Prefix:         %{_bindir}
 Binary files of pkfix

 %package pmx-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of pmx
 License:        LPPL-1.0
@ -1739,18 +1836,18 @@ Prefix:         %{_bindir}
 %description pmxchords-bin
 Binary files of pmxchords

-%package ps2pkm-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+%package ps2pk-bin
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
-Summary:        Binary files of ps2pkm
+Summary:        Binary files of ps2pk
 License:        LPPL-1.0
 Group:          Productivity/Publishing/TeX/Utilities
 Url:            http://www.tug.org/texlive/
-Recommends:     texlive-ps2pkm >= %{texlive_version}
+Recommends:     texlive-ps2pk >= %{texlive_version}
 Prefix:         %{_bindir}

-%description ps2pkm-bin
-Binary files of ps2pkm
+%description ps2pk-bin
+Binary files of ps2pk

 %package pst-pdf-bin
 Version:        %{texlive_version}.%{texlive_release}.svn7838
@ -1779,7 +1876,7 @@ Prefix:         %{_bindir}
 Binary files of pst2pdf

 %package pstools-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of pstools
 License:        LPPL-1.0
@ -1792,7 +1889,7 @@ Prefix:         %{_bindir}
 Binary files of pstools

 %package ptex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn37340
 Release:        0
 Summary:        Binary files of ptex
 License:        LPPL-1.0
@ -1830,6 +1927,19 @@ Prefix:         %{_bindir}
 %description purifyeps-bin
 Binary files of purifyeps

+%package pygmentex-bin
+Version:        %{texlive_version}.%{texlive_release}.svn34996
+Release:        0
+Summary:        Binary files of pygmentex
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-pygmentex >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description pygmentex-bin
+Binary files of pygmentex
+
 %package pythontex-bin
 Version:        %{texlive_version}.%{texlive_release}.svn31638
 Release:        0
@ -1857,7 +1967,7 @@ Prefix:         %{_bindir}
 Binary files of rubik

 %package seetexk-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of seetexk
 License:        LPPL-1.0
@ -1909,7 +2019,7 @@ Prefix:         %{_bindir}
 Binary files of svn-multi

 %package synctex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of synctex
 License:        LPPL-1.0
@ -1922,7 +2032,7 @@ Prefix:         %{_bindir}
 Binary files of synctex

 %package tetex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn29741
+Version:        %{texlive_version}.%{texlive_release}.svn36770
 Release:        0
 Summary:        Binary files of tetex
 License:        LPPL-1.0
@ -1935,7 +2045,7 @@ Prefix:         %{_bindir}
 Binary files of tetex

 %package tex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of tex
 License:        LPPL-1.0
@ -1947,8 +2057,21 @@ Prefix:         %{_bindir}
 %description tex-bin
 Binary files of tex

+%package tex4ebook-bin
+Version:        %{texlive_version}.%{texlive_release}.svn37771
+Release:        0
+Summary:        Binary files of tex4ebook
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-tex4ebook >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description tex4ebook-bin
+Binary files of tex4ebook
+
 %package tex4ht-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of tex4ht
 License:        LPPL-1.0
@ -2093,7 +2216,7 @@ Prefix:         %{_bindir}
 Binary files of texsis

 %package texware-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of texware
 License:        LPPL-1.0
@ -2119,7 +2242,7 @@ Prefix:         %{_bindir}
 Binary files of thumbpdf

 %package tie-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of tie
 License:        LPPL-1.0
@ -2145,7 +2268,7 @@ Prefix:         %{_bindir}
 Binary files of tpic2pdftex

 %package ttfutils-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn37100
 Release:        0
 Summary:        Binary files of ttfutils
 License:        LPPL-1.0
@ -2184,7 +2307,7 @@ Prefix:         %{_bindir}
 Binary files of ulqda

 %package uptex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn37340
 Release:        0
 Summary:        Binary files of uptex
 License:        LPPL-1.0
@ -2210,7 +2333,7 @@ Prefix:         %{_bindir}
 Binary files of urlbst

 %package vlna-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of vlna
 License:        LPPL-1.0
@ -2236,7 +2359,7 @@ Prefix:         %{_bindir}
 Binary files of vpe

 %package web-bin
-Version:        %{texlive_version}.%{texlive_release}.svn33479
+Version:        %{texlive_version}.%{texlive_release}.svn36790
 Release:        0
 Summary:        Binary files of web
 License:        LPPL-1.0
@ -2249,7 +2372,7 @@ Prefix:         %{_bindir}
 Binary files of web

 %package xdvi-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34086
+Version:        %{texlive_version}.%{texlive_release}.svn37100
 Release:        0
 Summary:        Binary files of xdvi
 License:        LPPL-1.0
@ -2262,7 +2385,7 @@ Prefix:         %{_bindir}
 Binary files of xdvi

 %package xetex-bin
-Version:        %{texlive_version}.%{texlive_release}.svn34199
+Version:        %{texlive_version}.%{texlive_release}.svn37261
 Release:        0
 Summary:        Binary files of xetex
 License:        LPPL-1.0
@ -2289,8 +2412,21 @@ Prefix:         %{_bindir}
 %description xmltex-bin
 Binary files of xmltex

+%package yplan-bin
+Version:        %{texlive_version}.%{texlive_release}.svn34398
+Release:        0
+Summary:        Binary files of yplan
+License:        LPPL-1.0
+Group:          Productivity/Publishing/TeX/Utilities
+Url:            http://www.tug.org/texlive/
+Recommends:     texlive-yplan >= %{texlive_version}
+Prefix:         %{_bindir}
+
+%description yplan-bin
+Binary files of yplan
+
 %package -n libkpathsea6
-Version:        6.2.0
+Version:        6.2.1
 Release:        0
 Summary:        Path searching library for TeX-related files
 License:        LGPL-2.1+
@ -2307,13 +2443,13 @@ separately, but rather is released and maintained as part of
 the TeX-live sources.

 %package -n %{name}-kpathsea-devel
-Version:        6.2.0
+Version:        6.2.1
 Release:        0
 Summary:        Path searching library for TeX-related files
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Url:            http://www.tug.org/texlive/
-Requires:       libkpathsea6 = 6.2.0
+Requires:       libkpathsea6 = 6.2.1

 %description -n %{name}-kpathsea-devel
 Kpathsea is a library and utility programs which provide path
@ -2324,7 +2460,7 @@ separately, but rather is released and maintained as part of
 the TeX-live sources.

 %package -n libptexenc1
-Version:        1.3.2
+Version:        1.3.3
 Release:        0
 Summary:        Libraries of Kanji code convert library for pTeX
 License:        BSD-3-Clause
@ -2338,13 +2474,13 @@ The ptexenc is a useful library for Japanese pTeX
 TeX by ASCII Co.) and its surrounding tools.

 %package -n %{name}-ptexenc-devel
-Version:        1.3.2
+Version:        1.3.3
 Release:        0
 Summary:        Libraries of Kanji code convert library for pTeX
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            http://www.tug.org/texlive/
-Requires:       libptexenc1 = 1.3.2
+Requires:       libptexenc1 = 1.3.3

 %description -n %{name}-ptexenc-devel
 This package includes the ptexenc development files.
@ -2359,8 +2495,8 @@ Summary:        Basic development packages for TeXLive
 License:        LGPL-2.1+ and BSD-3-Clause and SUSE-TeX
 Group:          Development/Languages/Other
 Url:            http://www.tug.org/texlive/
-Requires:       libkpathsea6 = 6.2.0
-Requires:       libptexenc1 = 1.3.2
+Requires:       libkpathsea6 = 6.2.1
+Requires:       libptexenc1 = 1.3.3
 Requires:       texlive-cweb-bin >= %{texlive_version}
 Requires:       texlive-web-bin >= %{texlive_version}

@ -2563,7 +2699,6 @@ This package is required by the package texlive-biber-bin.
 %if %{with psutils}
 %patch8  -p0 -b .psutils
 %endif
-%patch9  -p0 -b .aysm
 %patch10 -p0 -b .poppler
 %patch11 -p0 -b .lacheck
 %patch12 -p0 -b .warns
@ -2573,14 +2708,17 @@ This package is required by the package texlive-biber-bin.
 %patch17 -p0 -b .64
 %patch18 -p0 -b .a2p
 %patch19 -p0 -b .dvipng
-%patch0
+%patch20 -p0 -b .missed
+%patch0  -p0 -b .p0
 %if %{with buildbiber}
 pushd ../biblatex-biber-*
 /usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
 %patch42 -p0 -b .en
 %patch43 -p0 -b .522
-%patch44 -p0 -b .ro
-%patch45 -p0 -b .decode
+%patch44 -p0 -b .noica
+%patch45 -p0 -b .pun
+%patch46 -p0 -b .bcf
+rm -vf bin/biber.noica
 popd
 %endif

@ -3184,6 +3322,12 @@ rm -f /var/run/texlive/run-update
 %post   -n libptexenc1 -p /sbin/ldconfig
 %postun -n libptexenc1 -p /sbin/ldconfig

+%post   synctex-bin -p /sbin/ldconfig
+%postun synctex-bin -p /sbin/ldconfig
+
+%post   luatex-bin -p /sbin/ldconfig
+%postun luatex-bin -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root,755)
 %if 0%{texlive_version} >= 2013
@ -3283,6 +3427,10 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/chkweb
 %{_bindir}/deweb

+%files cjk-gs-integrate-bin
+%defattr(-,root,root,755)
+%{_bindir}/cjk-gs-integrate
+
 %files cjkutils-bin
 %defattr(-,root,root,755)
 %{_bindir}/bg5+latex
@ -3322,6 +3470,12 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/convbkmk

+%files crossrefware-bin
+%defattr(-,root,root,755)
+%{_bindir}/bibdoiadd
+%{_bindir}/bibzbladd
+%{_bindir}/ltx2crossrefxml
+
 %files cslatex-bin
 %defattr(-,root,root,755)
 %{_bindir}/cslatex
@ -3366,6 +3520,10 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/devnag

+%files diadia-bin
+%defattr(-,root,root,755)
+%{_bindir}/diadia
+
 %files dosepsbin-bin
 %defattr(-,root,root,755)
 %{_bindir}/dosepsbin
@ -3479,9 +3637,14 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/fragmaster

+%files getmap-bin
+%defattr(-,root,root,755)
+%{_bindir}/getmapdl
+
 %files glossaries-bin
 %defattr(-,root,root,755)
 %{_bindir}/makeglossaries
+%{_bindir}/makeglossaries-lite

 %files gsftopk-bin
 %defattr(-,root,root,755)
@ -3613,7 +3776,6 @@ rm -f /var/run/texlive/run-update
 %files luaotfload-bin
 %defattr(-,root,root,755)
 %{_bindir}/luaotfload-tool
-%{_bindir}/mkluatexfontdb

 %files luatex-bin
 %defattr(-,root,root,755)
@ -3624,12 +3786,35 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/texluac
 %{_bindir}/texluajit
 %{_bindir}/texluajitc
+%exclude %dir %{_includedir}/texlua52/
+%exclude %dir %{_includedir}/texluajit/
+%exclude %{_includedir}/texlua52/lauxlib.h
+%exclude %{_includedir}/texlua52/lua.h
+%exclude %{_includedir}/texlua52/lua.hpp
+%exclude %{_includedir}/texlua52/luaconf.h
+%exclude %{_includedir}/texlua52/lualib.h
+%exclude %{_includedir}/texluajit/lauxlib.h
+%exclude %{_includedir}/texluajit/lua.h
+%exclude %{_includedir}/texluajit/lua.hpp
+%exclude %{_includedir}/texluajit/luaconf.h
+%exclude %{_includedir}/texluajit/luajit.h
+%exclude %{_includedir}/texluajit/lualib.h
+%exclude %{_libdir}/libtexluajit.so
+%exclude %{_libdir}/libtexlua52.so
+%{_libdir}/libtexlua52.so.5
+%{_libdir}/libtexlua52.so.5.2.4
+%{_libdir}/libtexluajit.so.2
+%{_libdir}/libtexluajit.so.2.0.3

 %files m-tx-bin
 %defattr(-,root,root,755)
 %{_bindir}/m-tx
 %{_bindir}/prepmx

+%files make4ht-bin
+%defattr(-,root,root,755)
+%{_bindir}/make4ht
+
 %files makeindex-bin
 %defattr(-,root,root,755)
 %{_bindir}/makeindex
@ -3705,6 +3890,11 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/musixtex
 %{_bindir}/pdfmusixtex

+%files musixtnt-bin
+%defattr(-,root,root,755)
+%{_bindir}/fixmsxpart
+%{_bindir}/msxlint
+
 %files omegaware-bin
 %defattr(-,root,root,755)
 %{_bindir}/odvicopy
@ -3729,6 +3919,10 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/pdfannotextractor

+%files pdfbook2-bin
+%defattr(-,root,root,755)
+%{_bindir}/pdfbook2
+
 %files pdfcrop-bin
 %defattr(-,root,root,755)
 %{_bindir}/pdfcrop
@ -3795,7 +3989,7 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/pmxchords

-%files ps2pkm-bin
+%files ps2pk-bin
 %defattr(-,root,root,755)
 %{_bindir}/mag
 %{_bindir}/pfb2pfa
@ -3823,8 +4017,10 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/makejvf
 %{_bindir}/mendex
 %{_bindir}/pbibtex
+%{_bindir}/pdvitomp
 %{_bindir}/pdvitype
 %{_bindir}/platex
+%{_bindir}/pmpost
 %{_bindir}/ppltotf
 %{_bindir}/ptex
 %{_bindir}/ptftopl
@ -3837,6 +4033,10 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/purifyeps

+%files pygmentex-bin
+%defattr(-,root,root,755)
+%{_bindir}/pygmentex
+
 %files pythontex-bin
 %defattr(-,root,root,755)
 %{_bindir}/depythontex
@ -3871,6 +4071,12 @@ rm -f /var/run/texlive/run-update
 %files synctex-bin
 %defattr(-,root,root,755)
 %{_bindir}/synctex
+%exclude %dir %{_includedir}/synctex/
+%exclude %{_includedir}/synctex/synctex_parser.h
+%exclude %{_includedir}/synctex/synctex_parser_utils.h
+%exclude %{_libdir}/libsynctex.so
+%{_libdir}/libsynctex.so.1
+%{_libdir}/libsynctex.so.1.17.0

 %files tetex-bin
 %defattr(-,root,root,755)
@ -3896,6 +4102,10 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/initex
 %{_bindir}/tex

+%files tex4ebook-bin
+%defattr(-,root,root,755)
+%{_bindir}/tex4ebook
+
 %files tex4ht-bin
 %defattr(-,root,root,755)
 %{_bindir}/ht
@ -3987,8 +4197,10 @@ rm -f /var/run/texlive/run-update
 %defattr(-,root,root,755)
 %{_bindir}/euptex
 %{_bindir}/upbibtex
+%{_bindir}/updvitomp
 %{_bindir}/updvitype
 %{_bindir}/uplatex
+%{_bindir}/upmpost
 %{_bindir}/uppltotf
 %{_bindir}/uptex
 %{_bindir}/uptftopl
@ -4028,6 +4240,10 @@ rm -f /var/run/texlive/run-update
 %{_bindir}/pdfxmltex
 %{_bindir}/xmltex

+%files yplan-bin
+%defattr(-,root,root,755)
+%{_bindir}/yplan
+
 %files -n libkpathsea6
 %defattr(-,root,root,755)
 %{_libdir}/libkpathsea*.so.*