summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk/confsearch.diff3
-rw-r--r--meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff4
-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
7and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian 7and tkConfig.sh in /usr/share/tcltk/tk8.5 where they are located in Debian
8installation. 8installation.
9 9
10---
11Upstream-Status: Pending 10Upstream-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 @@
1Upstream-Status: Pending
2
3Patch by Chris Waters sets path which are normally point to a directory 1Patch by Chris Waters sets path which are normally point to a directory
4with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules 2with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules
5puts private Tk headers there). 3puts private Tk headers there).
6 4
5Upstream-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"
26SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" 26
27SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" 27SRC_URI[sha256sum] = "550969f35379f952b3020f3ab7b9dd5bfd11c1ef7c9b7c6a75f5c49aca793fec"
28 28
29UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" 29UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/"
30UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" 30UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/"