diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-05-27 12:44:07 +0200 |
| commit | 293b05335ab540c4c8402e0a5caf2886b786a318 (patch) | |
| tree | 11e5a7c2dce338058f150e08d1ff47c9d4d8eccd /recipes/gtk+/gtk+_2.12.0.bb | |
| parent | 1ee2156592ba17f64f3c9b8970285a259730b871 (diff) | |
| parent | e9aacc4ce4784c91cb4908145b8fb7b3ec8aa6e0 (diff) | |
| download | openembedded-293b05335ab540c4c8402e0a5caf2886b786a318.tar.gz | |
Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010
Conflicts:
recipes/linux/linux-openmoko-devel_git.bb
recipes/openmoko-3rdparty/pisi_0.5.2.bb
recipes/openmoko-3rdparty/pisi_0.5.3.bb
recipes/openmoko-3rdparty/pisi_0.5.bb
recipes/uclibc/uclibc_nptl.bb
Diffstat (limited to 'recipes/gtk+/gtk+_2.12.0.bb')
| -rw-r--r-- | recipes/gtk+/gtk+_2.12.0.bb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/recipes/gtk+/gtk+_2.12.0.bb b/recipes/gtk+/gtk+_2.12.0.bb index fb246eee10..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;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 \ + file://cellrenderer-cairo.patch;striplevel=0 \ + file://entry-cairo.patch;striplevel=0 \ + file://scrolled-placement.patch;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 \ +# file://combo-arrow-size.patch;striplevel=0 \ # die die die -# file://pangoxft2.10.6.diff;patch=1" +# file://pangoxft2.10.6.diff" EXTRA_OECONF = "--with-libtiff --disable-xkb --disable-glibtest --enable-display-migration" |