pool/texlive
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 366519 from Publishing:TeXLive

Browse Source 
- Fix version template to get version of libtexlua52 right 

-  Split off shared libraries and the development headers for
   synctex, lua52, and luajit as separate packages.

- new perl-biber also requires perl module Text::Roman

- Let texlive-ps2pk Obsoletes texlive-ps2pkm (boo#965472)

- Also enforce fmtutil.pl to use FHS as then it will find mktexlsr.pl
  boo#965151 

- Fix bug boo#965151 that is wrong perl syntax 

- Make it build even on Leap with old perl 5.18.2 

- On older systems the linpoppler is somewhat to old

- Be aware that LuaJIT does not build on all architectures

- 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

OBS-URL: https://build.opensuse.org/request/show/366519
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=27
This commit is contained in:
Dominique Leuenberger 2016-03-17 15:33:38 +00:00 committed by Git OBS Bridge
commit e7905062af
24 changed files with 2926 additions and 572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
biber-certs.dif Normal file
View File

@ -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'}) {

63
biber-decode.diff
View File

@ -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');

30
biber-noreadonly.diff
View File

@ -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;

39
biber-perl-5.18.2.dif Normal file
View File

@ -0,0 +1,39 @@
With perl-5.18.2 macros like
{\v S}
\s S
do not work.
---
t/tdata/names.bib | 4 ++--
t/utils.t | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--- t/utils.t
+++ t/utils.t 2016-02-03 11:03:21.266959058 +0000
@@ -66,7 +66,7 @@ eq_or_diff(File::Spec->canonpath(locate_
eq_or_diff(normalise_string('"a, b–c: d" ', 1), 'a bc d', 'normalise_string' );
Biber::Config->setoption('output_encoding', 'UTF-8');
-eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c Se\x{c}\"ok-\foo{a}, N\`i\~no
+eq_or_diff(NFC(normalise_string_underscore(latex_decode('\c{S}e\x{c}\"ok-\foo{a}, N\`i\~no
$§+ :-) '), 0)), 'Şecöka_Nìño', 'normalise_string_underscore 1' );
eq_or_diff(normalise_string_underscore('{Foo de Bar, Graf Ludwig}', 1), 'Foo_de_Bar_Graf_Ludwig', 'normalise_string_underscore 3');
--- t/tdata/names.bib
+++ t/tdata/names.bib 2016-02-03 11:33:24.475937720 +0000
@@ -87,11 +87,11 @@
}
@BOOK{L21,
- AUTHOR = {{\v S}omeone Smith},
+ AUTHOR = {\v{S}omeone Smith},
}
@BOOK{L22,
- AUTHOR = {Someone {\v S}mith},
+ AUTHOR = {Someone \v{S}mith},
}
@BOOK{L23,

645
biber-perl-5.22.dif
View File

@ -1,51 +1,636 @@
--- 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 | 6 +++---
lib/Biber/LaTeX/Recode.pm | 6 +++---
lib/Biber/Utils.pm | 2 +-
t/basic-misc.t | 2 +-
t/biblatexml.t | 2 +-
t/bibtex-aliases.t | 2 +-
t/bibtex-output.t | 2 +-
t/crossrefs.t | 2 +-
t/dm-constraints.t | 2 +-
t/dm-dateformats.t | 2 +-
t/encoding.t | 2 +-
t/endnotexml.t | 2 +-
t/extratitle.t | 2 +-
t/extratitleyear.t | 2 +-
t/extrayear.t | 2 +-
t/labelalpha.t | 2 +-
t/labelname.t | 2 +-
t/names.t | 2 +-
t/options.t | 3 ++-
t/related-entries.t | 2 +-
t/remote-files.t | 2 +-
t/ris.t | 2 +-
t/sections-complex.t | 2 +-
t/sections.t | 2 +-
t/set-dynamic.t | 2 +-
t/set-legacy.t | 2 +-
t/set-static.t | 2 +-
t/skips.t | 2 +-
t/sort-case.t | 2 +-
t/sort-complex.t | 2 +-
t/sort-order.t | 4 ++--
t/sort-uc.t | 2 +-
t/sorting.t | 2 +-
t/tool-bltxml.t | 2 +-
t/tool.t | 2 +-
t/uniqueness.t | 32 ++++++++++++++++----------------
t/xdata.t | 2 +-
t/zoterordfxml.t | 2 +-
38 files changed, 59 insertions(+), 58 deletions(-)
--- lib/Biber/Input/file/bibtex.pm
+++ lib/Biber/Input/file/bibtex.pm
@@ -759,7 +757,7 @@ sub _name {
# Check for malformed names in names which aren't completely escaped
# Too many commas
- unless ($name =~ m/\A{\X+}\z/xms) { # Ignore these tests for escaped names
+ unless ($name =~ m/\A\{\X+}\z/xms) { # Ignore these tests for escaped names
+ unless ($name =~ m/\A\{\X+\}\z/xms) { # Ignore these tests for escaped names
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;
@@ -1262,8 +1260,8 @@ my %months = (
sub _hack_month {
my $in_month = shift;
- if ($in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
- return $months{lc(Unicode::GCString->new($1)->substr(0,3)->as_string)};
+ if (my ($m) = $in_month =~ m/\A\s*((?:jan|feb|mar|apr|may|jun|jul|aug|sep|oct|nov|dec).*)\s*\z/i) {
+ return $months{lc(Unicode::GCString->new($m)->substr(0,3)->as_string)};
}
else {
return $in_month;
--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm
@@ -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
@@ -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;
}
--- t/basic-misc.t
+++ t/basic-misc.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
Biber::Config->setblxoption('uniquelist', 1);
Biber::Config->setblxoption('maxcitenames', 3);
--- t/biblatexml.t
+++ t/biblatexml.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Now generate the information
$biber->prepare;
--- t/bibtex-aliases.t
+++ t/bibtex-aliases.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('validate_datamodel', 1);
# THERE IS A MAPPING SECTION IN THE .bcf BEING USED TO TEST USER MAPS TOO!
--- t/bibtex-output.t
+++ t/bibtex-output.t
@@ -36,7 +36,7 @@ Log::Log4perl->init(\$l4pconf);
# Biber options
Biber::Config->setoption('output_resolve', 1);
Biber::Config->setoption('output_format', 'bibtex');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
$biber->parse_ctrlfile('bibtex-output.bcf');
$biber->set_output_obj(Biber::Output::bibtex->new());
--- t/crossrefs.t
+++ t/crossrefs.t
@@ -40,8 +40,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('nodieonerror', 1); # because there is a failing cyclic crossref check
# Now generate the information
--- t/dm-constraints.t
+++ t/dm-constraints.t
@@ -50,9 +50,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
Biber::Config->setoption('validate_datamodel', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Now generate the information
$biber->prepare;
--- t/dm-dateformats.t
+++ t/dm-dateformats.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('validate_datamodel', 1);
# Biblatex options
--- t/encoding.t
+++ t/encoding.t
@@ -30,8 +30,8 @@ my $l4pconf = qq|
|;
Log::Log4perl->init(\$l4pconf);
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
my $encode1 = q| \entry{testŠ}{book}{}
\name{author}{1}{}{%
--- t/endnotexml.t
+++ t/endnotexml.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
--- t/extratitle.t
+++ t/extratitle.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
--- t/extratitleyear.t
+++ t/extratitleyear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Now generate the information
$biber->prepare;
--- t/extrayear.t
+++ t/extrayear.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
--- t/labelalpha.t
+++ t/labelalpha.t
@@ -37,8 +37,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Biblatex options
Biber::Config->setblxoption('maxalphanames', 1);
--- t/labelname.t
+++ t/labelname.t
@@ -27,8 +27,8 @@ my $l4pconf = qq|
|;
Log::Log4perl->init(\$l4pconf);
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
$biber->parse_ctrlfile("general1.bcf");
$biber->set_output_obj(Biber::Output::bbl->new());
--- t/names.t
+++ t/names.t
@@ -38,8 +38,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('namesep', 'und'); # Testing custom name splitting string
Biber::Config->setoption('others_string', 'andere'); # Testing custom implied "et al"
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setblxoption('mincitenames', 3);
# Now generate the information
--- t/options.t
+++ t/options.t
@@ -34,8 +34,9 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+
# Testing customg xsv format sep
Biber::Config->setoption('xsvsep', '\s*\|\s*');
--- t/related-entries.t
+++ t/related-entries.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Now generate the information
$biber->prepare;
--- t/remote-files.t
+++ t/remote-files.t
@@ -41,8 +41,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('quiet', 1);
Biber::Config->setoption('nodieonerror', 1); # because the remote bibs might be messy
--- t/ris.t
+++ t/ris.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# THERE IS A CONFIG FILE BEING READ TO TEST USER MAPS TOO!
--- t/sections-complex.t
+++ t/sections-complex.t
@@ -35,8 +35,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
--- t/sections.t
+++ t/sections.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
Biber::Config->setoption('output_safechars', 1);
--- t/set-dynamic.t
+++ t/set-dynamic.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Now generate the information
$biber->prepare;
--- t/set-legacy.t
+++ t/set-legacy.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
# Now generate the information
--- t/set-static.t
+++ t/set-static.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
# Now generate the information
--- t/skips.t
+++ t/skips.t
@@ -34,7 +34,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('fastsort', 1);
# Now generate the information
--- t/sort-case.t
+++ t/sort-case.t
@@ -33,7 +33,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
Biber::Config->setoption('sortcase', 1);
Biber::Config->setoption('sortupper', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
$S = [
[
--- t/sort-complex.t
+++ t/sort-complex.t
@@ -34,8 +34,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# relying on here for tests
# Biber options
+Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
# Want to ignore SHORTHAND* fields for the first few tests
Biber::Config->setoption('sourcemap', [
{
--- t/sort-order.t
+++ t/sort-order.t
@@ -31,8 +31,8 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Options - we could set these in the control file but it's nice to see what we're
# relying on here for tests
+Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
Biber::Config->setblxoption('labelyear', undef);
Biber::Config->setblxoption('labelalpha', 0);
--- t/sort-uc.t
+++ t/sort-uc.t
@@ -31,7 +31,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Options - we could set these in the control file but it's nice to see what we're
# relying on here for tests
-Biber::Config->setoption('sortlocale', 'sv_SE');
+Biber::Config->setoption('sortlocale', 'sv_SE.UTF-8');
# U::C Swedish tailoring
$biber->prepare;
--- t/sorting.t
+++ t/sorting.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
my $yearoff1 = 'mm,,Knuth!Donald E,Computers Typesetting,1984,0000';
my $yearoff2 = 'mm,,Knuth!Donald E,Computers Typesetting,198,0000';
--- t/tool-bltxml.t
+++ t/tool-bltxml.t
@@ -44,7 +44,7 @@ $out->set_output_target_file(\$outvar);
Biber::Config->setoption('tool', 1);
Biber::Config->setoption('output_resolve', 1);
Biber::Config->setoption('output_format', 'biblatexml');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# THERE IS A CONFIG FILE BEING READ!
--- t/tool.t
+++ t/tool.t
@@ -38,7 +38,7 @@ $biber->set_output_obj(Biber::Output::bibtex->new());
Biber::Config->setoption('tool', 1);
Biber::Config->setoption('output_resolve', 1);
Biber::Config->setoption('output_format', 'bibtex');
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# THERE IS A CONFIG FILE BEING READ!
--- t/uniqueness.t
+++ t/uniqueness.t
@@ -36,7 +36,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
@@ -84,7 +84,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
@@ -111,7 +111,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 5);
@@ -138,7 +138,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 2);
Biber::Config->setblxoption('mincitenames', 1);
@@ -157,7 +157,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 1);
Biber::Config->setblxoption('uniquelist', 1);
@@ -218,7 +218,7 @@ $biber->parse_ctrlfile('uniqueness1.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
Biber::Config->setblxoption('mincitenames', 1);
@@ -247,7 +247,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 3);
Biber::Config->setblxoption('mincitenames', 3);
@@ -317,7 +317,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 3);
Biber::Config->setblxoption('mincitenames', 1);
@@ -357,7 +357,7 @@ $biber->parse_ctrlfile('uniqueness4.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 2);
Biber::Config->setblxoption('mincitenames', 1);
@@ -393,7 +393,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 1);
Biber::Config->setblxoption('mincitenames', 1);
@@ -422,7 +422,7 @@ $biber->parse_ctrlfile('uniqueness5.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('maxcitenames', 3);
Biber::Config->setblxoption('mincitenames', 2);
@@ -451,7 +451,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 1);
Biber::Config->setblxoption('uniquelist', 0);
@@ -480,7 +480,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 2);
Biber::Config->setblxoption('uniquelist', 1);
@@ -509,7 +509,7 @@ $biber->parse_ctrlfile('uniqueness3.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 0);
Biber::Config->setblxoption('uniquelist', 0);
@@ -538,7 +538,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 3);
Biber::Config->setblxoption('uniquelist', 1);
@@ -565,7 +565,7 @@ $biber->parse_ctrlfile('uniqueness2.bcf');
$biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Biblatex options
Biber::Config->setblxoption('uniquename', 4);
Biber::Config->setblxoption('uniquelist', 1);
--- t/xdata.t
+++ t/xdata.t
@@ -44,7 +44,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
Biber::Config->setoption('nodieonerror', 1); # because there is a cyclic xdata check
# Now generate the information
--- t/zoterordfxml.t
+++ t/zoterordfxml.t
@@ -37,7 +37,7 @@ $biber->set_output_obj(Biber::Output::bbl->new());
# Biber options
Biber::Config->setoption('fastsort', 1);
-Biber::Config->setoption('sortlocale', 'C');
+Biber::Config->setoption('sortlocale', 'en_GB.UTF-8');
# Now generate the information
$biber->prepare;

15
biber-perl-unicode-normalize.dif Normal file
View File

@ -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,

17
biber-skip-bibtex-forms.dif Normal file
View File

@ -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');

3
biblatex-biber-1.8.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5e227d8cc5c2aed77583acfa5fd9543ea7d3ab9a66f3421681ea7b9fc00979e7
size 1004116

3
biblatex-biber-2.1.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdfb11a432063bcb25fc7bf37a6701c1ae6e5850be387aafc35aaf6a4cd01223
size 974108

20
biblatex-encoding.dif
View File

@ -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');

37
source-asymptote-gs9.15.dif
View File

@ -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");

34
source-configure.dif
View File

@ -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

12
source-dvipng.dif
View File

@ -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;

46
source-dviutils.dif
View File

@ -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.)

10
source-lacheck.dif
View File

@ -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> */

1331
source-missed-scripts.dif Normal file
View File

File diff suppressed because it is too large Load Diff

18
source-overflow.dif
View File

@ -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

118
source-warns.dif
View File

@ -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;

4
source-x11r7.dif
View File

@ -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

366
source.dif
View File

@ -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,116 @@
-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
@@ -11,16 +11,16 @@
# Original shell script (C) 2001 Thomas Esser, public domain
#
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
}
@@ -73,7 +73,7 @@ my @deferred_stdout;
# this function checks by itself whether it is running on windows or not
reset_root_home();
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -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 +901,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 +912,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 +920,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 +930,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 +951,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 +969,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 +991,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 +1014,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 +1024,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 +1034,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 +1063,7 @@
}
@@ -214,8 +216,22 @@ search_symlinkdir()
@@ -208,8 +210,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
@ -1058,7 +1088,7 @@
done
}
@@ -280,12 +296,12 @@ main()
@@ -274,12 +290,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
@ -1074,7 +1104,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 +1122,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 +1133,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 +1146,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 +1166,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 +1193,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 +1206,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 +1244,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

3
texlive-20140525-source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e3c86ed2231ae08ea041c10513b1767f14680bb114c5ec2fe984f3f78bcf52d5
size 39180252

3
texlive-20150521-source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ed9bcd7bdce899c3c27c16a8c5c3017c4f09e1d7fd097038351b72497e9d4669
size 45459552

75
texlive.changes
View File

@ -1,3 +1,78 @@
-------------------------------------------------------------------
Sat Mar 5 14:17:59 UTC 2016 - werner@suse.de
- Fix version template to get version of libtexlua52 right
-------------------------------------------------------------------
Fri Mar 4 09:47:55 UTC 2016 - werner@suse.de
- Split off shared libraries and the development headers for
synctex, lua52, and luajit as separate packages.
-------------------------------------------------------------------
Tue Feb 9 10:22:57 UTC 2016 - kruber@zib.de
- new perl-biber also requires perl module Text::Roman
-------------------------------------------------------------------
Tue Feb 9 08:12:05 UTC 2016 - werner@suse.de
- Let texlive-ps2pk Obsoletes texlive-ps2pkm (boo#965472)
-------------------------------------------------------------------
Mon Feb 8 10:36:43 UTC 2016 - werner@suse.de
- Also enforce fmtutil.pl to use FHS as then it will find mktexlsr.pl
boo#965151
-------------------------------------------------------------------
Thu Feb 4 14:58:39 UTC 2016 - werner@suse.de
- Fix bug boo#965151 that is wrong perl syntax
-------------------------------------------------------------------
Wed Feb 3 13:15:30 UTC 2016 - werner@suse.de
- Make it build even on Leap with old perl 5.18.2
-------------------------------------------------------------------
Tue Feb 2 17:41:37 UTC 2016 - werner@suse.de
- On older systems the linpoppler is somewhat to old
-------------------------------------------------------------------
Tue Feb 2 08:11:37 UTC 2016 - werner@suse.de
- Be aware that LuaJIT does not build on all architectures
-------------------------------------------------------------------
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.18.2.dif becomes 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

558
texlive.spec
View File

File diff suppressed because it is too large Load Diff