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/gtk+/gdk-pixbuf-csource-native_2.12.11.bb | 2 +- recipes/gtk+/gdk-pixbuf_2.10.14.bb | 2 +- recipes/gtk+/gtk+-1.2_1.2.10.bb | 2 +- recipes/gtk+/gtk+-fastscaling_2.10.14.bb | 2 +- recipes/gtk+/gtk+.inc | 8 ++-- recipes/gtk+/gtk+_2.10.14.bb | 42 +++++++++--------- recipes/gtk+/gtk+_2.12.0.bb | 14 +++--- recipes/gtk+/gtk+_2.12.11.bb | 12 +++--- recipes/gtk+/gtk+_2.12.3.bb | 12 +++--- recipes/gtk+/gtk+_2.14.2.bb | 2 +- recipes/gtk+/gtk+_2.18.6.bb | 2 +- recipes/gtk+/gtk+_2.20.0.bb | 2 +- recipes/gtk+/gtk+_2.6.10.bb | 52 +++++++++++------------ recipes/gtk+/gtk+_2.8.16.bb | 28 ++++++------ recipes/gtk+/gtk+_2.8.9.bb | 26 ++++++------ 15 files changed, 104 insertions(+), 104 deletions(-) (limited to 'recipes/gtk+') 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 6ad8328224..86ae530c6a 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;apply=yes" +SRC_URI += "file://reduce-dependencies.patch" #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 2df8d5b9eb..8aa57e9164 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;apply=yes \ + file://automake-lossage.patch \ " 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 9838338d8d..0ec1508d00 100644 --- a/recipes/gtk+/gtk+-1.2_1.2.10.bb +++ b/recipes/gtk+/gtk+-1.2_1.2.10.bb @@ -7,7 +7,7 @@ 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;apply=yes \ + file://timezone-fix.patch \ file://gtk+1.2-reconf-fix;apply=yes \ file://no-xwc;apply=yes" S = "${WORKDIR}/gtk+-${PV}" diff --git a/recipes/gtk+/gtk+-fastscaling_2.10.14.bb b/recipes/gtk+/gtk+-fastscaling_2.10.14.bb index 3a479701d3..d2b3347d82 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;apply=yes" +SRC_URI += "file://lower-quality-scaling-in-pixbuf-engine.patch" S = "${WORKDIR}/gtk+-${PV}" diff --git a/recipes/gtk+/gtk+.inc b/recipes/gtk+/gtk+.inc index 3ad071b9aa..bb74d785de 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;apply=yes \ - file://run-iconcache.patch;apply=yes \ - file://toggle-font.diff;apply=yes;striplevel=0 \ - file://xsettings.patch;apply=yes \ + file://hardcoded_libtool.patch \ + file://run-iconcache.patch \ + file://toggle-font.diff;striplevel=0 \ + file://xsettings.patch \ " INC_PR = "r8" diff --git a/recipes/gtk+/gtk+_2.10.14.bb b/recipes/gtk+/gtk+_2.10.14.bb index 9c81f03917..473de5ad1d 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;apply=yes \ - file://automake-lossage.patch;apply=yes \ - file://disable-tooltips.patch;apply=yes \ + file://no-xwc.patch \ + file://automake-lossage.patch \ + file://disable-tooltips.patch \ 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 \ + file://menu-deactivate.patch \ + file://xsettings.patch \ + file://scroll-timings.patch \ + file://small-gtkfilesel.patch \ + file://small-gtkfilechooser.patch \ +# file://migration.patch;striplevel=0 \ + file://run-iconcache.patch \ + file://hardcoded_libtool.patch \ + file://no-demos.patch \ + file://single-click.patch \ + file://spinbutton.patch \ + file://gtk+-handhelds.patch \ + file://filesel-fix-segfault.patch \ + file://combo-arrow-size.patch;striplevel=0 \ + file://range-no-redraw.patch;striplevel=0 \ + file://scrolled-placement.patch;striplevel=0 \ + file://treeview-checkbox-size.patch;striplevel=0 \ + file://cell-renderer-edit-focus.patch;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 9ea77f3f45..664ed7ece1 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;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" +SRC_URI += "file://disable-print.patch \ + file://cellrenderer-cairo.patch;striplevel=0 \ + file://entry-cairo.patch;striplevel=0 \ + file://scrolled-placement.patch;striplevel=0" # temporary # file://gtklabel-resize-patch;apply=yes \ -# file://menu-deactivate.patch;apply=yes \ -# file://combo-arrow-size.patch;apply=yes;striplevel=0 \ +# file://menu-deactivate.patch \ +# file://combo-arrow-size.patch;striplevel=0 \ # die die die -# file://pangoxft2.10.6.diff;apply=yes" +# file://pangoxft2.10.6.diff" 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 7d4dd8b9d1..bf5a41f676 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;apply=yes;striplevel=0 \ - file://entry-cairo.patch;apply=yes;striplevel=0 \ - file://scrolled-placement.patch;apply=yes;striplevel=0" +SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \ + file://entry-cairo.patch;striplevel=0 \ + file://scrolled-placement.patch;striplevel=0" # temporary # file://gtklabel-resize-patch;apply=yes \ -# file://menu-deactivate.patch;apply=yes \ -# file://combo-arrow-size.patch;apply=yes;striplevel=0 \ +# file://menu-deactivate.patch \ +# file://combo-arrow-size.patch;striplevel=0 \ # die die die -# file://pangoxft2.10.6.diff;apply=yes" +# file://pangoxft2.10.6.diff" 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 c22769fff0..53b0bb8ecc 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;apply=yes;striplevel=0 \ - file://entry-cairo.patch;apply=yes;striplevel=0 \ - file://scrolled-placement.patch;apply=yes;striplevel=0" +SRC_URI += "file://cellrenderer-cairo.patch;striplevel=0 \ + file://entry-cairo.patch;striplevel=0 \ + file://scrolled-placement.patch;striplevel=0" # temporary # file://gtklabel-resize-patch;apply=yes \ -# file://menu-deactivate.patch;apply=yes \ -# file://combo-arrow-size.patch;apply=yes;striplevel=0 \ +# file://menu-deactivate.patch \ +# file://combo-arrow-size.patch;striplevel=0 \ # die die die -# file://pangoxft2.10.6.diff;apply=yes" +# file://pangoxft2.10.6.diff" 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 7886f9ae96..cb0d3f7efa 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;apply=yes \ +SRC_URI += "file://smallscreen_filechooser.patch \ " 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 259b8ee4fd..237689dcf6 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;apply=yes \ +SRC_URI_append_virtclass-native = " file://no-demos.patch \ " PR = "${INC_PR}.4" diff --git a/recipes/gtk+/gtk+_2.20.0.bb b/recipes/gtk+/gtk+_2.20.0.bb index f6b31a8f34..68bf212a6b 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;apply=yes \ +SRC_URI_append_virtclass-native = " file://no-demos.patch \ " SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6" diff --git a/recipes/gtk+/gtk+_2.6.10.bb b/recipes/gtk+/gtk+_2.6.10.bb index 359705bdc6..45eaf30fa0 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;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://help.patch \ + file://no-demos.patch \ + file://no-xwc.patch \ + file://automake-lossage.patch \ + file://gtk+-handhelds.patch \ + file://spinbutton.patch \ + file://hardcoded_libtool.patch \ + file://disable-tooltips.patch \ 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 \ + file://menu-deactivate.patch \ + file://xsettings.patch \ + file://scroll-timings.patch \ + file://small-gtkfilesel.patch \ + file://migration.patch;striplevel=0 \ + file://single-click.patch \ + file://menu-styling.patch \ + file://compile-against-newer-glib.patch \ + file://gtk.keynav.gtkcombobox.patch;striplevel=0 \ + file://gtk.keynav.gtkentry.patch;striplevel=0 \ + file://gtk.keynav.gtkiconview.patch;striplevel=0 \ + file://gtk.keynav.gtkradiobutton.patch;striplevel=0 \ + file://gtk.keynav.gtksettings.patch;striplevel=0 \ + file://gtk.keynav.gtktextview.patch;striplevel=0 \ + file://gtk.keynav.gtktreeview.patch;striplevel=0 \ + file://gtk.keynav.gtkwidget.patch;striplevel=0 \ + file://gtk+-2.6.10-bg.patch \ + file://filesel-fix-segfault.patch \ " inherit autotools pkgconfig diff --git a/recipes/gtk+/gtk+_2.8.16.bb b/recipes/gtk+/gtk+_2.8.16.bb index c5897645d7..f1141bebef 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;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://no-xwc.patch \ + file://automake-lossage.patch \ + file://spinbutton.patch \ + file://hardcoded_libtool.patch \ + file://disable-tooltips.patch \ 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" + file://gtktreeview-316689.patch \ + file://menu-deactivate.patch \ + file://xsettings.patch \ + file://scroll-timings.patch \ + file://small-gtkfilesel.patch \ + file://migration.patch;striplevel=0 \ + file://no-demos.patch \ + file://gtk+-handhelds.patch \ + file://single-click.patch" inherit autotools pkgconfig diff --git a/recipes/gtk+/gtk+_2.8.9.bb b/recipes/gtk+/gtk+_2.8.9.bb index c2250ab1d5..224702e943 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;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://no-xwc.patch \ + file://automake-lossage.patch \ + file://spinbutton.patch \ + file://hardcoded_libtool.patch \ + file://disable-tooltips.patch \ 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" + file://menu-deactivate.patch \ + file://xsettings.patch \ + file://scroll-timings.patch \ + file://small-gtkfilesel.patch \ + file://migration.patch;striplevel=0 \ + file://no-demos.patch \ + file://gtk+-handhelds.patch \ + file://single-click.patch" inherit autotools pkgconfig -- cgit 1.2.3-korg