diff options
| author | tmpfile <tmpfile@users.noreply.github.com> | 2017-09-07 09:21:12 -0300 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-09-08 08:38:27 +0000 |
| commit | a6efc97a75189ae494521293dd4ec9a37f47a6c7 (patch) | |
| tree | 8eccda291c3103fd9242eea6f8a70821e6e29215 | |
| parent | 162941d08c4cb20fef1d7045711be48d88e78340 (diff) | |
| download | aports-a6efc97a75189ae494521293dd4ec9a37f47a6c7.tar.bz2 aports-a6efc97a75189ae494521293dd4ec9a37f47a6c7.tar.xz | |
main/intltool: update perl-regexp patch
| -rw-r--r-- | main/intltool/APKBUILD | 4 | ||||
| -rw-r--r-- | main/intltool/intltool-perl-regexp.patch | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD index f79b63b196..5a086d395c 100644 --- a/main/intltool/APKBUILD +++ b/main/intltool/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=intltool pkgver=0.51.0 -pkgrel=3 +pkgrel=4 pkgdesc="The internationalization tool collection" url="http://freedesktop.org/wiki/Software/intltool" arch="noarch" @@ -32,4 +32,4 @@ package() { } sha512sums="4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf intltool-0.51.0.tar.gz -297a9ed5e97e3f116332a9193d254598d541c7f931b91229b788ca66e9bfc109c2badcc75e5e8d45464c086bab9ffeddb564291ef34cd35b505b354b9e834aa7 intltool-perl-regexp.patch" +119386effcacde4e41250fe527bd868e5f2dea4b46856313126bc664f22a1513980f2ab7dc37317ca4f6be6daa2617127f07477ad312f2ff7bc360120a30627a intltool-perl-regexp.patch" diff --git a/main/intltool/intltool-perl-regexp.patch b/main/intltool/intltool-perl-regexp.patch index 34ee03aa7d..f423bee92f 100644 --- a/main/intltool/intltool-perl-regexp.patch +++ b/main/intltool/intltool-perl-regexp.patch @@ -1,6 +1,6 @@ --- a/intltool-update.in.orig 2015-03-09 01:39:54.000000000 +0000 +++ b/intltool-update.in 2017-01-22 20:14:20.359080387 +0000 -@@ -1062,7 +1062,7 @@ +@@ -1062,13 +1062,13 @@ } } @@ -9,6 +9,13 @@ { my $rest = $3; my $untouched = $1; + 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 @@ $name =~ s/\(+$//g; $version =~ s/\(+$//g; @@ -41,4 +48,3 @@ } # \s makes this not work, why? - |