summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-01-03 14:59:31 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-04 11:56:42 +0000
commit93855361b76565bef7b8cc5b474a51b20b328464 (patch)
tree3fa3fc74fa8aabd12b5b579f316caf38f65c6ba3 /meta
parentf212c81c7a481d812344abbf20a727fff85175bc (diff)
downloadpoky-93855361b76565bef7b8cc5b474a51b20b328464.tar.gz
vte: upgrade from 0.24.3 to 0.28.2
Added a patch to add introspection.m4 to avoid the following configure error: | src/Makefile.am:168: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed. NOTE: package vte-0.28.2-r0: task do_configure: Failed This upgrade avoids configure issues with automake version 1.11.2 seen on the earlier version of vte: | src/Makefile.am:155: `pkglibdir' is not a legitimate directory for `PROGRAMS' | src/Makefile.am:156: `pkglibdir' is not a legitimate directory for `SCRIPTS' | src/Makefile.am:178: variable `interpret_SOURCES' is defined but no program or | src/Makefile.am:178: library has `interpret' as canonical name (possible typo) | src/Makefile.am:229: variable `slowcat_SOURCES' is defined but no program or | src/Makefile.am:229: library has `slowcat' as canonical name (possible typo) | src/Makefile.am:203: variable `interpret_LDADD' is defined but no program or | src/Makefile.am:203: library has `interpret' as canonical name (possible typo) | autoreconf: automake failed with exit status: 1 | ERROR: autoreconf execution failed. NOTE: package vte-0.24.3-r0: task do_configure: Failed Did not upgrade to the latest version 0.31.0. 0.28.2 is the last version supporting gtk+ 2. Next versions have dropped support for gtk+ 2, and they require gtk+ 3. It would be more appropriate to move to next version after gtk+ 3 recipe is available. (From OE-Core rev: e5def5f36619c8f78fbb82f106f1ab7aab607532) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/vte/vte.inc6
-rw-r--r--meta/recipes-support/vte/vte/introspection.patch99
-rw-r--r--meta/recipes-support/vte/vte_0.24.3.bb8
-rw-r--r--meta/recipes-support/vte/vte_0.28.2.bb8
4 files changed, 111 insertions, 10 deletions
diff --git a/meta/recipes-support/vte/vte.inc b/meta/recipes-support/vte/vte.inc
index 6138f8ca01..54bd8ae290 100644
--- a/meta/recipes-support/vte/vte.inc
+++ b/meta/recipes-support/vte/vte.inc
@@ -6,9 +6,11 @@ RDEPENDS_libvte = "vte-termcap"
6 6
7inherit gnome 7inherit gnome
8 8
9EXTRA_OECONF = "--disable-gtk-doc --disable-python" 9SRC_URI += "file://introspection.patch"
10
11EXTRA_OECONF = "--disable-gtk-doc --disable-python --disable-introspection"
10 12
11PACKAGES =+ "libvte vte-termcap" 13PACKAGES =+ "libvte vte-termcap"
12FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" 14FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
13FILES_vte-dbg =+ ${libexecdir}/.debug" 15FILES_vte-dbg =+ ${libexecdir}/.debug"
14FILES_vte-termcap = "${datadir}/vte/termcap" 16FILES_vte-termcap = "${datadir}/vte/termcap-0.0"
diff --git a/meta/recipes-support/vte/vte/introspection.patch b/meta/recipes-support/vte/vte/introspection.patch
new file mode 100644
index 0000000000..76a841ce10
--- /dev/null
+++ b/meta/recipes-support/vte/vte/introspection.patch
@@ -0,0 +1,99 @@
1Index: vte-0.28.2/m4/introspection.m4
2===================================================================
3--- /dev/null
4+++ vte-0.28.2/m4/introspection.m4
5@@ -0,0 +1,94 @@
6+dnl -*- mode: autoconf -*-
7+dnl Copyright 2009 Johan Dahlin
8+dnl
9+dnl This file is free software; the author(s) gives unlimited
10+dnl permission to copy and/or distribute it, with or without
11+dnl modifications, as long as this notice is preserved.
12+dnl
13+
14+# serial 1
15+
16+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
17+[
18+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
19+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
20+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
21+
22+ dnl enable/disable introspection
23+ m4_if([$2], [require],
24+ [dnl
25+ enable_introspection=yes
26+ ],[dnl
27+ AC_ARG_ENABLE(introspection,
28+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
29+ [Enable introspection for this build]),,
30+ [enable_introspection=auto])
31+ ])dnl
32+
33+ AC_MSG_CHECKING([for gobject-introspection])
34+
35+ dnl presence/version checking
36+ AS_CASE([$enable_introspection],
37+ [no], [dnl
38+ found_introspection="no (disabled, use --enable-introspection to enable)"
39+ ],dnl
40+ [yes],[dnl
41+ PKG_CHECK_EXISTS([gobject-introspection-1.0],,
42+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
43+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
44+ found_introspection=yes,
45+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
46+ ],dnl
47+ [auto],[dnl
48+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
49+ ],dnl
50+ [dnl
51+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
52+ ])dnl
53+
54+ AC_MSG_RESULT([$found_introspection])
55+
56+ INTROSPECTION_SCANNER=
57+ INTROSPECTION_COMPILER=
58+ INTROSPECTION_GENERATE=
59+ INTROSPECTION_GIRDIR=
60+ INTROSPECTION_TYPELIBDIR=
61+ if test "x$found_introspection" = "xyes"; then
62+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
63+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
64+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
65+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
66+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
67+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
68+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
69+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
70+ fi
71+ AC_SUBST(INTROSPECTION_SCANNER)
72+ AC_SUBST(INTROSPECTION_COMPILER)
73+ AC_SUBST(INTROSPECTION_GENERATE)
74+ AC_SUBST(INTROSPECTION_GIRDIR)
75+ AC_SUBST(INTROSPECTION_TYPELIBDIR)
76+ AC_SUBST(INTROSPECTION_CFLAGS)
77+ AC_SUBST(INTROSPECTION_LIBS)
78+ AC_SUBST(INTROSPECTION_MAKEFILE)
79+
80+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
81+])
82+
83+
84+dnl Usage:
85+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
86+
87+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
88+[
89+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
90+])
91+
92+dnl Usage:
93+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
94+
95+
96+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
97+[
98+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
99+])
diff --git a/meta/recipes-support/vte/vte_0.24.3.bb b/meta/recipes-support/vte/vte_0.24.3.bb
deleted file mode 100644
index c06dd532c8..0000000000
--- a/meta/recipes-support/vte/vte_0.24.3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
1require vte.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5PR = "r0"
6
7SRC_URI[archive.md5sum] = "3eba555eab7ccbbe5ca056bb203a14ab"
8SRC_URI[archive.sha256sum] = "fe7d01178976b17ca809e41d0e6dbbcb28e2af5e2f5aa857f9df65affac17d01"
diff --git a/meta/recipes-support/vte/vte_0.28.2.bb b/meta/recipes-support/vte/vte_0.28.2.bb
new file mode 100644
index 0000000000..c74419adcb
--- /dev/null
+++ b/meta/recipes-support/vte/vte_0.28.2.bb
@@ -0,0 +1,8 @@
1require vte.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4
5PR = "r0"
6
7SRC_URI[archive.md5sum] = "f07a4bf943194f94b7f142db8f7f36dc"
8SRC_URI[archive.sha256sum] = "8d04e202b617373dfb47689e5e628febe2c58840b34cccc4af4feb88c48df903"