vte: upgrade 0.52.2 -> 0.56.1
PATCH 1/1 vte: upgrade 0.52.2 -> 0.56.1
* license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bit
---
V1 -> V2: Fix build with musl
...EXITCODE-macro-for-non-glibc-systems.patch | 59 +++++++++++++++++++
.../vte/{vte_0.52.2.bb => vte_0.56.1.bb} | 19 ++++--
2 files changed, 72 insertions(+), 6 deletions(-)
create mode 100644 meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
rename meta/recipes-support/vte/{vte_0.52.2.bb => vte_0.56.1.bb} (75%)meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch new file +59 -0
@@ -0,0 +1,59 @@ +From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001 +From: Danilo Spinella <[email protected]> +Date: Thu, 21 Mar 2019 14:19:26 +0100 +Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems + +Upstream-Status: Submitted [1] + +Signed-off-by: Andreas Müller <[email protected]> + +[1] https://gitlab.gnome.org/GNOME/vte/issues/72 + +--- + src/missing.hh | 21 +++++++++++++++++++++ + src/widget.cc | 1 + + 2 files changed, 22 insertions(+) + create mode 100644 src/missing.hh + +diff --git a/src/missing.hh b/src/missing.hh +new file mode 100644 +index 00000000..1baa993d +--- /dev/null ++++ b/src/missing.hh +@@ -0,0 +1,21 @@ ++/* Copyright 2019 Danilo Spinella ++ * ++ * This library is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 3 of the License, or (at your option) any later version. ++ * ++ * This library is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this library; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifndef W_EXITCODE ++#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++#endif ++ +diff --git a/src/widget.cc b/src/widget.cc +index 331ddba9..555a4adf 100644 +--- a/src/widget.cc ++++ b/src/widget.cc +@@ -21,6 +21,7 @@ + #include "widget.hh" + + #include <sys/wait.h> // for W_EXITCODE ++#include "missing.hh" // for W_EXITCODE on non-glibc systems + + #include <new> + #include <string> +-- +2.21.0 +
meta/recipes-support/vte/vte_0.56.1.bb renamed from meta/recipes-support/vte/vte_0.52.2.bb +13 -6
@@ -1,9 +1,15 @@ SUMMARY = "Virtual terminal emulator GTK+ widget library" BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" -LICENSE = "LGPLv2.1+" -DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" +LICENSE = "GPLv3 & LGPLv2.1+" +LICENSE_libvte = "LGPLv2.1+" + +LIC_FILES_CHKSUM = " \ + file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ + file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ +" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" +DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection
@@ -11,9 +17,10 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject 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) } \ file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ + file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \ " -SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" -SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" +SRC_URI[archive.md5sum] = "a8984cd5a101dbff0b0c875d1de3f692" +SRC_URI[archive.sha256sum] = "02fa8ecc02a9332e47f486795494527b5687b3bd448e73e6b67285f2f326dc7c" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -27,7 +34,7 @@ export XDG_DATA_DIRS = "${STAGING_DATADIR}" # Help g-ir-scanner find the .so for linking do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" + export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" } # Package additional files
Signature · 1 line
2.20.1
Hi,
Quoted 8 lines · Andreas Müller
* license: COPYING was replaced by
COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bitSigned-off-by Andreas Müller <[email protected]>---
V1 -> V2: Fix build with musl
I think something with vte-native is not working quite right with one of these patches and is causing oe-selftest to fail:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/433
(oe-selftest -r runtime_test.TestImage.test_testimage_virgl_gtk)
Cheers,
Richard
Quoted 11 lines · Richard Purdie
Hi,
Quoted 7 lines · Andreas Müller
* license: COPYING was replaced by
COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bitSigned-off-by Andreas Müller <[email protected]>---
Quoted 8 lines
Quoted 1 line
V1 -> V2: Fix build with musl
I think something with vte-native is not working quite right with one of these patches and is causing oe-selftest to fail:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/433
(oe-selftest -r runtime_test.TestImage.test_testimage_virgl_gtk)
Will try to reproduce...
Andreas
Quoted 16 lines · Andreas Müller
Quoted 13 lines · Richard Purdie
Hi,
Quoted 8 lines · Andreas Müller
* license: COPYING was replaced by
COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bitSigned-off-by Andreas Müller <[email protected]>---
V1 -> V2: Fix build with musl
Quoted 8 lines
Quoted 6 lines
I think something with vte-native is not working quite right with one of these patches and is causing oe-selftest to fail:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/433
(oe-selftest -r runtime_test.TestImage.test_testimage_virgl_gtk)
Will try to reproduce...
Hi,
Alex - you just wrote in mesa-meson thread, that vte-native fails due to ancient gcc on host. May I ask where you found this information?
Andreas
The build log makes it rather clear?
configure: error: *** A compiler with support for C++17 language features is required.
Alex
Quoted 33 lines · Andreas Müller
Quoted 18 lines · Andreas Müller
Quoted 13 lines · Richard Purdie
Hi,
Quoted 9 lines · Andreas Müller
* license: COPYING was replaced by
COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bitSigned-off-by Andreas Müller <[email protected]>---
V1 -> V2: Fix build with musl
Quoted 8 lines
Quoted 6 lines
I think something with vte-native is not working quite right with one of these patches and is causing oe-selftest to fail:
https://autobuilder.yoctoproject.org/typhoon/#/builders/56/builds/433
(oe-selftest -r runtime_test.TestImage.test_testimage_virgl_gtk)
Will try to reproduce...
Hi,
Alex - you just wrote in mesa-meson thread, that vte-native fails due to ancient gcc on host. May I ask where you found this information?
Andreas
Quoted 6 lines · Alexander Kanavin
The build log makes it rather clear?
configure: error: *** A compiler with support for C++17 language features is required.
It is not that I cannot read how about a link?
Followed Richard's link
and find nothing which helps:
ERROR: vte-native-0.56.1-r0 do_configure: configure failed
ERROR: vte-native-0.56.1-r0 do_configure: Function failed:do_configure (log file is located at /home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: vte-native-0.56.1-r0 do_configure: configure failed
ERROR: vte-native-0.56.1-r0 do_configure: Function failed:do_configure (log file is located at /home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: Command . ./oe-init-build-env; ${SCRIPTSDIR}/checkvnc;
DISPLAY=:1 oe-selftest --skip-tests
distrodata.Distrodata.test_checkpkg
buildoptions.SourceMirroring.test_yocto_source_mirror -j 15 failed
with exit code 1, see errors above. (1556308938.9: 9403.3)
Andreas
Look at the step2d section, the actual error is there. Errors section includes only the high level errors.
Alex
Quoted 38 lines · Andreas Müller
Quoted 6 lines · Alexander Kanavin
The build log makes it rather clear?
configure: error: *** A compiler with support for C++17 language features is required.
It is not that I cannot read how about a link?
Followed Richard's link
and find nothing which helps:
ERROR: vte-native-0.56.1-r0do_configure: configure failed
ERROR: vte-native-0.56.1-r0do_configure: Function failed:do_configure(log file is located at/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: vte-native-0.56.1-r0do_configure: configure failed
ERROR: vte-native-0.56.1-r0do_configure: Function failed:do_configure(log file is located at/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: Command . ./oe-init-build-env; ${SCRIPTSDIR}/checkvnc;
DISPLAY=:1 oe-selftest --skip-tests
distrodata.Distrodata.test_checkpkg
buildoptions.SourceMirroring.test_yocto_source_mirror -j 15 failed
with exit code 1, see errors above. (1556308938.9: 9403.3)Andreas
Quoted 2 lines · Alexander Kanavin
Look at the step2d section, the actual error is there. Errors section includes only the high level errors.
Thanks - lesson learned :)
Andreas
Quoted 41 lines
Alex
Quoted 38 lines · Andreas Müller
Quoted 6 lines · Alexander Kanavin
The build log makes it rather clear?
configure: error: *** A compiler with support for C++17 language features is required.
It is not that I cannot read how about a link?
Followed Richard's link
and find nothing which helps:
ERROR: vte-native-0.56.1-r0do_configure: configure failed
ERROR: vte-native-0.56.1-r0do_configure: Function failed:do_configure(log file is located at/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: vte-native-0.56.1-r0do_configure: configure failed
ERROR: vte-native-0.56.1-r0do_configure: Function failed:do_configure(log file is located at/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196)
ERROR: Logfile of failure stored in:/home/pokybuild/yocto-worker/oe-selftest/build/build-st-50315/tmp/work/x86_64-linux/vte-native/0.56.1-r0/temp/log.do_configure.9196
ERROR: Task (virtual:native:/home/pokybuild/yocto-worker/oe-selftest/build/meta/recipes-support/vte/vte_0.56.1.bb:do_configure) failed with exit code '1'
ERROR: Command . ./oe-init-build-env; ${SCRIPTSDIR}/checkvnc;
DISPLAY=:1 oe-selftest --skip-tests
distrodata.Distrodata.test_checkpkg
buildoptions.SourceMirroring.test_yocto_source_mirror -j 15 failed
with exit code 1, see errors above. (1556308938.9: 9403.3)Andreas