Attachment 167104 Details for Bug 207270 – eliminate warnings patch

eliminate warnings patch

intltool.diff.txt (text/plain), 3.50 KB, created by Ruslan Makhmatkhanov on 2016-02-17 03:01:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ruslan Makhmatkhanov

Created: 2016-02-17 03:01:55 UTC

Size: 3.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 408885)
>+++ Makefile	(working copy)
>@@ -3,8 +3,9 @@
> 
> PORTNAME=	intltool
> PORTVERSION=	0.51.0
>+PORTREVISION=	1
> CATEGORIES=	textproc gnome
>-MASTER_SITES=	https://launchpad.net/intltool/trunk/$(PORTVERSION)/+download/
>+MASTER_SITES=	https://launchpad.net/intltool/trunk/${PORTVERSION}/+download/
> DIST_SUBDIR=	gnome
> 
> MAINTAINER=	gnome@FreeBSD.org
>Index: files/patch-intltool-update.in
>===================================================================
>--- files/patch-intltool-update.in	(nonexistent)
>+++ files/patch-intltool-update.in	(working copy)
>@@ -0,0 +1,51 @@
>+This patch eliminates warnings like this by escaping left brace:
>+Unescaped left brace in regex is deprecated, passed through in regex;
>+marked by <-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at /usr/local/bin/intltool-update line 1065.
>+Unescaped left brace in regex is deprecated, passed through in regex;
>+marked by <-- HERE in m/\${ <-- HERE ?AC_PACKAGE_NAME}?/ at /usr/local/bin/intltool-update line 1193.
>+
>+when building ports involving intltool (gitg, gnome-builder etc)
>+
>+--- intltool-update.in.orig	2015-03-09 01:39:54 UTC
>++++ intltool-update.in
>+@@ -1062,7 +1062,7 @@ sub SubstituteVariable
>+ 	}
>+     }
>+ 
>+-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
>++    if ($str =~ /^(.*)\$\{?([A-Z_]+)}?(.*)$/)
>+     {
>+ 	my $rest = $3;
>+ 	my $untouched = $1;
>+@@ -1190,10 +1190,10 @@ sub FindPackageName
>+ 	$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 @@ sub FindPackageName
>+ 	$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?
>
>Property changes on: files/patch-intltool-update.in
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View

Attachments on bug 207270: 167104