From bf7d0467a0788a7fcc1c96e0dc35a25ae09278a0 Mon Sep 17 00:00:00 2001
From: Chris Larson <chris_larson@mentor.com>
Date: Sun, 23 May 2010 20:23:53 -0700
Subject: Rename url params patch=<ignored>/pnum=<n> to
 apply={yes,no}/striplevel=<n>

I think this makes the behavior rather more clear.

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 da044051df..7c6f95a77b 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;patch=1;pnum=2 \
-#  file://fix-configure.patch;patch=1;pnum=2 \
+  file://tcl-add-soname.patch;apply=yes;striplevel=2 \
+#  file://fix-configure.patch;apply=yes;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 447da5db94..edd14bf453 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;patch=1;pnum=2 \
-  file://manpages.diff;patch=1;pnum=2 \
-  file://non-linux.diff;patch=1;pnum=2 \
-  file://rpath.diff;patch=1;pnum=2 \
-  file://tcllibrary.diff;patch=1;pnum=2 \
-  file://tclpackagepath.diff;patch=1;pnum=2 \
-  file://tclprivate.diff;patch=1;pnum=2 \
+  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 \
 "
 
 SRC_URI[md5sum] = "7f123e53b3daaaba2478d3af5a0752e3"
diff --git a/recipes/tcltk/tk_8.4.19.bb b/recipes/tcltk/tk_8.4.19.bb
index bc4b477f71..730080cfe8 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;patch=1;pnum=0 \
-  file://tk-add-soname.patch;patch=1;pnum=2 \
-#  file://fix-configure.patch;patch=1;pnum=2 \
+  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 \
 "
 S = "${WORKDIR}/tk${PV}/unix"
 
diff --git a/recipes/tcltk/tk_8.5.8.bb b/recipes/tcltk/tk_8.5.8.bb
index 08683a373d..502496dba7 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;patch=1;pnum=2 \
-  file://manpages.diff;patch=1;pnum=2 \
-  file://non-linux.diff;patch=1;pnum=2 \
-  file://rpath.diff;patch=1;pnum=2 \
-  file://tklibrary.diff;patch=1;pnum=2 \
-  file://tkprivate.diff;patch=1;pnum=2 \
-  file://fix-xft.diff;patch=1 \
+  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 \
 "
 
 SRC_URI[md5sum] = "13bf90602e16fc530e05196431021dc6"
-- 
cgit v1.2.3