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>

15 files changed, 113 insertions, 113 deletions

diff --git a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb b/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
index 22d30bfd01..6ad8328224 100644
--- a/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
+++ b/recipes/gtk+/gdk-pixbuf-csource-native_2.12.11.bb
@@ -3,7 +3,7 @@ inherit native
 DEPENDS = "jpeg-native libpng-native gettext-native glib-2.0-native libx11-native"
 S = "${WORKDIR}/gtk+-${PV}"
 FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FILE_DIRNAME}/files"
-SRC_URI += "file://reduce-dependencies.patch;patch=1"
+SRC_URI += "file://reduce-dependencies.patch;apply=yes"
 
 #clear recommends for uclibc builds
 RRECOMMENDS = " "
diff --git a/recipes/gtk+/gdk-pixbuf_2.10.14.bb b/recipes/gtk+/gdk-pixbuf_2.10.14.bb
index 1ff2687bf0..2df8d5b9eb 100644
--- a/recipes/gtk+/gdk-pixbuf_2.10.14.bb
+++ b/recipes/gtk+/gdk-pixbuf_2.10.14.bb
@@ -12,7 +12,7 @@ FILESPATH = "${FILE_DIRNAME}/gdk-pixbuf-csource:${FILE_DIRNAME}/gtk+-${PV}:${FIL
 
 SRC_URI = "\
   ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-  file://automake-lossage.patch;patch=1 \
+  file://automake-lossage.patch;apply=yes \
 "
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk+/gtk+-1.2_1.2.10.bb b/recipes/gtk+/gtk+-1.2_1.2.10.bb
index e072eb625e..9838338d8d 100644
--- a/recipes/gtk+/gtk+-1.2_1.2.10.bb
+++ b/recipes/gtk+/gtk+-1.2_1.2.10.bb
@@ -7,9 +7,9 @@ DEPENDS = "glib-1.2 jpeg libpng libxext"
 PR = "r3"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v1.2/gtk+-${PV}.tar.gz \
-           file://timezone-fix.patch;patch=1 \
-           file://gtk+1.2-reconf-fix;patch=1 \
-           file://no-xwc;patch=1"
+           file://timezone-fix.patch;apply=yes \
+           file://gtk+1.2-reconf-fix;apply=yes \
+           file://no-xwc;apply=yes"
 S = "${WORKDIR}/gtk+-${PV}"
 
 inherit autotools pkgconfig flow-lossage
diff --git a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
index 8fcb5667ff..3a479701d3 100644
--- a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
+++ b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb
@@ -8,7 +8,7 @@ PROVIDES = "gtk+"
 RPROVIDES_${PN} = "gtk+"
 PR = "r2"
 
-SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;patch=1"
+SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch;apply=yes"
 
 S = "${WORKDIR}/gtk+-${PV}"
 
diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc
index b30a4f560b..3ad071b9aa 100644
--- a/recipes/gtk+/gtk+.inc
+++ b/recipes/gtk+/gtk+.inc
@@ -10,10 +10,10 @@ PROVIDES = "gdk-pixbuf"
 
 MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 SRC_URI = "http://download.gnome.org/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.bz2;name=gtk \
-	file://hardcoded_libtool.patch;patch=1 \
-	file://run-iconcache.patch;patch=1 \
-	file://toggle-font.diff;patch=1;pnum=0 \
-	file://xsettings.patch;patch=1 \
+	file://hardcoded_libtool.patch;apply=yes \
+	file://run-iconcache.patch;apply=yes \
+	file://toggle-font.diff;apply=yes;striplevel=0 \
+	file://xsettings.patch;apply=yes \
 	"
 
 INC_PR = "r8"
diff --git a/recipes/gtk+/gtk+_2.10.14.bb b/recipes/gtk+/gtk+_2.10.14.bb
index 81b4983ceb..9c81f03917 100644
--- a/recipes/gtk+/gtk+_2.10.14.bb
+++ b/recipes/gtk+/gtk+_2.10.14.bb
@@ -3,28 +3,28 @@ require gtk-2.10.inc
 PR = "r9"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-           file://disable-tooltips.patch;patch=1 \
-           file://gtklabel-resize-patch;patch=1 \
-           file://menu-deactivate.patch;patch=1 \
-           file://xsettings.patch;patch=1 \
-           file://scroll-timings.patch;patch=1 \
-           file://small-gtkfilesel.patch;patch=1 \
-           file://small-gtkfilechooser.patch;patch=1 \
-#           file://migration.patch;patch=1;pnum=0 \
-           file://run-iconcache.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://single-click.patch;patch=1 \
-           file://spinbutton.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://filesel-fix-segfault.patch;patch=1 \
-           file://combo-arrow-size.patch;patch=1;pnum=0 \
-           file://range-no-redraw.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0 \
-           file://treeview-checkbox-size.patch;patch=1;pnum=0 \
-           file://cell-renderer-edit-focus.patch;patch=1;pnum=0 \
+           file://no-xwc.patch;apply=yes \
+           file://automake-lossage.patch;apply=yes \
+           file://disable-tooltips.patch;apply=yes \
+           file://gtklabel-resize-patch;apply=yes \
+           file://menu-deactivate.patch;apply=yes \
+           file://xsettings.patch;apply=yes \
+           file://scroll-timings.patch;apply=yes \
+           file://small-gtkfilesel.patch;apply=yes \
+           file://small-gtkfilechooser.patch;apply=yes \
+#           file://migration.patch;apply=yes;striplevel=0 \
+           file://run-iconcache.patch;apply=yes \
+           file://hardcoded_libtool.patch;apply=yes \
+           file://no-demos.patch;apply=yes \
+           file://single-click.patch;apply=yes \
+           file://spinbutton.patch;apply=yes \
+           file://gtk+-handhelds.patch;apply=yes \
+           file://filesel-fix-segfault.patch;apply=yes \
+           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
+           file://range-no-redraw.patch;apply=yes;striplevel=0 \
+           file://scrolled-placement.patch;apply=yes;striplevel=0 \
+           file://treeview-checkbox-size.patch;apply=yes;striplevel=0 \
+           file://cell-renderer-edit-focus.patch;apply=yes;striplevel=0 \
            "
 
 # check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb
index fb246eee10..9ea77f3f45 100644
--- a/recipes/gtk+/gtk+_2.12.0.bb
+++ b/recipes/gtk+/gtk+_2.12.0.bb
@@ -2,16 +2,16 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://disable-print.patch;patch=1 \
-           file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://disable-print.patch;apply=yes \
+           file://cellrenderer-cairo.patch;apply=yes;striplevel=0 \
+           file://entry-cairo.patch;apply=yes;striplevel=0 \
+           file://scrolled-placement.patch;apply=yes;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch;apply=yes \
+#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff;apply=yes"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.12.11.bb b/recipes/gtk+/gtk+_2.12.11.bb
index 824d1b4fa9..7d4dd8b9d1 100644
--- a/recipes/gtk+/gtk+_2.12.11.bb
+++ b/recipes/gtk+/gtk+_2.12.11.bb
@@ -2,15 +2,15 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://cellrenderer-cairo.patch;apply=yes;striplevel=0 \
+           file://entry-cairo.patch;apply=yes;striplevel=0 \
+           file://scrolled-placement.patch;apply=yes;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch;apply=yes \
+#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff;apply=yes"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.12.3.bb b/recipes/gtk+/gtk+_2.12.3.bb
index 6936b52dc6..c22769fff0 100644
--- a/recipes/gtk+/gtk+_2.12.3.bb
+++ b/recipes/gtk+/gtk+_2.12.3.bb
@@ -2,15 +2,15 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://cellrenderer-cairo.patch;patch=1;pnum=0 \
-           file://entry-cairo.patch;patch=1;pnum=0 \
-           file://scrolled-placement.patch;patch=1;pnum=0"
+SRC_URI += "file://cellrenderer-cairo.patch;apply=yes;striplevel=0 \
+           file://entry-cairo.patch;apply=yes;striplevel=0 \
+           file://scrolled-placement.patch;apply=yes;striplevel=0"
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#           file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;apply=yes \
+#           file://menu-deactivate.patch;apply=yes \
+#           file://combo-arrow-size.patch;apply=yes;striplevel=0 \
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1"
+#           file://pangoxft2.10.6.diff;apply=yes"
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 
diff --git a/recipes/gtk+/gtk+_2.14.2.bb b/recipes/gtk+/gtk+_2.14.2.bb
index 2114df1f28..7886f9ae96 100644
--- a/recipes/gtk+/gtk+_2.14.2.bb
+++ b/recipes/gtk+/gtk+_2.14.2.bb
@@ -2,7 +2,7 @@ require gtk+.inc
 
 PR = "${INC_PR}.0"
 
-SRC_URI += "file://smallscreen_filechooser.patch;patch=1 \
+SRC_URI += "file://smallscreen_filechooser.patch;apply=yes \
           "
 
 EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration gio_can_sniff=yes"
diff --git a/recipes/gtk+/gtk+_2.18.6.bb b/recipes/gtk+/gtk+_2.18.6.bb
index 14e6f3f7dd..259b8ee4fd 100644
--- a/recipes/gtk+/gtk+_2.18.6.bb
+++ b/recipes/gtk+/gtk+_2.18.6.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+SRC_URI_append_virtclass-native = " file://no-demos.patch;apply=yes \
 "
 
 PR = "${INC_PR}.4"
diff --git a/recipes/gtk+/gtk+_2.20.0.bb b/recipes/gtk+/gtk+_2.20.0.bb
index abddc2756e..f6b31a8f34 100644
--- a/recipes/gtk+/gtk+_2.20.0.bb
+++ b/recipes/gtk+/gtk+_2.20.0.bb
@@ -1,6 +1,6 @@
 require gtk+.inc
 
-SRC_URI_append_virtclass-native = " file://no-demos.patch;patch=1 \
+SRC_URI_append_virtclass-native = " file://no-demos.patch;apply=yes \
 "
 
 SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6"
diff --git a/recipes/gtk+/gtk+_2.6.10.bb b/recipes/gtk+/gtk+_2.6.10.bb
index f42be9c51e..359705bdc6 100644
--- a/recipes/gtk+/gtk+_2.6.10.bb
+++ b/recipes/gtk+/gtk+_2.6.10.bb
@@ -8,33 +8,33 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt"
 PR = "r11"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \
-           file://help.patch;patch=1 \
-           file://no-demos.patch;patch=1 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-           file://gtk+-handhelds.patch;patch=1 \
-           file://spinbutton.patch;patch=1 \
-           file://hardcoded_libtool.patch;patch=1 \
-           file://disable-tooltips.patch;patch=1 \
-           file://gtklabel-resize-patch;patch=1 \
-           file://menu-deactivate.patch;patch=1 \
-           file://xsettings.patch;patch=1 \
-           file://scroll-timings.patch;patch=1 \
-           file://small-gtkfilesel.patch;patch=1 \
-           file://migration.patch;patch=1;pnum=0 \
-           file://single-click.patch;patch=1 \
-           file://menu-styling.patch;patch=1 \
-           file://compile-against-newer-glib.patch;patch=1 \
-           file://gtk.keynav.gtkcombobox.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkentry.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkiconview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkradiobutton.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtksettings.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtktextview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtktreeview.patch;patch=1;pnum=0 \
-           file://gtk.keynav.gtkwidget.patch;patch=1;pnum=0 \
-           file://gtk+-2.6.10-bg.patch;patch=1 \
-           file://filesel-fix-segfault.patch;patch=1 \
+           file://help.patch;apply=yes \
+           file://no-demos.patch;apply=yes \
+           file://no-xwc.patch;apply=yes \
+           file://automake-lossage.patch;apply=yes \
+           file://gtk+-handhelds.patch;apply=yes \
+           file://spinbutton.patch;apply=yes \
+           file://hardcoded_libtool.patch;apply=yes \
+           file://disable-tooltips.patch;apply=yes \
+           file://gtklabel-resize-patch;apply=yes \
+           file://menu-deactivate.patch;apply=yes \
+           file://xsettings.patch;apply=yes \
+           file://scroll-timings.patch;apply=yes \
+           file://small-gtkfilesel.patch;apply=yes \
+           file://migration.patch;apply=yes;striplevel=0 \
+           file://single-click.patch;apply=yes \
+           file://menu-styling.patch;apply=yes \
+           file://compile-against-newer-glib.patch;apply=yes \
+           file://gtk.keynav.gtkcombobox.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtkentry.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtkiconview.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtkradiobutton.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtksettings.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtktextview.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtktreeview.patch;apply=yes;striplevel=0 \
+           file://gtk.keynav.gtkwidget.patch;apply=yes;striplevel=0 \
+           file://gtk+-2.6.10-bg.patch;apply=yes \
+           file://filesel-fix-segfault.patch;apply=yes \
            "
 
 inherit autotools pkgconfig
diff --git a/recipes/gtk+/gtk+_2.8.16.bb b/recipes/gtk+/gtk+_2.8.16.bb
index f0f01725e2..c5897645d7 100644
--- a/recipes/gtk+/gtk+_2.8.16.bb
+++ b/recipes/gtk+/gtk+_2.8.16.bb
@@ -10,21 +10,21 @@ PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://hardcoded_libtool.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://gtktreeview-316689.patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-	   file://no-demos.patch;patch=1 \
-	   file://gtk+-handhelds.patch;patch=1 \
-	   file://single-click.patch;patch=1"
+           file://no-xwc.patch;apply=yes \
+           file://automake-lossage.patch;apply=yes \
+	   file://spinbutton.patch;apply=yes \
+	   file://hardcoded_libtool.patch;apply=yes \
+	   file://disable-tooltips.patch;apply=yes \
+	   file://gtklabel-resize-patch;apply=yes \
+	   file://gtktreeview-316689.patch;apply=yes \
+	   file://menu-deactivate.patch;apply=yes \
+	   file://xsettings.patch;apply=yes \
+	   file://scroll-timings.patch;apply=yes \
+	   file://small-gtkfilesel.patch;apply=yes \
+	   file://migration.patch;apply=yes;striplevel=0 \
+	   file://no-demos.patch;apply=yes \
+	   file://gtk+-handhelds.patch;apply=yes \
+	   file://single-click.patch;apply=yes"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gtk+/gtk+_2.8.9.bb b/recipes/gtk+/gtk+_2.8.9.bb
index 419a5d04b0..c2250ab1d5 100644
--- a/recipes/gtk+/gtk+_2.8.9.bb
+++ b/recipes/gtk+/gtk+_2.8.9.bb
@@ -8,20 +8,20 @@ DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt c
 PR = "r7"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/gtk+-${PV}.tar.bz2 \
-           file://no-xwc.patch;patch=1 \
-           file://automake-lossage.patch;patch=1 \
-	   file://spinbutton.patch;patch=1 \
-	   file://hardcoded_libtool.patch;patch=1 \
-	   file://disable-tooltips.patch;patch=1 \
-	   file://gtklabel-resize-patch;patch=1 \
-	   file://menu-deactivate.patch;patch=1 \
-	   file://xsettings.patch;patch=1 \
-	   file://scroll-timings.patch;patch=1 \
-	   file://small-gtkfilesel.patch;patch=1 \
-	   file://migration.patch;patch=1;pnum=0 \
-	   file://no-demos.patch;patch=1 \
-	   file://gtk+-handhelds.patch;patch=1 \
-	   file://single-click.patch;patch=1"
+           file://no-xwc.patch;apply=yes \
+           file://automake-lossage.patch;apply=yes \
+	   file://spinbutton.patch;apply=yes \
+	   file://hardcoded_libtool.patch;apply=yes \
+	   file://disable-tooltips.patch;apply=yes \
+	   file://gtklabel-resize-patch;apply=yes \
+	   file://menu-deactivate.patch;apply=yes \
+	   file://xsettings.patch;apply=yes \
+	   file://scroll-timings.patch;apply=yes \
+	   file://small-gtkfilesel.patch;apply=yes \
+	   file://migration.patch;apply=yes;striplevel=0 \
+	   file://no-demos.patch;apply=yes \
+	   file://gtk+-handhelds.patch;apply=yes \
+	   file://single-click.patch;apply=yes"
 
 inherit autotools pkgconfig