[oe-commits] Tom Rini : tk 8.4.19: Rework disable-xim.patch

[git version control]

Module: openembedded.git
Branch: 2011.03-maintenance
Commit: a74bc87bf3575ae2badccca3e3cb6d67bcd7fa3b
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=a74bc87bf3575ae2badccca3e3cb6d67bcd7fa3b

Author: Tom Rini <tom_rini at mentor.com>
Date:   Wed Mar 16 11:48:17 2011 -0700

tk 8.4.19: Rework disable-xim.patch

Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 recipes/tcltk/files/disable-xim.patch |    4 ++--
 recipes/tcltk/tk_8.4.19.bb            |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes/tcltk/files/disable-xim.patch b/recipes/tcltk/files/disable-xim.patch
index bc11d3b..d88aa7c 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 68a8925..8d9293a 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
 }