From 714204fdcfa6f872829f50acfcb431e8b68abd5c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Wed, 19 Aug 2009 17:06:05 +0100
Subject: vte: Upgrade 0.16.9 -> 0.20.5
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
meta/packages/vte/files/vte-pkgconfig-fixes.patch | 47 -----------------------
meta/packages/vte/vte.inc | 6 ---
meta/packages/vte/vte_0.16.9.bb | 2 -
meta/packages/vte/vte_0.20.5.bb | 2 +
4 files changed, 2 insertions(+), 55 deletions(-)
delete mode 100644 meta/packages/vte/files/vte-pkgconfig-fixes.patch
delete mode 100644 meta/packages/vte/vte_0.16.9.bb
create mode 100644 meta/packages/vte/vte_0.20.5.bb
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 2acc7348e..000000000
--- a/meta/packages/vte/files/vte-pkgconfig-fixes.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Index: vte-0.16.9/configure.in
-===================================================================
---- vte-0.16.9.orig/configure.in 2007-09-17 23:07:18.000000000 +0100
-+++ vte-0.16.9/configure.in 2008-03-05 15:59:04.000000000 +0000
-@@ -381,8 +381,6 @@
-
- # Search for the required modules.
- PKG_CHECK_MODULES(VTE,[$wantedmodules])
--NEEDEDPACKAGES="$wantedmodules"
--AC_SUBST(NEEDEDPACKAGES)
-
- # Check for various optional functions within those modules
- save_CFLAGS="$CFLAGS"
-@@ -403,10 +401,12 @@
-
- # Require Freetype2. First see if there is suitable pkgconfig file...
- PKG_CHECK_EXISTS(freetype2 >= 6.1.0,
-- [PKG_CHECK_MODULES(FT2, freetype2)], [
-+ [PKG_CHECK_MODULES(FT2, freetype2)
-+ wantedmodules="$wantedmodules freetype2 >= 6.1.0"], [
- # We use our local copy of the macro because packages of
- # freetype's development files don't always include the proper macro.
-- VTE_CHECK_FT2(6.1.0,,
-+ VTE_CHECK_FT2(6.1.0,[
-+ wantedmodules="$wantedmodules freetype2 >= 6.1.0" ],
- [AC_MSG_ERROR([You must have freetype 2.0.2 or later to build vte.])])])
-
- # Temporarily pull in the Freetype cflags and libs for checking what's
-@@ -508,6 +508,8 @@
- CFLAGS="$savecflags"
- CPPFLAGS="$savecppflags"
-
-+NEEDEDPACKAGES="$wantedmodules"
-+AC_SUBST(NEEDEDPACKAGES)
-
- wcs_funcs_includes="
- #ifdef HAVE_STRING_H
-Index: vte-0.16.9/vte.pc.in
-===================================================================
---- vte-0.16.9.orig/vte.pc.in 2007-02-26 21:05:19.000000000 +0000
-+++ vte-0.16.9/vte.pc.in 2008-03-05 15:56:37.000000000 +0000
-@@ -11,4 +11,4 @@
- Requires: @NEEDEDPACKAGES@
- Libs: -L${libdir} -lvte @OTHERLIBS@
- Libs.private: @FT2_LIBS@
--Cflags: -I${includedir} @FT2_CFLAGS@ @OTHERCFLAGS@
-+Cflags: -I${includedir} @OTHERCFLAGS@
diff --git a/meta/packages/vte/vte.inc b/meta/packages/vte/vte.inc
index 1d197c53c..ba06151c7 100644
--- a/meta/packages/vte/vte.inc
+++ b/meta/packages/vte/vte.inc
@@ -5,14 +5,8 @@ RDEPENDS_libvte = "vte-termcap"
inherit gnome
-SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
-
EXTRA_OECONF = "--disable-gtk-doc --disable-python"
-do_stage() {
- autotools_stage_all
-}
-
PACKAGES =+ "libvte vte-termcap"
FILES_libvte = "${libdir}/*.so.* ${libexecdir}/gnome-pty-helper"
FILES_vte-dbg =+ ${libexecdir}/.debug"
diff --git a/meta/packages/vte/vte_0.16.9.bb b/meta/packages/vte/vte_0.16.9.bb
deleted file mode 100644
index 6b748e150..000000000
--- a/meta/packages/vte/vte_0.16.9.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require vte.inc
-PR = "r7"
diff --git a/meta/packages/vte/vte_0.20.5.bb b/meta/packages/vte/vte_0.20.5.bb
new file mode 100644
index 000000000..6b748e150
--- /dev/null
+++ b/meta/packages/vte/vte_0.20.5.bb
@@ -0,0 +1,2 @@
+require vte.inc
+PR = "r7"
--
cgit v1.2.3