mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-30 00:50:00 +00:00
Code Issues Projects Releases Wiki Activity

tk: Upgrade to 8.6.9

Browse Source 
Use tcl8.6 instead of tcl8.5 in confsearch.diff patch

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2018-12-05 21:06:56 -08:00
parent ebcd20dc7d
commit a8887d5702
2 changed files with 41 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-devtools/tcltk/tk/confsearch.diff
+30 -19
View File
@@ -1,35 +1,46 @@
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.
--- tk8.5-8.5.8.orig/unix/configure
+++ tk8.5-8.5.8/unix/configure
@@ -1431,7 +1431,8 @@
`ls -d /usr/contrib/lib 2>/dev/null` \
---
unix/configure | 1 +
unix/tcl.m4 | 2 ++
2 files changed, 3 insertions(+)
Index: a/unix/configure
===================================================================
--- a/unix/configure.orig
+++ b/unix/configure
@@ -1432,6 +1432,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.5 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 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,7 +93,8 @@
`ls -d /usr/contrib/lib 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], [
`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.5 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tcl8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
if test -f "$i/tclConfig.sh" ; then
@@ -223,7 +224,8 @@
`ls -d ${prefix}/lib 2>/dev/null` \
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
@@ -227,6 +228,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/share/tcltk/tk8.5 2>/dev/null` \
`ls -d /usr/pkg/lib 2>/dev/null` \
+ `ls -d /usr/share/tcltk/tk8.6 2>/dev/null` \
`ls -d /usr/lib 2>/dev/null` \
`ls -d /usr/lib64 2>/dev/null` \
; do
if test -f "$i/tkConfig.sh" ; then
`ls -d /usr/local/lib/tk8.6 2>/dev/null` \
meta-oe/recipes-devtools/tcltk/tk_8.6.8.bb → meta-oe/recipes-devtools/tcltk/tk_8.6.9.bb
+11 -11
View File
@@ -4,15 +4,15 @@ SECTION = "devel/tcltk"
# http://www.tcl.tk/software/tcltk/license.html
LICENSE = "tcl"
LIC_FILES_CHKSUM = "file://../license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
LIC_FILES_CHKSUM = "file://${S}/../license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../compat/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../doc/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../library/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../macosx/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../tests/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../unix/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../win/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
file://${S}/../xlib/license.terms;md5=c88f99decec11afa967ad33d314f87fe \
"
DEPENDS = "tcl virtual/libx11 libxt"
@@ -26,8 +26,8 @@ SRC_URI = "\
file://fix-xft.diff \
file://configure.use.fontconfig.with.xft.patch \
"
SRC_URI[md5sum] = "5e0faecba458ee1386078fb228d008ba"
SRC_URI[sha256sum] = "49e7bca08dde95195a27f594f7c850b088be357a7c7096e44e1158c7a5fd7b33"
SRC_URI[md5sum] = "e3cf6290999ee30651d75864eccfec63"
SRC_URI[sha256sum] = "d3f9161e8ba0f107fe8d4df1f6d3a14c30cc3512dfc12a795daa367a27660dac"
S = "${WORKDIR}/${BPN}${PV}/unix"