diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-01-30 11:59:43 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-01-31 23:23:27 +0000 |
commit | 9516e8117b9548890d0c3e96906d29dbdbed28a8 (patch) | |
tree | deebc14051b0e930df2bac2fa79e5470af7ab1d5 /meta/recipes-support | |
parent | 91ce95bf3623c317f7640e0b8f4e61a9ee33a40f (diff) | |
download | poky-9516e8117b9548890d0c3e96906d29dbdbed28a8.tar.gz |
vte: allow building vte-native with gcc 4.8
(From OE-Core rev: 54083e96f0b293171f6a846ba0cba3b8d805f577)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support')
-rw-r--r-- | meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch | 27 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.52.2.bb | 5 |
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch b/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch new file mode 100644 index 0000000000..9c3f98fa61 --- /dev/null +++ b/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch | |||
@@ -0,0 +1,27 @@ | |||
1 | From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 17 Jan 2019 16:37:54 +0100 | ||
4 | Subject: [PATCH] app.cc: use old school asignment to avoid gcc 4.8 error | ||
5 | |||
6 | This is needed to build vte-native on Centos 7, | ||
7 | and can be dropped once that OS is no longer supported. | ||
8 | |||
9 | Upstream-Status: Inappropriate [ancient compiler fix] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | src/app/app.cc | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/app/app.cc b/src/app/app.cc | ||
16 | index d424064..675d789 100644 | ||
17 | --- a/src/app/app.cc | ||
18 | +++ b/src/app/app.cc | ||
19 | @@ -306,7 +306,7 @@ public: | ||
20 | else | ||
21 | alpha = get_alpha(); | ||
22 | |||
23 | - GdkRGBA color{bg_color}; | ||
24 | + GdkRGBA color = bg_color; | ||
25 | color.alpha = alpha; | ||
26 | return color; | ||
27 | } | ||
diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/meta/recipes-support/vte/vte_0.52.2.bb index 62fb5288fa..272ae66f13 100644 --- a/meta/recipes-support/vte/vte_0.52.2.bb +++ b/meta/recipes-support/vte/vte_0.52.2.bb | |||
@@ -9,8 +9,9 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject | |||
9 | 9 | ||
10 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) | 10 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) |
11 | SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ | 11 | SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ |
12 | ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ | 12 | ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ |
13 | " | 13 | file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ |
14 | " | ||
14 | SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" | 15 | SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" |
15 | SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" | 16 | SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" |
16 | 17 | ||