Dr. Werner Fink 2018-03-15 08:56:40 +00:00 committed by Git OBS Bridge
parent d1f2603a8b
commit 581f1810c1
3 changed files with 34 additions and 0 deletions

24
biber-perl-5.30.dif Normal file
View File

@ -0,0 +1,24 @@
Fun with Perl 5.30
---
lib/Biber/LaTeX/Recode.pm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- lib/Biber/LaTeX/Recode.pm
+++ lib/Biber/LaTeX/Recode.pm 2018-03-15 08:49:32.341586613 +0000
@@ -312,9 +312,14 @@ sub latex_decode {
#
# Workaround perl's lack of variable-width negative look-behind -
# Reverse string (and therefore some of the Re) and use variable width negative look-ahead
+ # Careful here - reversing puts any combining chars before the char so \X can't be used
$text = reverse $text;
- $text =~ s/}(\pM+\pL){(?!\pL+\\)/$1/g;
+ $text =~ s/\}(\pM*\pL)\{(?!(?:\}[^}]+\{)*\pL+\\)/$1/g;
$text = reverse $text;
+ # Put brace markers back after doing the brace elimination as we only want to eliminate
+ # braces introduced as part of decoding, not explicit braces in the data
+ $text =~ s/\x{1f}/{/g;
+ $text =~ s/\x{1e}/}/g;
# Replace verbatim field markers
$text =~ s/([a-f0-9]{32})/$saveverb->{$1}/gie;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 15 08:54:09 UTC 2018 - werner@suse.de
- Avoid trouble with perl 5.30 and biber
-------------------------------------------------------------------
Thu Mar 15 07:29:33 UTC 2018 - werner@suse.de

View File

@ -259,6 +259,8 @@ Patch20: source-missed-scripts.dif
Patch42: biblatex-encoding.dif
# PATCH-FIX-SUSE Old problem back: we do not use internal Certs!
Patch44: biber-certs.dif
# PATCH-FIX-SUSE Make biber work with perl 5.30
Patch46: biber-perl-5.30.dif
# PATCH-FIX-SUSE Make biber work with perl 5.18.2
Patch47: biber-perl-5.18.2.dif
# PATCH-FIX-UPSTREAM texlive-20170524-source-poppler059-1.patch dimstar@opensuse.org -- Adapt to poppler 0.59 API changes
@ -3419,6 +3421,9 @@ pushd ../biblatex-biber-*
/usr/bin/chmod -Rf a+rX,u+w,g-w,o-w .
%patch42 -p0 -b .en
%patch44 -p0 -b .noica
%if 0%{perl_versnum} >= 5300
%patch46 -p0 -b .530
%endif
%if 0%{perl_versnum} < 5200
%patch47 -p0 -b .518
%endif