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>

17 files changed, 31 insertions, 31 deletions

diff --git a/recipes/gtk-webcore/midori_0.1.10.bb b/recipes/gtk-webcore/midori_0.1.10.bb
index a8286d840e..279dbec230 100644
--- a/recipes/gtk-webcore/midori_0.1.10.bb
+++ b/recipes/gtk-webcore/midori_0.1.10.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://archive.xfce.org/src/apps/midori/0.1/midori-${PV}.tar.bz2 \
            file://waf \
           "
 
-SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;patch=1 \
+SRC_URI_append_shr = "file://ua-iphone-0.1.10.patch;apply=yes \
                       file://config"
 
 do_configure() {
diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb
index 97de2cb8ad..46cb0da292 100644
--- a/recipes/gtk-webcore/midori_0.2.1.bb
+++ b/recipes/gtk-webcore/midori_0.2.1.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \
            file://waf"
 
 SRC_URI_append_shr = " file://config \
-                       file://retain-navigationbar-in-fullwindow.patch;patch=1 \
+                       file://retain-navigationbar-in-fullwindow.patch;apply=yes \
                      "
 
 PR = "r2"
diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb
index 18b663cb08..20482d3330 100644
--- a/recipes/gtk-webcore/midori_git.bb
+++ b/recipes/gtk-webcore/midori_git.bb
@@ -9,7 +9,7 @@ PV = "0.1.7+${PR}+gitr${SRCPV}"
 
 SRC_URI = "git://git.xfce.org/apps/midori;protocol=git \
            file://waf \
-           file://wscript-fix.patch;patch=1"
+           file://wscript-fix.patch;apply=yes"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes/gtk-webcore/osb-browser_0.5.0.bb b/recipes/gtk-webcore/osb-browser_0.5.0.bb
index ebf8c52645..b92444fb26 100644
--- a/recipes/gtk-webcore/osb-browser_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-browser_0.5.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 SECTION = "gpe"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-browser-${PV}.tar.gz \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch;apply=yes"
 
 inherit autotools
 
diff --git a/recipes/gtk-webcore/osb-browser_20050430.bb b/recipes/gtk-webcore/osb-browser_20050430.bb
index 749698eba5..b7921b855d 100644
--- a/recipes/gtk-webcore/osb-browser_20050430.bb
+++ b/recipes/gtk-webcore/osb-browser_20050430.bb
@@ -12,7 +12,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch;apply=yes"
 S = "${WORKDIR}/osb-browser"
 
 inherit autotools
diff --git a/recipes/gtk-webcore/osb-browser_20060212.bb b/recipes/gtk-webcore/osb-browser_20060212.bb
index 608b3ec014..dac39c08ff 100644
--- a/recipes/gtk-webcore/osb-browser_20060212.bb
+++ b/recipes/gtk-webcore/osb-browser_20060212.bb
@@ -12,7 +12,7 @@ DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade"
 RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=osb-browser;date=${FIXEDSRCDATE} \
-           file://no-pedantic.patch;patch=1"
+           file://no-pedantic.patch;apply=yes"
 S = "${WORKDIR}/osb-browser"
 
 DEFAULT_PREFERENCE = "${@['-1', '1'][not bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1) or bb.data.getVar('PREFERRED_VERSION_gcc-cross', d, 1).split('.')[0] == '4']}"
diff --git a/recipes/gtk-webcore/osb-jscore_0.5.0.bb b/recipes/gtk-webcore/osb-jscore_0.5.0.bb
index 5a4761c862..fbc6d348c3 100644
--- a/recipes/gtk-webcore/osb-jscore_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-jscore_0.5.0.bb
@@ -6,12 +6,12 @@ SECTION = "gpe"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-jscore-${PV}.tar.gz \
-           file://missing-includes.patch;patch=1 \
-           file://libm.patch;patch=1"
+           file://missing-includes.patch;apply=yes \
+           file://libm.patch;apply=yes"
 
-SRC_URI_append_sh3 = " file://superh-aclocal.patch;patch=1 \
-                       file://gcc4-fno-threadsafe-statics.patch;patch=1 \
-		       file://superh-ustring-declaration-error.patch;patch=1"
+SRC_URI_append_sh3 = " file://superh-aclocal.patch;apply=yes \
+                       file://gcc4-fno-threadsafe-statics.patch;apply=yes \
+		       file://superh-ustring-declaration-error.patch;apply=yes"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk-webcore/osb-jscore_20050430.bb b/recipes/gtk-webcore/osb-jscore_20050430.bb
index f024bbfa02..f88ea1fe8b 100644
--- a/recipes/gtk-webcore/osb-jscore_20050430.bb
+++ b/recipes/gtk-webcore/osb-jscore_20050430.bb
@@ -9,7 +9,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
-           file://libm.patch;patch=1"
+           file://libm.patch;apply=yes"
 S = "${WORKDIR}/JavaScriptCore"
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk-webcore/osb-jscore_20070816.bb b/recipes/gtk-webcore/osb-jscore_20070816.bb
index 672b0ba0a7..247e510838 100644
--- a/recipes/gtk-webcore/osb-jscore_20070816.bb
+++ b/recipes/gtk-webcore/osb-jscore_20070816.bb
@@ -9,7 +9,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=JavaScriptCore;date=${FIXEDSRCDATE} \
-           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1"
+           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;apply=yes"
 S = "${WORKDIR}/JavaScriptCore"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gtk-webcore/osb-jscore_svn.bb b/recipes/gtk-webcore/osb-jscore_svn.bb
index 434a5f131f..8ee00b58f9 100644
--- a/recipes/gtk-webcore/osb-jscore_svn.bb
+++ b/recipes/gtk-webcore/osb-jscore_svn.bb
@@ -8,8 +8,8 @@ PV = "0.5.2+svnr${SRCPV}"
 PR = "r2"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \
-           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;patch=1 \
-	   file://no-static-templates.patch;patch=1 \
+           file://gcc4-fno-threadsafe-statics-JavaScriptCore.patch;apply=yes \
+	   file://no-static-templates.patch;apply=yes \
 	"
 
 S = "${WORKDIR}/JavaScriptCore"
diff --git a/recipes/gtk-webcore/osb-nrcit_20050430.bb b/recipes/gtk-webcore/osb-nrcit_20050430.bb
index 261b52f01b..5adfce6165 100644
--- a/recipes/gtk-webcore/osb-nrcit_20050430.bb
+++ b/recipes/gtk-webcore/osb-nrcit_20050430.bb
@@ -11,9 +11,9 @@ PR = "r3"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \
-	   file://stop-load.image-loading.patch;patch=1	\
-   	   file://gdk-colorspace.diff;patch=1 \
-	   file://fix-loading-error-report.patch;patch=1"
+	   file://stop-load.image-loading.patch;apply=yes	\
+   	   file://gdk-colorspace.diff;apply=yes \
+	   file://fix-loading-error-report.patch;apply=yes"
 
 S = "${WORKDIR}/NRCit"
 
diff --git a/recipes/gtk-webcore/osb-nrcit_20070816.bb b/recipes/gtk-webcore/osb-nrcit_20070816.bb
index 3441d1d508..b9dc94d234 100644
--- a/recipes/gtk-webcore/osb-nrcit_20070816.bb
+++ b/recipes/gtk-webcore/osb-nrcit_20070816.bb
@@ -11,8 +11,8 @@ PR = "r0"
 DEPENDS = "curl librsvg osb-nrcore"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCit;date=${FIXEDSRCDATE} \
-           file://stop-load.image-loading.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
+           file://stop-load.image-loading.patch;apply=yes \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch;apply=yes"
 S = "${WORKDIR}/NRCit"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/gtk-webcore/osb-nrcit_svn.bb b/recipes/gtk-webcore/osb-nrcit_svn.bb
index aff5df6c12..a00345763c 100644
--- a/recipes/gtk-webcore/osb-nrcit_svn.bb
+++ b/recipes/gtk-webcore/osb-nrcit_svn.bb
@@ -11,8 +11,8 @@ PR = "r1"
 DEPENDS = "curl librsvg osb-nrcore pango"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCit;proto=https \
-           file://pkgconfig_fix.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCit.patch;patch=1"
+           file://pkgconfig_fix.patch;apply=yes \
+           file://gcc4-fno-threadsafe-statics-NRCit.patch;apply=yes"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk-webcore/osb-nrcore_0.5.0.bb b/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
index 9478fde3f8..1b0be98891 100644
--- a/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
+++ b/recipes/gtk-webcore/osb-nrcore_0.5.0.bb
@@ -3,7 +3,7 @@ require osb-nrcore.inc
 PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/gtk-webcore/osb-nrcore-${PV}.tar.gz \
-           file://KWQDictImpl.patch;patch=1"
+           file://KWQDictImpl.patch;apply=yes"
 
 SRC_URI[md5sum] = "16d9a9a322025cae1a7fe8225690695a"
 SRC_URI[sha256sum] = "39123e386671e18873392fe221616bbfc2be5ca6ddc3660d6cc001a6aa1f59a8"
diff --git a/recipes/gtk-webcore/osb-nrcore_20050430.bb b/recipes/gtk-webcore/osb-nrcore_20050430.bb
index c79f2b9fbd..b91e8dc87e 100644
--- a/recipes/gtk-webcore/osb-nrcore_20050430.bb
+++ b/recipes/gtk-webcore/osb-nrcore_20050430.bb
@@ -5,7 +5,7 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r1"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
-	   file://KWIQ-mimetype-segfault.patch;patch=1 \
-	   file://setHandle_segfault-fix.patch;patch=1"
+	   file://KWIQ-mimetype-segfault.patch;apply=yes \
+	   file://setHandle_segfault-fix.patch;apply=yes"
 
 S = "${WORKDIR}/NRCore"
diff --git a/recipes/gtk-webcore/osb-nrcore_20070816.bb b/recipes/gtk-webcore/osb-nrcore_20070816.bb
index 1c946d05c6..f1fec4d3a6 100644
--- a/recipes/gtk-webcore/osb-nrcore_20070816.bb
+++ b/recipes/gtk-webcore/osb-nrcore_20070816.bb
@@ -5,9 +5,9 @@ PV = "0.5.0+cvs${FIXEDSRCDATE}"
 PR = "r0"
 
 SRC_URI = "cvs://anonymous@gtk-webcore.cvs.sourceforge.net/cvsroot/gtk-webcore;module=NRCore;date=${FIXEDSRCDATE} \
-           file://KWIQ-mimetype-segfault.patch;patch=1 \
-	   file://KWQKURL-urlcmp.patch;patch=1 \
-           file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1"
+           file://KWIQ-mimetype-segfault.patch;apply=yes \
+	   file://KWQKURL-urlcmp.patch;apply=yes \
+           file://gcc4-fno-threadsafe-statics-NRCore.patch;apply=yes"
 
 S = "${WORKDIR}/NRCore"
 
diff --git a/recipes/gtk-webcore/osb-nrcore_svn.bb b/recipes/gtk-webcore/osb-nrcore_svn.bb
index 1579a36f9a..f924fcb676 100644
--- a/recipes/gtk-webcore/osb-nrcore_svn.bb
+++ b/recipes/gtk-webcore/osb-nrcore_svn.bb
@@ -5,9 +5,9 @@ PV = "0.5.2+svnr${SRCPV}"
 PR = "r3"
 
 SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \
-           file://gcc4-fno-threadsafe-statics-NRCore.patch;patch=1 \
-	   file://build_silence.patch;patch=0;maxdate=20070401 \
-	   file://path_fixes.patch;patch=1"
+           file://gcc4-fno-threadsafe-statics-NRCore.patch;apply=yes \
+	   file://build_silence.patch;apply=yes;maxdate=20070401 \
+	   file://path_fixes.patch;apply=yes"
 
 S = "${WORKDIR}/NRCore"