summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/abiword
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-gnome/recipes-gnome/abiword
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome/recipes-gnome/abiword')
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword.inc34
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb6
2 files changed, 20 insertions, 20 deletions
diff --git a/meta-gnome/recipes-gnome/abiword/abiword.inc b/meta-gnome/recipes-gnome/abiword/abiword.inc
index 8fbcd3bb25..39c590c41e 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword.inc
@@ -20,15 +20,15 @@ CVSSRC = "${WORKDIR}/abi"
20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
21 21
22FILES_${PN} += " \ 22FILES_${PN} += " \
23 ${datadir}/icons/* \ 23 ${datadir}/icons/* \
24 ${datadir}/mime-info \ 24 ${datadir}/mime-info \
25 ${datadir}/abiword-${SHRT_VER}/glade \ 25 ${datadir}/abiword-${SHRT_VER}/glade \
26 ${datadir}/abiword-${SHRT_VER}/system.profile-en \ 26 ${datadir}/abiword-${SHRT_VER}/system.profile-en \
27 ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ 27 ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
28 " 28"
29 29
30# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ 30# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
31# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ 31# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
32 32
33inherit autotools pkgconfig 33inherit autotools pkgconfig
34 34
@@ -40,10 +40,10 @@ PARALLEL_MAKE = ""
40# --disable-exports options 40# --disable-exports options
41 41
42EXTRA_OECONF = " --enable-embedded=poky \ 42EXTRA_OECONF = " --enable-embedded=poky \
43 --disable-printing \ 43 --disable-printing \
44 --with-sys-wv \ 44 --with-sys-wv \
45 --disable-exports \ 45 --disable-exports \
46 --disable-spellcheck" 46 --disable-spellcheck"
47 47
48# TODO -- refactor this, so that instead of two strings and profiles 48# TODO -- refactor this, so that instead of two strings and profiles
49# packages we have lots of locale packages, each with a set of strings and 49# packages we have lots of locale packages, each with a set of strings and
@@ -51,14 +51,14 @@ EXTRA_OECONF = " --enable-embedded=poky \
51# 51#
52PACKAGES += " abiword-strings abiword-systemprofiles" 52PACKAGES += " abiword-strings abiword-systemprofiles"
53 53
54FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" 54FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
55FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" 55FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
56 56
57# AbiWord configure.ac does not play nicely with autoreconf 57# AbiWord configure.ac does not play nicely with autoreconf
58# so use the autogen.sh script that comes with AbiWord 58# so use the autogen.sh script that comes with AbiWord
59# 59#
60do_configure() { 60do_configure() {
61 cd ${S} 61 cd ${S}
62 export NOCONFIGURE="no"; ./autogen.sh 62 export NOCONFIGURE="no"; ./autogen.sh
63 oe_runconf 63 oe_runconf
64} 64}
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index a2cd1cc169..1aa88cbe3c 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -50,9 +50,9 @@ do_configure() {
50} 50}
51 51
52do_install_append() { 52do_install_append() {
53 install -d ${D}${datadir}/pixmaps/ 53 install -d ${D}${datadir}/pixmaps/
54 mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ 54 mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
55 rmdir ${D}${datadir}/icons 55 rmdir ${D}${datadir}/icons
56} 56}
57 57
58PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates " 58PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates "