mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

vte: upgrade 0.52.2 -> 0.56.1

Browse Source 
* license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3
* prettify recipe a bit

(From OE-Core rev: 2cce886e322ac2220af369b75c075cfdb1ac36d3)

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Andreas Müller
2019-04-24 11:13:18 +02:00
committed by Richard Purdie
parent 837637da9e
commit 9f44921266
2 changed files with 72 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch Normal file
View File

@@ -0,0 +1,59 @@
From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001
From: Danilo Spinella <danyspin97@protonmail.com>
Date: Thu, 21 Mar 2019 14:19:26 +0100
Subject: [PATCH] Add W_EXITCODE macro for non-glibc systems
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 | 21 +++++++++++++++++++++
src/widget.cc | 1 +
2 files changed, 22 insertions(+)
create mode 100644 src/missing.hh
diff --git a/src/missing.hh b/src/missing.hh
new file mode 100644
index 00000000..1baa993d
--- /dev/null
+++ b/src/missing.hh
@@ -0,0 +1,21 @@
+/* Copyright 2019 Danilo Spinella
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef W_EXITCODE
+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
+#endif
+
diff --git a/src/widget.cc b/src/widget.cc
index 331ddba9..555a4adf 100644
--- a/src/widget.cc
+++ b/src/widget.cc
@@ -21,6 +21,7 @@
#include "widget.hh"
#include <sys/wait.h> // for W_EXITCODE
+#include "missing.hh" // for W_EXITCODE on non-glibc systems
#include <new>
#include <string>
--
2.21.0

19
meta/recipes-support/vte/vte_0.52.2.bb → meta/recipes-support/vte/vte_0.56.1.bb
View File

@@ -1,9 +1,15 @@
SUMMARY = "Virtual terminal emulator GTK+ widget library"
BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte"
LICENSE = "LGPLv2.1+"
DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native"
LICENSE = "GPLv3 & LGPLv2.1+"
LICENSE_libvte = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
LIC_FILES_CHKSUM = " \
file://COPYING.GPL3;md5=2f31b266d3440dd7ee50f92cf67d8e6c \
file://COPYING.LGPL2;md5=4fbd65380cdd255951079008b364516c \
file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \
"
DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native"
inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection
@@ -11,9 +17,10 @@ inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject
SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \
${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \
file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \
file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
"
SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18"
SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af"
SRC_URI[archive.md5sum] = "a8984cd5a101dbff0b0c875d1de3f692"
SRC_URI[archive.sha256sum] = "02fa8ecc02a9332e47f486795494527b5687b3bd448e73e6b67285f2f326dc7c"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
@@ -27,7 +34,7 @@ export XDG_DATA_DIRS = "${STAGING_DATADIR}"
# Help g-ir-scanner find the .so for linking
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
}
# Package additional files