diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2024-09-29 20:15:23 +0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-09-29 10:01:08 -0700 |
| commit | 9abc7e7fa78aae4a26af0c01c1ca1ee4f843a308 (patch) | |
| tree | c7ce23076e7427546cc343fef1a860aa7c7f96e2 | |
| parent | c0095bd11888d2d6e132d7202d8204e52130e8f4 (diff) | |
| download | meta-openembedded-9abc7e7fa78aae4a26af0c01c1ca1ee4f843a308.tar.gz | |
tk: upgrade 8.6.10 -> 8.6.15
Release Notes:
https://sourceforge.net/p/tcl/mailman/message/58817026/
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 3 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff | 4 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.15.bb (renamed from meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb) | 4 |
3 files changed, 5 insertions, 6 deletions
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 | |||
| 7 | and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian | 7 | and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian |
| 8 | installation. | 8 | installation. |
| 9 | 9 | ||
| 10 | --- | ||
| 11 | Upstream-Status: Pending | 10 | Upstream-Status: Pending |
| 12 | 11 | --- | |
| 13 | unix/configure | 1 + | 12 | unix/configure | 1 + |
| 14 | unix/tcl.m4 | 2 ++ | 13 | unix/tcl.m4 | 2 ++ |
| 15 | 2 files changed, 3 insertions(+) | 14 | 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 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | Patch by Chris Waters sets path which are normally point to a directory | 1 | Patch by Chris Waters sets path which are normally point to a directory |
| 4 | with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules | 2 | with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules |
| 5 | puts private Tk headers there). | 3 | puts private Tk headers there). |
| 6 | 4 | ||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in | 7 | --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in |
| 8 | +++ tk8.5-8.5.8/unix/tkConfig.sh.in | 8 | +++ tk8.5-8.5.8/unix/tkConfig.sh.in |
| 9 | @@ -55,7 +55,7 @@ | 9 | @@ -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 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 = "\ | |||
| 23 | file://tkprivate.diff;striplevel=2 \ | 23 | file://tkprivate.diff;striplevel=2 \ |
| 24 | file://fix-xft.diff \ | 24 | file://fix-xft.diff \ |
| 25 | " | 25 | " |
| 26 | SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" | 26 | |
| 27 | SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" | 27 | SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec" |
| 28 | 28 | ||
| 29 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" | 29 | UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" |
| 30 | UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" | 30 | UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" |
