summaryrefslogtreecommitdiff
path: root/packages/vte
diff options
context:
space:
mode:
Diffstat (limited to 'packages/vte')
-rw-r--r--packages/vte/files/.mtn2git_empty0
-rw-r--r--packages/vte/files/vte-pkgconfig-fixes.patch47
-rw-r--r--packages/vte/vte.inc2
-rw-r--r--packages/vte/vte_0.16.9.bb2
4 files changed, 50 insertions, 1 deletions
diff --git a/packages/vte/files/.mtn2git_empty b/packages/vte/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/vte/files/.mtn2git_empty
diff --git a/packages/vte/files/vte-pkgconfig-fixes.patch b/packages/vte/files/vte-pkgconfig-fixes.patch
new file mode 100644
index 0000000000..2acc7348e7
--- /dev/null
+++ b/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/packages/vte/vte.inc b/packages/vte/vte.inc
index e575a5a3fb..e9313cd861 100644
--- a/packages/vte/vte.inc
+++ b/packages/vte/vte.inc
@@ -5,6 +5,8 @@ RDEPENDS = "termcap"
inherit gnome
+SRC_URI += "file://vte-pkgconfig-fixes.patch;patch=1"
+
EXTRA_OECONF = "--disable-gtk-doc"
do_stage() {
diff --git a/packages/vte/vte_0.16.9.bb b/packages/vte/vte_0.16.9.bb
index f408632430..5875fd317f 100644
--- a/packages/vte/vte_0.16.9.bb
+++ b/packages/vte/vte_0.16.9.bb
@@ -1,2 +1,2 @@
require vte.inc
-PR = "r3"
+PR = "r4"