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

6 files changed, 11 insertions, 11 deletions

diff --git a/recipes/xfce-base/exo_0.3.105.bb b/recipes/xfce-base/exo_0.3.105.bb
index 9f766caf94..eedbe10acb 100644
--- a/recipes/xfce-base/exo_0.3.105.bb
+++ b/recipes/xfce-base/exo_0.3.105.bb
@@ -8,9 +8,9 @@ inherit xfce46 python-dir
 XFCE_VERSION = "4.6.1"
 
 SRC_URI += " \
-    file://exo-0.3.105-iocharset.patch;patch=1 \
-    file://exo-no-tests.patch;patch=1 \
-    file://configure.patch;patch=1 \
+    file://exo-0.3.105-iocharset.patch \
+    file://exo-no-tests.patch \
+    file://configure.patch \
 "
 
 # Note: Python checking is broken
diff --git a/recipes/xfce-base/exo_0.3.4.bb b/recipes/xfce-base/exo_0.3.4.bb
index 53f489df74..f48c9bb069 100644
--- a/recipes/xfce-base/exo_0.3.4.bb
+++ b/recipes/xfce-base/exo_0.3.4.bb
@@ -5,8 +5,8 @@ PR = "r1"
 inherit xfce
 XFCE_VERSION = 4.4.2
 
-SRC_URI += " file://configure.patch;patch=1"
-SRC_URI += " file://exo-no-tests.patch;patch=1"
+SRC_URI += " file://configure.patch"
+SRC_URI += " file://exo-no-tests.patch"
 
 # Note: Python checking is broken
 do_configure_prepend() {
diff --git a/recipes/xfce-base/xfce-terminal_0.2.8.bb b/recipes/xfce-base/xfce-terminal_0.2.8.bb
index 0f672594e4..1a23241cfe 100644
--- a/recipes/xfce-base/xfce-terminal_0.2.8.bb
+++ b/recipes/xfce-base/xfce-terminal_0.2.8.bb
@@ -6,7 +6,7 @@ PR = "r2"
 inherit xfce
 
 SRC_URI = "http://www.us.xfce.org/archive/xfce-4.4.2/src/Terminal-${PV}.tar.bz2 \
-           file://into-support.patch;patch=1"
+           file://into-support.patch"
 
 S = "${WORKDIR}/Terminal-${PV}"
 
diff --git a/recipes/xfce-base/xfce4-settings_4.6.1.bb b/recipes/xfce-base/xfce4-settings_4.6.1.bb
index 529d0cbdcb..7ac82cf1d4 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.1.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.1.bb
@@ -11,8 +11,8 @@ PR = "r2"
 inherit xfce46
 
 SRC_URI += " \
-    file://xfce4-settings-4.6.1-libxklavier.patch;patch=1 \
-    file://xfce4-settings-4.6.1-configure.patch;patch=1 \
+    file://xfce4-settings-4.6.1-libxklavier.patch \
+    file://xfce4-settings-4.6.1-configure.patch \
 "
 
 SRC_URI[md5sum] = "dc1c8704471c5b0104fa10c30eb60cb6"
diff --git a/recipes/xfce-base/xfce4-settings_4.6.4.bb b/recipes/xfce-base/xfce4-settings_4.6.4.bb
index c3b0f06b01..121098896d 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.4.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.4.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util"
 
 inherit xfce46
 
-SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch;patch=1" 
+SRC_URI += "file://0001-Port-to-libxklavier-5.0-API.patch" 
 
 SRC_URI[archive.md5sum] = "04985407e8e5b916c44780314a177e96"
 SRC_URI[archive.sha256sum] = "a5e3f0d959b0d424355414769250473785043c3977446a73b36fa3a5ce44ecdb"
diff --git a/recipes/xfce-base/xfdesktop_4.4.2.bb b/recipes/xfce-base/xfdesktop_4.4.2.bb
index 3238e49c03..201f2e38c2 100644
--- a/recipes/xfce-base/xfdesktop_4.4.2.bb
+++ b/recipes/xfce-base/xfdesktop_4.4.2.bb
@@ -9,8 +9,8 @@ PR = "r2"
 
 inherit xfce
 
-SRC_URI += " file://relocation-and-memleak.patch;patch=1 \
-             file://fix-segfault-when-removable-icons-are-disabled.patch;patch=1"
+SRC_URI += " file://relocation-and-memleak.patch \
+             file://fix-segfault-when-removable-icons-are-disabled.patch"
 
 PACKAGES += "xfdesktop-backdrops ${PN}-mcs-plugins"