tk: upgrade 8.6.0 -> 8.6.4

update content of non-linux.diff

Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

6 files changed, 151 insertions, 0 deletions

diff --git a/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch b/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
new file mode 100644
index 000000000..a0c157f5a
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/configure.use.fontconfig.with.xft.patch
@@ -0,0 +1,13 @@
+--- a/configure.in.orig 2014-05-10 14:35:39.859147385 +0000
++++ b/configure.in      2014-05-10 14:36:20.282925184 +0000
+@@ -554,8 +554,8 @@
+        dnl make sure package configurator (xft-config or pkg-config
+        dnl says that xft is present.
+            found_xft=yes
+-           XFT_CFLAGS=`pkg-config --cflags xft 2>/dev/null` || found_xft="no"
+-           XFT_LIBS=`pkg-config --libs xft 2>/dev/null` || found_xft="no"
++           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"
+        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/tk/confsearch.diff b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
new file mode 100644
index 000000000..c51e47542
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
@@ -0,0 +1,32 @@
+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.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -1431,6 +1431,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -93,6 +93,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tcl8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tclConfig.sh" ; then
+@@ -223,6 +224,7 @@
+                        `ls -d ${prefix}/lib 2>/dev/null` \
+                        `ls -d /usr/local/lib 2>/dev/null` \
+                        `ls -d /usr/contrib/lib 2>/dev/null` \
++                       `ls -d /usr/share/tcltk/tk8.5 2>/dev/null` \
+                        `ls -d /usr/lib 2>/dev/null` \
+                        ; do
+                    if test -f "$i/tkConfig.sh" ; then
diff --git a/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
new file mode 100644
index 000000000..d1bb7105c
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/fix-xft.diff
@@ -0,0 +1,16 @@
+--- /tmp/configure.in   2010-05-19 13:29:03.000000000 +0200
++++ 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 2>/dev/null` || found_xft="no"
+            XFT_LIBS=`pkg-config --libs xft 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/tk/non-linux.diff b/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
new file mode 100644
index 000000000..7d31f9fdc
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/non-linux.diff
@@ -0,0 +1,27 @@
+Patch by Sergei Golovan (originally by Mike Markley and Chris Waters) fixes
+building on non-linux Debian architectures.
+
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -4447,6 +4447,9 @@
+                if test "`uname -s`" = "AIX" ; then
+                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+                fi
++               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++                   tcl_cv_sys_version=NetBSD-Debian
++               fi
+            fi
+        fi
+
+--- tk8.5-8.5.8.orig/unix/tcl.m4
++++ tk8.5-8.5.8/unix/tcl.m4
+@@ -962,6 +962,9 @@
+                if test "`uname -s`" = "AIX" ; then
+                    tcl_cv_sys_version=AIX-`uname -v`.`uname -r`
+                fi
++               if test "`uname -s`" = "NetBSD" -a -f /etc/debian_version ; then
++                   tcl_cv_sys_version=NetBSD-Debian
++               fi
+            fi
+        fi
+     ])
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff b/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
new file mode 100644
index 000000000..ee38c2a1a
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/tklibrary.diff
@@ -0,0 +1,22 @@
+--- tk8.5-8.5.8.orig/unix/configure
++++ tk8.5-8.5.8/unix/configure
+@@ -11070,7 +11070,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
+--- tk8.5-8.5.8.orig/unix/configure.in
++++ tk8.5-8.5.8/unix/configure.in
+@@ -607,7 +607,7 @@
+     TCL_STUB_FLAGS="-DUSE_TCL_STUBS"
+ fi
+ 
+-TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
++test -z "$TK_LIBRARY" && TK_LIBRARY='$(prefix)/lib/tk$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ TK_PKG_DIR='tk$(VERSION)'
diff --git a/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
new file mode 100644
index 000000000..4e1546973
--- /dev/null
+++ b/meta-oe/recipes-devtools/tcltk/tk/tkprivate.diff
@@ -0,0 +1,41 @@
+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).
+
+--- 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@'