tk: 8.6.6 -> 8.6.8

1.Upgrade tk from 8.6.6 to 8.6.8.
2.Modify confsearch.diff, since the data has been changed.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>

2 files changed, 12 insertions, 9 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
index c51e47542..4dbd9a4f1 100644
--- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
@@ -4,29 +4,32 @@ installation.
 
 --- tk8.5-8.5.8.orig/unix/configure
 +++ tk8.5-8.5.8/unix/configure
-@@ -1431,6 +1431,7 @@
-                        `ls -d ${prefix}/lib 2>/dev/null` \
-                        `ls -d /usr/local/lib 2>/dev/null` \
+@@ -1431,7 +1431,8 @@
                         `ls -d /usr/contrib/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/pkg/lib 2>/dev/null` \
 +                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
                         `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
                         ; do
                     if test -f "$i/tclConfig.sh" ; then
 --- tk8.5-8.5.8.orig/unix/tcl.m4
 +++ tk8.5-8.5.8/unix/tcl.m4
-@@ -93,6 +93,7 @@
-                        `ls -d ${prefix}/lib 2>/dev/null` \
-                        `ls -d /usr/local/lib 2>/dev/null` \
+@@ -93,7 +93,8 @@
                         `ls -d /usr/contrib/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/pkg/lib 2>/dev/null` \
 +                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
                         `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
                         ; do
                     if test -f "$i/tclConfig.sh" ; then
-@@ -223,6 +224,7 @@
+@@ -223,7 +224,8 @@
                         `ls -d ${prefix}/lib 2>/dev/null` \
                         `ls -d /usr/local/lib 2>/dev/null` \
                         `ls -d /usr/contrib/lib 2>/dev/null` \
 +                       `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
                         `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
                         ; do
                     if test -f "$i/tkConfig.sh" ; then
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
index d3bf397b4..13dc4d751 100644
--- a/meta-oe/recipes-devtools/tcltk/tk_8.6.6.bb
+++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb
@@ -26,8 +26,8 @@ SRC_URI = "\
     file://fix-xft.diff \
     file://configure.use.fontconfig.with.xft.patch \
 "
-SRC_URI[md5sum] = "dd7dbb3a6523c42d05f6ab6e86096e99"
-SRC_URI[sha256sum] = "d62c371a71b4744ed830e3c21d27968c31dba74dd2c45f36b9b071e6d88eb19d"
+SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba"
+SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33"
 
 S = "${WORKDIR}/${BPN}${PV}/unix"