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 bc11d3bbe91a7cecf50bf1cbf3f9e19756be0e22..d88aa7c3b90ce1d2c8501c2ab37ce94635cf4f2b 100644 (file)
--- 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 68a89254b1fd1d461020ed553b9a530b88c6dfd5..8d9293ae30bec9be96ab7fc18bfdacda3f4e7e5b 100644 (file)
--- 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
 }