From 6fe7cef27069415f2eba36bc640cf59013d4979b Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Mon, 24 May 2010 13:01:00 -0700 Subject: Make the do_patch apply=yes param implicit if extension is .diff/.patch For .diff/.patch you need to apply manually, you can specify apply=no. Signed-off-by: Chris Larson Acked-by: Denys Dmytriyenko Acked-by: Khem Raj --- recipes/abiword/abiword-plugins_2.4.6.bb | 2 +- recipes/abiword/abiword-plugins_2.6.0.bb | 2 +- recipes/abiword/abiword-plugins_2.6.4.bb | 2 +- recipes/abiword/abiword-plugins_2.6.8.bb | 2 +- recipes/abiword/abiword_2.8.1.bb | 2 +- recipes/abiword/abiword_2.8.2.bb | 2 +- recipes/abiword/abiword_2.8.3.bb | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'recipes/abiword') diff --git a/recipes/abiword/abiword-plugins_2.4.6.bb b/recipes/abiword/abiword-plugins_2.4.6.bb index 79354500c6..372eb8f685 100644 --- a/recipes/abiword/abiword-plugins_2.4.6.bb +++ b/recipes/abiword/abiword-plugins_2.4.6.bb @@ -8,7 +8,7 @@ RDEPENDS = "abiword" PR = "r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ - file://abiword-plugin-pdf-poppler.patch;apply=yes;striplevel=2" + file://abiword-plugin-pdf-poppler.patch;striplevel=2" S = "${WORKDIR}/abiword-${PV}/abiword-plugins" inherit autotools diff --git a/recipes/abiword/abiword-plugins_2.6.0.bb b/recipes/abiword/abiword-plugins_2.6.0.bb index 640ddcfd1f..8209b42769 100644 --- a/recipes/abiword/abiword-plugins_2.6.0.bb +++ b/recipes/abiword/abiword-plugins_2.6.0.bb @@ -7,7 +7,7 @@ RDEPENDS = "abiword" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ - file://abiword-cxx-for-ld-fix.patch;apply=yes \ + file://abiword-cxx-for-ld-fix.patch \ " DEFAULT_PREFERENCE = "2" diff --git a/recipes/abiword/abiword-plugins_2.6.4.bb b/recipes/abiword/abiword-plugins_2.6.4.bb index ac309a7cab..03df1f7764 100644 --- a/recipes/abiword/abiword-plugins_2.6.4.bb +++ b/recipes/abiword/abiword-plugins_2.6.4.bb @@ -9,7 +9,7 @@ PR = "r1" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ -# file://abiword-cxx-for-ld-fix.patch;apply=yes \ +# file://abiword-cxx-for-ld-fix.patch \ " DEFAULT_PREFERENCE = "2" diff --git a/recipes/abiword/abiword-plugins_2.6.8.bb b/recipes/abiword/abiword-plugins_2.6.8.bb index 06b43a9b2d..af886903ab 100644 --- a/recipes/abiword/abiword-plugins_2.6.8.bb +++ b/recipes/abiword/abiword-plugins_2.6.8.bb @@ -8,7 +8,7 @@ RDEPENDS = "abiword" SRC_URI = "http://www.abiword.org/downloads/abiword/${PV}/source/abiword-plugins-${PV}.tar.gz;name=plugins \ http://www.abiword.org/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=archive \ -# file://abiword-cxx-for-ld-fix.patch;apply=yes \ +# file://abiword-cxx-for-ld-fix.patch \ " DEFAULT_PREFERENCE = "2" diff --git a/recipes/abiword/abiword_2.8.1.bb b/recipes/abiword/abiword_2.8.1.bb index 06d584e7ac..96bc03c17e 100644 --- a/recipes/abiword/abiword_2.8.1.bb +++ b/recipes/abiword/abiword_2.8.1.bb @@ -4,7 +4,7 @@ PR = "r5" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz \ file://autogen-common.sh \ - file://nodolt.patch;apply=yes" + file://nodolt.patch" do_configure() { autotools_do_configure diff --git a/recipes/abiword/abiword_2.8.2.bb b/recipes/abiword/abiword_2.8.2.bb index 8a4f8ad62e..7352f18e4a 100644 --- a/recipes/abiword/abiword_2.8.2.bb +++ b/recipes/abiword/abiword_2.8.2.bb @@ -4,7 +4,7 @@ RCONFLICTS_${PN} = "abiword-embedded" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ file://autogen-common.sh \ - file://nodolt.patch;apply=yes" + file://nodolt.patch" SRC_URI[abiword.md5sum] = "b44ffbebd5bd0f5f98f34dc8c688b4ed" SRC_URI[abiword.sha256sum] = "cb668f47649a8ed40dbaedb22383794d07b8349549a392fed57814120803db9c" diff --git a/recipes/abiword/abiword_2.8.3.bb b/recipes/abiword/abiword_2.8.3.bb index 542ea30d6e..248fbbf610 100644 --- a/recipes/abiword/abiword_2.8.3.bb +++ b/recipes/abiword/abiword_2.8.3.bb @@ -6,7 +6,7 @@ PR = "r2" SRC_URI = "http://www.abisource.com/downloads/abiword/${PV}/source/abiword-${PV}.tar.gz;name=abiword \ file://autogen-common.sh \ - file://nodolt.patch;apply=yes" + file://nodolt.patch" SRC_URI[abiword.md5sum] = "8984b09663e1514ca0e361b0627ea285" SRC_URI[abiword.sha256sum] = "b74f7ba5852e6225dd1fb52be266eaa33149fb24210b33b5d8d0f37273e0e3cb" -- cgit 1.2.3-korg