rpm/intltool
SHA256
1
0
Fork 0
forked from pool/intltool
Code Pull Requests Activity
c7db056ac1
intltool/intltool-perl-5.22.patch

53 lines
2.3 KiB
Diff
Raw Normal View History

Accepting request 528478 from home:coolo:branches:openSUSE:Factory - extend intltool-perl-5.22.patch to fix one more perl 5.26 issue OBS-URL: https://build.opensuse.org/request/show/528478 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=37
2017-09-25 14:59:37 +02:00
Index: intltool-update.in
===================================================================
--- intltool-update.in.orig
+++ intltool-update.in
@@ -1062,13 +1062,13 @@ sub SubstituteVariable
Accepting request 328287 from home:dimstar:branches:GNOME:Apps - Add intltool-perl-5.22.patch: Fix execution with perl 5.22. OBS-URL: https://build.opensuse.org/request/show/328287 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=31
2015-09-01 12:10:55 +02:00
}
}
- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
+ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
{
my $rest = $3;
my $untouched = $1;
Accepting request 528478 from home:coolo:branches:openSUSE:Factory - extend intltool-perl-5.22.patch to fix one more perl 5.26 issue OBS-URL: https://build.opensuse.org/request/show/528478 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=37
2017-09-25 14:59:37 +02:00
my $sub = "";
# Ignore recursive definitions of variables
- $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2}?/;
return SubstituteVariable ("$untouched$sub$rest");
}
@@ -1190,10 +1190,10 @@ sub FindPackageName
Accepting request 328287 from home:dimstar:branches:GNOME:Apps - Add intltool-perl-5.22.patch: Fix execution with perl 5.22. OBS-URL: https://build.opensuse.org/request/show/328287 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=31
2015-09-01 12:10:55 +02:00
$name =~ s/\(+$//g;
$version =~ s/\(+$//g;
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
}
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
Accepting request 528478 from home:coolo:branches:openSUSE:Factory - extend intltool-perl-5.22.patch to fix one more perl 5.26 issue OBS-URL: https://build.opensuse.org/request/show/528478 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=37
2017-09-25 14:59:37 +02:00
@@ -1219,11 +1219,11 @@ sub FindPackageName
Accepting request 328287 from home:dimstar:branches:GNOME:Apps - Add intltool-perl-5.22.patch: Fix execution with perl 5.22. OBS-URL: https://build.opensuse.org/request/show/328287 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/intltool?expand=0&rev=31
2015-09-01 12:10:55 +02:00
$version =~ s/\(+$//g;
$bugurl =~ s/\(+$//g if (defined $bugurl);
- $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
- $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
- $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
- $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
- $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION}?/);
+ $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+}?/);
}
# \s makes this not work, why?
Copy Permalink