From 816eee71e16f4c3c70644d1b4699bd6e1989ecb62ac8f334bdd6f9c95bc0d2c0 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 14 Jul 2015 14:39:57 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=192
---
 biber-perl-5.22.dif | 51 +++++++++++++++++++++++++++++++++++++++++++++
 texlive.changes     |  6 ++++++
 texlive.spec        |  7 +++++--
 3 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 biber-perl-5.22.dif

diff --git a/biber-perl-5.22.dif b/biber-perl-5.22.dif
new file mode 100644
index 0000000..487277b
--- /dev/null
+++ b/biber-perl-5.22.dif
@@ -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;
+ }
+ 
diff --git a/texlive.changes b/texlive.changes
index 9c54346..21bfea6 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -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
 
diff --git a/texlive.spec b/texlive.spec
index 32f3bcf..ebc9404 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -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