mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-10 05:40:07 +02:00
62 lines
2.5 KiB
Plaintext
62 lines
2.5 KiB
Plaintext
From 3602bd8448dc1cbcb757316f359cf744968b6b43 Mon Sep 17 00:00:00 2001
|
|
From: Jerome Duval <jerome.duval@gmail.com>
|
|
Date: Wed, 26 Jul 2017 19:29:49 +0200
|
|
Subject: patch for perl 5.26 from arch linux.
|
|
|
|
|
|
diff --git a/intltool-update.in b/intltool-update.in
|
|
index 6992ab4..d878410 100644
|
|
--- a/intltool-update.in
|
|
+++ b/intltool-update.in
|
|
@@ -1062,13 +1062,13 @@ sub SubstituteVariable
|
|
}
|
|
}
|
|
|
|
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
|
|
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
|
|
{
|
|
my $rest = $3;
|
|
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");
|
|
}
|
|
@@ -1190,10 +1190,10 @@ sub FindPackageName
|
|
$name =~ s/\(+$//g;
|
|
$version =~ s/\(+$//g;
|
|
|
|
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
}
|
|
|
|
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
|
|
@@ -1219,11 +1219,11 @@ sub FindPackageName
|
|
$version =~ s/\(+$//g;
|
|
$bugurl =~ s/\(+$//g if (defined $bugurl);
|
|
|
|
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
|
|
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
|
|
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
|
|
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
|
|
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
|
|
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
|
|
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
|
|
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
|
|
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
|
|
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
|
|
}
|
|
|
|
# \s makes this not work, why?
|
|
--
|
|
2.13.3
|
|
|