Home Verkennen Help
Registreren Inloggen
XCAppCollection
/
XCVMKit-OS
2
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Aftakking: master
Aftakkingen Labels
XCVMKit-OS
/
package
/
intltool
/
0001-perl-5.26-compatibility.patch

0001-perl-5.26-compatibility.patch 2.4 KB
Permalink Geschiedenis Ruwe

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455 
  1. Fix regex errors thrown by Perl 5.26:
    2. 

  2. 

  3. Unescaped left brace in regex is illegal here in regex; marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at $BUILDROOT/host/usr/bin/intltool-update line 1065.
    4. 

  4. 

  5. Fetched from:
    6. 

  6. https://github.com/Alexpux/MSYS2-packages/blob/master/intltool/perl-5.22-compatibility.patch
    7. 

  7. 

  8. Reported upstream:
    9. 

  9. https://bugs.launchpad.net/intltool/+bug/1696658
    10. 

  10. 

  11. Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
    12. 

  12. 

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

  14. +++ intltool-0.51.0.orig/intltool-update.in	2015-06-19 01:52:07.171228154 +0200
    15. 

  15. @@ -1062,7 +1062,7 @@ 
    16. 

  16.  	}
    17. 

  17.      }
    18. 

  18.  
    19. 

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

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

  21.      {
    22. 

  22.  	my $rest = $3;
    23. 

  23.  	my $untouched = $1;
    24. 

  24. @@ -1190,10 +1190,10 @@ 
    25. 

  25.  	$name    =~ s/\(+$//g;
    26. 

  26.  	$version =~ s/\(+$//g;
    27. 

  27.  
    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. +	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
    33. 

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

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

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

  36.      }
    37. 

  37.  
    38. 

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

  39. @@ -1219,11 +1219,11 @@ 
    40. 

  40.  	$version =~ s/\(+$//g;
    41. 

  41.          $bugurl  =~ s/\(+$//g if (defined $bugurl);
    42. 

  42.  
    43. 

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

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

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

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

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

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

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

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

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

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

  53.      }
    54. 

  54.  
    55. 

  55.      # \s makes this not work, why?
    56.