Home Explore Help
Sign In
milislinux
/
milis21
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Branch: master
Branches Tags
milis21
/
talimatname
/
2
/
minimal
/
intltool#0.51.0-1
/
intltool-0.51.0-perl-5.26.patch

intltool-0.51.0-perl-5.26.patch 2.4 KB
Permalink History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152 
  1. diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
    2. 

  2. --- intltool-0.51.0.orig/intltool-update.in	2015-03-09 02:39:54.000000000 +0100
    3. 

  3. +++ intltool-0.51.0/intltool-update.in	2017-07-21 22:35:10.613631420 +0200
    4. 

  4. @@ -1062,13 +1062,13 @@
    5. 

  5.  	}
    6. 

  6.      }
    7. 

  7.  
    8. 

  8. -    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
    9. 

  9. +    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
    10. 

  10.      {
    11. 

  11.  	my $rest = $3;
    12. 

  12.  	my $untouched = $1;
    13. 

  13.  	my $sub = "";
    14. 

  14.          # Ignore recursive definitions of variables
    15. 

  15. -        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
    16. 

  16. +        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
    17. 

  17.  
    18. 

  18.  	return SubstituteVariable ("$untouched$sub$rest");
    19. 

  19.      }
    20. 

  20. @@ -1190,10 +1190,10 @@
    21. 

  21.  	$name    =~ s/\(+$//g;
    22. 

  22.  	$version =~ s/\(+$//g;
    23. 

  23.  
    24. 

  24. -	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    25. 

  25. -	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    26. 

  26. -	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    27. 

  27. -	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
    28. 

  28. +	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
    29. 

  29. +	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
    30. 

  30. +	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
    31. 

  31. +	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
    32. 

  32.      }
    33. 

  33.  
    34. 

  34.      if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
    35. 

  35. @@ -1219,11 +1219,11 @@
    36. 

  36.  	$version =~ s/\(+$//g;
    37. 

  37.          $bugurl  =~ s/\(+$//g if (defined $bugurl);
    38. 

  38.  
    39. 

  39. -	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    40. 

  40. -	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    41. 

  41. -	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    42. 

  42. -	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
    43. 

  43. -        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
    44. 

  44. +	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
    45. 

  45. +	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
    46. 

  46. +	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
    47. 

  47. +	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
    48. 

  48. +        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
    49. 

  49.      }
    50. 

  50.  
    51. 

  51.      # \s makes this not work, why?
    52. 

  52.