summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch59
-rw-r--r--meta/recipes-support/vte/vte_0.56.1.bb (renamed from meta/recipes-support/vte/vte_0.52.2.bb)19
2 files changed, 72 insertions, 6 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
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 @@
1From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001
2From: Danilo Spinella <danyspin97@protonmail.com>
3Date: Thu, 21 Mar 2019 14:19:26 +0100
4Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems
5
6Upstream-Status: Submitted [1]
7
8Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
9
10[1] https://gitlab.gnome.org/GNOME/vte/issues/72
11
12---
13 src/missing.hh | 21 +++++++++++++++++++++
14 src/widget.cc | 1 +
15 2 files changed, 22 insertions(+)
16 create mode 100644 src/missing.hh
17
18diff --git a/src/missing.hh b/src/missing.hh
19new file mode 100644
20index 00000000..1baa993d
21--- /dev/null
22+++ b/src/missing.hh
23@@ -0,0 +1,21 @@
24+/* Copyright 2019 Danilo Spinella
25+ *
26+ * This library is free software; you can redistribute it and/or
27+ * modify it under the terms of the GNU Lesser General Public
28+ * License as published by the Free Software Foundation; either
29+ * version 3 of the License, or (at your option) any later version.
30+ *
31+ * This library is distributed in the hope that it will be useful,
32+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
33+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
34+ * Lesser General Public License for more details.
35+ *
36+ * You should have received a copy of the GNU Lesser General Public
37+ * License along with this library; if not, write to the Free Software
38+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
39+ */
40+
41+#ifndef W_EXITCODE
42+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
43+#endif
44+
45diff --git a/src/widget.cc b/src/widget.cc
46index 331ddba9..555a4adf 100644
47--- a/src/widget.cc
48+++ b/src/widget.cc
49@@ -21,6 +21,7 @@
50 #include "widget.hh"
51
52 #include <sys/wait.h> // for W_EXITCODE
53+#include "missing.hh" // for W_EXITCODE on non-glibc systems
54
55 #include <new>
56 #include <string>
57--
582.21.0
59
diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/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 @@
1SUMMARY = "Virtual terminal emulator GTK+ widget library" 1SUMMARY = "Virtual terminal emulator GTK+ widget library"
2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" 2BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
3LICENSE = "LGPLv2.1+" 3LICENSE = "GPLv3 & LGPLv2.1+"
4DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" 4LICENSE_libvte = "LGPLv2.1+"
5
6LIC_FILES_CHKSUM = " \
7 file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
8 file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \
9 file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \
10"
5 11
6LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 12DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native"
7 13
8inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection 14inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection
9 15
@@ -11,9 +17,10 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject
11SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ 17SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \
12 ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ 18 ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \
13 file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \ 19 file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \
20 file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
14 " 21 "
15SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" 22SRC_URI[archive.md5sum] = "a8984cd5a101dbff0b0c875d1de3f692"
16SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" 23SRC_URI[archive.sha256sum] = "02fa8ecc02a9332e47f486795494527b5687b3bd448e73e6b67285f2f326dc7c"
17 24
18ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 25ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
19 26
@@ -27,7 +34,7 @@ export XDG_DATA_DIRS = "${STAGING_DATADIR}"
27 34
28# Help g-ir-scanner find the .so for linking 35# Help g-ir-scanner find the .so for linking
29do_compile_prepend() { 36do_compile_prepend() {
30 export GIR_EXTRA_LIBS_PATH="${B}/src/.libs" 37 export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
31} 38}
32 39
33# Package additional files 40# Package additional files