diff options
| author | Khem Raj <raj.khem@gmail.com> | 2024-11-03 16:19:49 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2024-11-19 23:51:14 -0800 |
| commit | cae61406bbc7b36818ab8526467d0dc576c7330b (patch) | |
| tree | 56f29869e809bf21046f95014efc2818de0afcfe /meta-oe/recipes-devtools/tcltk/tk | |
| parent | bea74f838b42926cfbf60278914c4a211cc907a9 (diff) | |
| download | meta-openembedded-cae61406bbc7b36818ab8526467d0dc576c7330b.tar.gz | |
tk: Add recipe for TK 9.0.0 release
Core is upgrading TCL to 9.0.0 as well, this has to
be done in tandem
Rename tk 8.x as tk8 recipe
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/tcltk/tk')
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/confsearch.diff | 47 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff | 18 | ||||
| -rw-r--r-- | meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff | 43 |
3 files changed, 0 insertions, 108 deletions
diff --git a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff deleted file mode 100644 index 81d4735752..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff +++ /dev/null | |||
| @@ -1,47 +0,0 @@ | |||
| 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 | |||
| 6 | 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 | ||
| 8 | installation. | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | --- | ||
| 12 | unix/configure | 1 + | ||
| 13 | unix/tcl.m4 | 2 ++ | ||
| 14 | 2 files changed, 3 insertions(+) | ||
| 15 | |||
| 16 | Index: a/unix/configure | ||
| 17 | =================================================================== | ||
| 18 | --- a/unix/configure.orig | ||
| 19 | +++ b/unix/configure | ||
| 20 | @@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d | ||
| 21 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 22 | `ls -d /usr/contrib/lib 2>/dev/null` \ | ||
| 23 | `ls -d /usr/pkg/lib 2>/dev/null` \ | ||
| 24 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ | ||
| 25 | `ls -d /usr/lib/tcl8.6 2>/dev/null` \ | ||
| 26 | `ls -d /usr/lib 2>/dev/null` \ | ||
| 27 | `ls -d /usr/lib64 2>/dev/null` \ | ||
| 28 | Index: a/unix/tcl.m4 | ||
| 29 | =================================================================== | ||
| 30 | --- a/unix/tcl.m4.orig | ||
| 31 | +++ b/unix/tcl.m4 | ||
| 32 | @@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [ | ||
| 33 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 34 | `ls -d /usr/contrib/lib 2>/dev/null` \ | ||
| 35 | `ls -d /usr/pkg/lib 2>/dev/null` \ | ||
| 36 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ | ||
| 37 | `ls -d /usr/lib/tcl8.6 2>/dev/null` \ | ||
| 38 | `ls -d /usr/lib 2>/dev/null` \ | ||
| 39 | `ls -d /usr/lib64 2>/dev/null` \ | ||
| 40 | @@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [ | ||
| 41 | `ls -d /usr/local/lib 2>/dev/null` \ | ||
| 42 | `ls -d /usr/contrib/lib 2>/dev/null` \ | ||
| 43 | `ls -d /usr/pkg/lib 2>/dev/null` \ | ||
| 44 | + `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \ | ||
| 45 | `ls -d /usr/lib/tk8.6 2>/dev/null` \ | ||
| 46 | `ls -d /usr/lib 2>/dev/null` \ | ||
| 47 | `ls -d /usr/lib64 2>/dev/null` \ | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff deleted file mode 100644 index c1e2f7344e..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff +++ /dev/null | |||
| @@ -1,18 +0,0 @@ | |||
| 1 | Upstream-Status: Pending | ||
| 2 | |||
| 3 | --- a/unix/configure.in 2010-05-19 13:29:03.000000000 +0200 | ||
| 4 | +++ b/unix/configure.in 2010-05-19 13:42:05.000000000 +0200 | ||
| 5 | @@ -526,13 +526,9 @@ | ||
| 6 | found_xft="yes" | ||
| 7 | dnl make sure package configurator (xft-config or pkg-config | ||
| 8 | dnl says that xft is present. | ||
| 9 | - XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no" | ||
| 10 | - XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no" | ||
| 11 | - if test "$found_xft" = "no" ; then | ||
| 12 | found_xft=yes | ||
| 13 | XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no" | ||
| 14 | XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no" | ||
| 15 | - fi | ||
| 16 | AC_MSG_RESULT([$found_xft]) | ||
| 17 | dnl make sure that compiling against Xft header file doesn't bomb | ||
| 18 | if test "$found_xft" = "yes" ; then | ||
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff deleted file mode 100644 index 8cdcf20207..0000000000 --- a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff +++ /dev/null | |||
| @@ -1,43 +0,0 @@ | |||
| 1 | Patch by Chris Waters sets path which are normally point to a directory | ||
| 2 | with Tk sources to a subdirectory of /usr/include/tcl8.4 (debian/rules | ||
| 3 | puts private Tk headers there). | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | |||
| 7 | --- tk8.5-8.5.8.orig/unix/tkConfig.sh.in | ||
| 8 | +++ tk8.5-8.5.8/unix/tkConfig.sh.in | ||
| 9 | @@ -55,7 +55,7 @@ | ||
| 10 | |||
| 11 | # String to pass to linker to pick up the Tk library from its | ||
| 12 | # build directory. | ||
| 13 | -TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@' | ||
| 14 | +TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@' | ||
| 15 | |||
| 16 | # String to pass to linker to pick up the Tk library from its | ||
| 17 | # installed directory. | ||
| 18 | @@ -71,7 +71,7 @@ | ||
| 19 | # different place than the directory containing the source files, this | ||
| 20 | # points to the location of the sources, not the location where Tk was | ||
| 21 | # compiled. | ||
| 22 | -TK_SRC_DIR='@TK_SRC_DIR@' | ||
| 23 | +TK_SRC_DIR='@includedir@/tk-private' | ||
| 24 | |||
| 25 | # Needed if you want to make a 'fat' shared library library | ||
| 26 | # containing tk objects or link a different wish. | ||
| 27 | @@ -86,14 +86,14 @@ | ||
| 28 | |||
| 29 | # String to pass to linker to pick up the Tk stub library from its | ||
| 30 | # build directory. | ||
| 31 | -TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@' | ||
| 32 | +TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' | ||
| 33 | |||
| 34 | # String to pass to linker to pick up the Tk stub library from its | ||
| 35 | # installed directory. | ||
| 36 | TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@' | ||
| 37 | |||
| 38 | # Path to the Tk stub library in the build directory. | ||
| 39 | -TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@' | ||
| 40 | +TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' | ||
| 41 | |||
| 42 | # Path to the Tk stub library in the install directory. | ||
| 43 | TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@' | ||
