diff options
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk')
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 49 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb (renamed from meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb) | 22 |
2 files changed, 41 insertions, 30 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff index 4dbd9a4f1..8cc07bcfa 100644 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | |||
@@ -1,35 +1,46 @@ | |||
1 | From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Wed, 17 Aug 2011 22:52:35 +0200 | ||
4 | Subject: [PATCH] tk 8.5.8: import from OE rev | ||
5 | |||
1 | Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 | 6 | Patch by Sergei Golovan allows to find tclConfig.sh in /usr/share/tcltk/tcl8.5 |
2 | 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 |
3 | installation. | 8 | installation. |
4 | 9 | ||
5 | --- tk8.5-8.5.8.orig/unix/configure | 10 | --- |
6 | +++ tk8.5-8.5.8/unix/configure | 11 | unix/configure | 1 + |
7 | @@ -1431,7 +1431,8 @@ | 12 | unix/tcl.m4 | 2 ++ |
8 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 13 | 2 files changed, 3 insertions(+) |
14 | |||
15 | Index: a/unix/configure | ||
16 | =================================================================== | ||
17 | --- a/unix/configure.orig | ||
18 | +++ b/unix/configure | ||
19 | @@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d | ||
9 | `ls -d /usr/local/lib 2>/dev/null` \ | 20 | `ls -d /usr/local/lib 2>/dev/null` \ |
21 | `ls -d /usr/contrib/lib 2>/dev/null` \ | ||
10 | `ls -d /usr/pkg/lib 2>/dev/null` \ | 22 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
11 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ | 23 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ |
12 | `ls -d /usr/lib 2>/dev/null` \ | 24 | `ls -d /usr/lib 2>/dev/null` \ |
13 | `ls -d /usr/lib64 2>/dev/null` \ | 25 | `ls -d /usr/lib64 2>/dev/null` \ |
14 | ; do | 26 | `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ |
15 | if test -f "$i/tclConfig.sh" ; then | 27 | Index: a/unix/tcl.m4 |
16 | --- tk8.5-8.5.8.orig/unix/tcl.m4 | 28 | =================================================================== |
17 | +++ tk8.5-8.5.8/unix/tcl.m4 | 29 | --- a/unix/tcl.m4.orig |
18 | @@ -93,7 +93,8 @@ | 30 | +++ b/unix/tcl.m4 |
19 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 31 | @@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ |
20 | `ls -d /usr/local/lib 2>/dev/null` \ | 32 | `ls -d /usr/local/lib 2>/dev/null` \ |
33 | `ls -d /usr/contrib/lib 2>/dev/null` \ | ||
21 | `ls -d /usr/pkg/lib 2>/dev/null` \ | 34 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
22 | + `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \ | 35 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ |
23 | `ls -d /usr/lib 2>/dev/null` \ | 36 | `ls -d /usr/lib 2>/dev/null` \ |
24 | `ls -d /usr/lib64 2>/dev/null` \ | 37 | `ls -d /usr/lib64 2>/dev/null` \ |
25 | ; do | 38 | `ls -d /usr/local/lib/tcl8.6 2>/dev/null` \ |
26 | if test -f "$i/tclConfig.sh" ; then | 39 | @@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ |
27 | @@ -223,7 +224,8 @@ | ||
28 | `ls -d ${prefix}/lib 2>/dev/null` \ | ||
29 | `ls -d /usr/local/lib 2>/dev/null` \ | 40 | `ls -d /usr/local/lib 2>/dev/null` \ |
30 | `ls -d /usr/contrib/lib 2>/dev/null` \ | 41 | `ls -d /usr/contrib/lib 2>/dev/null` \ |
31 | + `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \ | 42 | `ls -d /usr/pkg/lib 2>/dev/null` \ |
43 | + `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \ | ||
32 | `ls -d /usr/lib 2>/dev/null` \ | 44 | `ls -d /usr/lib 2>/dev/null` \ |
33 | `ls -d /usr/lib64 2>/dev/null` \ | 45 | `ls -d /usr/lib64 2>/dev/null` \ |
34 | ; do | 46 | `ls -d /usr/local/lib/tk8.6 2>/dev/null` \ |
35 | if test -f "$i/tkConfig.sh" ; then | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb index 4e38525cb..9eec4bba7 100644 --- a/meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb +++ b/meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb | |||
@@ -4,15 +4,15 @@ SECTION = "devel/tcltk" | |||
4 | 4 | ||
5 | # http://www.tcl.tk/software/tcltk/license.html | 5 | # http://www.tcl.tk/software/tcltk/license.html |
6 | LICENSE = "tcl" | 6 | LICENSE = "tcl" |
7 | LIC_FILES_CHKSUM = "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 7 | LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
8 | file://../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 8 | file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
9 | file://../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 9 | file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
10 | file://../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 10 | file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
11 | file://../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 11 | file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
12 | file://../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 12 | file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
13 | file://../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 13 | file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
14 | file://../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 14 | file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
15 | file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ | 15 | file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \ |
16 | " | 16 | " |
17 | 17 | ||
18 | DEPENDS = "tcl virtual/libx11 libxt" | 18 | DEPENDS = "tcl virtual/libx11 libxt" |
@@ -26,8 +26,8 @@ SRC_URI = "\ | |||
26 | file://fix-xft.diff \ | 26 | file://fix-xft.diff \ |
27 | file://configure.use.fontconfig.with.xft.patch \ | 27 | file://configure.use.fontconfig.with.xft.patch \ |
28 | " | 28 | " |
29 | SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba" | 29 | SRC_URI[md5sum] = "e3cf6290999ee30651d75864eccfec63" |
30 | SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33" | 30 | SRC_URI[sha256sum] = "d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac" |
31 | 31 | ||
32 | S = "${WORKDIR}/${BPN}${PV}/unix" | 32 | S = "${WORKDIR}/${BPN}${PV}/unix" |
33 | 33 | ||