diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index e13bf69b23..81d4735752 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff @@ -7,9 +7,8 @@ Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian installation. ---- Upstream-Status: Pending - +--- unix/configure | 1 + unix/tcl.m4 | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff index 62467af1d5..8cdcf20207 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff @@ -1,9 +1,9 @@ -Upstream-Status: Pending - Patch by Chris Waters sets path which are normally point to a directory with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules puts private Tk headers there). +Upstream-Status: Pending + --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in +++ tk8.5-8.5.8/unix/tkConfig.sh.in @@ -55,7 +55,7 @@ diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb similarity index 95% rename from meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb rename to meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb index 7159e74c2a..8d055c9d11 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb @@ -23,8 +23,8 @@ SRC_URI = "\ file://tkprivate.diff;striplevel=2 \ file://fix-xft.diff \ " -SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" -SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" + +SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec" UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" UPSTREAM_CHECK_REGEX = "Tcl/(?P\d+(\.\d+)+)/"