Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev

56 files changed, 69 insertions, 69 deletions

diff --git a/recipes/gnome/epiphany_2.21.92.bb b/recipes/gnome/epiphany_2.21.92.bb
index 493f21437a..b9c66911e9 100644
--- a/recipes/gnome/epiphany_2.21.92.bb
+++ b/recipes/gnome/epiphany_2.21.92.bb
@@ -5,7 +5,7 @@ PR ="r2"
 
 inherit gnome
 
-SRC_URI_append = " file://file_contains.patch;patch=1"
+SRC_URI_append = " file://file_contains.patch"
 
 EXTRA_OECONF = "--with-engine=webkit --with-distributor-name=${DISTRO}"
 
diff --git a/recipes/gnome/gconf_2.6.1.bb b/recipes/gnome/gconf_2.6.1.bb
index 7c4adde966..da112f7666 100644
--- a/recipes/gnome/gconf_2.6.1.bb
+++ b/recipes/gnome/gconf_2.6.1.bb
@@ -8,7 +8,7 @@ PR = "r2"
 S = "${WORKDIR}/GConf-${PV}"
 
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
-	   file://backends.patch;patch=1"
+	   file://backends.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/gdm_2.14.9.bb b/recipes/gnome/gdm_2.14.9.bb
index 66ca994748..85bc216a6a 100644
--- a/recipes/gnome/gdm_2.14.9.bb
+++ b/recipes/gnome/gdm_2.14.9.bb
@@ -5,7 +5,7 @@ DEPENDS = "gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-l
 
 inherit gnome
 
-SRC_URI += "file://gdm-nodocs.patch;patch=1"
+SRC_URI += "file://gdm-nodocs.patch"
 
 FILES_${PN} += "${datadir}/icon* \
 		${datadir}/xsession*"
diff --git a/recipes/gnome/gdm_2.24.1.bb b/recipes/gnome/gdm_2.24.1.bb
index 3bb6b8c2e2..0c6050d63c 100644
--- a/recipes/gnome/gdm_2.24.1.bb
+++ b/recipes/gnome/gdm_2.24.1.bb
@@ -7,7 +7,7 @@ PR = "r3"
 
 inherit gnome update-rc.d
 
-SRC_URI += "file://cross-xdetection.diff;patch=1 \
+SRC_URI += "file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm.conf \
             file://gdm \
diff --git a/recipes/gnome/gdm_2.26.1.bb b/recipes/gnome/gdm_2.26.1.bb
index 686ce4051d..40d9c36a0b 100644
--- a/recipes/gnome/gdm_2.26.1.bb
+++ b/recipes/gnome/gdm_2.26.1.bb
@@ -8,8 +8,8 @@ PR = "r1"
 inherit gnome update-rc.d
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
-            file://gdm-xklavier.patch;patch=1 \
+            file://cross-xdetection.diff \
+            file://gdm-xklavier.patch \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gdm_2.28.2.bb b/recipes/gnome/gdm_2.28.2.bb
index a1406d3174..0fb6883b5f 100644
--- a/recipes/gnome/gdm_2.28.2.bb
+++ b/recipes/gnome/gdm_2.28.2.bb
@@ -8,7 +8,7 @@ inherit gnome update-rc.d
 RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
+            file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gdm_2.30.0.bb b/recipes/gnome/gdm_2.30.0.bb
index c461d86cde..7352bf3e1f 100644
--- a/recipes/gnome/gdm_2.30.0.bb
+++ b/recipes/gnome/gdm_2.30.0.bb
@@ -8,7 +8,7 @@ inherit gnome update-rc.d
 RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files"
 
 SRC_URI += " \
-            file://cross-xdetection.diff;patch=1 \
+            file://cross-xdetection.diff \
             file://%gconf-tree.xml \
             file://gdm \
             file://gdm.conf \
diff --git a/recipes/gnome/gnome-common.inc b/recipes/gnome/gnome-common.inc
index 5a1e2072e2..826052fcb3 100644
--- a/recipes/gnome/gnome-common.inc
+++ b/recipes/gnome/gnome-common.inc
@@ -7,7 +7,7 @@ inherit gnomebase
 # The omf.make file failed if scrollkeeper doesn't happen to be
 # installed
 
-SRC_URI += "file://omf.patch;patch=1"
+SRC_URI += "file://omf.patch"
 
 EXTRA_AUTORECONF = ""
 DEPENDS = ""
diff --git a/recipes/gnome/gnome-desktop_2.16.1.bb b/recipes/gnome/gnome-desktop_2.16.1.bb
index bb45742b26..f036475627 100644
--- a/recipes/gnome/gnome-desktop_2.16.1.bb
+++ b/recipes/gnome/gnome-desktop_2.16.1.bb
@@ -5,8 +5,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "e92edb17cd75faca45a4fe2d6806bdd8"
 SRC_URI[archive.sha256sum] = "56c7dbe56e6a9fbcd3730c55892734a9daff23a86d69f49a381a4c965732f9d1"
diff --git a/recipes/gnome/gnome-desktop_2.18.3.bb b/recipes/gnome/gnome-desktop_2.18.3.bb
index 221a25f071..fb30071cc8 100644
--- a/recipes/gnome/gnome-desktop_2.18.3.bb
+++ b/recipes/gnome/gnome-desktop_2.18.3.bb
@@ -6,8 +6,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "98de3b7d0da690da8b94cddc74f3914b"
 SRC_URI[archive.sha256sum] = "8997a2ceca2dbb28fb402e23ea5f255b68c59ea4f932b253e2843bfe62af7c64"
diff --git a/recipes/gnome/gnome-desktop_2.22.2.bb b/recipes/gnome/gnome-desktop_2.22.2.bb
index 5c24a51ac7..ec3cf2313b 100644
--- a/recipes/gnome/gnome-desktop_2.22.2.bb
+++ b/recipes/gnome/gnome-desktop_2.22.2.bb
@@ -4,8 +4,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "6d6271cfa135ce016126414d929b8fb7"
 SRC_URI[archive.sha256sum] = "4bd3141b2c668b24b43ac10a7a7040ce0717d8f088aee8a93ef261e446d88818"
diff --git a/recipes/gnome/gnome-desktop_2.24.0.bb b/recipes/gnome/gnome-desktop_2.24.0.bb
index 78e1f070e5..d1959b1365 100644
--- a/recipes/gnome/gnome-desktop_2.24.0.bb
+++ b/recipes/gnome/gnome-desktop_2.24.0.bb
@@ -4,8 +4,8 @@ inherit gnome pkgconfig
 
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
-SRC_URI += "file://scrollkeeper.patch;patch=1 \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://scrollkeeper.patch \
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "a2cc0424619f271bf1a65cc0fbe782f0"
 SRC_URI[archive.sha256sum] = "7ebe5b0c2bb296386f1d62c3a5d30ed50e353c8d9dc390b77e0b5fdf56e4dad9"
diff --git a/recipes/gnome/gnome-desktop_2.26.0.bb b/recipes/gnome/gnome-desktop_2.26.0.bb
index ed66640c38..28e063a117 100644
--- a/recipes/gnome/gnome-desktop_2.26.0.bb
+++ b/recipes/gnome/gnome-desktop_2.26.0.bb
@@ -5,7 +5,7 @@ inherit gnome pkgconfig
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 SRC_URI += " \
-            file://no-desktop-docs.patch;patch=1;pnum=0"
+            file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "796fc830e0baff24381809a7abe012f8"
 SRC_URI[archive.sha256sum] = "3b3fe18bc30ad60f1bbbb2bc2d2ec14a2f9babb9312eb4834395b5839b7d7ee9"
diff --git a/recipes/gnome/gnome-desktop_2.28.0.bb b/recipes/gnome/gnome-desktop_2.28.0.bb
index 5f74ab9505..9a99d27d83 100644
--- a/recipes/gnome/gnome-desktop_2.28.0.bb
+++ b/recipes/gnome/gnome-desktop_2.28.0.bb
@@ -5,7 +5,7 @@ inherit gnome pkgconfig
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 # FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://no-desktop-docs.patch;striplevel=0"
 
 SRC_URI[archive.md5sum] = "73927d3c43d783f5d7d6cdbb4359d7d6"
 SRC_URI[archive.sha256sum] = "976fde6c0764b7b26b633030032b992c4dcbbaefd29d118303de5f7258794ae5"
diff --git a/recipes/gnome/gnome-desktop_2.30.0.bb b/recipes/gnome/gnome-desktop_2.30.0.bb
index 3c458a41ce..75dc0757cb 100644
--- a/recipes/gnome/gnome-desktop_2.30.0.bb
+++ b/recipes/gnome/gnome-desktop_2.30.0.bb
@@ -8,4 +8,4 @@ SRC_URI[archive.sha256sum] = "cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d4
 DEPENDS += "gnome-doc-utils gnome-vfs libxrandr"
 
 # FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook
-SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0"
+SRC_URI += "file://no-desktop-docs.patch;striplevel=0"
diff --git a/recipes/gnome/gnome-games_2.24.3.bb b/recipes/gnome/gnome-games_2.24.3.bb
index 770fdc6def..07b308122a 100644
--- a/recipes/gnome/gnome-games_2.24.3.bb
+++ b/recipes/gnome/gnome-games_2.24.3.bb
@@ -8,7 +8,7 @@ inherit gnome distutils-base gconf
 
 PR = "r2"
 
-SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
+SRC_URI += "file://ggz-unbreak-m4.patch \
            "
 
 EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
diff --git a/recipes/gnome/gnome-keyring_2.28.2.bb b/recipes/gnome/gnome-keyring_2.28.2.bb
index f71e0ac7f1..dceb070835 100644
--- a/recipes/gnome/gnome-keyring_2.28.2.bb
+++ b/recipes/gnome/gnome-keyring_2.28.2.bb
@@ -8,7 +8,7 @@ inherit gnome pkgconfig
 
 EXTRA_OECONF = "--disable-gtk-doc --enable-pam --with-pam-dir=${libdir}/security"
 
-SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service file://libtool.workarround.patch;patch=1"
+SRC_URI += "file://tasn.m4 file://org.gnome.keyring.service file://libtool.workarround.patch"
 
 do_configure_prepend() {
 	cp ${WORKDIR}/tasn.m4 acinclude.m4
diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
index 60713f39c0..d34343d978 100644
--- a/recipes/gnome/gnome-panel_2.24.0.bb
+++ b/recipes/gnome/gnome-panel_2.24.0.bb
@@ -3,9 +3,9 @@ DEPENDS = "librsvg libgweather startup-notification libwnck orbit2 gtk+ libgnome
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://scrollkeeper.patch;patch=1"
+SRC_URI += "file://scrollkeeper.patch"
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
diff --git a/recipes/gnome/gnome-panel_2.26.0.bb b/recipes/gnome/gnome-panel_2.26.0.bb
index 24c22ae230..7511f9af1b 100644
--- a/recipes/gnome/gnome-panel_2.26.0.bb
+++ b/recipes/gnome/gnome-panel_2.26.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ li
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
diff --git a/recipes/gnome/gnome-panel_2.28.0.bb b/recipes/gnome/gnome-panel_2.28.0.bb
index 49e9575a2f..fb5036c0b6 100644
--- a/recipes/gnome/gnome-panel_2.28.0.bb
+++ b/recipes/gnome/gnome-panel_2.28.0.bb
@@ -7,7 +7,7 @@ PR = "r2"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 CPPFLAGS += " -I${STAGING_INCDIR}/gnome-desktop-2.0" 
 export SYSROOT = "${STAGING_DIR_HOST}"
diff --git a/recipes/gnome/gnome-panel_2.30.0.bb b/recipes/gnome/gnome-panel_2.30.0.bb
index 87aef8e372..cfe2cfeaec 100644
--- a/recipes/gnome/gnome-panel_2.30.0.bb
+++ b/recipes/gnome/gnome-panel_2.30.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "libcanberra gconf librsvg libgweather startup-notification libwnck or
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://idl-sysroot.patch;patch=1"
+SRC_URI += "file://idl-sysroot.patch"
 
 SRC_URI[archive.md5sum] = "e17f25417b2c9011ed1c3ebd75706de6"
 SRC_URI[archive.sha256sum] = "7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220"
diff --git a/recipes/gnome/gnome-system-tools_2.27.1.bb b/recipes/gnome/gnome-system-tools_2.27.1.bb
index b7c90cb041..364720f847 100644
--- a/recipes/gnome/gnome-system-tools_2.27.1.bb
+++ b/recipes/gnome/gnome-system-tools_2.27.1.bb
@@ -6,7 +6,7 @@ inherit gnome pkgconfig
 
 PR = "r2"
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 EXTRA_OECONF = "--disable-scrollkeeper \
                "
diff --git a/recipes/gnome/gnome-system-tools_2.28.2.bb b/recipes/gnome/gnome-system-tools_2.28.2.bb
index 503a111ff2..3bb5af62f6 100644
--- a/recipes/gnome/gnome-system-tools_2.28.2.bb
+++ b/recipes/gnome/gnome-system-tools_2.28.2.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center"
 inherit gnome pkgconfig
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 SRC_URI[archive.md5sum] = "6947cd83c8f83af54e76a36ab3bb6cf0"
 SRC_URI[archive.sha256sum] = "806dd14792149b7f01e84a214b8d6debda53965e1eb74d189c66498adeb2af29"
 
diff --git a/recipes/gnome/gnome-system-tools_2.30.0.bb b/recipes/gnome/gnome-system-tools_2.30.0.bb
index 69f32d9a4d..c53a83ea76 100644
--- a/recipes/gnome/gnome-system-tools_2.30.0.bb
+++ b/recipes/gnome/gnome-system-tools_2.30.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "policykit-gnome nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center"
 inherit gnome pkgconfig
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 SRC_URI[archive.md5sum] = "e3e779c8a31c34993315a6c6c78a5ed5"
 SRC_URI[archive.sha256sum] = "7bf41b88566f715ede95fd0e4297b64a95450af7f9d63a6741bb9e65ba361c7d"
diff --git a/recipes/gnome/gnome-utils_2.28.0.bb b/recipes/gnome/gnome-utils_2.28.0.bb
index 8380f8d5f2..9b008ac3f0 100644
--- a/recipes/gnome/gnome-utils_2.28.0.bb
+++ b/recipes/gnome/gnome-utils_2.28.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "gnome-common glib-2.0 gtk+ gconf"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://no-try-run-strftime.diff;patch=1"
+SRC_URI += "file://no-try-run-strftime.diff"
 
 EXTRA_OECONF = "--disable-scrollkeeper"
 
diff --git a/recipes/gnome/gnome-utils_2.30.0.bb b/recipes/gnome/gnome-utils_2.30.0.bb
index ea6d17b1d7..b2f39cfed2 100644
--- a/recipes/gnome/gnome-utils_2.30.0.bb
+++ b/recipes/gnome/gnome-utils_2.30.0.bb
@@ -7,7 +7,7 @@ inherit gnome pkgconfig
 
 PR = "r1"
 
-SRC_URI += "file://no-try-run-strftime.diff;patch=1"
+SRC_URI += "file://no-try-run-strftime.diff"
 SRC_URI[archive.md5sum] = "c6d779ddccf99cbe0667b578078dd011"
 SRC_URI[archive.sha256sum] = "745bb25fce536dc5337e7b5cbcbce9eee66b3cc0c500de302759b98ebcef6a8f"
 
diff --git a/recipes/gnome/gnome-vfs_2.22.0.bb b/recipes/gnome/gnome-vfs_2.22.0.bb
index c71cac9895..d3d24b1f96 100644
--- a/recipes/gnome/gnome-vfs_2.22.0.bb
+++ b/recipes/gnome/gnome-vfs_2.22.0.bb
@@ -7,8 +7,8 @@ PR = "r1"
 
 inherit gnome
 
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
-	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+SRC_URI += "file://gconftool-lossage.patch \
+	    file://gnome-vfs-no-kerberos.patch;striplevel=0"
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 PROVIDES = "gnome-vfs-plugin-dbus"
diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb
index 5c65839380..3902e7774a 100644
--- a/recipes/gnome/gnome-vfs_2.24.1.bb
+++ b/recipes/gnome/gnome-vfs_2.24.1.bb
@@ -7,9 +7,9 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
-	    file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0 \
-	    file://03_gnutls27.patch;patch=1"
+SRC_URI += "file://gconftool-lossage.patch \
+	    file://gnome-vfs-no-kerberos.patch;striplevel=0 \
+	    file://03_gnutls27.patch"
 
 # This is to provide compatibility with the gnome-vfs DBus fork
 PROVIDES = "gnome-vfs-plugin-dbus"
diff --git a/recipes/gnome/gnumeric_1.10.1.bb b/recipes/gnome/gnumeric_1.10.1.bb
index 926bdd16bf..5b8240af2a 100644
--- a/recipes/gnome/gnumeric_1.10.1.bb
+++ b/recipes/gnome/gnumeric_1.10.1.bb
@@ -7,7 +7,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += " file://nodolt.patch;patch=1 "
+SRC_URI += " file://nodolt.patch "
 
 SRC_URI[archive.md5sum] = "80daf446f299578d05e60e9b7d38900c"
 SRC_URI[archive.sha256sum] = "91a0a9aa47ae82b14fe717e5d49d164cfe871add2bf71d0cb2f68cf3d383c9db"
diff --git a/recipes/gnome/gnumeric_1.8.4.bb b/recipes/gnome/gnumeric_1.8.4.bb
index b3a3aee506..97adddef77 100644
--- a/recipes/gnome/gnumeric_1.8.4.bb
+++ b/recipes/gnome/gnumeric_1.8.4.bb
@@ -10,7 +10,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += "file://remove-docs.patch;patch=1"
+SRC_URI += "file://remove-docs.patch"
 
 EXTRA_OECONF=" --without-perl "
 
diff --git a/recipes/gnome/gnumeric_1.9.14.bb b/recipes/gnome/gnumeric_1.9.14.bb
index cf7987107e..1bcd997185 100644
--- a/recipes/gnome/gnumeric_1.9.14.bb
+++ b/recipes/gnome/gnumeric_1.9.14.bb
@@ -7,7 +7,7 @@ PARALLEL_MAKE = ""
 
 inherit gnome flow-lossage
 
-SRC_URI += " file://nodolt.patch;patch=1 "
+SRC_URI += " file://nodolt.patch "
 
 EXTRA_OECONF=" --without-perl "
 
diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb
index 4b25e852ac..e40cb1a5c8 100644
--- a/recipes/gnome/goffice_0.7.14.bb
+++ b/recipes/gnome/goffice_0.7.14.bb
@@ -7,8 +7,8 @@ DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2
 
 inherit gnome pkgconfig
 
-SRC_URI += " file://c99math.patch;patch=1 \
-             file://nodolt.patch;patch=1 "
+SRC_URI += " file://c99math.patch \
+             file://nodolt.patch "
 
 do_stage() {
 	autotools_stage_all
diff --git a/recipes/gnome/goffice_0.8.1.bb b/recipes/gnome/goffice_0.8.1.bb
index 50c431c0d2..6ef4fbf714 100644
--- a/recipes/gnome/goffice_0.8.1.bb
+++ b/recipes/gnome/goffice_0.8.1.bb
@@ -5,8 +5,8 @@ DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2
 
 inherit gnome pkgconfig
 
-SRC_URI += " file://c99math.patch;patch=1 \
-             file://nodolt.patch;patch=1 "
+SRC_URI += " file://c99math.patch \
+             file://nodolt.patch "
 
 SRC_URI[archive.md5sum] = "fdc43c5e04f6ead55bebc034c1d34296"
 SRC_URI[archive.sha256sum] = "9e2497956349fee8e6ec34a13160635455ead79a5118cbe61cb387e4cfd2b31e"
diff --git a/recipes/gnome/gvfs_1.5.5.bb b/recipes/gnome/gvfs_1.5.5.bb
index 1e1106defa..4968d928ce 100644
--- a/recipes/gnome/gvfs_1.5.5.bb
+++ b/recipes/gnome/gvfs_1.5.5.bb
@@ -5,8 +5,8 @@ DEPENDS = "gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avah
 inherit gnome
 
 SRC_URI += " \
-            file://imobile-fix.patch;patch=1 \
-            file://imobile-fix2.patch;patch=1 \
+            file://imobile-fix.patch \
+            file://imobile-fix2.patch \
 "
 
 SRC_URI[archive.md5sum] = "d4ae94acdea317d8a8bf88a793b8df3f"
diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc
index 52ee9b5314..aa06237e4d 100644
--- a/recipes/gnome/libart-lgpl.inc
+++ b/recipes/gnome/libart-lgpl.inc
@@ -9,7 +9,7 @@ INC_PR = "r5"
 # can't use gnome.bbclass due to _ in filename
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \
        file://${ART_CONFIG} \
-       file://Makefile.am.patch;patch=1"
+       file://Makefile.am.patch"
 
 inherit autotools pkgconfig
 
diff --git a/recipes/gnome/libbonobo_2.22.0.bb b/recipes/gnome/libbonobo_2.22.0.bb
index 0a811a9761..7349bf777a 100644
--- a/recipes/gnome/libbonobo_2.22.0.bb
+++ b/recipes/gnome/libbonobo_2.22.0.bb
@@ -2,7 +2,7 @@ require libbonobo.inc
 
 PR = "r0"
 
-SRC_URI += "file://configure-gthread.patch;patch=1"
+SRC_URI += "file://configure-gthread.patch"
 
 
 SRC_URI[archive.md5sum] = "998a576ad26784ac87eab99e96013527"
diff --git a/recipes/gnome/libgnome_2.6.1.1.bb b/recipes/gnome/libgnome_2.6.1.1.bb
index ca23ba1164..2133cf24d3 100644
--- a/recipes/gnome/libgnome_2.6.1.1.bb
+++ b/recipes/gnome/libgnome_2.6.1.1.bb
@@ -5,7 +5,7 @@ PR = "r2"
 
 inherit gnome
 
-SRC_URI += "file://makefile.patch;patch=1"
+SRC_URI += "file://makefile.patch"
 
 DEPENDS = "gnome-vfs libbonobo"
 
diff --git a/recipes/gnome/libgnomeprintui_2.6.2.bb b/recipes/gnome/libgnomeprintui_2.6.2.bb
index a1a1566813..a532adea12 100644
--- a/recipes/gnome/libgnomeprintui_2.6.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.6.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 SRC_URI[archive.md5sum] = "b26f7f70eb67fe29f20f6312d4f3085e"
 SRC_URI[archive.sha256sum] = "7869603bbda88f35652d9b70af178836ca7612119ab36084ccc35f2d51c83f13"
diff --git a/recipes/gnome/libgnomeprintui_2.8.2.bb b/recipes/gnome/libgnomeprintui_2.8.2.bb
index 2540ceaef7..630c261b8b 100644
--- a/recipes/gnome/libgnomeprintui_2.8.2.bb
+++ b/recipes/gnome/libgnomeprintui_2.8.2.bb
@@ -7,7 +7,7 @@ DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme gnome-common"
 
 inherit gnome pkgconfig
 
-SRC_URI += "file://configure.patch;patch=1"
+SRC_URI += "file://configure.patch"
 
 SRC_URI[archive.md5sum] = "b38d1f6813dd52879ba4174ddc3f1b1c"
 SRC_URI[archive.sha256sum] = "5c4ba52ca52cdb2d89e2fb7a638891ded38e844c08dd992e482f0793cfbc71c7"
diff --git a/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc
index 537eb5a08d..4bf97ea7ac 100644
--- a/recipes/gnome/libgnomeui.inc
+++ b/recipes/gnome/libgnomeui.inc
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.12.0.bb b/recipes/gnome/libgnomeui_2.12.0.bb
index 1f2537cd4c..b3b6803eed 100644
--- a/recipes/gnome/libgnomeui_2.12.0.bb
+++ b/recipes/gnome/libgnomeui_2.12.0.bb
@@ -12,7 +12,7 @@ inherit gnome
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.15.2.bb b/recipes/gnome/libgnomeui_2.15.2.bb
index f080c16ccd..3cf274af7e 100644
--- a/recipes/gnome/libgnomeui_2.15.2.bb
+++ b/recipes/gnome/libgnomeui_2.15.2.bb
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 
 inherit gnome
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.16.1.bb b/recipes/gnome/libgnomeui_2.16.1.bb
index 16a26edb28..98d53751bb 100644
--- a/recipes/gnome/libgnomeui_2.16.1.bb
+++ b/recipes/gnome/libgnomeui_2.16.1.bb
@@ -14,7 +14,7 @@ inherit gnome
 FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
 FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libgnomeui_2.6.1.1.bb b/recipes/gnome/libgnomeui_2.6.1.1.bb
index 921554b8fb..dedfbbc448 100644
--- a/recipes/gnome/libgnomeui_2.6.1.1.bb
+++ b/recipes/gnome/libgnomeui_2.6.1.1.bb
@@ -11,7 +11,7 @@ FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
 
 inherit gnome
 
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch"
 
 EXTRA_OECONF = "--disable-gtk-doc"
 
diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb
index 8b768e53ef..eb8a909a23 100644
--- a/recipes/gnome/libproxy_0.2.3.bb
+++ b/recipes/gnome/libproxy_0.2.3.bb
@@ -5,7 +5,7 @@ DEPENDS = "libxmu gconf virtual/libx11"
 PR = "r1"
 
 SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
-	   file://libproxy-move-define-__USE_BSD.patch;patch=1 \
+	   file://libproxy-move-define-__USE_BSD.patch \
 	   "
 
 inherit autotools_stage
diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb
index f3396e92e3..d6028799aa 100644
--- a/recipes/gnome/metacity_2.30.0.bb
+++ b/recipes/gnome/metacity_2.30.0.bb
@@ -5,7 +5,7 @@ DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csourc
 
 inherit gnome update-alternatives
 
-SRC_URI += "file://crosscompile.patch;patch=1 "
+SRC_URI += "file://crosscompile.patch "
 
 SRC_URI[archive.md5sum] = "7c8a4c8f3b667efcc60f286adb445d4c"
 SRC_URI[archive.sha256sum] = "5c4e2af2216de022181f692f15427361a1dae3d30756ef89b97a11ff5bd50b22"
diff --git a/recipes/gnome/orbit2-native_2.10.2.bb b/recipes/gnome/orbit2-native_2.10.2.bb
index 492229316c..78448b6288 100644
--- a/recipes/gnome/orbit2-native_2.10.2.bb
+++ b/recipes/gnome/orbit2-native_2.10.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "CORBA ORB"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2-native_2.13.2.bb b/recipes/gnome/orbit2-native_2.13.2.bb
index 6ca618fbe6..aaf2b385a9 100644
--- a/recipes/gnome/orbit2-native_2.13.2.bb
+++ b/recipes/gnome/orbit2-native_2.13.2.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "CORBA ORB"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2-native_2.14.12.bb b/recipes/gnome/orbit2-native_2.14.12.bb
index a0b0189014..bf69e99dce 100644
--- a/recipes/gnome/orbit2-native_2.14.12.bb
+++ b/recipes/gnome/orbit2-native_2.14.12.bb
@@ -3,7 +3,7 @@ PR = "r0"
 LICENSE = "LGPL GPL"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl-native popt-native gtk-doc"
diff --git a/recipes/gnome/orbit2.inc b/recipes/gnome/orbit2.inc
index 42ade84d1f..157d8d9230 100644
--- a/recipes/gnome/orbit2.inc
+++ b/recipes/gnome/orbit2.inc
@@ -2,8 +2,8 @@ LICENSE = "GPL"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.14/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
-           file://pkgconfig-fix.patch;patch=1 \
+           file://configure-lossage.patch \
+           file://pkgconfig-fix.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/orbit2_2.10.2.bb b/recipes/gnome/orbit2_2.10.2.bb
index 012f5f4959..dbcbc501f7 100644
--- a/recipes/gnome/orbit2_2.10.2.bb
+++ b/recipes/gnome/orbit2_2.10.2.bb
@@ -3,7 +3,7 @@ PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.10/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/orbit2_2.13.2.bb b/recipes/gnome/orbit2_2.13.2.bb
index 5174ed488c..33f5e912c3 100644
--- a/recipes/gnome/orbit2_2.13.2.bb
+++ b/recipes/gnome/orbit2_2.13.2.bb
@@ -3,7 +3,7 @@ PR = "r2"
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/ORBit2/2.13/ORBit2-${PV}.tar.bz2 \
-           file://configure-lossage.patch;patch=1;pnum=1 \
+           file://configure-lossage.patch \
 	   file://gtk-doc.m4 \
 	   file://gtk-doc.make"
 DEPENDS = "libidl popt orbit2-native gtk-doc"
diff --git a/recipes/gnome/system-tools-backends_2.10.0.bb b/recipes/gnome/system-tools-backends_2.10.0.bb
index 393f971075..ca4d1024b8 100644
--- a/recipes/gnome/system-tools-backends_2.10.0.bb
+++ b/recipes/gnome/system-tools-backends_2.10.0.bb
@@ -14,7 +14,7 @@ SRC_URI += " \
            "
 
 SRC_URI_append_angstrom = " \
-            file://add-angstrom-distro.patch;patch=1 \
+            file://add-angstrom-distro.patch \
            "
 
 SRC_URI[archive.md5sum] = "01fd8fcfbe5f68492186404c96af915a"
diff --git a/recipes/gnome/system-tools-backends_2.6.1.bb b/recipes/gnome/system-tools-backends_2.6.1.bb
index 2fbc460df9..2bf4915c32 100644
--- a/recipes/gnome/system-tools-backends_2.6.1.bb
+++ b/recipes/gnome/system-tools-backends_2.6.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib glib-2.0 policykit"
 inherit gnome pkgconfig update-rc.d
 
 SRC_URI += " \
-            file://angstrom.patch;patch=1 \
+            file://angstrom.patch \
             file://system-tools-backends \
            "
 
diff --git a/recipes/gnome/system-tools-backends_2.8.1.bb b/recipes/gnome/system-tools-backends_2.8.1.bb
index 5f9a0cd22a..16bc05f260 100644
--- a/recipes/gnome/system-tools-backends_2.8.1.bb
+++ b/recipes/gnome/system-tools-backends_2.8.1.bb
@@ -6,7 +6,7 @@ DEPENDS = "dbus dbus-glib glib-2.0 policykit"
 inherit gnome pkgconfig update-rc.d
 
 SRC_URI += " \
-            file://angstrom.patch;patch=1 \
+            file://angstrom.patch \
             file://system-tools-backends \
            "
 
diff --git a/recipes/gnome/system-tools-backends_2.8.3.bb b/recipes/gnome/system-tools-backends_2.8.3.bb
index 68be130cbc..d924d81a46 100644
--- a/recipes/gnome/system-tools-backends_2.8.3.bb
+++ b/recipes/gnome/system-tools-backends_2.8.3.bb
@@ -16,7 +16,7 @@ SRC_URI += " \
            "
 
 SRC_URI_append_angstrom = " \
-            file://add-angstrom-distro.patch;patch=1 \
+            file://add-angstrom-distro.patch \
            "
 
 EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 "