diff options
Diffstat (limited to 'meta/recipes-support/vte')
-rw-r--r-- | meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch | 38 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.62.2.bb | 57 | ||||
-rw-r--r-- | meta/recipes-support/vte/vte_0.74.2.bb | 56 |
3 files changed, 71 insertions, 80 deletions
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 index a1d2e7ff27..8934d5f80a 100644 --- 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 | |||
@@ -11,33 +11,25 @@ Upstream-Status: Submitted [1] | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> | 11 | Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> |
12 | 12 | ||
13 | [1] https://gitlab.gnome.org/GNOME/vte/issues/72 | 13 | [1] https://gitlab.gnome.org/GNOME/vte/issues/72 |
14 | |||
15 | --- | 14 | --- |
16 | src/missing.hh | 4 ++++ | 15 | src/widget.cc | 4 +++ |
17 | src/widget.cc | 1 + | 16 | 1 files changed, 4 insertions(+) |
18 | 2 files changed, 5 insertions(+) | ||
19 | 17 | ||
20 | diff --git a/src/missing.hh b/src/missing.hh | ||
21 | index 0742270..30ede62 100644 | ||
22 | --- a/src/missing.hh | ||
23 | +++ b/src/missing.hh | ||
24 | @@ -33,3 +33,7 @@ int fdwalk(int (*cb)(void* data, int fd), | ||
25 | char* strchrnul(char const* s, | ||
26 | int c); | ||
27 | #endif | ||
28 | + | ||
29 | +#ifndef W_EXITCODE | ||
30 | +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) | ||
31 | +#endif | ||
32 | diff --git a/src/widget.cc b/src/widget.cc | 18 | diff --git a/src/widget.cc b/src/widget.cc |
33 | index 44a2271..0668735 100644 | 19 | index 07f7cabf..31a77f68 100644 |
34 | --- a/src/widget.cc | 20 | --- a/src/widget.cc |
35 | +++ b/src/widget.cc | 21 | +++ b/src/widget.cc |
36 | @@ -21,6 +21,7 @@ | 22 | @@ -16,6 +16,10 @@ |
37 | #include "widget.hh" | 23 | * along with this library. If not, see <https://www.gnu.org/licenses/>. |
24 | */ | ||
38 | 25 | ||
39 | #include <sys/wait.h> // for W_EXITCODE | 26 | +#ifndef W_EXITCODE |
40 | +#include "missing.hh" // for W_EXITCODE on non-glibc systems | 27 | +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) |
28 | +#endif | ||
29 | + | ||
30 | #include "config.h" | ||
41 | 31 | ||
42 | #include <exception> | 32 | #include "widget.hh" |
43 | #include <new> | 33 | -- |
34 | 2.42.0 | ||
35 | |||
diff --git a/meta/recipes-support/vte/vte_0.62.2.bb b/meta/recipes-support/vte/vte_0.62.2.bb deleted file mode 100644 index b7e6f0bd8f..0000000000 --- a/meta/recipes-support/vte/vte_0.62.2.bb +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | SUMMARY = "Virtual terminal emulator GTK+ widget library" | ||
2 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" | ||
3 | LICENSE = "GPLv3 & LGPLv3+ & LGPLv2.1+" | ||
4 | LICENSE_libvte = "LGPLv3+" | ||
5 | |||
6 | LIC_FILES_CHKSUM = " \ | ||
7 | file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \ | ||
8 | file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \ | ||
9 | file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ | ||
10 | " | ||
11 | |||
12 | DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native icu" | ||
13 | |||
14 | GNOMEBASEBUILDCLASS = "meson" | ||
15 | GIR_MESON_OPTION = 'gir' | ||
16 | |||
17 | inherit gnomebase gtk-doc features_check upstream-version-is-even gobject-introspection | ||
18 | |||
19 | # vapigen.m4 is required when vala is not present (but the one from vala should be used normally) | ||
20 | SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" | ||
21 | SRC_URI[archive.sha256sum] = "b0300bbcf0c02df5812a10a3cb8e4fff723bab92c08c97a0a90c167cf543aff0" | ||
22 | |||
23 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
24 | |||
25 | # Instead of "inherit vala" we do the relevant settings here so we can | ||
26 | # set DEPENDS based on PACKAGECONFIG. | ||
27 | |||
28 | # Our patched version of Vala looks in STAGING_DATADIR for .vapi files | ||
29 | export STAGING_DATADIR | ||
30 | # Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files | ||
31 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" | ||
32 | |||
33 | # Help g-ir-scanner find the .so for linking | ||
34 | do_compile_prepend() { | ||
35 | export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" | ||
36 | } | ||
37 | |||
38 | # Package additional files | ||
39 | FILES_${PN}-dev += "${datadir}/vala/vapi/*" | ||
40 | |||
41 | PACKAGECONFIG ??= "gnutls" | ||
42 | PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala" | ||
43 | PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" | ||
44 | PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" | ||
45 | # vala requires gir | ||
46 | PACKAGECONFIG_remove_class-native = "vala" | ||
47 | |||
48 | CFLAGS += "-D_GNU_SOURCE" | ||
49 | |||
50 | PACKAGES =+ "libvte ${PN}-prompt" | ||
51 | FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" | ||
52 | FILES_${PN}-prompt = " \ | ||
53 | ${sysconfdir}/profile.d \ | ||
54 | ${libexecdir}/vte-urlencode-cwd \ | ||
55 | " | ||
56 | |||
57 | BBCLASSEXTEND = "native nativesdk" | ||
diff --git a/meta/recipes-support/vte/vte_0.74.2.bb b/meta/recipes-support/vte/vte_0.74.2.bb new file mode 100644 index 0000000000..d8eafde2fb --- /dev/null +++ b/meta/recipes-support/vte/vte_0.74.2.bb | |||
@@ -0,0 +1,56 @@ | |||
1 | SUMMARY = "Virtual terminal emulator GTK+ widget library" | ||
2 | DESCRIPTION = "VTE provides a virtual terminal widget for GTK applications." | ||
3 | HOMEPAGE = "https://wiki.gnome.org/Apps/Terminal/VTE" | ||
4 | BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" | ||
5 | LICENSE = "GPL-3.0-only & LGPL-3.0-or-later & MIT" | ||
6 | LICENSE:libvte = "LGPL-3.0-or-later" | ||
7 | |||
8 | LIC_FILES_CHKSUM = " \ | ||
9 | file://COPYING.GPL3;md5=cc702cf3444d1f19680c794cc61948f9 \ | ||
10 | file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ | ||
11 | file://COPYING.XTERM;md5=d7fc3a23c16c039afafe2e042030f057 \ | ||
12 | " | ||
13 | |||
14 | DEPENDS = "glib-2.0 glib-2.0-native gtk+3 libpcre2 libxml2-native gperf-native icu" | ||
15 | |||
16 | GIR_MESON_OPTION = 'gir' | ||
17 | GIDOCGEN_MESON_OPTION = "docs" | ||
18 | |||
19 | inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection systemd vala | ||
20 | |||
21 | SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch" | ||
22 | SRC_URI[archive.sha256sum] = "a535fb2a98fea8a2449cd1a02cccf5190131dddff52e715afdace3feb536eae7" | ||
23 | |||
24 | ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" | ||
25 | |||
26 | EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" | ||
27 | EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}" | ||
28 | |||
29 | PACKAGECONFIG ??= " \ | ||
30 | gnutls \ | ||
31 | ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ | ||
32 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \ | ||
33 | " | ||
34 | PACKAGECONFIG[fribidi] = "-Dfribidi=true,-Dfribidi=false,fribidi" | ||
35 | PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" | ||
36 | PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" | ||
37 | PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" | ||
38 | |||
39 | PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" | ||
40 | FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" | ||
41 | FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" | ||
42 | FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ | ||
43 | ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ | ||
44 | ${datadir}/gir-1.0/Vte-3.91.gir \ | ||
45 | ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ | ||
46 | ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ | ||
47 | ${includedir}/vte-2.91-gtk4 \ | ||
48 | " | ||
49 | FILES:${PN} +="${systemd_user_unitdir}" | ||
50 | FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" | ||
51 | FILES:${PN}-prompt = " \ | ||
52 | ${sysconfdir}/profile.d \ | ||
53 | ${libexecdir}/vte-urlencode-cwd \ | ||
54 | " | ||
55 | |||
56 | FILES:${PN}-dev += "${datadir}/glade/" | ||