Fix warnings introduced by perl-5.22. Part II
This commit is contained in:
parent
0d3f442553
commit
8593c0c36e
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=automake1.10
|
||||
pkgver=1.10.3
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
@ -14,13 +14,15 @@ checkdepends=('dejagnu' 'python2')
|
||||
install=automake.install
|
||||
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.bz2{,.sig}
|
||||
automake-1.10-msys2.patch
|
||||
automake1.10-documentation.patch
|
||||
automake-1.10-makeinfo-fix.patch)
|
||||
automake1.10-documentation.patch
|
||||
automake-1.10-makeinfo-fix.patch
|
||||
automake-1.10-perl-escape-curly-bracket.patch)
|
||||
md5sums=('b8e67fb458da396bc35555af7ef2b49f'
|
||||
'SKIP'
|
||||
'0cc04bed86ae6d1b5c3bd90ba3593ee6'
|
||||
'b9537a6237a5bdf8c48a76c277b53ae6'
|
||||
'79199a6a20eaab3f95f17cfde86e628d')
|
||||
'79199a6a20eaab3f95f17cfde86e628d'
|
||||
'704acfc4ca356728dd8ee4cef2dbb842')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/automake-${pkgver}
|
||||
@ -28,6 +30,7 @@ prepare() {
|
||||
patch -p2 -i ${srcdir}/automake1.10-documentation.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.10-makeinfo-fix.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.10-msys2.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.10-perl-escape-curly-bracket.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
21
automake1.10/automake-1.10-perl-escape-curly-bracket.patch
Normal file
21
automake1.10/automake-1.10-perl-escape-curly-bracket.patch
Normal 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/automake.in b/automake.in
|
||||
index eedc8bc..a679d16 100644
|
||||
--- a/automake.in
|
||||
+++ b/automake.in
|
||||
@@ -4030,7 +4030,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;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=automake1.11
|
||||
pkgver=1.11.6
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
@ -14,13 +14,15 @@ checkdepends=('dejagnu' 'python2')
|
||||
install=automake.install
|
||||
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
|
||||
automake-1.11-msys2.patch
|
||||
automake1.11-documentation.patch
|
||||
automake-1.11-makeinfo-fix.patch)
|
||||
automake1.11-documentation.patch
|
||||
automake-1.11-makeinfo-fix.patch
|
||||
automake-1.11-perl-escape-curly-bracket.patch)
|
||||
md5sums=('cf4752287ad708f83bd3689da57a32c9'
|
||||
'SKIP'
|
||||
'a092a0617795ff482591b84184934276'
|
||||
'5802e665ccf58509f774ba999b509c51'
|
||||
'9871ecdc828cac4b4b0dae2b0a91089f')
|
||||
'9871ecdc828cac4b4b0dae2b0a91089f'
|
||||
'704acfc4ca356728dd8ee4cef2dbb842')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/automake-${pkgver}
|
||||
@ -28,6 +30,7 @@ prepare() {
|
||||
patch -p2 -i ${srcdir}/automake1.11-documentation.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.11-makeinfo-fix.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.11-msys2.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.11-perl-escape-curly-bracket.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
21
automake1.11/automake-1.11-perl-escape-curly-bracket.patch
Normal file
21
automake1.11/automake-1.11-perl-escape-curly-bracket.patch
Normal 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/automake.in b/automake.in
|
||||
index eedc8bc..a679d16 100644
|
||||
--- a/automake.in
|
||||
+++ b/automake.in
|
||||
@@ -4030,7 +4030,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;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=automake1.12
|
||||
pkgver=1.12.6
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
@ -14,17 +14,20 @@ checkdepends=('dejagnu' 'python2')
|
||||
install=automake.install
|
||||
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
|
||||
automake-1.14-msys2.patch
|
||||
automake1.12-documentation.patch)
|
||||
automake1.12-documentation.patch
|
||||
automake-1.12-perl-escape-curly-bracket.patch)
|
||||
md5sums=('140e084223bf463a24c1a28427c6aec7'
|
||||
'SKIP'
|
||||
'233d8dc0c46722a8940bac31a2a25cbc'
|
||||
'0b1ea43e3b8cb33562c15eb13b29488c')
|
||||
'0b1ea43e3b8cb33562c15eb13b29488c'
|
||||
'704acfc4ca356728dd8ee4cef2dbb842')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/automake-${pkgver}
|
||||
|
||||
patch -p2 -i ${srcdir}/automake1.12-documentation.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.14-msys2.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.12-perl-escape-curly-bracket.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
21
automake1.12/automake-1.12-perl-escape-curly-bracket.patch
Normal file
21
automake1.12/automake-1.12-perl-escape-curly-bracket.patch
Normal 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/automake.in b/automake.in
|
||||
index eedc8bc..a679d16 100644
|
||||
--- a/automake.in
|
||||
+++ b/automake.in
|
||||
@@ -4030,7 +4030,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;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=automake1.13
|
||||
pkgver=1.13.4
|
||||
pkgrel=2
|
||||
pkgrel=4
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
@ -14,17 +14,20 @@ checkdepends=('dejagnu' 'python2')
|
||||
install=automake.install
|
||||
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
|
||||
automake-1.14-msys2.patch
|
||||
automake1.13-documentation.patch)
|
||||
automake1.13-documentation.patch
|
||||
automake-1.13-perl-escape-curly-bracket.patch)
|
||||
md5sums=('71b03c1bc4f587add12604587d9276d1'
|
||||
'SKIP'
|
||||
'233d8dc0c46722a8940bac31a2a25cbc'
|
||||
'2e85e5cdd7db44bba63126a9e95cdbf4')
|
||||
'2e85e5cdd7db44bba63126a9e95cdbf4'
|
||||
'680dceda92dab475169a0200a25b101e')
|
||||
|
||||
prepare() {
|
||||
cd ${srcdir}/automake-${pkgver}
|
||||
|
||||
patch -p2 -i ${srcdir}/automake1.13-documentation.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.14-msys2.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.13-perl-escape-curly-bracket.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
21
automake1.13/automake-1.13-perl-escape-curly-bracket.patch
Normal file
21
automake1.13/automake-1.13-perl-escape-curly-bracket.patch
Normal 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/automake.in b/automake.in
|
||||
index eedc8bc..a679d16 100644
|
||||
--- a/automake.in
|
||||
+++ b/automake.in
|
||||
@@ -3932,7 +3932,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;
|
||||
}
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
pkgname=automake1.14
|
||||
pkgver=1.14.1
|
||||
pkgrel=2
|
||||
pkgrel=3
|
||||
pkgdesc="A GNU tool for automatically creating Makefiles"
|
||||
arch=('any')
|
||||
license=('GPL')
|
||||
@ -13,12 +13,14 @@ makedepends=('autoconf')
|
||||
checkdepends=('dejagnu' 'python2')
|
||||
install=automake.install
|
||||
source=(ftp://ftp.gnu.org/gnu/automake/automake-${pkgver}.tar.xz{,.sig}
|
||||
automake1.14-documentation.patch
|
||||
automake-1.14-msys2.patch)
|
||||
automake1.14-documentation.patch
|
||||
automake-1.14-msys2.patch
|
||||
automake-1.14-perl-escape-curly-bracket.patch)
|
||||
md5sums=('7fc29854c520f56b07aa232a0f880292'
|
||||
'SKIP'
|
||||
'6966aacbdd0fbfcb0694963a5a53b042'
|
||||
'233d8dc0c46722a8940bac31a2a25cbc')
|
||||
'233d8dc0c46722a8940bac31a2a25cbc'
|
||||
'3d5bae907a03ee3d26d0f8a0ae649cc5')
|
||||
replace=('automake')
|
||||
|
||||
prepare() {
|
||||
@ -26,6 +28,7 @@ prepare() {
|
||||
|
||||
patch -p2 -i ${srcdir}/automake1.14-documentation.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.14-msys2.patch
|
||||
patch -p1 -i ${srcdir}/automake-1.14-perl-escape-curly-bracket.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
|
||||
21
automake1.14/automake-1.14-perl-escape-curly-bracket.patch
Normal file
21
automake1.14/automake-1.14-perl-escape-curly-bracket.patch
Normal 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;
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user