aboutsummaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-03-16 11:48:17 -0700
committerSteffen Sledz <sledz@dresearch-fe.de>2011-04-29 14:08:31 +0200
commitcea419dd4f66f2fba2f130132c25ba8e4b552cf7 (patch)
treec89e2243747d10d400e8e7566f204b15978a312f /recipes
parent195e4933b818ce7f2805891cacb49c14d6ac3ad8 (diff)
downloadopenembedded-cea419dd4f66f2fba2f130132c25ba8e4b552cf7.tar.gz
openembedded-cea419dd4f66f2fba2f130132c25ba8e4b552cf7.tar.bz2
openembedded-cea419dd4f66f2fba2f130132c25ba8e4b552cf7.zip
tk 8.4.19: Rework disable-xim.patch
Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/tcltk/files/disable-xim.patch4
-rw-r--r--recipes/tcltk/tk_8.4.19.bb5
2 files changed, 5 insertions, 4 deletions
diff --git a/recipes/tcltk/files/disable-xim.patch b/recipes/tcltk/files/disable-xim.patch
index bc11d3bbe9..d88aa7c3b9 100644
--- a/recipes/tcltk/files/disable-xim.patch
+++ b/recipes/tcltk/files/disable-xim.patch
@@ -3,8 +3,8 @@
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- ../generic/tk.h~disable-xim
-+++ ../generic/tk.h
+--- generic/tk.h~disable-xim
++++ generic/tk.h
@@ -109,9 +109,9 @@
* Decide whether or not to use input methods.
*/
diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
index 68a89254b1..8d9293ae30 100644
--- a/recipes/tcltk/tk_8.4.19.bb
+++ b/recipes/tcltk/tk_8.4.19.bb
@@ -3,11 +3,11 @@ LICENSE = "tcl"
SECTION = "devel/tcltk"
HOMEPAGE = "http://tcl.sourceforge.net"
DEPENDS = "tcl virtual/libx11 libxt"
-PR = "r0"
+PR = "r1"
SRC_URI = "\
${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
- file://disable-xim.patch;striplevel=0 \
+ file://disable-xim.patch;apply=false \
file://tk-add-soname.patch;striplevel=2 \
# file://fix-configure.patch;striplevel=2 \
"
@@ -23,6 +23,7 @@ EXTRA_OECONF = "\
"
do_configure() {
+ (cd .. ; patch -p0 -i ${WORKDIR}/disable-xim.patch)
gnu-configize
oe_runconf
}