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:13:50 +0100 |
| commit | 84e9c9ec86252fba7d0b472ec6f84793db51e62f (patch) | |
| tree | 9de1fd458d50ff6c119bdf0777826009666f3438 | |
| parent | 595d2df62b049e463568ab97cfe26d6df96a18a9 (diff) | |
| download | openembedded-core-contrib-84e9c9ec86252fba7d0b472ec6f84793db51e62f.tar.gz | |
vte: Remove workaround for gcc 4.8
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 @@ -From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Thu, 17 Jan 2019 16:37:54 +0100 -Subject: [PATCH] app.cc: use old school asignment to avoid gcc 4.8 error - -This is needed to build vte-native on Centos 7, -and can be dropped once that OS is no longer supported. - -Upstream-Status: Inappropriate [ancient compiler fix] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - src/app/app.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/app/app.cc b/src/app/app.cc -index d424064..675d789 100644 ---- a/src/app/app.cc -+++ b/src/app/app.cc -@@ -306,7 +306,7 @@ public: - else - alpha = get_alpha(); - -- GdkRGBA color{bg_color}; -+ GdkRGBA color = bg_color; - color.alpha = alpha; - return color; - } 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' inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) -SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ +SRC_URI += " \ file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ " SRC_URI[archive.md5sum] = "1a0b5395915d2f3c88484511b38cc584" |