* [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3
@ 2023-02-23 7:52 Markus Volk
2023-02-23 16:47 ` Alexandre Belloni
2023-02-23 23:28 ` Alexandre Belloni
0 siblings, 2 replies; 5+ messages in thread
From: Markus Volk @ 2023-02-23 7:52 UTC (permalink / raw)
To: openembedded-core; +Cc: Markus Volk
- Allow to build the gtk4 widget and vapi
This is needed to build gtk4 based terminals like blackbox
- Update dependencies
- Cleanup recipe
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
.../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (71%)
diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb
similarity index 71%
rename from meta/recipes-support/vte/vte_0.70.2.bb
rename to meta/recipes-support/vte/vte_0.70.3.bb
index ec2fb1f522..474ed87a88 100644
--- a/meta/recipes-support/vte/vte_0.70.2.bb
+++ b/meta/recipes-support/vte/vte_0.70.3.bb
@@ -11,34 +11,34 @@ LIC_FILES_CHKSUM = " \
file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \
"
-DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
+DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu pango zlib"
GNOMEBASEBUILDCLASS = "meson"
GIR_MESON_OPTION = 'gir'
GIDOCGEN_MESON_OPTION = "docs"
-inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
+inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
-# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
-SRC_URI[archive.sha256sum] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
+SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-# Help g-ir-scanner find the .so for linking
-do_compile:prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
-}
-
# Package additional files
FILES:${PN}-dev += "${datadir}/vala/vapi/*"
-PACKAGECONFIG ??= "gnutls"
-PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG ??= " \
+ gnutls \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
+"
+PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
+PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
# vala requires gir
PACKAGECONFIG:remove:class-native = "vala"
+PACKAGECONFIG:remove:class-nativesdk = "vala gtk4"
CFLAGS += "-D_GNU_SOURCE"
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3
2023-02-23 7:52 [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3 Markus Volk
@ 2023-02-23 16:47 ` Alexandre Belloni
2023-02-23 19:10 ` Markus Volk
2023-02-23 23:28 ` Alexandre Belloni
1 sibling, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2023-02-23 16:47 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
It failed on qemux86-64-x32:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/6598/steps/11/logs/stdio
On 23/02/2023 08:52:56+0100, Markus Volk wrote:
> - Allow to build the gtk4 widget and vapi
> This is needed to build gtk4 based terminals like blackbox
> - Update dependencies
> - Cleanup recipe
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
> .../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 22 +++++++++----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
> rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (71%)
>
> diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb
> similarity index 71%
> rename from meta/recipes-support/vte/vte_0.70.2.bb
> rename to meta/recipes-support/vte/vte_0.70.3.bb
> index ec2fb1f522..474ed87a88 100644
> --- a/meta/recipes-support/vte/vte_0.70.2.bb
> +++ b/meta/recipes-support/vte/vte_0.70.3.bb
> @@ -11,34 +11,34 @@ LIC_FILES_CHKSUM = " \
> file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \
> "
>
> -DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
> +DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu pango zlib"
>
> GNOMEBASEBUILDCLASS = "meson"
> GIR_MESON_OPTION = 'gir'
> GIDOCGEN_MESON_OPTION = "docs"
>
> -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
> +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
>
> -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
> SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
> -SRC_URI[archive.sha256sum] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
> +SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23"
>
> ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> -# Help g-ir-scanner find the .so for linking
> -do_compile:prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
> -}
> -
> # Package additional files
> FILES:${PN}-dev += "${datadir}/vala/vapi/*"
>
> -PACKAGECONFIG ??= "gnutls"
> -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
> +PACKAGECONFIG ??= " \
> + gnutls \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
> +"
> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
> PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
> PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
> # vala requires gir
> PACKAGECONFIG:remove:class-native = "vala"
> +PACKAGECONFIG:remove:class-nativesdk = "vala gtk4"
>
> CFLAGS += "-D_GNU_SOURCE"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177605): https://lists.openembedded.org/g/openembedded-core/message/177605
> Mute This Topic: https://lists.openembedded.org/mt/97178843/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3
2023-02-23 16:47 ` Alexandre Belloni
@ 2023-02-23 19:10 ` Markus Volk
0 siblings, 0 replies; 5+ messages in thread
From: Markus Volk @ 2023-02-23 19:10 UTC (permalink / raw)
To: Alexandre Belloni; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 497 bytes --]
Am Do, 23. Feb 2023 um 17:47:20 +0100 schrieb Alexandre Belloni
<alexandre.belloni@bootlin.com>:
> It failed on qemux86-64-x32:
Now that's unruly
I did a test build for qemux86-64-x32. For some reason gir gets
disabled while vala still is requested to be built and thus configure
fails. Not sure, why gir gets disabled here without disable vala as
well. Maybe there is a global setting for this somewhere?
However, adding another PACKAGECONFIG:remove line for x86-x32 did solve
the issue
[-- Attachment #2: Type: text/html, Size: 719 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3
2023-02-23 7:52 [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3 Markus Volk
2023-02-23 16:47 ` Alexandre Belloni
@ 2023-02-23 23:28 ` Alexandre Belloni
2023-02-24 1:02 ` Markus Volk
1 sibling, 1 reply; 5+ messages in thread
From: Alexandre Belloni @ 2023-02-23 23:28 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
I'm sorry I didn't catch it earlier but this is also the cause of:
ERROR: core-image-sato-1.0-r0 do_rootfs: Multilib check error: duplicate files /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/multilib/lib32/usr/share/glib-2.0/schemas/gschemas.compiled /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs/usr/share/glib-2.0/schemas/gschemas.compiled is not the same
https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/6745/steps/20/logs/stdio
On 23/02/2023 08:52:56+0100, Markus Volk wrote:
> - Allow to build the gtk4 widget and vapi
> This is needed to build gtk4 based terminals like blackbox
> - Update dependencies
> - Cleanup recipe
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
> .../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 22 +++++++++----------
> 1 file changed, 11 insertions(+), 11 deletions(-)
> rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb} (71%)
>
> diff --git a/meta/recipes-support/vte/vte_0.70.2.bb b/meta/recipes-support/vte/vte_0.70.3.bb
> similarity index 71%
> rename from meta/recipes-support/vte/vte_0.70.2.bb
> rename to meta/recipes-support/vte/vte_0.70.3.bb
> index ec2fb1f522..474ed87a88 100644
> --- a/meta/recipes-support/vte/vte_0.70.2.bb
> +++ b/meta/recipes-support/vte/vte_0.70.3.bb
> @@ -11,34 +11,34 @@ LIC_FILES_CHKSUM = " \
> file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \
> "
>
> -DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
> +DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu pango zlib"
>
> GNOMEBASEBUILDCLASS = "meson"
> GIR_MESON_OPTION = 'gir'
> GIDOCGEN_MESON_OPTION = "docs"
>
> -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
> +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
>
> -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
> SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
> -SRC_URI[archive.sha256sum] = "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
> +SRC_URI[archive.sha256sum] = "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23"
>
> ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> -# Help g-ir-scanner find the .so for linking
> -do_compile:prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
> -}
> -
> # Package additional files
> FILES:${PN}-dev += "${datadir}/vala/vapi/*"
>
> -PACKAGECONFIG ??= "gnutls"
> -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
> +PACKAGECONFIG ??= " \
> + gnutls \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
> +"
> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
> PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
> PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
> # vala requires gir
> PACKAGECONFIG:remove:class-native = "vala"
> +PACKAGECONFIG:remove:class-nativesdk = "vala gtk4"
>
> CFLAGS += "-D_GNU_SOURCE"
>
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177605): https://lists.openembedded.org/g/openembedded-core/message/177605
> Mute This Topic: https://lists.openembedded.org/mt/97178843/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3
2023-02-23 23:28 ` Alexandre Belloni
@ 2023-02-24 1:02 ` Markus Volk
0 siblings, 0 replies; 5+ messages in thread
From: Markus Volk @ 2023-02-24 1:02 UTC (permalink / raw)
To: alexandre.belloni; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 4722 bytes --]
I cant reproduce this. I've built core-image-sato multilib and rootfs
was created without an issue
Am Fr, 24. Feb 2023 um 00:28:30 +0100 schrieb Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org>:
> I'm sorry I didn't catch it earlier but this is also the cause of:
>
> ERROR: core-image-sato-1.0-r0 do_rootfs: Multilib check error:
> duplicate files
> /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/multilib/lib32/usr/share/glib-2.0/schemas/gschemas.compiled
> /home/pokybuild/yocto-worker/multilib/build/build/tmp/work/qemux86_64-poky-linux/core-image-sato/1.0-r0/rootfs/usr/share/glib-2.0/schemas/gschemas.compiled
> is not the same
>
> <https://autobuilder.yoctoproject.org/typhoon/#/builders/44/builds/6745/steps/20/logs/stdio>
>
> On 23/02/2023 08:52:56+0100, Markus Volk wrote:
>> - Allow to build the gtk4 widget and vapi
>> This is needed to build gtk4 based terminals like blackbox
>> - Update dependencies
>> - Cleanup recipe
>>
>> Signed-off-by: Markus Volk <f_l_k@t-online.de
>> <mailto:f_l_k@t-online.de>>
>> ---
>> .../vte/{vte_0.70.2.bb => vte_0.70.3.bb} | 22
>> +++++++++----------
>> 1 file changed, 11 insertions(+), 11 deletions(-)
>> rename meta/recipes-support/vte/{vte_0.70.2.bb => vte_0.70.3.bb}
>> (71%)
>>
>> diff --git a/meta/recipes-support/vte/vte_0.70.2.bb
>> b/meta/recipes-support/vte/vte_0.70.3.bb
>> similarity index 71%
>> rename from meta/recipes-support/vte/vte_0.70.2.bb
>> rename to meta/recipes-support/vte/vte_0.70.3.bb
>> index ec2fb1f522..474ed87a88 100644
>> --- a/meta/recipes-support/vte/vte_0.70.2.bb
>> +++ b/meta/recipes-support/vte/vte_0.70.3.bb
>> @@ -11,34 +11,34 @@ LIC_FILES_CHKSUM = " \
>> file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057
>> <file://copying.xterm;md5=d7fc3a23c16c039afafe2e042030f057/> \
>> "
>>
>> -DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu"
>> +DEPENDS = "fribidi glib-2.0 gtk+3 libpcre2 libxml2-native
>> gperf-native icu pango zlib"
>>
>> GNOMEBASEBUILDCLASS = "meson"
>> GIR_MESON_OPTION = 'gir'
>> GIDOCGEN_MESON_OPTION = "docs"
>>
>> -inherit gnomebase gi-docgen features_check
>> upstream-version-is-even gobject-introspection
>> +inherit gnomebase gi-docgen features_check
>> upstream-version-is-even gobject-introspection vala
>>
>> -# vapigen.m4 is required when vala is not present (but the one
>> from vala should be used normally)
>> SRC_URI +=
>> "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
>> <file://0001-add-w_exitcode-macro-for-non-glibc-systems.patch/>
>> -SRC_URI[archive.sha256sum] =
>> "4d15b4380de3f564d57eabd006389c407c705df5b0c70030fdcc24971a334d80"
>> +SRC_URI[archive.sha256sum] =
>> "9457134a02f3157fca04f7e0d39bdb0f3099be0a3ce82b7139d0c98a80748f23"
>>
>> ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>>
>> -# Help g-ir-scanner find the .so for linking
>> -do_compile:prepend() {
>> - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
>> -}
>> -
>> # Package additional files
>> FILES:${PN}-dev += "${datadir}/vala/vapi/*"
>>
>> -PACKAGECONFIG ??= "gnutls"
>> -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
>> +PACKAGECONFIG ??= " \
>> + gnutls \
>> + ${@bb.utils.contains
>> <mailto:${@bb.utils.contains>('DISTRO_FEATURES',
>> 'gobject-introspection-data', 'vala', '', d)} \
>> + ${@bb.utils.contains
>> <mailto:${@bb.utils.contains>('DISTRO_FEATURES', 'opengl', 'gtk4',
>> '', d)} \
>> +"
>> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
>> +PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false"
>> PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
>> PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
>> # vala requires gir
>> PACKAGECONFIG:remove:class-native = "vala"
>> +PACKAGECONFIG:remove:class-nativesdk = "vala gtk4"
>>
>> CFLAGS += "-D_GNU_SOURCE"
>>
>> --
>> 2.34.1
>>
>
>>
>>
>>
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com <https://bootlin.com/>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#177639):
> <https://lists.openembedded.org/g/openembedded-core/message/177639>
> Mute This Topic: <https://lists.openembedded.org/mt/97178843/3618223>
> Group Owner: openembedded-core+owner@lists.openembedded.org
> <mailto:openembedded-core+owner@lists.openembedded.org>
> Unsubscribe:
> <https://lists.openembedded.org/g/openembedded-core/unsub>
> [f_l_k@t-online.de <mailto:f_l_k@t-online.de>]
> -=-=-=-=-=-=-=-=-=-=-=-
>
[-- Attachment #2: Type: text/html, Size: 5150 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-02-24 1:02 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-23 7:52 [oe-core][PATCHv3] vte: update 0.70.2 -> 0.70.3 Markus Volk
2023-02-23 16:47 ` Alexandre Belloni
2023-02-23 19:10 ` Markus Volk
2023-02-23 23:28 ` Alexandre Belloni
2023-02-24 1:02 ` Markus Volk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.