From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <lorenz.marcel@web.de>
To: development@lists.ipfire.org
Subject: [PATCH] intltool: add patch for perl warings
Date: Thu, 18 Feb 2016 12:04:06 +0100
Message-ID: <1455793446-9809-1-git-send-email-lorenz.marcel@web.de>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9018681125356436765=="
List-Id: <development.lists.ipfire.org>

--===============9018681125356436765==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

---
 src/patches/intltool-0.51.0_perl_warning.patch | 50 ++++++++++++++++++++++++=
++
 1 file changed, 50 insertions(+)
 create mode 100644 src/patches/intltool-0.51.0_perl_warning.patch

diff --git a/src/patches/intltool-0.51.0_perl_warning.patch b/src/patches/int=
ltool-0.51.0_perl_warning.patch
new file mode 100644
index 0000000..23c52e4
--- /dev/null
+++ b/src/patches/intltool-0.51.0_perl_warning.patch
@@ -0,0 +1,50 @@
+--- intltool-0.51.0/intltool-update.in
++++ intltool-0.51.0/intltool-update.in
+@@ -1062,13 +1062,13 @@
+ 	}
+     }
+=20
+-    if ($str =3D~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
++    if ($str =3D~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
+     {
+ 	my $rest =3D $3;
+ 	my $untouched =3D $1;
+ 	my $sub =3D "";
+         # Ignore recursive definitions of variables
+-        $sub =3D $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /=
\${?$2}?/;
++        $sub =3D $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /=
\$\{?$2}?/;
+=20
+ 	return SubstituteVariable ("$untouched$sub$rest");
+     }
+@@ -1190,10 +1190,10 @@
+ 	$name    =3D~ s/\(+$//g;
+ 	$version =3D~ s/\(+$//g;
+=20
+-	$varhash{"PACKAGE_NAME"} =3D $name if (not $name =3D~ /\${?AC_PACKAGE_NAME=
}?/);
+-	$varhash{"PACKAGE"} =3D $name if (not $name =3D~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} =3D $version if (not $name =3D~ /\${?AC_PACKAG=
E_VERSION}?/);
+-	$varhash{"VERSION"} =3D $version if (not $name =3D~ /\${?VERSION}?/);
++	$varhash{"PACKAGE_NAME"} =3D $name if (not $name =3D~ /\$\{?AC_PACKAGE_NAM=
E}?/);
++	$varhash{"PACKAGE"} =3D $name if (not $name =3D~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} =3D $version if (not $name =3D~ /\$\{?AC_PACKA=
GE_VERSION}?/);
++	$varhash{"VERSION"} =3D $version if (not $name =3D~ /\$\{?VERSION}?/);
+     }
+=20
+     if ($conf_source =3D~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
+@@ -1219,11 +1219,11 @@
+ 	$version =3D~ s/\(+$//g;
+         $bugurl  =3D~ s/\(+$//g if (defined $bugurl);
+=20
+-	$varhash{"PACKAGE_NAME"} =3D $name if (not $name =3D~ /\${?AC_PACKAGE_NAME=
}?/);
+-	$varhash{"PACKAGE"} =3D $name if (not $name =3D~ /\${?PACKAGE}?/);
+-	$varhash{"PACKAGE_VERSION"} =3D $version if (not $name =3D~ /\${?AC_PACKAG=
E_VERSION}?/);
+-	$varhash{"VERSION"} =3D $version if (not $name =3D~ /\${?VERSION}?/);
+-        $varhash{"PACKAGE_BUGREPORT"} =3D $bugurl if (defined $bugurl and n=
ot $bugurl =3D~ /\${?\w+}?/);
++	$varhash{"PACKAGE_NAME"} =3D $name if (not $name =3D~ /\$\{?AC_PACKAGE_NAM=
E}?/);
++	$varhash{"PACKAGE"} =3D $name if (not $name =3D~ /\$\{?PACKAGE}?/);
++	$varhash{"PACKAGE_VERSION"} =3D $version if (not $name =3D~ /\$\{?AC_PACKA=
GE_VERSION}?/);
++	$varhash{"VERSION"} =3D $version if (not $name =3D~ /\$\{?VERSION}?/);
++        $varhash{"PACKAGE_BUGREPORT"} =3D $bugurl if (defined $bugurl and n=
ot $bugurl =3D~ /\$\{?\w+}?/);
+     }
+=20
+     # \s makes this not work, why?
--=20
1.9.1


--===============9018681125356436765==--