From 54083e96f0b293171f6a846ba0cba3b8d805f577 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 30 Jan 2019 11:59:43 +0100 Subject: vte: allow building vte-native with gcc 4.8 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...old-school-asignment-to-avoid-gcc-4.8-err.patch | 27 ++++++++++++++++++++++ meta/recipes-support/vte/vte_0.52.2.bb | 5 ++-- 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-support/vte/vte/0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch (limited to 'meta/recipes-support/vte') 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 @@ +From 442da9076b52003743ffc6fd7b9d647de6d7aa8f Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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.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 # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ - ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ - " + ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ + file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ + " SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" -- cgit 1.2.3-korg