From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 24 May 2010 13:01:00 -0700
Subject: Make the do_patch apply=yes param implicit if extension is
 .diff/.patch

For .diff/.patch you need to apply manually, you can specify apply=no.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Acked-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
---
 recipes/tcltk/tcl_8.4.19.bb |  4 ++--
 recipes/tcltk/tcl_8.5.8.bb  | 14 +++++++-------
 recipes/tcltk/tk_8.4.19.bb  |  6 +++---
 recipes/tcltk/tk_8.5.8.bb   | 14 +++++++-------
 4 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'recipes/tcltk')

diff --git a/recipes/tcltk/tcl_8.4.19.bb b/recipes/tcltk/tcl_8.4.19.bb
index 7c6f95a77b..a4a92a121f 100644
--- a/recipes/tcltk/tcl_8.4.19.bb
+++ b/recipes/tcltk/tcl_8.4.19.bb
@@ -6,8 +6,8 @@ PR = "r4"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-  file://tcl-add-soname.patch;apply=yes;striplevel=2 \
-#  file://fix-configure.patch;apply=yes;striplevel=2 \
+  file://tcl-add-soname.patch;striplevel=2 \
+#  file://fix-configure.patch;striplevel=2 \
 "
 S = "${WORKDIR}/tcl${PV}/unix"
 
diff --git a/recipes/tcltk/tcl_8.5.8.bb b/recipes/tcltk/tcl_8.5.8.bb
index edd14bf453..f5ad8790d3 100644
--- a/recipes/tcltk/tcl_8.5.8.bb
+++ b/recipes/tcltk/tcl_8.5.8.bb
@@ -7,13 +7,13 @@ PR = "r5"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tcl${PV}-src.tar.gz \
-  file://confsearch.diff;apply=yes;striplevel=2 \
-  file://manpages.diff;apply=yes;striplevel=2 \
-  file://non-linux.diff;apply=yes;striplevel=2 \
-  file://rpath.diff;apply=yes;striplevel=2 \
-  file://tcllibrary.diff;apply=yes;striplevel=2 \
-  file://tclpackagepath.diff;apply=yes;striplevel=2 \
-  file://tclprivate.diff;apply=yes;striplevel=2 \
+  file://confsearch.diff;striplevel=2 \
+  file://manpages.diff;striplevel=2 \
+  file://non-linux.diff;striplevel=2 \
+  file://rpath.diff;striplevel=2 \
+  file://tcllibrary.diff;striplevel=2 \
+  file://tclpackagepath.diff;striplevel=2 \
+  file://tclprivate.diff;striplevel=2 \
 "
 
 SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3"
diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
index 730080cfe8..68a89254b1 100644
--- a/recipes/tcltk/tk_8.4.19.bb
+++ b/recipes/tcltk/tk_8.4.19.bb
@@ -7,9 +7,9 @@ PR = "r0"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
-  file://disable-xim.patch;apply=yes;striplevel=0 \
-  file://tk-add-soname.patch;apply=yes;striplevel=2 \
-#  file://fix-configure.patch;apply=yes;striplevel=2 \
+  file://disable-xim.patch;striplevel=0 \
+  file://tk-add-soname.patch;striplevel=2 \
+#  file://fix-configure.patch;striplevel=2 \
 "
 S = "${WORKDIR}/tk${PV}/unix"
 
diff --git a/recipes/tcltk/tk_8.5.8.bb b/recipes/tcltk/tk_8.5.8.bb
index 502496dba7..7637b7b5f2 100644
--- a/recipes/tcltk/tk_8.5.8.bb
+++ b/recipes/tcltk/tk_8.5.8.bb
@@ -8,13 +8,13 @@ PR = "r1"
 
 SRC_URI = "\
   ${SOURCEFORGE_MIRROR}/tcl/tk${PV}-src.tar.gz \
-  file://confsearch.diff;apply=yes;striplevel=2 \
-  file://manpages.diff;apply=yes;striplevel=2 \
-  file://non-linux.diff;apply=yes;striplevel=2 \
-  file://rpath.diff;apply=yes;striplevel=2 \
-  file://tklibrary.diff;apply=yes;striplevel=2 \
-  file://tkprivate.diff;apply=yes;striplevel=2 \
-  file://fix-xft.diff;apply=yes \
+  file://confsearch.diff;striplevel=2 \
+  file://manpages.diff;striplevel=2 \
+  file://non-linux.diff;striplevel=2 \
+  file://rpath.diff;striplevel=2 \
+  file://tklibrary.diff;striplevel=2 \
+  file://tkprivate.diff;striplevel=2 \
+  file://fix-xft.diff \
 "
 
 SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6"
-- 
cgit v1.2.3