From e5694cf1b9eb8b5071a55478fdebc78f947c3047 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Wed, 19 Mar 2008 16:38:20 +0000
Subject: vte: Merge from OE.dev, upgrade to 0.16.9 with fixes

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4070 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/vte/files/vte-pkgconfig-fixes.patch | 47 +++++++++++++++++++++++
 meta/packages/vte/vte.inc                         | 17 ++++++++
 meta/packages/vte/vte_0.16.8.bb                   | 12 ------
 meta/packages/vte/vte_0.16.9.bb                   |  2 +
 4 files changed, 66 insertions(+), 12 deletions(-)
 create mode 100644 meta/packages/vte/files/vte-pkgconfig-fixes.patch
 create mode 100644 meta/packages/vte/vte.inc
 delete mode 100644 meta/packages/vte/vte_0.16.8.bb
 create mode 100644 meta/packages/vte/vte_0.16.9.bb

(limited to 'meta/packages')

diff --git a/meta/packages/vte/files/vte-pkgconfig-fixes.patch b/meta/packages/vte/files/vte-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..2acc7348e7
--- /dev/null
+++ b/meta/packages/vte/files/vte-pkgconfig-fixes.patch
@@ -0,0 +1,47 @@
+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
new file mode 100644
index 0000000000..587ea85a39
--- /dev/null
+++ b/meta/packages/vte/vte.inc
@@ -0,0 +1,17 @@
+DESCRIPTION = "vte is a virtual terminal emulator"
+LICENSE = "LGPL"
+DEPENDS += " glib-2.0 gtk+ intltool-native"
+RDEPENDS = "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"
+FILES_libvte = "${libdir}/*.so*"
diff --git a/meta/packages/vte/vte_0.16.8.bb b/meta/packages/vte/vte_0.16.8.bb
deleted file mode 100644
index 45448fc49c..0000000000
--- a/meta/packages/vte/vte_0.16.8.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-LICENSE = "LGPL"
-DEPENDS = "gtk+ intltool-native"
-
-PR="r1"
-
-inherit gnome
-
-EXTRA_OECONF = "--disable-gtk-doc --disable-python"
-
-do_stage() {
-autotools_stage_all
-}
diff --git a/meta/packages/vte/vte_0.16.9.bb b/meta/packages/vte/vte_0.16.9.bb
new file mode 100644
index 0000000000..5875fd317f
--- /dev/null
+++ b/meta/packages/vte/vte_0.16.9.bb
@@ -0,0 +1,2 @@
+require vte.inc
+PR = "r4"
-- 
cgit v1.2.3