From 2cce886e322ac2220af369b75c075cfdb1ac36d3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Wed, 24 Apr 2019 11:13:18 +0200 Subject: vte: upgrade 0.52.2 -> 0.56.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * license: COPYING was replaced by COPYING.LGPL2/COPYING.LGPL3/COPYING.GPL3 * prettify recipe a bit Signed-off-by: Andreas Müller Signed-off-by: Richard Purdie --- ...dd-W_EXITCODE-macro-for-non-glibc-systems.patch | 59 ++++++++++++++++++++++ meta/recipes-support/vte/vte_0.52.2.bb | 49 ------------------ meta/recipes-support/vte/vte_0.56.1.bb | 56 ++++++++++++++++++++ 3 files changed, 115 insertions(+), 49 deletions(-) create mode 100644 meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch delete mode 100644 meta/recipes-support/vte/vte_0.52.2.bb create mode 100644 meta/recipes-support/vte/vte_0.56.1.bb (limited to 'meta/recipes-support/vte') 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 @@ +From f78988d3bb5929c857e788a86c7919d6a4ffacc9 Mon Sep 17 00:00:00 2001 +From: Danilo Spinella +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 + +[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 // for W_EXITCODE ++#include "missing.hh" // for W_EXITCODE on non-glibc systems + + #include + #include +-- +2.21.0 + diff --git a/meta/recipes-support/vte/vte_0.52.2.bb b/meta/recipes-support/vte/vte_0.52.2.bb deleted file mode 100644 index 272ae66f13..0000000000 --- a/meta/recipes-support/vte/vte_0.52.2.bb +++ /dev/null @@ -1,49 +0,0 @@ -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" - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection - -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) -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 \ - " -SRC_URI[archive.md5sum] = "de8181350dccb010e915e366bdd06d18" -SRC_URI[archive.sha256sum] = "0f2657cef52accbfe56feede553155552d7c1984b1291838af3cb8cfc19b26af" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -# Instead of "inherit vala" we do the relevant settings here so we can -# set DEPENDS based on PACKAGECONFIG. - -# Our patched version of Vala looks in STAGING_DATADIR for .vapi files -export STAGING_DATADIR -# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files -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" -} - -# Package additional files -FILES_${PN}-dev += "${datadir}/vala/vapi/*" - -PACKAGECONFIG ??= "gnutls" -PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" -PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" - -CFLAGS += "-D_GNU_SOURCE" - -# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. -# Use libtool-cross (which has a hack to prevent that) instead. -EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" - -PACKAGES =+ "libvte" -FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/vte/vte_0.56.1.bb b/meta/recipes-support/vte/vte_0.56.1.bb new file mode 100644 index 0000000000..02b84c38d9 --- /dev/null +++ b/meta/recipes-support/vte/vte_0.56.1.bb @@ -0,0 +1,56 @@ +SUMMARY = "Virtual terminal emulator GTK+ widget library" +BUGTRACKER = "https://bugzilla.gnome.org/buglist.cgi?product=vte" +LICENSE = "GPLv3 & LGPLv2.1+" +LICENSE_libvte = "LGPLv2.1+" + +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 + +# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) +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] = "a8984cd5a101dbff0b0c875d1de3f692" +SRC_URI[archive.sha256sum] = "02fa8ecc02a9332e47f486795494527b5687b3bd448e73e6b67285f2f326dc7c" + +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" + +# Instead of "inherit vala" we do the relevant settings here so we can +# set DEPENDS based on PACKAGECONFIG. + +# Our patched version of Vala looks in STAGING_DATADIR for .vapi files +export STAGING_DATADIR +# Upstream Vala >= 0.11 looks in XDG_DATA_DIRS for .vapi files +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" +} + +# Package additional files +FILES_${PN}-dev += "${datadir}/vala/vapi/*" + +PACKAGECONFIG ??= "gnutls" +PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" +PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" + +CFLAGS += "-D_GNU_SOURCE" + +# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds. +# Use libtool-cross (which has a hack to prevent that) instead. +EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool" + +PACKAGES =+ "libvte" +FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg