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

Accepting request 317789 from Publishing:TeXLive

Browse Source 
- Add patch biber-perl-5.22.dif to make regular expressions work
  even with perl 5.22 (boo#938018, patch by Friedrich Haubensak)

OBS-URL: https://build.opensuse.org/request/show/317789
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/texlive?expand=0&rev=26
This commit is contained in:
Stephan Kulow 2015-08-25 05:23:37 +00:00 committed by Git OBS Bridge
commit 2acb651c6e
3 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
biber-perl-5.22.dif Normal file
View File

@ -0,0 +1,51 @@
--- 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 @@
# 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
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;
}
elsif ($type eq 'superscripts') {
- $text =~ s/\\textsuperscript{($re)}/$map->{$1}/ge if $re;
+ $text =~ s/\\textsuperscript\{($re)}/$map->{$1}/ge if $re;
}
- 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 'dings') {
- $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 @@
sub remove_outer {
my $str = shift;
- $str =~ s/^{(\X+)}$/$1/;
+ $str =~ s/^\{(\X+)}$/$1/;
return $str;
}

6
texlive.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Jul 14 14:25:04 UTC 2015 - werner@suse.de
- Add patch biber-perl-5.22.dif to make regular expressions work
even with perl 5.22 (boo#938018, patch by Friedrich Haubensak)
-------------------------------------------------------------------
Fri Apr 17 13:40:24 UTC 2015 - werner@suse.de

7
texlive.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package texlive
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -218,8 +218,10 @@ Patch15: source-overflow.dif
Patch17: source-64.dif
Patch18: source-a2ping.dif
Patch19: source-dvipng.dif
# PATCH-FIX-SUSE Make biber work with out perl
# 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
@ -2576,6 +2578,7 @@ This package is required by the package texlive-biber-bin.
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
popd