From cea419dd4f66f2fba2f130132c25ba8e4b552cf7 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Mar 2011 11:48:17 -0700 Subject: tk 8.4.19: Rework disable-xim.patch Signed-off-by: Tom Rini Signed-off-by: Koen Kooi --- recipes/tcltk/files/disable-xim.patch | 4 ++-- recipes/tcltk/tk_8.4.19.bb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'recipes') 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 } -- cgit 1.2.3-korg