mirror of
https://git.yoctoproject.org/poky
synced 2026-04-17 18:32:12 +02:00
vte: upgrade 0.56.3 -> 0.58.2
* they moved to meson build * all autotools specific patches must go * although not inheriting gettext dependency on intltool-native can go * tested with all variants of PACKAGECONFIG * need it for gnome-terminal 3.34 (From OE-Core rev: 6e7cfd2edd7b35201478e66d47b21547a1032e30) Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
8ea756fbdc
commit
1522ffd7fe
@@ -1,119 +0,0 @@
|
||||
From 08ca1c48b25c332b75bba2a6b5d757da006e955b Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Fri, 7 Oct 2016 16:27:57 +0300
|
||||
Subject: [PATCH] Add m4/vapigen.m4
|
||||
|
||||
Building without vala will fail if we don't have a vapigen.m4.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
m4/vapigen.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 96 insertions(+)
|
||||
create mode 100644 m4/vapigen.m4
|
||||
|
||||
diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
|
||||
new file mode 100644
|
||||
index 0000000..f2df12f
|
||||
--- /dev/null
|
||||
+++ b/m4/vapigen.m4
|
||||
@@ -0,0 +1,96 @@
|
||||
+dnl vapigen.m4
|
||||
+dnl
|
||||
+dnl Copyright 2012 Evan Nemerson
|
||||
+dnl
|
||||
+dnl This library is free software; you can redistribute it and/or
|
||||
+dnl modify it under the terms of the GNU Lesser General Public
|
||||
+dnl License as published by the Free Software Foundation; either
|
||||
+dnl version 2.1 of the License, or (at your option) any later version.
|
||||
+dnl
|
||||
+dnl This library is distributed in the hope that it will be useful,
|
||||
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
+dnl Lesser General Public License for more details.
|
||||
+dnl
|
||||
+dnl You should have received a copy of the GNU Lesser General Public
|
||||
+dnl License along with this library; if not, write to the Free Software
|
||||
+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
+
|
||||
+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
|
||||
+# --------------------------------------
|
||||
+# Check vapigen existence and version
|
||||
+#
|
||||
+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
|
||||
+AC_DEFUN([VAPIGEN_CHECK],
|
||||
+[
|
||||
+ AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
|
||||
+ AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0])
|
||||
+
|
||||
+ AC_ARG_ENABLE([vala],
|
||||
+ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
|
||||
+ AS_IF([test "x$4" = "x"], [
|
||||
+ enable_vala=auto
|
||||
+ ], [
|
||||
+ enable_vala=$4
|
||||
+ ])
|
||||
+ ])
|
||||
+
|
||||
+ AS_CASE([$enable_vala], [no], [enable_vala=no],
|
||||
+ [yes], [
|
||||
+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
|
||||
+ AC_MSG_ERROR([Vala bindings require GObject Introspection])
|
||||
+ ])
|
||||
+ ], [auto], [
|
||||
+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
|
||||
+ enable_vala=no
|
||||
+ ])
|
||||
+ ], [
|
||||
+ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
|
||||
+ ])
|
||||
+
|
||||
+ AS_IF([test "x$2" = "x"], [
|
||||
+ vapigen_pkg_name=vapigen
|
||||
+ ], [
|
||||
+ vapigen_pkg_name=vapigen-$2
|
||||
+ ])
|
||||
+ AS_IF([test "x$1" = "x"], [
|
||||
+ vapigen_pkg="$vapigen_pkg_name"
|
||||
+ ], [
|
||||
+ vapigen_pkg="$vapigen_pkg_name >= $1"
|
||||
+ ])
|
||||
+
|
||||
+ PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
+ PKG_CHECK_EXISTS([$vapigen_pkg], [
|
||||
+ AS_IF([test "$enable_vala" = "auto"], [
|
||||
+ enable_vala=yes
|
||||
+ ])
|
||||
+ ], [
|
||||
+ AS_CASE([$enable_vala], [yes], [
|
||||
+ AC_MSG_ERROR([$vapigen_pkg not found])
|
||||
+ ], [auto], [
|
||||
+ enable_vala=no
|
||||
+ ])
|
||||
+ ])
|
||||
+
|
||||
+ AC_MSG_CHECKING([for vala])
|
||||
+
|
||||
+ AS_CASE([$enable_vala],
|
||||
+ [yes], [
|
||||
+ VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
|
||||
+ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
|
||||
+ AS_IF([test "x$2" = "x"], [
|
||||
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
|
||||
+ ], [
|
||||
+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
|
||||
+ ])
|
||||
+ ])
|
||||
+
|
||||
+ AC_MSG_RESULT([$enable_vala])
|
||||
+
|
||||
+ AC_SUBST([VAPIGEN])
|
||||
+ AC_SUBST([VAPIGEN_VAPIDIR])
|
||||
+ AC_SUBST([VAPIGEN_MAKEFILE])
|
||||
+
|
||||
+ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
|
||||
+])
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 13 Jun 2016 11:05:00 +0300
|
||||
Subject: [PATCH] Don't enable stack-protection by default
|
||||
|
||||
These are set by security_flags.inc.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
configure.ac | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 068d072..d580f84 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
|
||||
-fno-common dnl
|
||||
-fdiagnostics-show-option dnl
|
||||
-fno-strict-aliasing dnl
|
||||
- -fstack-protector dnl
|
||||
- -fstack-protector-strong dnl
|
||||
-fno-semantic-interposition dnl
|
||||
-Wno-deprecated-declarations dnl
|
||||
])
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -9,18 +9,19 @@ LIC_FILES_CHKSUM = " \
|
||||
file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \
|
||||
"
|
||||
|
||||
DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native"
|
||||
DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native"
|
||||
|
||||
GNOMEBASEBUILDCLASS = "meson"
|
||||
GIR_MESON_OPTION = 'gir'
|
||||
|
||||
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 += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \
|
||||
file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch \
|
||||
"
|
||||
SRC_URI[archive.md5sum] = "adf341807861a5dad9f98e5c701c0769"
|
||||
SRC_URI[archive.sha256sum] = "17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648"
|
||||
SRC_URI[archive.md5sum] = "dadbf2c1d9864d3ea185738f97ab63af"
|
||||
SRC_URI[archive.sha256sum] = "33c966d2b1f2c3b0f9416dbca883fd746159b5bd040350e3b78f8104b2a42bc0"
|
||||
|
||||
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
||||
|
||||
@@ -41,15 +42,13 @@ do_compile_prepend() {
|
||||
FILES_${PN}-dev += "${datadir}/vala/vapi/*"
|
||||
|
||||
PACKAGECONFIG ??= "gnutls"
|
||||
PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala"
|
||||
PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
|
||||
PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
|
||||
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
|
||||
# vala requires gir
|
||||
PACKAGECONFIG_remove_class-native = "vala"
|
||||
|
||||
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 ${PN}-prompt"
|
||||
FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
|
||||
FILES_${PN}-prompt = "${sysconfdir}/profile.d"
|
||||
Reference in New Issue
Block a user