diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2017-06-19 10:35:06 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2017-06-19 10:35:06 +0000 |
| commit | 6f4fe24b23a8dac61864f690e5eb427c5623a2e4 (patch) | |
| tree | 521f0437874f627dcf89f818e14e97e4666cc494 /main/intltool | |
| parent | c2608d3ee64ad09c79073fc45e14d6d2cbfff87c (diff) | |
| download | aports-6f4fe24b23a8dac61864f690e5eb427c5623a2e4.tar.bz2 aports-6f4fe24b23a8dac61864f690e5eb427c5623a2e4.tar.xz | |
main/intltool: fixes #7450
Diffstat (limited to 'main/intltool')
| -rw-r--r-- | main/intltool/APKBUILD | 8 | ||||
| -rw-r--r-- | main/intltool/intltool-perl-regexp.patch | 44 |
2 files changed, 49 insertions, 3 deletions
diff --git a/main/intltool/APKBUILD b/main/intltool/APKBUILD index b012605506..6179e3e6d8 100644 --- a/main/intltool/APKBUILD +++ b/main/intltool/APKBUILD @@ -1,14 +1,15 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=intltool pkgver=0.51.0 -pkgrel=1 +pkgrel=2 pkgdesc="The internationalization tool collection" url="http://freedesktop.org/wiki/Software/intltool" arch="noarch" license="GPL2" depends="perl perl-xml-parser gettext file" subpackages="$pkgname-doc" -source="http://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz" +source="http://edge.launchpad.net/intltool/trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz + intltool-perl-regexp.patch" builddir="$srcdir/$pkgname-$pkgver" build () { @@ -26,4 +27,5 @@ package() { make DESTDIR="$pkgdir" install || return 1 } -sha512sums="4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf intltool-0.51.0.tar.gz" +sha512sums="4c93cb26592ed0b1622d3b7800b5d6622ffa36f58ac73f2ef0bddfab522565fdfb8fa73d81914b9a202f1d62bc995a08960f8adb9f62c86918e75498e85fbfdf intltool-0.51.0.tar.gz +297a9ed5e97e3f116332a9193d254598d541c7f931b91229b788ca66e9bfc109c2badcc75e5e8d45464c086bab9ffeddb564291ef34cd35b505b354b9e834aa7 intltool-perl-regexp.patch" diff --git a/main/intltool/intltool-perl-regexp.patch b/main/intltool/intltool-perl-regexp.patch new file mode 100644 index 0000000000..34ee03aa7d --- /dev/null +++ b/main/intltool/intltool-perl-regexp.patch @@ -0,0 +1,44 @@ +--- 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 @@ + } + } + +- if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/) ++ if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/) + { + my $rest = $3; + my $untouched = $1; +@@ -1190,10 +1190,10 @@ + $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) +@@ -1219,11 +1219,11 @@ + $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? + |