From: Tom Rini <tom_rini@mentor.com>
Date: Wed, 16 Mar 2011 18:48:17 +0000 (-0700)
Subject: tk 8.4.19: Rework disable-xim.patch
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9e50e5d6fe859daa26874c42dac8702892121730;p=openembedded.git

tk 8.4.19: Rework disable-xim.patch

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---

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
 }