package/develop/intltool/perl-5.26.patch

   1 --- intltool-0.51.0.orig/intltool-update.in     2015-03-09 02:39:54.000000000 +0100
   2 +++ intltool-0.51.0.orig/intltool-update.in     2015-06-19 01:52:07.171228154 +0200
   3 @@ -1062,7 +1062,7 @@
   4         }
   5      }
   6
   7 -    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
   8 +    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
   9      {
  10         my $rest = $3;
  11         my $untouched = $1;
  12 @@ -1190,10 +1190,10 @@
  13         $name    =~ s/\(+$//g;
  14         $version =~ s/\(+$//g;
  15
  16 -       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
  17 -       $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
  18 -       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
  19 -       $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
  20 +       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
  21 +       $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
  22 +       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
  23 +       $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
  24      }
  25
  26      if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
  27 @@ -1219,11 +1219,11 @@
  28         $version =~ s/\(+$//g;
  29          $bugurl  =~ s/\(+$//g if (defined $bugurl);
  30
  31 -       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
  32 -       $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
  33 -       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
  34 -       $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
  35 -        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
  36 +       $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
  37 +       $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
  38 +       $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
  39 +       $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
  40 +        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
  41      }
  42
  43      # \s makes this not work, why?
  44