summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-19 17:06:05 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-19 17:06:05 +0100
commit714204fdcfa6f872829f50acfcb431e8b68abd5c (patch)
treec993167f47242785ccbdbae8a208224cf3b0bfdc /meta/packages
parent26b814e959d2f2e515ee9a9910108f1d266ab042 (diff)
downloadpoky-714204fdcfa6f872829f50acfcb431e8b68abd5c.tar.gz
vte: Upgrade 0.16.9 -> 0.20.5
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/vte/files/vte-pkgconfig-fixes.patch47
-rw-r--r--meta/packages/vte/vte.inc6
-rw-r--r--meta/packages/vte/vte_0.20.5.bb (renamed from meta/packages/vte/vte_0.16.9.bb)0
3 files changed, 0 insertions, 53 deletions
diff --git a/meta/packages/vte/files/vte-pkgconfig-fixes.patch b/meta/packages/vte/files/vte-pkgconfig-fixes.patch
deleted file mode 100644
index 2acc7348e7..0000000000
--- a/meta/packages/vte/files/vte-pkgconfig-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
1Index: vte-0.16.9/configure.in
2===================================================================
3--- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100
4+++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000
5@@ -381,8 +381,6 @@
6
7 # Search for the required modules.
8 PKG_CHECK_MODULES(VTE,[$wantedmodules])
9-NEEDEDPACKAGES="$wantedmodules"
10-AC_SUBST(NEEDEDPACKAGES)
11
12 # Check for various optional functions within those modules
13 save_CFLAGS="$CFLAGS"
14@@ -403,10 +401,12 @@
15
16 # Require Freetype2. First see if there is suitable pkgconfig file...
17 PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
18- [PKG_CHECK_MODULES(FT2, freetype2)], [
19+ [PKG_CHECK_MODULES(FT2, freetype2)
20+ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
21 # We use our local copy of the macro because packages of
22 # freetype's development files don't always include the proper macro.
23- VTE_CHECK_FT2(6.1.0,,
24+ VTE_CHECK_FT2(6.1.0,[
25+ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
26 [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
27
28 # Temporarily pull in the Freetype cflags and libs for checking what's
29@@ -508,6 +508,8 @@
30 CFLAGS="$savecflags"
31 CPPFLAGS="$savecppflags"
32
33+NEEDEDPACKAGES="$wantedmodules"
34+AC_SUBST(NEEDEDPACKAGES)
35
36 wcs_funcs_includes="
37 #ifdef HAVE_STRING_H
38Index: vte-0.16.9/vte.pc.in
39===================================================================
40--- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000
41+++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000
42@@ -11,4 +11,4 @@
43 Requires: @NEEDEDPACKAGES@
44 Libs: -L${libdir} -lvte @OTHERLIBS@
45 Libs.private: @FT2_LIBS@
46-Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
47+Cflags: -I${includedir} @OTHERCFLAGS@
diff --git a/meta/packages/vte/vte.inc b/meta/packages/vte/vte.inc
index 1d197c53ce..ba06151c74 100644
--- a/meta/packages/vte/vte.inc
+++ b/meta/packages/vte/vte.inc
@@ -5,14 +5,8 @@ RDEPENDS_libvte = "vte-termcap"
5 5
6inherit gnome 6inherit gnome
7 7
8SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
9
10EXTRA_OECONF = "--disable-gtk-doc --disable-python" 8EXTRA_OECONF = "--disable-gtk-doc --disable-python"
11 9
12do_stage() {
13 autotools_stage_all
14}
15
16PACKAGES =+ "libvte vte-termcap" 10PACKAGES =+ "libvte vte-termcap"
17FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper" 11FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
18FILES_vte-dbg =+ ${libexecdir}/.debug" 12FILES_vte-dbg =+ ${libexecdir}/.debug"
diff --git a/meta/packages/vte/vte_0.16.9.bb b/meta/packages/vte/vte_0.20.5.bb
index 6b748e1503..6b748e1503 100644
--- a/meta/packages/vte/vte_0.16.9.bb
+++ b/meta/packages/vte/vte_0.20.5.bb