From 9cd7b8d9b0f71450ee0721d86b86c06ea2803530 Mon Sep 17 00:00:00 2001 From: maxice8 Date: Mon, 27 Nov 2017 07:10:36 -0200 Subject: [PATCH] intltool: Fix instance of Unescaped left brace in regex Found out while trying to run tests on glade3 --- srcpkgs/intltool/patches/perl522.patch | 11 +++++++++++ srcpkgs/intltool/template | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/srcpkgs/intltool/patches/perl522.patch b/srcpkgs/intltool/patches/perl522.patch index 3f0c340eed4..fcb6b7cec0e 100644 --- a/srcpkgs/intltool/patches/perl522.patch +++ b/srcpkgs/intltool/patches/perl522.patch @@ -44,3 +44,14 @@ Unescaped left brace in regex is deprecated, passed through in regex; marked by } # \s makes this not work, why? +--- intltool-update.in 2015-05-27 00:20:43.038379963 +0200 ++++ intltool-update.in 2015-05-27 00:23:53.309078052 +0200 +@@ -1068,7 +1068,7 @@ sub SubstituteVariable + my $untouched = $1; + my $sub = ""; + # Ignore recursive definitions of variables +- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/; ++ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2\}?/; + + return SubstituteVariable ("$untouched$sub$rest"); + } diff --git a/srcpkgs/intltool/template b/srcpkgs/intltool/template index 1c71faba7b2..6ca3a6154a6 100644 --- a/srcpkgs/intltool/template +++ b/srcpkgs/intltool/template @@ -1,7 +1,7 @@ # Template build file for 'intltool'. pkgname=intltool version=0.51.0 -revision=3 +revision=4 noarch=yes build_style=gnu-configure hostmakedepends="perl-XML-Parser"