Befator-Inc-Firmen-Netzwerk/MSYS2-packages
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix warnings introduced by perl-5.22

Browse Source
This commit is contained in:
Alexey Pavlov 2015-07-21 08:24:44 +03:00
parent c677ff8889
commit 0d3f442553
4 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
automake1.15/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=automake1.15
pkgver=1.15
pkgrel=1
pkgrel=2
pkgdesc="A GNU tool for automatically creating Makefiles"
arch=('any')
license=('GPL')
@ -14,11 +14,13 @@ checkdepends=('dejagnu' 'python2')
install=automake.install
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
automake1.15-documentation.patch
automake-1.15-msys2.patch)
automake-1.15-msys2.patch
automake-1.15-perl-escape-curly-bracket.patch)
md5sums=('9a1ddb0e053474d9d1105cfe39b0c48d'
'SKIP'
'dc671559c3ab5ff1fe38bb6859cc6f01'
'eb5d504185474b2de2163060c4df4d8d')
'eb5d504185474b2de2163060c4df4d8d'
'3d5bae907a03ee3d26d0f8a0ae649cc5')
replace=('automake')
prepare() {
@ -26,6 +28,7 @@ prepare() {
patch -p1 -i ${srcdir}/automake1.15-documentation.patch
patch -p1 -i ${srcdir}/automake-1.15-msys2.patch
patch -p1 -i ${srcdir}/automake-1.15-perl-escape-curly-bracket.patch
}
build() {

21
automake1.15/automake-1.15-perl-escape-curly-bracket.patch Normal file
View File

@ -0,0 +1,21 @@
From: Pavel Raiskup <praiskup@redhat.com>
Date: Tue, 7 Jul 2015 10:54:24 +0200
Subject: [PATCH 2/2] bin/automake: escape '{' in regexp pattern
Resolves: rhbz#1239379
Upstream report:
http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
diff --git a/bin/automake.in b/bin/automake.in
index eedc8bc..a679d16 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker
sub substitute_ac_subst_variables
{
my ($text) = @_;
- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
return $text;
}

9
intltool/PKGBUILD
View File

@ -2,7 +2,7 @@
pkgname=intltool
pkgver=0.51.0
pkgrel=1
pkgrel=2
pkgdesc="The internationalization tool collection"
license=('GPL3')
arch=('i686' 'x86_64')
@ -10,12 +10,15 @@ url="https://edge.launchpad.net/intltool"
groups=('base-devel')
makedepends=('perl')
depends=('perl-XML-Parser')
source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc})
source=(http://edge.launchpad.net/intltool/trunk/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz{,.asc}
perl-5.22-compatibility.patch)
sha1sums=('a0c3bcb99d1bcfc5db70f8d848232a47c47da090'
'SKIP')
'SKIP'
'9b09b206b3101b83eb91706c56d3b0df693fc9c8')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
patch -p1 -i ${srcdir}/perl-5.22-compatibility.patch
}
build() {

43
intltool/perl-5.22-compatibility.patch Normal file
View File

@ -0,0 +1,43 @@
--- intltool-0.51.0.orig/intltool-update.in 2015-03-09 02:39:54.000000000 +0100
+++ intltool-0.51.0.orig/intltool-update.in 2015-06-19 01:52:07.171228154 +0200
@@ -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?