seatd: add PACKAGECONFIG for the man-pages
PATCH 1/3 seatd: add PACKAGECONFIG for the man-pages
seatd will build manpages if scdoc is present. Inherit manpages and add a PACKAGECONFIG so that we build them if they're enabled.
This also removes a floating dependency on scdoc.
--- meta/recipes-core/seatd/seatd_0.9.3.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-core/seatd/seatd_0.9.3.bb +2 -1
@@ -10,7 +10,7 @@ SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master;tag file://init" SRCREV = "daa8196e10b180b8b0caeafa8e5f860eb1bd6706" -inherit meson pkgconfig systemd update-rc.d useradd +inherit meson manpages pkgconfig systemd update-rc.d useradd # https://www.openwall.com/lists/musl/2020/01/20/3 CFLAGS:append:libc-musl:powerpc64le = " -Wno-error=overflow"
@@ -30,6 +30,7 @@ PACKAGECONFIG ?= " \ PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled" PACKAGECONFIG[systemd] = "-Dlibseat-logind=systemd,,systemd" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages-disabled,scdoc-native" do_install:append() { if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
Signature · 1 line
2.43.0
PATCH 2/3 libportal: disable qt6 backend explicitly to ensure deterministic builds
In theory we can just add a PACKAGECONFIG for qt6 that uses meta-qt6, but that fails to find the native binaries in the sysroot and I don't know how to fix this.
--- meta/recipes-gnome/libportal/libportal_0.11.0.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
meta/recipes-gnome/libportal/libportal_0.11.0.bb +2 -1
@@ -22,7 +22,8 @@ PACKAGECONFIG ??= "${@oe.utils.vartrue('CAN_GTK', 'gtk3', '', d)} \ PACKAGECONFIG[gtk3] = "-Dbackend-gtk3=enabled,-Dbackend-gtk3=disabled,gtk+3" PACKAGECONFIG[gtk4] = "-Dbackend-gtk4=enabled,-Dbackend-gtk4=disabled,gtk4" -EXTRA_OEMESON = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} -Dbackend-qt5=disabled" +EXTRA_OEMESON = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ + -Dbackend-qt5=disabled -Dbackend-qt6=disabled" PACKAGES =+ "${PN}-gtk3 ${PN}-gtk4"
Signature · 1 line
2.43.0
PATCH 3/3 webkitgtk: remove libnotify dependency
In reply to Ross BurtonThis was removed upstream in webkitgtk 2.39.1 onwards[1].
[1] https://github.com/WebKit/WebKit/commit/95858e6cc2e3f804cc95b4f55cd7532329db790a
--- meta/recipes-sato/webkit/webkitgtk_2.52.6.bb | 1 - 1 file changed, 1 deletion(-)
meta/recipes-sato/webkit/webkitgtk_2.52.6.bb +0 -1
@@ -39,7 +39,6 @@ DEPENDS += " \ gtk4 \ libxslt \ libtasn1 \ - libnotify \ gstreamer1.0 \ gstreamer1.0-plugins-base \ glib-2.0-native \
Signature · 1 line
2.43.0
Quoted 24 lines · Ross Burton via lists.openembedded.org
seatd will build manpages if scdoc is present. Inherit manpages and add a PACKAGECONFIG so that we build them if they're enabled.
This also removes a floating dependency on scdoc.
Signed-off-by Ross Burton <[email protected]>---
meta/recipes-core/seatd/seatd_0.9.3.bb | 3 ++-1 file changed, 2 insertions(+), 1 deletion(-)meta/recipes-core/seatd/seatd_0.9.3.bb +0
-0@@ -10,7 +10,7 @@ SRC_URI = "git://git.sr.ht/~kennylevinsen/seatd;protocol=https;branch=master;tagfile://init"
SRCREV = "daa8196e10b180b8b0caeafa8e5f860eb1bd6706"meta/recipes-core/seatd/seatd_0.9.3.bb +1
-1-inherit meson pkgconfig systemd update-rc.d useradd +inherit meson manpages pkgconfig systemd update-rc.d useradd
# https://www.openwall.com/lists/musl/2020/01/20/3
CFLAGS:append:libc-musl:powerpc64le = " -Wno-error=overflow"meta/recipes-core/seatd/seatd_0.9.3.bb +0
-0@@ -30,6 +30,7 @@ PACKAGECONFIG ?= " \
Quoted 7 lines
PACKAGECONFIG[libseat-builtin] = "-Dlibseat-builtin=enabled,-Dlibseat-builtin=disabled" PACKAGECONFIG[systemd] = "-Dlibseat-logind=systemd,,systemd" +PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages-disabled,scdoc-native"
do_install:append() {
if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then
https://autobuilder.yoctoproject.org/valkyrie/#/builders/48/builds/4676
| meson setup: error: The argument for option '-D' must be in OPTION=VALUE format.
You mean -Dman-pages=disabled
I'll tweak the patch.
Cheers,
Richard
Quoted 2 lines · Richard Purdie
You mean -Dman-pages=disabled
Sigh, sorry about that. Can you tell I have api-docs enabled?
Ross