3 files changed, 108 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff
new file mode 100644
index 0000000000..81d4735752
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk8/confsearch.diff
@@ -0,0 +1,47 @@
+From 5539442e5f5442606071afc5cf02642314ad13bb Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Wed, 17 Aug 2011 22:52:35 +0200
+Subject: [PATCH] tk 8.5.8: import from OE rev
+
+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(+)
+
+Index: a/unix/configure
+===================================================================
+--- a/unix/configure.orig
++++ b/unix/configure
+@@ -1431,6 +1431,7 @@ echo "$as_me: error: ${with_tclconfig} d
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
+                        `ls -d /usr/pkg/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+                        `ls -d /usr/lib/tcl8.6 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
+Index: a/unix/tcl.m4
+===================================================================
+--- a/unix/tcl.m4.orig
++++ b/unix/tcl.m4
+@@ -93,6 +93,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
+                        `ls -d /usr/pkg/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+                        `ls -d /usr/lib/tcl8.6 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
+@@ -226,6 +227,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
+                        `ls -d /usr/pkg/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
+                        `ls -d /usr/lib/tk8.6 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        `ls -d /usr/lib64 2>/dev/null` \
diff --git a/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff
new file mode 100644
index 0000000000..c1e2f7344e
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk8/fix-xft.diff
@@ -0,0 +1,18 @@
+Upstream-Status: Pending
+
+--- a/unix/configure.in 2010-05-19 13:29:03.000000000 +0200
++++ b/unix/configure.in 2010-05-19 13:42:05.000000000 +0200
+@@ -526,13 +526,9 @@
+        found_xft="yes"
+        dnl make sure package configurator (xft-config or pkg-config
+        dnl says that xft is present.
+-       XFT_CFLAGS=`xft-config --cflags 2>/dev/null` || found_xft="no"
+-       XFT_LIBS=`xft-config --libs 2>/dev/null` || found_xft="no"
+-       if test "$found_xft" = "no" ; then
+            found_xft=yes
+            XFT_CFLAGS=`pkg-config --cflags xft fontconfig 2>/dev/null` || found_xft="no"
+            XFT_LIBS=`pkg-config --libs xft fontconfig 2>/dev/null` || found_xft="no"
+-       fi
+        AC_MSG_RESULT([$found_xft])
+        dnl make sure that compiling against Xft header file doesn't bomb
+        if test "$found_xft" = "yes" ; then
diff --git a/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff
new file mode 100644
index 0000000000..8cdcf20207
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk8/tkprivate.diff
@@ -0,0 +1,43 @@
+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 @@
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # build directory.
+-TK_BUILD_LIB_SPEC='@TK_BUILD_LIB_SPEC@'
++TK_BUILD_LIB_SPEC='@TK_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk library from its
+ # installed directory.
+@@ -71,7 +71,7 @@
+ # different place than the directory containing the source files, this
+ # points to the location of the sources, not the location where Tk was
+ # compiled.
+-TK_SRC_DIR='@TK_SRC_DIR@'
++TK_SRC_DIR='@includedir@/tk-private'
+ 
+ # Needed if you want to make a 'fat' shared library library
+ # containing tk objects or link a different wish.
+@@ -86,14 +86,14 @@
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # build directory.
+-TK_BUILD_STUB_LIB_SPEC='@TK_BUILD_STUB_LIB_SPEC@'
++TK_BUILD_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # String to pass to linker to pick up the Tk stub library from its
+ # installed directory.
+ TK_STUB_LIB_SPEC='@TK_STUB_LIB_SPEC@'
+ 
+ # Path to the Tk stub library in the build directory.
+-TK_BUILD_STUB_LIB_PATH='@TK_BUILD_STUB_LIB_PATH@'
++TK_BUILD_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'
+ 
+ # Path to the Tk stub library in the install directory.
+ TK_STUB_LIB_PATH='@TK_STUB_LIB_PATH@'