summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Müller <schnitzeltony@gmail.com>2019-11-02 00:08:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-05 10:37:11 +0000
commit1522ffd7fe4b356d367445b067b0d3a0db2fd48d (patch)
tree37d59704c880db7b465b08a6bae546b119664a07
parent8ea756fbdc653b7863a1c0f8b31278c019aadc63 (diff)
downloadpoky-1522ffd7fe4b356d367445b067b0d3a0db2fd48d.tar.gz
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>
-rw-r--r--meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch119
-rw-r--r--meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch29
-rw-r--r--meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch (renamed from meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch)0
-rw-r--r--meta/recipes-support/vte/vte_0.58.2.bb (renamed from meta/recipes-support/vte/vte_0.56.3.bb)25
4 files changed, 12 insertions, 161 deletions
diff --git a/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch b/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch
deleted file mode 100644
index 1c5630ed9c..0000000000
--- a/meta/recipes-support/vte/vte/0001-Add-m4-vapigen.m4.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1From 08ca1c48b25c332b75bba2a6b5d757da006e955b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Fri, 7 Oct 2016 16:27:57 +0300
4Subject: [PATCH] Add m4/vapigen.m4
5
6Building without vala will fail if we don't have a vapigen.m4.
7
8Upstream-Status: Pending
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10---
11 m4/vapigen.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
12 1 file changed, 96 insertions(+)
13 create mode 100644 m4/vapigen.m4
14
15diff --git a/m4/vapigen.m4 b/m4/vapigen.m4
16new file mode 100644
17index 0000000..f2df12f
18--- /dev/null
19+++ b/m4/vapigen.m4
20@@ -0,0 +1,96 @@
21+dnl vapigen.m4
22+dnl
23+dnl Copyright 2012 Evan Nemerson
24+dnl
25+dnl This library is free software; you can redistribute it and/or
26+dnl modify it under the terms of the GNU Lesser General Public
27+dnl License as published by the Free Software Foundation; either
28+dnl version 2.1 of the License, or (at your option) any later version.
29+dnl
30+dnl This library is distributed in the hope that it will be useful,
31+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
32+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
33+dnl Lesser General Public License for more details.
34+dnl
35+dnl You should have received a copy of the GNU Lesser General Public
36+dnl License along with this library; if not, write to the Free Software
37+dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
38+
39+# VAPIGEN_CHECK([VERSION], [API_VERSION], [FOUND-INTROSPECTION], [DEFAULT])
40+# --------------------------------------
41+# Check vapigen existence and version
42+#
43+# See http://live.gnome.org/Vala/UpstreamGuide for detailed documentation
44+AC_DEFUN([VAPIGEN_CHECK],
45+[
46+ AC_BEFORE([GOBJECT_INTROSPECTION_CHECK],[$0])
47+ AC_BEFORE([GOBJECT_INTROSPECTION_REQUIRE],[$0])
48+
49+ AC_ARG_ENABLE([vala],
50+ [AS_HELP_STRING([--enable-vala[=@<:@no/auto/yes@:>@]],[build Vala bindings @<:@default=]ifelse($4,,auto,$4)[@:>@])],,[
51+ AS_IF([test "x$4" = "x"], [
52+ enable_vala=auto
53+ ], [
54+ enable_vala=$4
55+ ])
56+ ])
57+
58+ AS_CASE([$enable_vala], [no], [enable_vala=no],
59+ [yes], [
60+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
61+ AC_MSG_ERROR([Vala bindings require GObject Introspection])
62+ ])
63+ ], [auto], [
64+ AS_IF([test "x$3" != "xyes" -a "x$found_introspection" != "xyes"], [
65+ enable_vala=no
66+ ])
67+ ], [
68+ AC_MSG_ERROR([Invalid argument passed to --enable-vala, should be one of @<:@no/auto/yes@:>@])
69+ ])
70+
71+ AS_IF([test "x$2" = "x"], [
72+ vapigen_pkg_name=vapigen
73+ ], [
74+ vapigen_pkg_name=vapigen-$2
75+ ])
76+ AS_IF([test "x$1" = "x"], [
77+ vapigen_pkg="$vapigen_pkg_name"
78+ ], [
79+ vapigen_pkg="$vapigen_pkg_name >= $1"
80+ ])
81+
82+ PKG_PROG_PKG_CONFIG
83+
84+ PKG_CHECK_EXISTS([$vapigen_pkg], [
85+ AS_IF([test "$enable_vala" = "auto"], [
86+ enable_vala=yes
87+ ])
88+ ], [
89+ AS_CASE([$enable_vala], [yes], [
90+ AC_MSG_ERROR([$vapigen_pkg not found])
91+ ], [auto], [
92+ enable_vala=no
93+ ])
94+ ])
95+
96+ AC_MSG_CHECKING([for vala])
97+
98+ AS_CASE([$enable_vala],
99+ [yes], [
100+ VAPIGEN=`$PKG_CONFIG --variable=vapigen vapigen`
101+ VAPIGEN_MAKEFILE=`$PKG_CONFIG --variable=datadir vapigen`/vala/Makefile.vapigen
102+ AS_IF([test "x$2" = "x"], [
103+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir vapigen`
104+ ], [
105+ VAPIGEN_VAPIDIR=`$PKG_CONFIG --variable=vapidir_versioned vapigen`
106+ ])
107+ ])
108+
109+ AC_MSG_RESULT([$enable_vala])
110+
111+ AC_SUBST([VAPIGEN])
112+ AC_SUBST([VAPIGEN_VAPIDIR])
113+ AC_SUBST([VAPIGEN_MAKEFILE])
114+
115+ AM_CONDITIONAL(ENABLE_VAPIGEN, test "x$enable_vala" = "xyes")
116+])
117--
1182.1.4
119
diff --git a/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch b/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
deleted file mode 100644
index fcfc559758..0000000000
--- a/meta/recipes-support/vte/vte/0001-Don-t-enable-stack-protection-by-default.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From b0a579d83e355545b64742c997fe8b1d58bf4207 Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Mon, 13 Jun 2016 11:05:00 +0300
4Subject: [PATCH] Don't enable stack-protection by default
5
6These are set by security_flags.inc.
7
8Upstream-Status: Inappropriate [configuration]
9Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
10---
11 configure.ac | 2 --
12 1 file changed, 2 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 068d072..d580f84 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -138,8 +138,6 @@ m4_define([compiler_flags_common],[ dnl
19 -fno-common dnl
20 -fdiagnostics-show-option dnl
21 -fno-strict-aliasing dnl
22- -fstack-protector dnl
23- -fstack-protector-strong dnl
24 -fno-semantic-interposition dnl
25 -Wno-deprecated-declarations dnl
26 ])
27--
282.1.4
29
diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
index 0ffd92b4ba..0ffd92b4ba 100644
--- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
+++ b/meta/recipes-support/vte/vte/0002-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
diff --git a/meta/recipes-support/vte/vte_0.56.3.bb b/meta/recipes-support/vte/vte_0.58.2.bb
index 0deee175df..9e27f6978d 100644
--- a/meta/recipes-support/vte/vte_0.56.3.bb
+++ b/meta/recipes-support/vte/vte_0.58.2.bb
@@ -9,18 +9,19 @@ LIC_FILES_CHKSUM = " \
9 file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \ 9 file://COPYING.LGPL3;md5=b52f2d57d10c4f7ee67a7eb9615d5d24 \
10" 10"
11 11
12DEPENDS = "glib-2.0 gtk+3 libpcre2 intltool-native libxml2-native gperf-native" 12DEPENDS = "glib-2.0 gtk+3 libpcre2 libxml2-native gperf-native"
13
14GNOMEBASEBUILDCLASS = "meson"
15GIR_MESON_OPTION = 'gir'
13 16
14inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection 17inherit gnomebase gtk-doc distro_features_check upstream-version-is-even gobject-introspection
15 18
16# vapigen.m4 is required when vala is not present (but the one from vala should be used normally) 19# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
17SRC_URI += "file://0001-Don-t-enable-stack-protection-by-default.patch \ 20SRC_URI += "file://0001-app.cc-use-old-school-asignment-to-avoid-gcc-4.8-err.patch \
18 ${@bb.utils.contains('PACKAGECONFIG', 'vala', '', 'file://0001-Add-m4-vapigen.m4.patch', d) } \ 21 file://0002-Add-W_EXITCODE-macro-for-non-glibc-systems.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 \
21 " 22 "
22SRC_URI[archive.md5sum] = "adf341807861a5dad9f98e5c701c0769" 23SRC_URI[archive.md5sum] = "dadbf2c1d9864d3ea185738f97ab63af"
23SRC_URI[archive.sha256sum] = "17a1d4bc8848f1d2acfa4c20aaa24b9bac49f057b8909c56d3dafec2e2332648" 24SRC_URI[archive.sha256sum] = "33c966d2b1f2c3b0f9416dbca883fd746159b5bd040350e3b78f8104b2a42bc0"
24 25
25ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 26ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
26 27
@@ -41,15 +42,13 @@ do_compile_prepend() {
41FILES_${PN}-dev += "${datadir}/vala/vapi/*" 42FILES_${PN}-dev += "${datadir}/vala/vapi/*"
42 43
43PACKAGECONFIG ??= "gnutls" 44PACKAGECONFIG ??= "gnutls"
44PACKAGECONFIG[vala] = "--enable-vala,--disable-vala,vala-native vala" 45PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
45PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls" 46PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
47# vala requires gir
48PACKAGECONFIG_remove_class-native = "vala"
46 49
47CFLAGS += "-D_GNU_SOURCE" 50CFLAGS += "-D_GNU_SOURCE"
48 51
49# libtool adds "-nostdlib" when g++ is used. This breaks PIE builds.
50# Use libtool-cross (which has a hack to prevent that) instead.
51EXTRA_OEMAKE_class-target = "LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
52
53PACKAGES =+ "libvte ${PN}-prompt" 52PACKAGES =+ "libvte ${PN}-prompt"
54FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" 53FILES_libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
55FILES_${PN}-prompt = "${sysconfdir}/profile.d" 54FILES_${PN}-prompt = "${sysconfdir}/profile.d"