[PATCH] vte: upgrade 0.52.2 -> 0.56.1

[PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

* license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* pretify recipe a bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---
 .../vte/{vte_0.52.2.bb => vte_0.56.1.bb}       | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)
 rename meta/recipes-support/vte/{vte_0.52.2.bb => vte_0.56.1.bb} (78%)

diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/meta/recipes-support/vte/vte_0.56.1.bb
similarity index 78%
rename from meta/recipes-support/vte/vte_0.52.2.bb
rename to meta/recipes-support/vte/vte_0.56.1.bb
index 272ae66f13..0c0c0f4cd8 100644
--- a/meta/recipes-support/vte/vte_0.52.2.bb
+++ b/meta/recipes-support/vte/vte_0.56.1.bb
@@ -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
 
@@ -12,8 +18,8 @@ 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 \
            "
-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 +33,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
-- 
2.20.1

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

On Wed, Apr 24, 2019 at 3:15 AM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> * license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
> * pretify recipe a bit
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
>  .../vte/{vte_0.52.2.bb => vte_0.56.1.bb}       | 18 ++++++++++++------
>  1 file changed, 12 insertions(+), 6 deletions(-)
>  rename meta/recipes-support/vte/{vte_0.52.2.bb => vte_0.56.1.bb} (78%)
Sent out too early: Does not yet build for musl

Andreas

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

On Sat, Apr 27, 2019 at 12:51 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> Look at the step2d section, the actual error is there. Errors section includes only the high level errors.

Thanks - lesson learned :)

Andreas
>
> Alex
>
> > On 27 Apr 2019, at 12.44, Andreas Müller <schnitzeltony@gmail.com> wrote:
> >
> > On Sat, Apr 27, 2019 at 12:02 PM Alexander Kanavin
> > <alex.kanavin@gmail.com> wrote:
> >>
> >> 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

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Alexander Kanavin]

Look at the step2d section, the actual error is there. Errors section includes only the high level errors.

Alex

> On 27 Apr 2019, at 12.44, Andreas Müller <schnitzeltony@gmail.com> wrote:
> 
> On Sat, Apr 27, 2019 at 12:02 PM Alexander Kanavin
> <alex.kanavin@gmail.com> wrote:
>> 
>> 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

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

On Sat, Apr 27, 2019 at 12:02 PM Alexander Kanavin
<alex.kanavin@gmail.com> wrote:
>
> 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

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 1237 bytes --]

The build log makes it rather clear?

configure: error: *** A compiler with support for C++17 language features is required.

Alex

> On 27 Apr 2019, at 11.52, Andreas Müller <schnitzeltony@gmail.com> wrote:
> 
>> On Fri, Apr 26, 2019 at 11:26 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>> 
>> On Fri, Apr 26, 2019 at 10:34 PM Richard Purdie
>> <richard.purdie@linuxfoundation.org> wrote:
>>> 
>>> Hi,
>>> 
>>>> On Wed, 2019-04-24 at 11:13 +0200, Andreas Müller wrote:
>>>> * license: COPYING was replaced by
>>>> COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
>>>> * prettify recipe a bit
>>>> 
>>>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>>>> ---
>>>> 
>>>> 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...
>> 
> 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

[-- Attachment #2: Type: text/html, Size: 4208 bytes --]

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

On Fri, Apr 26, 2019 at 11:26 PM Andreas Müller <schnitzeltony@gmail.com> wrote:
>
> On Fri, Apr 26, 2019 at 10:34 PM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >
> > Hi,
> >
> > On Wed, 2019-04-24 at 11:13 +0200, Andreas Müller wrote:
> > > * license: COPYING was replaced by
> > > COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
> > > * prettify recipe a bit
> > >
> > > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > > ---
> > >
> > > 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...
>
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

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

On Fri, Apr 26, 2019 at 10:34 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> Hi,
>
> On Wed, 2019-04-24 at 11:13 +0200, Andreas Müller wrote:
> > * license: COPYING was replaced by
> > COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
> > * prettify recipe a bit
> >
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > ---
> >
> > 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

Re: [PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Richard Purdie]

Hi,

On Wed, 2019-04-24 at 11:13 +0200, Andreas Müller wrote:
> * license: COPYING was replaced by
> COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
> * prettify recipe a bit
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> ---
> 
> 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

[PATCH] vte: upgrade 0.52.2 -> 0.56.1

[Andreas Müller]

* license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bit

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
---

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%)

diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
new file mode 100644
index 0000000000..0ffd92b4ba
--- /dev/null
+++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
@@ -0,0 +1,59 @@
+From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001
+From: Danilo Spinella <danyspin97@protonmail.com>
+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 <schnitzeltony@gmail.com>
+
+[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
+
diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/meta/recipes-support/vte/vte_0.56.1.bb
similarity index 75%
rename from meta/recipes-support/vte/vte_0.52.2.bb
rename to meta/recipes-support/vte/vte_0.56.1.bb
index 272ae66f13..02b84c38d9 100644
--- a/meta/recipes-support/vte/vte_0.52.2.bb
+++ b/meta/recipes-support/vte/vte_0.56.1.bb
@@ -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
-- 
2.20.1