mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-16 04:17:25 +00:00
Code Issues Projects Releases Wiki Activity

tk: upgrade 8.6.9 -> 8.6.10

Browse Source 
Drop patches that were merged upstream:
  configure.use.fontconfig.with.xft.patch
  non-linux.diff
  tklibrary.diff

Refresh patches:
  confsearch.diff
  fix-xft.diff

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Yi Zhao
2019-12-12 13:56:15 +08:00
committed by Khem Raj
parent 7906fbb404
commit 5a293cf439
6 changed files with 11 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+7 -7
View File
@@ -16,31 +16,31 @@ Index: a/unix/configure
===================================================================
--- a/unix/configure.orig
+++ b/unix/configure
@@ -1432,6 +1432,7 @@ echo "$as_me: error: ${with_tclconfig} d
@@ -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` \
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
Index: a/unix/tcl.m4
===================================================================
--- a/unix/tcl.m4.orig
+++ b/unix/tcl.m4
@@ -94,6 +94,7 @@ AC_DEFUN([SC_PATH_TCLCONFIG], [
@@ -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` \
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
@@ -227,6 +228,7 @@ AC_DEFUN([SC_PATH_TKCONFIG], [
@@ -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/tk8.6 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` \
`ls -d /usr/local/lib/tk8.6 2>/dev/null` \