tk: upgrade 8.6.0 -> 8.6.4

update content of non-linux.diff

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

1 files changed, 16 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
new file mode 100644
index 0000000000..d1bb7105c6
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
@@ -0,0 +1,16 @@
+--- /tmp/configure.in   2010-05-19 13:29:03.000000000 +0200
++++ unix/configure.in   2010-05-19 13:42:05.000000000 +0200
+@@ -526,13 +526,9 @@
+        found_xft="yes"
+        dnl make sure package configurator (xft-config or pkg-config
+        dnl says that xft is present.
+-       XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+-       XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+-       if test "$found_xft" = "no" ; then
+            found_xft=yes
+            XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+            XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
+-       fi
+        AC_MSG_RESULT([$found_xft])
+        dnl make sure that compiling against Xft header file doesn't bomb
+        if test "$found_xft" = "yes" ; then