diff options
author | ryoon <ryoon@pkgsrc.org> | 2015-06-11 15:35:01 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2015-06-11 15:35:01 +0000 |
commit | 42da9f8ccd2111b6d14cd56e244f2e7df4851399 (patch) | |
tree | 63e4482471c46b856d65665163c5e72f3539266e /x11 | |
parent | d5756f9788e4f7573ce91ddfec78e50efe695b7a (diff) | |
download | pkgsrc-42da9f8ccd2111b6d14cd56e244f2e7df4851399.tar.gz |
Fix build with perl-5.22.0.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gtk2/distinfo | 3 | ||||
-rw-r--r-- | x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in | 62 |
2 files changed, 64 insertions, 1 deletions
diff --git a/x11/gtk2/distinfo b/x11/gtk2/distinfo index dbd0e833074..050c7eaa035 100644 --- a/x11/gtk2/distinfo +++ b/x11/gtk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.154 2015/04/24 09:50:13 martin Exp $ +$NetBSD: distinfo,v 1.155 2015/06/11 15:35:01 ryoon Exp $ SHA1 (gtk+-2.24.27.tar.xz) = dae8cbb37f318c9e7a299d4a8dfccaf13edd8e27 RMD160 (gtk+-2.24.27.tar.xz) = 01f8917cd0dbc429c9295809209c64fe8ce38c48 @@ -6,5 +6,6 @@ Size (gtk+-2.24.27.tar.xz) = 13349252 bytes SHA1 (patch-ab) = 9c82cc60f3825d377a197c876fcc6faa379cbde3 SHA1 (patch-af) = d59414e24a7da7f8694dbefbd2f0c2c2b60ec5ad SHA1 (patch-aj) = 9887573ac7ade9e8f8ee2ead68e279f67836a1a3 +SHA1 (patch-demos_gtk-demo_geninclude.pl.in) = a15f5d7432d29c78462e6c27ea3f56db63b7ade3 SHA1 (patch-gdk_x11_gdkwindow-x11.c) = 08c05b31da38e16727a2941cdec4c855f2fc7d77 SHA1 (patch-gtk_gtktooltips.c) = 593e43bb0aacc0b07c24959f2ac6d84dfd04a780 diff --git a/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in b/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in new file mode 100644 index 00000000000..fba993c0158 --- /dev/null +++ b/x11/gtk2/patches/patch-demos_gtk-demo_geninclude.pl.in @@ -0,0 +1,62 @@ +$NetBSD: patch-demos_gtk-demo_geninclude.pl.in,v 1.1 2015/06/11 15:35:01 ryoon Exp $ + +Avoid +Can't use 'defined(@array)' (Maybe you should just omit the defined()?) +errors. + +--- demos/gtk-demo/geninclude.pl.in.orig 2014-09-29 20:02:16.000000000 +0000 ++++ demos/gtk-demo/geninclude.pl.in +@@ -40,7 +40,7 @@ foreach $href (@demos) { + my $do_next = 0; + + # parent detected +- if (defined @parents) { ++ if (@parents) { + foreach $foo (@parents) { + if ($foo eq $parent_name) { + $do_next = 1; +@@ -54,7 +54,7 @@ foreach $href (@demos) { + + push @parents, $parent_name; + +- $tmp = (defined @child_arrays)?($#child_arrays + 1):0; ++ $tmp = (@child_arrays)?($#child_arrays + 1):0; + push @child_arrays, "child$tmp"; + + push @demos, {"title" => $parent_name, "file" => "NULL", +@@ -62,7 +62,7 @@ foreach $href (@demos) { + } + } + +-if (defined @parents) { ++if (@parents) { + $i = 0; + for ($i = 0; $i <= $#parents; $i++) { + $first = 1; +@@ -73,7 +73,7 @@ if (defined @parents) { + for ($j = 0; $j <= $#demos; $j++) { + $href = $demos[$j]; + +- if (!defined $demos[$j]) { ++ if (!$demos[$j]) { + next; + } + +@@ -105,7 +105,7 @@ if (defined @parents) { + } @demos_old; + + # sort the child arrays +-if (defined @child_arrays) { ++if (@child_arrays) { + for ($i = 0; $i <= $#child_arrays; $i++) { + @foo_old = @{$child_arrays[$i]}; + +@@ -133,7 +133,7 @@ foreach $href (@demos) { + print ", \n"; + } + +- if (defined @parents) { ++ if (@parents) { + for ($i = 0; $i <= $#parents; $i++) { + if ($parents[$i] eq $href->{title}) { + |