source: patches/intltool-0.51.0-perl-5.22-compatibility.patch@ a4a0c7f

systemd
Last change on this file since a4a0c7f was 657587d, checked in by William Harrington <kb0iic@…>, 7 years ago

Update patch name.
  • Property mode set to 100644
File size: 2.3 KB

  • intltool-update.in 

    Submitted by: Chris Staub (chris at clfs dot org)
Date: 2017-06-10
Initial Package Version: 0.51 
Origin: https://raw.githubusercontent.com/Alexpux/MSYS2-packages/master/intltool/perl-5.22-compatibility.patch
Description: Updates Intltool to work with Perl 5.26

diff -Naur intltool-0.51.0.orig/intltool-update.in intltool-0.51.0/intltool-update.in
    old new  
    10621062        }
    10631063    }
    10641064
    1065     if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
     1065    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
    10661066    {
    10671067        my $rest = $3;
    10681068        my $untouched = $1;
    … …  
    11901190        $name    =~ s/\(+$//g;
    11911191        $version =~ s/\(+$//g;
    11921192
    1193         $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    1194         $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    1195         $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    1196         $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
     1193        $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
     1194        $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
     1195        $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
     1196        $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
    11971197    }
    11981198
    11991199    if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
    … …  
    12191219        $version =~ s/\(+$//g;
    12201220        $bugurl  =~ s/\(+$//g if (defined $bugurl);
    12211221
    1222         $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
    1223         $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
    1224         $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
    1225         $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
    1226         $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
     1222        $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
     1223        $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
     1224        $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
     1225        $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
     1226        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
    12271227    }
    12281228
    12291229    # \s makes this not work, why?
Note: See TracBrowser for help on using the repository browser.