mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
vte: upgrade 0.72.2 -> 0.74.0
Rework recipe - remove legacy of the autotools buildsystem - remove BBCLASSEXTEND - build vapi dependent on gi-data - docs require gir, add a EXTRA_OEMESON:append to avoid fail in a combination where docs=true and gir=false - gtk+3 and gtk4 are requested by default-> add gtk4 depending on DISTRO_FEATURE - install systemd support files depending on DISTRO_FEATURE - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch (From OE-Core rev: 47861220ab9358f1577d549eb367c2758e9f231e) Signed-off-by: Markus Volk <f_l_k@t-online.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
edc72a4bd1
commit
66d35dedcd
+14
-21
@@ -11,32 +11,25 @@ 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 | 4 ++++
|
||||
src/widget.cc | 1 +
|
||||
2 files changed, 5 insertions(+)
|
||||
src/widget.cc | 4 +++
|
||||
1 files changed, 4 insertions(+)
|
||||
|
||||
--- a/src/missing.hh
|
||||
+++ b/src/missing.hh
|
||||
@@ -24,6 +24,10 @@
|
||||
#define NSIG (8 * sizeof(sigset_t))
|
||||
#endif
|
||||
diff --git a/src/widget.cc b/src/widget.cc
|
||||
index 07f7cabf..31a77f68 100644
|
||||
--- a/src/widget.cc
|
||||
+++ b/src/widget.cc
|
||||
@@ -16,6 +16,10 @@
|
||||
* along with this library. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
+#ifndef W_EXITCODE
|
||||
+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
|
||||
+#endif
|
||||
+
|
||||
#ifndef HAVE_FDWALK
|
||||
int fdwalk(int (*cb)(void* data, int fd),
|
||||
void* data);
|
||||
--- a/src/widget.cc
|
||||
+++ b/src/widget.cc
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "widget.hh"
|
||||
|
||||
#include <sys/wait.h> // for W_EXITCODE
|
||||
+#include "missing.hh" // for W_EXITCODE on non-glibc systems
|
||||
|
||||
#include <exception>
|
||||
#include <new>
|
||||
--
|
||||
2.42.0
|
||||
|
||||
|
||||
@@ -16,32 +16,27 @@ DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native i
|
||||
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] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e"
|
||||
SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b"
|
||||
|
||||
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"
|
||||
}
|
||||
EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
|
||||
EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}"
|
||||
|
||||
# Package additional files
|
||||
FILES:${PN}-dev += "${datadir}/vala/vapi/*"
|
||||
|
||||
PACKAGECONFIG ??= "gnutls"
|
||||
PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
|
||||
PACKAGECONFIG ??= " \
|
||||
gnutls \
|
||||
${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
|
||||
${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
|
||||
"
|
||||
PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
|
||||
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
|
||||
PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
|
||||
# vala requires gir
|
||||
PACKAGECONFIG:remove:class-native = "vala"
|
||||
|
||||
CFLAGS += "-D_GNU_SOURCE"
|
||||
|
||||
PACKAGES =+ "libvte ${PN}-prompt"
|
||||
FILES:${PN} +="${systemd_user_unitdir}"
|
||||
FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
|
||||
FILES:${PN}-prompt = " \
|
||||
${sysconfdir}/profile.d \
|
||||
@@ -49,5 +44,3 @@ FILES:${PN}-prompt = " \
|
||||
"
|
||||
|
||||
FILES:${PN}-dev += "${datadir}/glade/"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
Reference in New Issue
Block a user