intltool/repos/extra-any/intltool-0.51.0-perl-5.26.patch

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