diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch | |
parent | d87262dd706fec50cd150aab3e93883b6337466d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch')
-rw-r--r-- | dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch b/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch deleted file mode 100644 index 097c511ce18d..000000000000 --- a/dev-util/intltool/files/intltool-0.51.0-perl-5.22.patch +++ /dev/null @@ -1,48 +0,0 @@ -https://bugs.launchpad.net/intltool/+bug/1490906 - -fix warnings w/newer perl: -Unescaped left brace in regex is deprecated, passed through in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/bin/intltool-update line 1065. - ---- a/intltool-update.in -+++ b/intltool-update.in -@@ -1062,7 +1062,7 @@ - } - } - -- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) -+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) - { - my $rest = $3; - my $untouched = $1; -@@ -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? |