API tools faq
paste
Guest User

Untitled

a guest
Nov 24th, 2017
66
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.08 KB | None | 0 0
raw download clone embed print report
  1. diff -ruN 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-08 18:39:54.000000000 -0700
  3. +++ intltool-0.51.0/intltool-update.in 2017-11-22 11:34:07.657722251 -0800
  4. @@ -1062,7 +1062,7 @@
  5. }
  6. }
  7.  
  8. - if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
  9. + if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
  10. {
  11. my $rest = $3;
  12. my $untouched = $1;
  13. @@ -1190,10 +1190,10 @@
  14. $name =~ s/\(+$//g;
  15. $version =~ s/\(+$//g;
  16.  
  17. - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
  18. - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
  19. - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
  20. - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
  21. + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
  22. + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
  23. + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
  24. + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
  25. }
  26.  
  27. if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
  28. @@ -1219,11 +1219,11 @@
  29. $version =~ s/\(+$//g;
  30. $bugurl =~ s/\(+$//g if (defined $bugurl);
  31.  
  32. - $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
  33. - $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
  34. - $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
  35. - $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
  36. - $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
  37. + $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
  38. + $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
  39. + $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
  40. + $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
  41. + $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);
  42. }
  43.  
  44. # \s makes this not work, why?
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!