diff options
author | Adrian Bunk <bunk@stusta.de> | 2020-05-12 23:37:44 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-14 14:15:11 +0100 |
commit | 6a60e2d2bbd832879e2de75a67deb1561fd08fbb (patch) | |
tree | eedbb4dfded190933cd731d00460e3f23772c323 /meta/recipes-support | |
parent | 5757286da1e6f0c81ac0121cc9531549f24bafbd (diff) | |
download | poky-6a60e2d2bbd832879e2de75a67deb1561fd08fbb.tar.gz |
vte: Remove workaround for gcc 4.8
(From OE-Core rev: 84e9c9ec86252fba7d0b472ec6f84793db51e62f)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
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.60.2.bb | 2 |
2 files changed, 1 insertions, 28 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 deleted file mode 100644 index 9c3f98fa61..0000000000 --- a/meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
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.60.2.bb b/meta/recipes-support/vte/vte_0.60.2.bb index a722e152a4..4a33f6e4d0 100644 --- a/meta/recipes-support/vte/vte_0.60.2.bb +++ b/meta/recipes-support/vte/vte_0.60.2.bb | |||
@@ -17,7 +17,7 @@ GIR_MESON_OPTION = 'gir' | |||
17 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection | 17 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection |
18 | 18 | ||
19 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) | 19 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) |
20 | SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ | 20 | SRC_URI += " \ |
21 | file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ | 21 | file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ |
22 | " | 22 | " |
23 | SRC_URI[archive.md5sum] = "1a0b5395915d2f3c88484511b38cc584" | 23 | SRC_URI[archive.md5sum] = "1a0b5395915d2f3c88484511b38cc584" |