summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-05-05 12:33:21 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 07:11:34 (GMT)
commit9b9b8285be367a889d46ff12fa7b85e1cac149c8 (patch)
treeba771848882f246176b0b40c6679b287e92301a8
parent3a4d269d39d0d037b9b563f0b31e49d50eb525f6 (diff)
downloadpoky-9b9b8285be367a889d46ff12fa7b85e1cac149c8.tar.gz
gtk+_2.24.25: backport a fix for building with newer host perl
This backports a patch from gtk+ upstream to prevent an issue when building on Fedora 23 hosts. (From OE-Core rev: fd27f8620ae4d95dfe07b27eee4256b0a128348a) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gtk+/gtk+/Avoid-perl-warnings.patch75
-rw-r--r--meta/recipes-gnome/gtk+/gtk+_2.24.25.bb1
2 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+/Avoid-perl-warnings.patch b/meta/recipes-gnome/gtk+/gtk+/Avoid-perl-warnings.patch
new file mode 100644
index 0000000..df380bd
--- /dev/null
+++ b/meta/recipes-gnome/gtk+/gtk+/Avoid-perl-warnings.patch
@@ -0,0 +1,75 @@
1From 3da748930fdcb19aaae32ae2fc6cb2d802857752 Mon Sep 17 00:00:00 2001
2From: Matthias Clasen <mclasen@redhat.com>
3Date: Fri, 1 Feb 2013 21:58:34 -0500
4Subject: Avoid perl warnings
5
6Apparently, defined is not cool anymore.
7
8Upstream-status: Backport [2.24.28+]
9Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
10
11---
12 demos/gtk-demo/geninclude.pl.in | 12 ++++++------
13 1 file changed, 6 insertions(+), 6 deletions(-)
14
15diff --git a/demos/gtk-demo/geninclude.pl.in b/demos/gtk-demo/geninclude.pl.in
16index b41e926..02b5c97 100755
17--- a/demos/gtk-demo/geninclude.pl.in
18+++ b/demos/gtk-demo/geninclude.pl.in
19@@ -40,7 +40,7 @@ foreach $href (@demos) {
20 my $do_next = 0;
21
22 # parent detected
23- if (defined @parents) {
24+ if (@parents) {
25 foreach $foo (@parents) {
26 if ($foo eq $parent_name) {
27 $do_next = 1;
28@@ -54,7 +54,7 @@ foreach $href (@demos) {
29
30 push @parents, $parent_name;
31
32- $tmp = (defined @child_arrays)?($#child_arrays + 1):0;
33+ $tmp = (@child_arrays)?($#child_arrays + 1):0;
34 push @child_arrays, "child$tmp";
35
36 push @demos, {"title" => $parent_name, "file" => "NULL",
37@@ -62,7 +62,7 @@ foreach $href (@demos) {
38 }
39 }
40
41-if (defined @parents) {
42+if (@parents) {
43 $i = 0;
44 for ($i = 0; $i <= $#parents; $i++) {
45 $first = 1;
46@@ -73,7 +73,7 @@ if (defined @parents) {
47 for ($j = 0; $j <= $#demos; $j++) {
48 $href = $demos[$j];
49
50- if (!defined $demos[$j]) {
51+ if (!$demos[$j]) {
52 next;
53 }
54
55@@ -105,7 +105,7 @@ if (defined @parents) {
56 } @demos_old;
57
58 # sort the child arrays
59-if (defined @child_arrays) {
60+if (@child_arrays) {
61 for ($i = 0; $i <= $#child_arrays; $i++) {
62 @foo_old = @{$child_arrays[$i]};
63
64@@ -133,7 +133,7 @@ foreach $href (@demos) {
65 print ", \n";
66 }
67
68- if (defined @parents) {
69+ if (@parents) {
70 for ($i = 0; $i <= $#parents; $i++) {
71 if ($parents[$i] eq $href->{title}) {
72
73--
74cgit v0.12
75
diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb
index ada7956..4c50bd8 100644
--- a/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.24.25.bb
@@ -9,6 +9,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \
9 file://hardcoded_libtool.patch \ 9 file://hardcoded_libtool.patch \
10 file://toggle-font.diff;striplevel=0 \ 10 file://toggle-font.diff;striplevel=0 \
11 file://doc-fixes.patch \ 11 file://doc-fixes.patch \
12 file://Avoid-perl-warnings.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "612350704dd3aacb95355a4981930c6f" 15SRC_URI[md5sum] = "612350704dd3aacb95355a4981930c6f"