diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-13 22:49:41 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-04-15 16:23:17 +0200 |
commit | a45830a39bb47a9eab27980d52966226c9504ea4 (patch) | |
tree | 001209d9740e8668b2eeeac4212b3561aecebf29 /meta-efl/recipes-efl | |
parent | 6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff) | |
download | meta-openembedded-contrib-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-efl/recipes-efl')
57 files changed, 289 insertions, 289 deletions
diff --git a/meta-efl/recipes-efl/e17/e-tasks_git.bb b/meta-efl/recipes-efl/e17/e-tasks_git.bb index dea6f03a737..29dec4f9f43 100644 --- a/meta-efl/recipes-efl/e17/e-tasks_git.bb +++ b/meta-efl/recipes-efl/e17/e-tasks_git.bb @@ -17,16 +17,16 @@ SRC_URI = "git://github.com/shr-project/e-tasks.git;protocol=git;branch=master \ S = "${WORKDIR}/git" do_install_append() { - install -d "${D}/${datadir}/pixmaps" - install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps" - install -d "${D}/${datadir}/applications" - install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications" - install -d "${D}/${datadir}/e-tasks" - for ico in "${S}/resources/"*.png; do - if [ "$(basename $ico)" != "e-tasks.png" ]; then - install -m 0644 $ico "${D}/${datadir}/e-tasks" - fi - done + install -d "${D}/${datadir}/pixmaps" + install -m 0644 "${S}/resources/e-tasks.png" "${D}/${datadir}/pixmaps" + install -d "${D}/${datadir}/applications" + install -m 0644 "${S}/resources/e-tasks.desktop" "${D}/${datadir}/applications" + install -d "${D}/${datadir}/e-tasks" + for ico in "${S}/resources/"*.png; do + if [ "$(basename $ico)" != "e-tasks.png" ]; then + install -m 0644 $ico "${D}/${datadir}/e-tasks" + fi + done } FILES_${PN} += "/usr/share/e-tasks/* /usr/share/applications/* /usr/share/pixmaps/*" diff --git a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb b/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb index f826e10697a..af32a355a41 100644 --- a/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm-theme-b-and-w_svn.bb @@ -18,14 +18,14 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http" S = "${WORKDIR}/${SRCNAME}/e" do_compile() { - # unfortunately hardcoded edje_cc in Makefile - sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile - make + # unfortunately hardcoded edje_cc in Makefile + sed -i "s#\tedje_cc#\t${STAGING_BINDIR_NATIVE}/edje_cc#g" Makefile + make } do_install() { - install -d ${D}${datadir}/enlightenment/data/themes/ - install -m 0644 ${S}/b_and_w.edj ${D}${datadir}/enlightenment/data/themes/ + install -d ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/b_and_w.edj ${D}${datadir}/enlightenment/data/themes/ } FILES_${PN} = "${datadir}/enlightenment/data/themes/" diff --git a/meta-efl/recipes-efl/e17/e-wm.inc b/meta-efl/recipes-efl/e17/e-wm.inc index 61c21d4ab27..78fbd9544d1 100644 --- a/meta-efl/recipes-efl/e17/e-wm.inc +++ b/meta-efl/recipes-efl/e17/e-wm.inc @@ -9,11 +9,11 @@ inherit e update-alternatives gettext S = "${WORKDIR}/${SRCNAME}" EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ " do_configure_prepend() { @@ -52,16 +52,16 @@ do_install_append() { } RDEPENDS_${PN} += "\ - shared-mime-info \ - mime-support \ - setxkbmap \ - edje-utils \ - ${PN}-utils \ - dbus-x11 \ - evas-loader-png \ - evas-loader-jpeg \ - evas-loader-gif \ - evas-generic-loader-svg \ + shared-mime-info \ + mime-support \ + setxkbmap \ + edje-utils \ + ${PN}-utils \ + dbus-x11 \ + evas-loader-png \ + evas-loader-jpeg \ + evas-loader-gif \ + evas-generic-loader-svg \ " # Uclibc build don't have 'glibc-utils' @@ -75,57 +75,57 @@ RCONFLICTS_${PN}-config-mobile = "${PN}-config-illume2" RPROVIDES_${PN}-config-mobile = "${PN}-config-illume2" PACKAGES =+ "\ - ${PN}-config-default \ - ${PN}-config-mobile \ - ${PN}-config-minimalist \ - ${PN}-config-netbook \ - ${PN}-config-scaleable \ - ${PN}-config-standard \ - ${PN}-theme-default \ - ${PN}-background-dark-gradient \ - ${PN}-background-light-gradient \ - ${PN}-backgrounds \ - ${PN}-images \ - ${PN}-icons \ - ${PN}-other \ - ${PN}-input-methods \ - ${PN}-sysactions \ - ${PN}-utils \ - ${PN}-menu \ - efm-desktop-icon \ - illume-keyboard-default-alpha \ - illume-keyboard-default-numeric \ - illume-keyboard-default-terminal \ + ${PN}-config-default \ + ${PN}-config-mobile \ + ${PN}-config-minimalist \ + ${PN}-config-netbook \ + ${PN}-config-scaleable \ + ${PN}-config-standard \ + ${PN}-theme-default \ + ${PN}-background-dark-gradient \ + ${PN}-background-light-gradient \ + ${PN}-backgrounds \ + ${PN}-images \ + ${PN}-icons \ + ${PN}-other \ + ${PN}-input-methods \ + ${PN}-sysactions \ + ${PN}-utils \ + ${PN}-menu \ + efm-desktop-icon \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ " ESYSACTIONS ?= "${PN}-sysactions" RRECOMMENDS_${PN} = "\ - ${PN}-config-default \ - ${PN}-images \ - ${PN}-icons \ - ${PN}-other \ - ${PN}-input-methods \ - ${ESYSACTIONS} \ + ${PN}-config-default \ + ${PN}-images \ + ${PN}-icons \ + ${PN}-other \ + ${PN}-input-methods \ + ${ESYSACTIONS} \ " FILES_${PN} = "\ - ${bindir}/* \ - ${libdir}/enlightenment/utils/* \ - ${libdir}/enlightenment/modules/*/*.* \ - ${libdir}/enlightenment/modules/*/*/* \ - ${libdir}/enlightenment/modules/*/*/.order \ - ${libdir}/enlightenment/modules/keyboards/ignore_built_in_keyboards \ - ${libdir}/enlightenment/*plugins/*/*/* \ - ${libdir}/enlightenment/preload/e_precache.so \ - ${datadir}/enlightenment/data/icons \ - ${datadir}/enlightenment/data/favorites \ - ${datadir}/enlightenment/data/input_methods \ - ${datadir}/enlightenment/data/config/profile.cfg \ - ${datadir}/enlightenment/AUTHORS \ - ${datadir}/enlightenment/COPYING \ - ${datadir}/xsessions/enlightenment.desktop \ - ${sysconfdir}/xdg \ + ${bindir}/* \ + ${libdir}/enlightenment/utils/* \ + ${libdir}/enlightenment/modules/*/*.* \ + ${libdir}/enlightenment/modules/*/*/* \ + ${libdir}/enlightenment/modules/*/*/.order \ + ${libdir}/enlightenment/modules/keyboards/ignore_built_in_keyboards \ + ${libdir}/enlightenment/*plugins/*/*/* \ + ${libdir}/enlightenment/preload/e_precache.so \ + ${datadir}/enlightenment/data/icons \ + ${datadir}/enlightenment/data/favorites \ + ${datadir}/enlightenment/data/input_methods \ + ${datadir}/enlightenment/data/config/profile.cfg \ + ${datadir}/enlightenment/AUTHORS \ + ${datadir}/enlightenment/COPYING \ + ${datadir}/xsessions/enlightenment.desktop \ + ${sysconfdir}/xdg \ " FILES_${PN}-config-default = "${datadir}/enlightenment/data/config/default" @@ -148,53 +148,53 @@ FILES_${PN}-utils = "${libdir}/enlightenment/utils/*" FILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" FILES_efm-desktop-icon = "\ - ${datadir}/applications/efm.desktop \ - ${datadir}/applications/enlightenment_filemanager.desktop \ - ${datadir}/icons/e-module-fileman.png \ + ${datadir}/applications/efm.desktop \ + ${datadir}/applications/enlightenment_filemanager.desktop \ + ${datadir}/icons/e-module-fileman.png \ " KEYBOARDS_DIR="${libdir}/enlightenment/modules/illume-keyboard/keyboards" FILES_illume-keyboard-default-alpha = "\ - ${KEYBOARDS_DIR}/Default.kbd \ - ${KEYBOARDS_DIR}/alpha.png \ + ${KEYBOARDS_DIR}/Default.kbd \ + ${KEYBOARDS_DIR}/alpha.png \ " FILES_illume-keyboard-default-numeric = "\ - ${KEYBOARDS_DIR}/Numbers.kbd \ - ${KEYBOARDS_DIR}/numeric.png \ + ${KEYBOARDS_DIR}/Numbers.kbd \ + ${KEYBOARDS_DIR}/numeric.png \ " FILES_illume-keyboard-default-terminal = "\ - ${KEYBOARDS_DIR}/Terminal.kbd \ - ${KEYBOARDS_DIR}/qwerty.png \ + ${KEYBOARDS_DIR}/Terminal.kbd \ + ${KEYBOARDS_DIR}/qwerty.png \ " RRECOMMENDS_${PN}-config-default = "${PN}-theme-default" RRECOMMENDS_${PN}-config-mobile = "\ - illume-keyboard-default-alpha \ - illume-keyboard-default-numeric \ - illume-keyboard-default-terminal \ + illume-keyboard-default-alpha \ + illume-keyboard-default-numeric \ + illume-keyboard-default-terminal \ " RRECOMMENDS_${PN}-config-minimalist = "\ - ${PN}-background-light-gradient \ - ${PN}-theme-default \ + ${PN}-background-light-gradient \ + ${PN}-theme-default \ " RRECOMMENDS_${PN}-config-netbook = "\ - ${PN}-background-dark-gradient \ - ${PN}-theme-default \ + ${PN}-background-dark-gradient \ + ${PN}-theme-default \ " RRECOMMENDS_${PN}-config-scaleable = "${PN}-theme-default" RRECOMMENDS_${PN}-config-standard = "${PN}-theme-default" FILES_${PN}-dbg += "\ - ${libdir}/enlightenment/modules/*/*/.debug/ \ - ${libdir}/enlightenment/modules/policies/.debug/ \ - ${libdir}/enlightenment/preload/.debug/ \ - ${libdir}/enlightenment/utils/.debug/ \ - ${libdir}/enlightenment/*plugins/*/*/.debug \ + ${libdir}/enlightenment/modules/*/*/.debug/ \ + ${libdir}/enlightenment/modules/policies/.debug/ \ + ${libdir}/enlightenment/preload/.debug/ \ + ${libdir}/enlightenment/utils/.debug/ \ + ${libdir}/enlightenment/*plugins/*/*/.debug \ " FILES_${PN}-doc += "\ - ${datadir}/enlightenment/doc \ + ${datadir}/enlightenment/doc \ " CONFFILES_${PN}-menu = "${sysconfdir}/xdg/menus/applications.menu" diff --git a/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb b/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb index ebd5900f953..228c12283a8 100644 --- a/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb +++ b/meta-efl/recipes-efl/e17/e-wm_0.17.2.1.bb @@ -7,9 +7,9 @@ SRCNAME = "enlightenment" S = "${WORKDIR}/${SRCNAME}-${PV}" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ - file://enlightenment_start.oe \ - file://applications.menu \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + file://enlightenment_start.oe \ + file://applications.menu \ " SRC_URI[md5sum] = "e78018ba7a4622efbcbebd6d093b7fa4" diff --git a/meta-efl/recipes-efl/e17/e-wm_svn.bb b/meta-efl/recipes-efl/e17/e-wm_svn.bb index 22eb821f779..fc03ff3e368 100644 --- a/meta-efl/recipes-efl/e17/e-wm_svn.bb +++ b/meta-efl/recipes-efl/e17/e-wm_svn.bb @@ -10,7 +10,7 @@ SRCREV = "${EFL_SRCREV}" S = "${WORKDIR}/${SRCNAME}" SRC_URI = "\ - ${E_SVN}/trunk;module=${SRCNAME};protocol=http \ - file://enlightenment_start.oe \ - file://applications.menu \ + ${E_SVN}/trunk;module=${SRCNAME};protocol=http \ + file://enlightenment_start.oe \ + file://applications.menu \ " diff --git a/meta-efl/recipes-efl/e17/elmdentica_svn.bb b/meta-efl/recipes-efl/e17/elmdentica_svn.bb index f3bf939eb48..543b9b70420 100644 --- a/meta-efl/recipes-efl/e17/elmdentica_svn.bb +++ b/meta-efl/recipes-efl/e17/elmdentica_svn.bb @@ -19,5 +19,5 @@ SRCREV = "${EFL_SRCREV}" RDEPENDS_${PN} = "${PN}-themes" do_configure_prepend() { - autopoint --force + autopoint --force } diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb index 5137c4edc4e..bdbe471e53a 100644 --- a/meta-efl/recipes-efl/e17/enjoy_svn.bb +++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb @@ -18,12 +18,12 @@ RDEPENDS_${PN} += "\ gst-plugins-base-ogg gst-plugins-base-ivorbisdec \ gst-plugins-good-flac \ lightmediascanner-test \ - " +" inherit e gettext SRC_URI = " \ - ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ - file://0001-always-use-position-as-percent-and-define-a-1-second.patch \ + ${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep \ + file://0001-always-use-position-as-percent-and-define-a-1-second.patch \ " S = "${WORKDIR}/${SRCNAME}" @@ -32,11 +32,11 @@ PR = "r1" FILES_${PN} += "${datadir}/icons/" EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ " do_configure_prepend() { - autopoint || touch config.rpath + autopoint || touch config.rpath } pkg_postinst_${PN} () { diff --git a/meta-efl/recipes-efl/e17/eve_svn.bb b/meta-efl/recipes-efl/e17/eve_svn.bb index 9f4b93b88ef..128bd1ab00d 100644 --- a/meta-efl/recipes-efl/e17/eve_svn.bb +++ b/meta-efl/recipes-efl/e17/eve_svn.bb @@ -10,16 +10,16 @@ SRC_URI = "${E_SVN}/trunk;module=${SRCNAME};protocol=http;scmdata=keep" S = "${WORKDIR}/${SRCNAME}" do_configure_prepend() { - autopoint || touch config.rpath + autopoint || touch config.rpath } SRC_URI += "file://eve-theme-for-smaller-screens.patch \ " EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ " FILES_${PN} += "\ - ${datadir}/icons/eve.png \ + ${datadir}/icons/eve.png \ " diff --git a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb index 9037f688b37..5948e20731f 100644 --- a/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb +++ b/meta-efl/recipes-efl/e17/exquisite-theme-illume.bb @@ -21,7 +21,7 @@ SRC_URI = "${E_SVN}/trunk/THEMES;module=${SRCNAME};protocol=http \ S = "${WORKDIR}/${SRCNAME}" do_compile() { - ${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj + ${STAGING_BINDIR_NATIVE}/edje_cc exquisite.edc illume.edj } do_install() { diff --git a/meta-efl/recipes-efl/e17/exquisite_svn.bb b/meta-efl/recipes-efl/e17/exquisite_svn.bb index 62453b8295f..7dfb8e41eae 100644 --- a/meta-efl/recipes-efl/e17/exquisite_svn.bb +++ b/meta-efl/recipes-efl/e17/exquisite_svn.bb @@ -21,18 +21,18 @@ SRC_URI += "file://splashfuncs" inherit update-rc.d do_install_prepend() { - install -d ${D}/mnt/.splash/ - install -d ${D}${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite - install -d ${D}${sysconfdir}/default - install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs - install -d ${D}${bindir} - ln -s exquisite-write ${D}${bindir}/splash-write + install -d ${D}/mnt/.splash/ + install -d ${D}${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/exquisite-init ${D}${sysconfdir}/init.d/exquisite + install -d ${D}${sysconfdir}/default + install -m 0755 ${WORKDIR}/splashfuncs ${D}${sysconfdir}/default/splashfuncs + install -d ${D}${bindir} + ln -s exquisite-write ${D}${bindir}/splash-write } do_install_append() { - rm -rf ${D}${datadir}/exquisite/data/fonts/* + rm -rf ${D}${datadir}/exquisite/data/fonts/* } INITSCRIPT_NAME = "exquisite" diff --git a/meta-efl/recipes-efl/e17/terminology.inc b/meta-efl/recipes-efl/e17/terminology.inc index 15af6ea50ea..00b8f834ac1 100644 --- a/meta-efl/recipes-efl/e17/terminology.inc +++ b/meta-efl/recipes-efl/e17/terminology.inc @@ -10,11 +10,11 @@ INC_PR = "r2" PE = "2" EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ " FILES_${PN} += "\ - ${datadir}/icons/terminology.png \ + ${datadir}/icons/terminology.png \ " # doesn't start without own theme diff --git a/meta-efl/recipes-efl/e17/terminology_0.3.0.bb b/meta-efl/recipes-efl/e17/terminology_0.3.0.bb index 5bd485bd96f..d3cd59cff7a 100644 --- a/meta-efl/recipes-efl/e17/terminology_0.3.0.bb +++ b/meta-efl/recipes-efl/e17/terminology_0.3.0.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "7cecd058cb4509873412252477f2ce5b" diff --git a/meta-efl/recipes-efl/efl/azy_svn.bb b/meta-efl/recipes-efl/efl/azy_svn.bb index 80821964c6a..a670b9ca996 100644 --- a/meta-efl/recipes-efl/efl/azy_svn.bb +++ b/meta-efl/recipes-efl/efl/azy_svn.bb @@ -15,14 +15,14 @@ BBCLASSEXTEND = "native" EXTRA_OECONF += " --disable-mysql-tests" do_configure_prepend_class-target() { - sed -i "s#\./lemon#${STAGING_BINDIR_NATIVE}/azy_lemon#g" ${S}/src/bin/Makefile.am - sed -i "s#\$(top_builddir)/src/bin/azy_parser -H -p -o#${STAGING_BINDIR_NATIVE}/azy_parser -H -p -o#g" ${S}/src/tests/Makefile.am - sed -i "s#\$(top_builddir)/src/bin/azy_parser -eHn -m#${STAGING_BINDIR_NATIVE}/azy_parser -eHn -m#g" ${S}/src/tests/identi.ca/Makefile.am + sed -i "s#\./lemon#${STAGING_BINDIR_NATIVE}/azy_lemon#g" ${S}/src/bin/Makefile.am + sed -i "s#\$(top_builddir)/src/bin/azy_parser -H -p -o#${STAGING_BINDIR_NATIVE}/azy_parser -H -p -o#g" ${S}/src/tests/Makefile.am + sed -i "s#\$(top_builddir)/src/bin/azy_parser -eHn -m#${STAGING_BINDIR_NATIVE}/azy_parser -eHn -m#g" ${S}/src/tests/identi.ca/Makefile.am } do_install_append_class-native() { - install -d ${D}/${bindir} - install -m 0755 ${S}/src/bin/lemon ${D}/${bindir}/azy_lemon + install -d ${D}/${bindir} + install -m 0755 ${S}/src/bin/lemon ${D}/${bindir}/azy_lemon } inherit efl diff --git a/meta-efl/recipes-efl/efl/ecore.inc b/meta-efl/recipes-efl/efl/ecore.inc index d329f573fac..fd75a00cca7 100644 --- a/meta-efl/recipes-efl/efl/ecore.inc +++ b/meta-efl/recipes-efl/efl/ecore.inc @@ -35,12 +35,12 @@ PACKAGES =+ "\ ${PN}-txt \ ${PN}-x \ ${PN}-input \ - " +" # Some upgrade path tweaking AUTO_LIBNAME_PKGS = "" FILES_${PN} = "${libdir}/libecore*.so.* \ - ${bindir} \ + ${bindir} \ " FILES_${PN}-con = "${libdir}/libecore_con*.so.*" FILES_${PN}-config = "${libdir}/libecore_config*.so.*" @@ -51,7 +51,7 @@ FILES_${PN}-evas = "${libdir}/libecore_evas*.so.*" FILES_${PN}-fb = "${libdir}/libecore_fb*.so.*" FILES_${PN}-file = "${libdir}/libecore_file*.so.*" FILES_${PN}-imf = "${libdir}/libecore_imf*.so.* \ - ${libdir}/ecore/immodules/*.so \ + ${libdir}/ecore/immodules/*.so \ " FILES_${PN}-imf-evas = "${libdir}/libecore_imf_evas*.so.*" FILES_${PN}-ipc = "${libdir}/libecore_ipc*.so.*" @@ -61,32 +61,32 @@ FILES_${PN}-x = "${libdir}/libecore_x*.so.*" FILES_${PN}-input = "${libdir}/libecore_input*.so.*" ECORE_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ - --enable-ecore-config \ - --enable-ecore-x \ - --enable-ecore-job \ - --enable-ecore-fb \ - --enable-ecore-evas \ - --enable-ecore-evas-software-16-x11 \ - --enable-ecore-evas-xrender \ - --enable-abstract-sockets \ - --enable-ecore-con \ - --enable-ecore-ipc \ - --enable-ecore-file \ - --enable-inotify \ - --disable-ecore-desktop \ - --disable-ecore-x-xcb \ - --disable-ecore-x-xprint \ - --disable-ecore-directfb \ - --disable-ecore-sdl \ - --enable-ecore-evas-opengl-x11 \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-sdl \ - --disable-openssl \ - --disable-poll \ - --enable-xim \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ + --enable-ecore-config \ + --enable-ecore-x \ + --enable-ecore-job \ + --enable-ecore-fb \ + --enable-ecore-evas \ + --enable-ecore-evas-software-16-x11 \ + --enable-ecore-evas-xrender \ + --enable-abstract-sockets \ + --enable-ecore-con \ + --enable-ecore-ipc \ + --enable-ecore-file \ + --enable-inotify \ + --disable-ecore-desktop \ + --disable-ecore-x-xcb \ + --disable-ecore-x-xprint \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ + --enable-ecore-evas-opengl-x11 \ + --disable-ecore-evas-dfb \ + --disable-ecore-evas-sdl \ + --disable-openssl \ + --disable-poll \ + --enable-xim \ " EXTRA_OECONF = "${ECORE_OECONF} \ diff --git a/meta-efl/recipes-efl/efl/ecore_1.7.6.bb b/meta-efl/recipes-efl/efl/ecore_1.7.6.bb index 4df653e990a..0842878ba0c 100644 --- a/meta-efl/recipes-efl/efl/ecore_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/ecore_1.7.6.bb @@ -3,8 +3,8 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ - file://fix-ecore-fb-initialization.patch \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + file://fix-ecore-fb-initialization.patch \ " SRC_URI[md5sum] = "a41828b5b4ca42283d8658c0fe54db07" diff --git a/meta-efl/recipes-efl/efl/ecore_svn.bb b/meta-efl/recipes-efl/efl/ecore_svn.bb index 945cfad4ebe..f421c2bfb0a 100644 --- a/meta-efl/recipes-efl/efl/ecore_svn.bb +++ b/meta-efl/recipes-efl/efl/ecore_svn.bb @@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ - file://fix-ecore-fb-initialization.patch \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + file://fix-ecore-fb-initialization.patch \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/edbus2_svn.bb b/meta-efl/recipes-efl/efl/edbus2_svn.bb index 26d80926717..e87f147194a 100644 --- a/meta-efl/recipes-efl/efl/edbus2_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus2_svn.bb @@ -6,7 +6,7 @@ PR = "${INC_PR}.2" DEFAULT_PREFERENCE = "-1" SRC_URI = "\ - ${E_SVN}/trunk/IN-EFL;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/trunk/IN-EFL;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/edbus_1.7.6.bb b/meta-efl/recipes-efl/efl/edbus_1.7.6.bb index 196dd37eee6..17f7c1bbc89 100644 --- a/meta-efl/recipes-efl/efl/edbus_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/edbus_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "3b4694a1b7c8f635effb225fe4c1f43d" diff --git a/meta-efl/recipes-efl/efl/edbus_svn.bb b/meta-efl/recipes-efl/efl/edbus_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/edbus_svn.bb +++ b/meta-efl/recipes-efl/efl/edbus_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/edje.inc b/meta-efl/recipes-efl/efl/edje.inc index 6f50ea8fbc6..b34453ce9c8 100644 --- a/meta-efl/recipes-efl/efl/edje.inc +++ b/meta-efl/recipes-efl/efl/edje.inc @@ -44,9 +44,9 @@ PACKAGES =+ "${PN}-utils" RDEPENDS_${PN}-utils = "cpp cpp-symlinks embryo-tests" RRECOMMENDS_${PN}-utils = "\ - evas-saver-png \ - evas-saver-jpeg \ - evas-saver-eet \ + evas-saver-png \ + evas-saver-jpeg \ + evas-saver-eet \ " DEBIAN_NOAUTONAME_${PN}-utils = "1" @@ -54,10 +54,10 @@ DEBIAN_NOAUTONAME_${PN}-utils = "1" AUTO_LIBNAME_PKGS = "" FILES_${PN}-utils = "\ - ${bindir}/edje_* \ - ${bindir}/inkscape2edc \ - ${libdir}/edje/utils/epp \ - ${datadir}/edje/include/edje.inc \ + ${bindir}/edje_* \ + ${bindir}/inkscape2edc \ + ${libdir}/edje/utils/epp \ + ${datadir}/edje/include/edje.inc \ " FILES_${PN} += "${libdir}/${PN}/modules/*/*/module.so \ diff --git a/meta-efl/recipes-efl/efl/edje_1.7.6.bb b/meta-efl/recipes-efl/efl/edje_1.7.6.bb index 4708ff6f212..0795e8d26f9 100644 --- a/meta-efl/recipes-efl/efl/edje_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/edje_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "2fa9079a1c53efebad47dccf6cb3a62c" diff --git a/meta-efl/recipes-efl/efl/edje_svn.bb b/meta-efl/recipes-efl/efl/edje_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/edje_svn.bb +++ b/meta-efl/recipes-efl/efl/edje_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/eet.inc b/meta-efl/recipes-efl/efl/eet.inc index 0f6a9fe105d..a7864ec79c6 100644 --- a/meta-efl/recipes-efl/efl/eet.inc +++ b/meta-efl/recipes-efl/efl/eet.inc @@ -9,16 +9,16 @@ BBCLASSEXTEND = "native" INC_PR = "r0" EXTRA_OECONF = "\ - --enable-openssl \ - --enable-cypher \ - --enable-signature \ - --disable-coverage \ - --enable-old-eet-file-format \ - --disable-assert \ + --enable-openssl \ + --enable-cypher \ + --enable-signature \ + --disable-coverage \ + --enable-old-eet-file-format \ + --disable-assert \ " PACKAGES =+ "${PN}-utils" FILES_${PN}-utils = "\ - ${bindir}/${PN} \ + ${bindir}/${PN} \ " diff --git a/meta-efl/recipes-efl/efl/eet_1.7.6.bb b/meta-efl/recipes-efl/efl/eet_1.7.6.bb index f014fe32b36..023dab088e3 100644 --- a/meta-efl/recipes-efl/efl/eet_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/eet_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "16a3b3cffbc7d63a5efdd673793e4a7a" diff --git a/meta-efl/recipes-efl/efl/eet_svn.bb b/meta-efl/recipes-efl/efl/eet_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/eet_svn.bb +++ b/meta-efl/recipes-efl/efl/eet_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/eeze_1.7.6.bb b/meta-efl/recipes-efl/efl/eeze_1.7.6.bb index 76a4c89f3e0..85dd6b17285 100644 --- a/meta-efl/recipes-efl/efl/eeze_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/eeze_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "8e23ead15f9f52df5ffd05560153756f" diff --git a/meta-efl/recipes-efl/efl/eeze_svn.bb b/meta-efl/recipes-efl/efl/eeze_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/eeze_svn.bb +++ b/meta-efl/recipes-efl/efl/eeze_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/efreet_1.7.6.bb b/meta-efl/recipes-efl/efl/efreet_1.7.6.bb index a72b47c1fb9..af7e44b3c92 100644 --- a/meta-efl/recipes-efl/efl/efreet_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/efreet_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "3888d88fcbf50e8977fc9f198facee8e" diff --git a/meta-efl/recipes-efl/efl/efreet_svn.bb b/meta-efl/recipes-efl/efl/efreet_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/efreet_svn.bb +++ b/meta-efl/recipes-efl/efl/efreet_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/eina_1.7.6.bb b/meta-efl/recipes-efl/efl/eina_1.7.6.bb index 69fda645c73..b3dafd5414e 100644 --- a/meta-efl/recipes-efl/efl/eina_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/eina_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "4f0075f404223284dac0f34f676c511e" diff --git a/meta-efl/recipes-efl/efl/eina_svn.bb b/meta-efl/recipes-efl/efl/eina_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/eina_svn.bb +++ b/meta-efl/recipes-efl/efl/eina_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/eio_1.7.6.bb b/meta-efl/recipes-efl/efl/eio_1.7.6.bb index 7265cf20ff1..5c45c92ffb2 100644 --- a/meta-efl/recipes-efl/efl/eio_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/eio_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "c180817c536822153a1853b74a96d01a" diff --git a/meta-efl/recipes-efl/efl/eio_svn.bb b/meta-efl/recipes-efl/efl/eio_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/eio_svn.bb +++ b/meta-efl/recipes-efl/efl/eio_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/elementary.inc b/meta-efl/recipes-efl/efl/elementary.inc index 34338e865d6..a8ed15f7602 100644 --- a/meta-efl/recipes-efl/efl/elementary.inc +++ b/meta-efl/recipes-efl/efl/elementary.inc @@ -8,63 +8,63 @@ inherit efl gettext INC_PR = "r0" EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ - --disable-web \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ + --disable-web \ " do_compile_append() { - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - elementary.pc + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + elementary.pc } PACKAGES += "${PN}-configs ${PN}-accessibility" RDEPENDS_${PN} = "\ - ${PN}-themes \ - ${PN}-configs \ + ${PN}-themes \ + ${PN}-configs \ " RSUGGESTS_${PN} = "${PN}-tests ${PN}-accessibility" FILES_${PN} += "\ - ${libdir}/edje/modules/elm \ - ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.so \ + ${libdir}/edje/modules/elm \ + ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.so \ " FILES_${PN}-dev += "\ - ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.la \ + ${libdir}/elementary/modules/datetime_input_ctxpopup/*/module.la \ " FILES_${PN}-themes = "\ - ${datadir}/elementary/themes \ + ${datadir}/elementary/themes \ " FILES_${PN}-configs = "\ - ${datadir}/elementary/config \ + ${datadir}/elementary/config \ " FILES_${PN}-dbg += "\ - ${libdir}/elementary/modules/test_entry/*/.debug \ - ${libdir}/elementary/modules/test_map/*/.debug \ - ${libdir}/elementary/modules/access_output/*/.debug \ - ${libdir}/elementary/modules/datetime_input_ctxpopup/*/.debug \ - ${libdir}/edje/modules/elm/*/.debug \ + ${libdir}/elementary/modules/test_entry/*/.debug \ + ${libdir}/elementary/modules/test_map/*/.debug \ + ${libdir}/elementary/modules/access_output/*/.debug \ + ${libdir}/elementary/modules/datetime_input_ctxpopup/*/.debug \ + ${libdir}/edje/modules/elm/*/.debug \ " FILES_${PN}-tests = "\ - ${bindir}/elementary* \ - ${datadir}/elementary/images \ - ${datadir}/elementary/objects \ - ${datadir}/elementary/examples \ - ${datadir}/applications/* \ - ${datadir}/icons/* \ - ${libdir}/elementary/modules/test_entry/* \ - ${libdir}/elementary/modules/test_map/* \ + ${bindir}/elementary* \ + ${datadir}/elementary/images \ + ${datadir}/elementary/objects \ + ${datadir}/elementary/examples \ + ${datadir}/applications/* \ + ${datadir}/icons/* \ + ${libdir}/elementary/modules/test_entry/* \ + ${libdir}/elementary/modules/test_map/* \ " FILES_${PN}-accessibility = "\ - ${libdir}/elementary/modules/access_output/* \ + ${libdir}/elementary/modules/access_output/* \ " # Some upgrade path tweaking, as in evas diff --git a/meta-efl/recipes-efl/efl/elementary_1.7.6.bb b/meta-efl/recipes-efl/efl/elementary_1.7.6.bb index f719253063e..060a8540ee7 100644 --- a/meta-efl/recipes-efl/efl/elementary_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/elementary_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "48f28d887432f9aca434c864de33d5f8" diff --git a/meta-efl/recipes-efl/efl/elementary_svn.bb b/meta-efl/recipes-efl/efl/elementary_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/elementary_svn.bb +++ b/meta-efl/recipes-efl/efl/elementary_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/embryo_1.7.6.bb b/meta-efl/recipes-efl/efl/embryo_1.7.6.bb index bb3aa74a69d..a288052a7d6 100644 --- a/meta-efl/recipes-efl/efl/embryo_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/embryo_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "6302e1845d50074a949d8d822e2c8874" diff --git a/meta-efl/recipes-efl/efl/embryo_svn.bb b/meta-efl/recipes-efl/efl/embryo_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/embryo_svn.bb +++ b/meta-efl/recipes-efl/efl/embryo_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/emotion_1.7.6.bb b/meta-efl/recipes-efl/efl/emotion_1.7.6.bb index 9435a9f1fde..1a7edb3b002 100644 --- a/meta-efl/recipes-efl/efl/emotion_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/emotion_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "eb15b6faa1e4a30f80622a1381c670fc" diff --git a/meta-efl/recipes-efl/efl/emotion_svn.bb b/meta-efl/recipes-efl/efl/emotion_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/emotion_svn.bb +++ b/meta-efl/recipes-efl/efl/emotion_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/entrance_svn.bb b/meta-efl/recipes-efl/efl/entrance_svn.bb index 02eb64ba915..9a85f7bda89 100644 --- a/meta-efl/recipes-efl/efl/entrance_svn.bb +++ b/meta-efl/recipes-efl/efl/entrance_svn.bb @@ -6,8 +6,8 @@ SECTION = "e/apps" inherit e gettext systemd SRC_URI = "${E_SVN}/trunk/PROTO;module=${SRCNAME};protocol=http;scmdata=keep \ - file://0001-pam-use-common-auth-instead-of-system-auth.patch \ - file://entrance.service \ + file://0001-pam-use-common-auth-instead-of-system-auth.patch \ + file://entrance.service \ " S = "${WORKDIR}/${SRCNAME}" @@ -33,6 +33,6 @@ RCONFLICTS_${PN} += "${PN}-systemd" SYSTEMD_SERVICE_${PN} = "entrance.service" do_install_append() { - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${WORKDIR}/entrance.service ${D}${systemd_unitdir}/system } diff --git a/meta-efl/recipes-efl/efl/ethumb.inc b/meta-efl/recipes-efl/efl/ethumb.inc index 92a83eee4f3..32a13065019 100644 --- a/meta-efl/recipes-efl/efl/ethumb.inc +++ b/meta-efl/recipes-efl/efl/ethumb.inc @@ -8,9 +8,9 @@ INC_PR = "r0" inherit efl EXTRA_OECONF = "\ - --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ - --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ - --disable-docs \ + --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \ + --with-eet-eet=${STAGING_BINDIR_NATIVE}/eet \ + --disable-docs \ " # Some upgrade path tweaking, as in evas diff --git a/meta-efl/recipes-efl/efl/ethumb_1.7.6.bb b/meta-efl/recipes-efl/efl/ethumb_1.7.6.bb index f66a6786f7e..b8ced290764 100644 --- a/meta-efl/recipes-efl/efl/ethumb_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/ethumb_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "343ef0dfda62295db353b7dca059e4a7" diff --git a/meta-efl/recipes-efl/efl/ethumb_svn.bb b/meta-efl/recipes-efl/efl/ethumb_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/ethumb_svn.bb +++ b/meta-efl/recipes-efl/efl/ethumb_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc index 4f8429187a7..43cdb869193 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders.inc +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders.inc @@ -10,11 +10,11 @@ INC_PR = "r0" SRCNAME = "evas_generic_loaders" EXTRA_OECONF = " \ - --enable-poppler \ - --enable-svg \ - --disable-gstreamer \ - --disable-libraw \ - --disable-spectre \ + --enable-poppler \ + --enable-svg \ + --disable-gstreamer \ + --disable-libraw \ + --disable-spectre \ " python populate_packages_prepend () { diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.6.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.6.bb index d3ea978b1cb..eb2e6f98705 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "f025e08a673ba4f11a3d17fc50e0abb1" diff --git a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb +++ b/meta-efl/recipes-efl/efl/evas-generic-loaders_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/evas.inc b/meta-efl/recipes-efl/efl/evas.inc index 04cf83563dd..4e5e1e30631 100644 --- a/meta-efl/recipes-efl/efl/evas.inc +++ b/meta-efl/recipes-efl/efl/evas.inc @@ -48,17 +48,17 @@ PACKAGES_DYNAMIC += "^evas-engine-.* ^evas-loader-.* ^evas-saver-.* ^evas-cserve RRECOMMENDS_${PN} += "evas-loader-generic evas-generic-loader-svn" RRECOMMENDS_${PN} = " \ - evas-engine-fb \ - evas-engine-software-generic \ - evas-engine-software-x11 \ - evas-engine-software-16 \ - evas-engine-software-16-x11 \ - evas-engine-xrender-x11 \ - \ - evas-loader-png \ - evas-loader-jpeg \ - evas-loader-gif \ - evas-loader-svg \ + evas-engine-fb \ + evas-engine-software-generic \ + evas-engine-software-x11 \ + evas-engine-software-16 \ + evas-engine-software-16-x11 \ + evas-engine-xrender-x11 \ + \ + evas-loader-png \ + evas-loader-jpeg \ + evas-loader-gif \ + evas-loader-svg \ " # Some upgrade path tweaking diff --git a/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb b/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb index 2ea56eea94a..f434d1ae24c 100644 --- a/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb +++ b/meta-efl/recipes-efl/efl/evas_1.7.6.1.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.1" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "c1710b7769c6dc8cfb0a21190fbc0c9b" diff --git a/meta-efl/recipes-efl/efl/evas_svn.bb b/meta-efl/recipes-efl/efl/evas_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/evas_svn.bb +++ b/meta-efl/recipes-efl/efl/evas_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/expedite.inc b/meta-efl/recipes-efl/efl/expedite.inc index 9399d82d049..89500bfbfdc 100644 --- a/meta-efl/recipes-efl/efl/expedite.inc +++ b/meta-efl/recipes-efl/efl/expedite.inc @@ -8,20 +8,20 @@ INC_PR = "r0" inherit e EXTRA_OECONF = "\ - --x-includes=${STAGING_INCDIR}/X11 \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-simple-x11 \ + --x-includes=${STAGING_INCDIR}/X11 \ + --x-libraries=${STAGING_LIBDIR} \ + --enable-simple-x11 \ \ - --disable-opengl-glew \ - --enable-software-x11 \ - --enable-xrender-x11 \ - --enable-software-16-x11 \ - --enable-opengl-x11 \ - --enable-fb \ - --disable-software-ddraw \ - --disable-software-16-ddraw \ - --disable-direct3d \ - --disable-software-sdl \ + --disable-opengl-glew \ + --enable-software-x11 \ + --enable-xrender-x11 \ + --enable-software-16-x11 \ + --enable-opengl-x11 \ + --enable-fb \ + --disable-software-ddraw \ + --disable-software-16-ddraw \ + --disable-direct3d \ + --disable-software-sdl \ " FILES_${PN} += "${datadir}" diff --git a/meta-efl/recipes-efl/efl/expedite_1.7.6.bb b/meta-efl/recipes-efl/efl/expedite_1.7.6.bb index 42431aa5210..c582ad1daf6 100644 --- a/meta-efl/recipes-efl/efl/expedite_1.7.6.bb +++ b/meta-efl/recipes-efl/efl/expedite_1.7.6.bb @@ -3,7 +3,7 @@ require ${BPN}.inc PR = "${INC_PR}.0" SRC_URI = "\ - ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ + ${E_MIRROR}/${SRCNAME}-${SRCVER}.tar.gz \ " SRC_URI[md5sum] = "a4a6f3a84ff85d78c74e56a046bd3419" diff --git a/meta-efl/recipes-efl/efl/expedite_svn.bb b/meta-efl/recipes-efl/efl/expedite_svn.bb index 95d8e02e5a5..5b13b9e7b44 100644 --- a/meta-efl/recipes-efl/efl/expedite_svn.bb +++ b/meta-efl/recipes-efl/efl/expedite_svn.bb @@ -8,6 +8,6 @@ DEFAULT_PREFERENCE = "-1" SRCNAME_append = "-1.7" SRC_URI = "\ - ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ + ${E_SVN}/branches;module=${SRCNAME};protocol=http;scmdata=keep \ " S = "${WORKDIR}/${SRCNAME}" diff --git a/meta-efl/recipes-efl/efl/libeweather_svn.bb b/meta-efl/recipes-efl/efl/libeweather_svn.bb index 934efa10f36..bc7bce654ec 100644 --- a/meta-efl/recipes-efl/efl/libeweather_svn.bb +++ b/meta-efl/recipes-efl/efl/libeweather_svn.bb @@ -16,31 +16,31 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" RSUGGESTS_${PN} = "elementary-tests" do_compile_append() { - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - eweather.pc + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + eweather.pc } PACKAGES += "${PN}-plugins" FILES_${PN}-themes = "\ - ${datadir} \ + ${datadir} \ " FILES_${PN}-plugins = "\ - ${libdir}/eweather/plugins/*.so \ + ${libdir}/eweather/plugins/*.so \ " FILES_${PN}-dbg += "\ - ${libdir}/eweather/plugins/.debug \ + ${libdir}/eweather/plugins/.debug \ " FILES_${PN}-dev += "\ - ${libdir}/eweather/plugins/*.a \ - ${libdir}/eweather/plugins/*.la \ + ${libdir}/eweather/plugins/*.a \ + ${libdir}/eweather/plugins/*.la \ " RRECOMMENDS_${PN} = "\ - ${PN}-themes \ - ${PN}-plugins \ + ${PN}-themes \ + ${PN}-plugins \ " diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc index 8f012677ed3..89c9f9a57cc 100644 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.inc @@ -8,7 +8,7 @@ SDK-EFL = " \ lua5.1-dev \ edje-dev \ elementary-dev \ - " +" SDK-EXTRAS ?= "" SDK-EXTRAS_qemux86 ?= " valgrind lttng-ust-dev" diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb index 11b01f6a9f5..47f758a8204 100644 --- a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb +++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb @@ -15,10 +15,10 @@ RPROVIDES_${PN} += "task-x11-illume" RREPLACES_${PN} += "task-x11-illume" RCONFLICTS_${PN} += "task-x11-illume" RDEPENDS_${PN} = "\ - packagegroup-core-x11-xserver \ - packagegroup-core-x11-utils \ - \ - e-wm \ - ${ECONFIG} \ - ${ETHEME} \ + packagegroup-core-x11-xserver \ + packagegroup-core-x11-utils \ + \ + e-wm \ + ${ECONFIG} \ + ${ETHEME} \ " diff --git a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb index 1b782cd44ee..33100c2a1f6 100644 --- a/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb +++ b/meta-efl/recipes-efl/webkit/webkit-efl_svn.bb @@ -17,17 +17,17 @@ PR = "r2" SRCREV_FORMAT = "source" SRC_URI = "\ - svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \ - svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \ - svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \ - file://CMakeLists.txt \ - file://bison-2.6.patch \ + svn://svn.webkit.org/repository/webkit/trunk;module=Source;name=source;protocol=http;subdir=src \ + svn://svn.webkit.org/repository/webkit/trunk/;module=WebKitLibraries;protocol=http;subdir=src \ + svn://svn.webkit.org/repository/webkit/trunk/;module=Tools;protocol=http;subdir=src \ + file://CMakeLists.txt \ + file://bison-2.6.patch \ " S = "${WORKDIR}/src" do_configure_prepend() { - cp ${WORKDIR}/CMakeLists.txt ${S}; + cp ${WORKDIR}/CMakeLists.txt ${S}; } inherit cmake lib_package pkgconfig perlnative pythonnative |