summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-12 13:50:08 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-11-12 13:50:08 +0000
commit5f82a0588a66f544fb262c467a2d92f5c2d95bf0 (patch)
treea1d000ddb35714c1c76391a2a3c46d09392054dc
parentd143b9c7e39c5acc280d21d39fa4eb30028d43f2 (diff)
downloadmidipix_build-5f82a0588a66f544fb262c467a2d92f5c2d95bf0.tar.bz2
midipix_build-5f82a0588a66f544fb262c467a2d92f5c2d95bf0.tar.xz
patches/intltool-0.51.0.local.patch: escape curly braces within regular expressions in intltool-update.
-rw-r--r--patches/intltool-0.51.0.local.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/patches/intltool-0.51.0.local.patch b/patches/intltool-0.51.0.local.patch
new file mode 100644
index 00000000..ca048433
--- /dev/null
+++ b/patches/intltool-0.51.0.local.patch
@@ -0,0 +1,50 @@
+--- intltool-0.51.0/intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000
++++ intltool-0.51.0/intltool-update.in 2017-11-12 13:48:23.236000000 +0000
+@@ -1062,13 +1062,13 @@
+ }
+ }
+
+- 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 @@
+ $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 @@
+ $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?