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-gnome/recipes-gnome | |
| 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-gnome/recipes-gnome')
49 files changed, 206 insertions, 204 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" SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" FILES_${PN} += " \ - ${datadir}/icons/* \ - ${datadir}/mime-info \ - ${datadir}/abiword-${SHRT_VER}/glade \ - ${datadir}/abiword-${SHRT_VER}/system.profile-en \ - ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ - " + ${datadir}/icons/* \ + ${datadir}/mime-info \ + ${datadir}/abiword-${SHRT_VER}/glade \ + ${datadir}/abiword-${SHRT_VER}/system.profile-en \ + ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ +" -# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ -# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ +# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ +# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ inherit autotools pkgconfig @@ -40,10 +40,10 @@ PARALLEL_MAKE = "" # --disable-exports options EXTRA_OECONF = " --enable-embedded=poky \ - --disable-printing \ - --with-sys-wv \ - --disable-exports \ - --disable-spellcheck" + --disable-printing \ + --with-sys-wv \ + --disable-exports \ + --disable-spellcheck" # TODO -- refactor this, so that instead of two strings and profiles # packages we have lots of locale packages, each with a set of strings and @@ -51,14 +51,14 @@ EXTRA_OECONF = " --enable-embedded=poky \ # PACKAGES += " abiword-strings abiword-systemprofiles" -FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" -FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" +FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" +FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" # AbiWord configure.ac does not play nicely with autoreconf # so use the autogen.sh script that comes with AbiWord # do_configure() { - cd ${S} - export NOCONFIGURE="no"; ./autogen.sh - oe_runconf + cd ${S} + export NOCONFIGURE="no"; ./autogen.sh + oe_runconf } 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() { } do_install_append() { - install -d ${D}${datadir}/pixmaps/ - mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ - rmdir ${D}${datadir}/icons + install -d ${D}${datadir}/pixmaps/ + mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ + rmdir ${D}${datadir}/icons } PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates " diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc index d9a861804d..9f0857701b 100644 --- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc +++ b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc @@ -9,13 +9,13 @@ inherit gnome SRC_URI += "file://gtk-doc.m4 \ file://gtk-doc.make \ - " +" ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ - ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" + ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples" FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a" @@ -24,17 +24,17 @@ LEAD_SONAME = "libbonobo-2.so" PARALLEL_MAKE = "" do_configure_prepend() { - install -d m4 - install ${WORKDIR}/gtk-doc.m4 m4/ - install ${WORKDIR}/gtk-doc.make ./ + install -d m4 + install ${WORKDIR}/gtk-doc.m4 m4/ + install ${WORKDIR}/gtk-doc.make ./ } do_compile() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } do_install() { - oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install - install -d ${D}${datadir}/idl/bonobo-activation-2.0/ - install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/ + oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install + install -d ${D}${datadir}/idl/bonobo-activation-2.0/ + install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/ } diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb index af9a83a1fc..ba14e8848c 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb @@ -19,7 +19,7 @@ PACKAGES =+ "dconf-editor" FILES_dconf-editor = "${bindir}/dconf-editor ${datadir}/dconf-editor/" FILES_${PN} += "${datadir}/dbus-1/ \ ${libdir}/gio/modules/*.so \ - " +" FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" pkg_postinst_${PN} () { diff --git a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb index 05311fd545..9e6ba90424 100644 --- a/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb +++ b/meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb @@ -7,9 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=00aefaa50aad75c21367df66102d542c \ DEPENDS = "gtk+ glib-2.0 libwnck lua5.1 virtual/libx11" SRC_URI = " \ - http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \ - file://default.lua \ - file://devilspie2.desktop \ + http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \ + file://default.lua \ + file://devilspie2.desktop \ " SRC_URI[md5sum] = "90b354662659e2922bd051fdde3b0971" SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d465a646a" @@ -17,14 +17,14 @@ SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d46 inherit pkgconfig do_compile() { - export GTK2=1 - oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" + export GTK2=1 + oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" } do_install() { - oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install - install -d ${D}/${sysconfdir}/devilspie2 - install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 - install -d ${D}/${sysconfdir}/xdg/autostart - install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart + oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install + install -d ${D}/${sysconfdir}/devilspie2 + install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 + install -d ${D}/${sysconfdir}/xdg/autostart + install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart } diff --git a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb index 958a90ccab..23a6cefeb2 100644 --- a/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +++ b/meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb @@ -40,8 +40,8 @@ LDFLAGS += "-lpthread" #PARALLEL_MAKE = "" do_configure_append () { - cp ${WORKDIR}/iconv-detect.h ${S} - sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile + cp ${WORKDIR}/iconv-detect.h ${S} + sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile } EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ diff --git a/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb index de02e261cf..495172d29e 100644 --- a/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb +++ b/meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb @@ -11,8 +11,8 @@ SRC_URI[archive.sha256sum] = "278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c4 EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file" do_configure_prepend() { - touch ${S}/gnome-doc-utils.make - sed -i -e s:help::g Makefile.am + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am } FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb index 74958d84f9..986cd7198c 100644 --- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb +++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb @@ -18,11 +18,11 @@ EXTRA_OECONF = " --enable-thumbnailer \ --disable-scrollkeeper \ --enable-pixbuf \ --disable-help \ - " +" do_install_append() { - install -d install -d ${D}${datadir}/pixmaps - install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/ + install -d install -d ${D}${datadir}/pixmaps + install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/ } RDEPENDS_${PN} += "glib-2.0-utils" diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb index 88cf1d6cae..d5a175139e 100644 --- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb +++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb @@ -14,5 +14,5 @@ SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a inherit autotools pkgconfig gsettings do_configure_prepend() { - sed -i -e "s: help: :g" ${S}/Makefile.am + sed -i -e "s: help: :g" ${S}/Makefile.am } diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb index 45bddc8f09..1e55dd9880 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb @@ -18,7 +18,7 @@ SRC_URI += " \ file://gdm-pam \ file://Default \ file://gdm.service.in \ - " +" SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703" @@ -29,36 +29,36 @@ EXTRA_OECONF = " --enable-authentication-scheme=shadow \ --disable-scrollkeeper" do_configure_prepend() { - sed -i -e "s:\bdocs::g" ${S}/Makefile.am + sed -i -e "s:\bdocs::g" ${S}/Makefile.am } do_install_prepend() { - mkdir -p ${D}/var/lib/gdm/.gconf.mandatory - cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ + mkdir -p ${D}/var/lib/gdm/.gconf.mandatory + cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ } do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ - install -d ${D}/${sysconfdir}/gdm - install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ + install -d ${D}/${sysconfdir}/gdm + install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ - install -d ${D}/${sysconfdir}/pam.d - install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm + install -d ${D}/${sysconfdir}/pam.d + install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm - install -d ${D}/${sysconfdir}/gdm/Init - install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init + install -d ${D}/${sysconfdir}/gdm/Init + install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init - install -d ${D}${systemd_unitdir}/system - sed -e 's,%sbindir%,${sbindir},g' \ - < ${WORKDIR}/gdm.service.in \ - > ${D}${systemd_unitdir}/system/gdm.service + install -d ${D}${systemd_unitdir}/system + sed -e 's,%sbindir%,${sbindir},g' \ + < ${WORKDIR}/gdm.service.in \ + > ${D}${systemd_unitdir}/system/gdm.service } FILES_${PN} += "${datadir}/icon* \ - ${datadir}/xsession* \ - " + ${datadir}/xsession* \ +" RDEPENDS_${PN} += "grep dbus-x11 shadow" # "libpam-base-files" @@ -81,8 +81,8 @@ pkg_postinst_${PN} () { grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm if [ -d /var/lib/gdm ]; then - chown -R gdm:gdm /var/lib/gdm - chmod 0750 /var/lib/gdm + chown -R gdm:gdm /var/lib/gdm + chmod 0750 /var/lib/gdm fi # Register up as default dm @@ -94,5 +94,5 @@ echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager pkg_postrm_${PN} () { deluser gdm || true delgroup gdm || true - sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true + sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true } diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 11e0945f83..11f1a60c1d 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -16,8 +16,8 @@ EXTRA_OECONF = "--disable-scrollkeeper \ --enable-gvfs-metadata" do_configure_prepend() { - gnome-doc-common --copy || true - gnome-doc-prepare --force --copy || true + gnome-doc-common --copy || true + gnome-doc-prepare --force --copy || true } FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb index 2b4ccbb8bd..a2037cff00 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb @@ -19,11 +19,11 @@ EXTRA_OECONF += "--enable-nautilus-sendto=no" # No native docbook XSL stylesheets recipe in OE yet do_configure_prepend() { - sed -i s/help// Makefile.am + sed -i s/help// Makefile.am } do_configure_append() { - sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool + sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool } RRECOMMENDS_${PN} += "obexd obex-data-server" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb index ea4ce4b098..ef04c8d549 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb @@ -14,7 +14,7 @@ SRC_URI[archive.sha256sum] = "7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b605 LDFLAGS += "-lgthread-2.0 -lxml2" do_configure_prepend() { - sed -i s:help::g Makefile.am + sed -i s:help::g Makefile.am } FILES_${PN} += "${datadir}/icon* \ @@ -22,7 +22,7 @@ FILES_${PN} += "${datadir}/icon* \ ${libdir}/window-manager-settings/*.so \ ${datadir}/gnome \ ${datadir}/desktop-directories \ - " +" FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb index 612e88fd3c..333f8cbe30 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb @@ -16,8 +16,8 @@ DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" do_configure_prepend () { - cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} - sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in + cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} + sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in } PACKAGES =+ "libgnome-desktop" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index 595d9dc6b7..a0fd9bdba7 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb @@ -12,15 +12,15 @@ SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" SRC_URI += "\ - file://disable-scrollkeeper.patch \ - file://fix-dbus-interfaces.patch \ - file://sysrooted-pkg-config.patch \ - " + file://disable-scrollkeeper.patch \ + file://fix-dbus-interfaces.patch \ + file://sysrooted-pkg-config.patch \ +" EXTRA_OECONF += "--disable-scrollkeeper" do_configure_prepend() { - sed -i -e "s: help : :g" ${S}/Makefile.am + sed -i -e "s: help : :g" ${S}/Makefile.am } PACKAGES =+ "${PN}-nautilus-extension" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb index 13614a062b..a82ceb9311 100644 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb @@ -27,13 +27,13 @@ SRC_URI[archive.sha256sum] = "25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" do_configure_prepend() { - gnome-doc-prepare --automake - sed -i -e s:help:: ${S}/Makefile.am + gnome-doc-prepare --automake + sed -i -e s:help:: ${S}/Makefile.am } pkg_postinst_${PN}_append () { - gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --direct --load /etc/gconf/schemas/panel-default-setup.entries + gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ + --direct --load /etc/gconf/schemas/panel-default-setup.entries } PACKAGES =+ "libpanel-applet" @@ -44,6 +44,6 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons \ ${datadir}/PolicyKit \ ${libdir}/bonobo \ - " +" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb index e54579d6dc..c4465a55ae 100644 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb @@ -21,17 +21,17 @@ S = "${WORKDIR}/git" EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" do_configure_prepend() { - gnome-doc-prepare --automake - sed -i -e s:help:: ${S}/Makefile.am - sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in + gnome-doc-prepare --automake + sed -i -e s:help:: ${S}/Makefile.am + sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in } pkg_postinst_${PN}_append () { if [ -n "$D" ]; then - exit 1 + exit 1 fi - gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \ - --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries + gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \ + --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries } PACKAGES =+ "libpanel-applet" @@ -42,6 +42,6 @@ FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons \ ${datadir}/PolicyKit \ ${libdir}/bonobo \ - " +" diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb index aeaf688917..cc4c0c478f 100644 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb @@ -21,32 +21,34 @@ EXTRA_OECONF = " --disable-scrollkeeper \ --with-dpms-ext=${STAGING_INCDIR}/.. \ --enable-compile-warnings=no \ ac_cv_header_X11_extensions_dpms_h=yes \ - " +" do_configure_prepend() { - sed -i -e 's: man ::g' ${S}/Makefile.am + sed -i -e 's: man ::g' ${S}/Makefile.am } do_configure_append() { - rm config.log - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:-Werror::g $i - done - sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile + rm config.log + # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:-Werror::g $i + done + sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile } PACKAGES =+ "${PN}-applets" FILES_${PN}-applets = "${bindir}/*applet* \ - ${libdir}/bonobo/servers \ - ${datadir}/gnome-2.0/ui" + ${libdir}/bonobo/servers \ + ${datadir}/gnome-2.0/ui \ +" FILES_${PN} += "${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/gnome/autostart \ - " + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ +" FILES_${PN}-doc += "${datadir}/omf \ - ${datadir}/gnome/help " + ${datadir}/gnome/help \ +" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb index e1fa519511..93b0284a22 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb @@ -15,10 +15,10 @@ SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f611 EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs" do_configure_append() { - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i - sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i - done + for i in $(find ${S} -name "Makefile") ; do + sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i + sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i + done } RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb index f5f394e1ba..47baea694f 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb @@ -17,10 +17,10 @@ EXTRA_OECONF = "--disable-esd \ --x-includes=${STAGING_INCDIR} \ --x-libraries=${STAGING_LIBDIR} \ --enable-polkit \ - " +" do_configure_prepend() { - sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac + sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac } FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb index 98b7b8ddfc..7764b71436 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb @@ -12,13 +12,13 @@ SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9 SRC_URI += "file://0001-Fix-glib-includes.patch" do_configure_prepend() { - sed -i -e s:help::g ${S}/Makefile.am + sed -i -e s:help::g ${S}/Makefile.am } FILES_${PN} += "${datadir}/icons \ ${datadir}/dbus-1 \ ${datadir}/gnome/autostart \ - " +" FILES_${PN}-doc += "${datadir}/omf \ ${datadir}/gnome/help " diff --git a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb index cfe7125dd9..78cd1d682f 100644 --- a/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +++ b/meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb @@ -21,7 +21,7 @@ inherit gnome RPROVIDES_${PN} = "gnome-vfs-plugin-dbus" SRC_URI += "file://gconftool-lossage.patch \ - file://gnome-vfs-no-kerberos.patch;striplevel=0" + file://gnome-vfs-no-kerberos.patch;striplevel=0" SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" @@ -33,7 +33,7 @@ EXTRA_OECONF = " --disable-hal \ ac_cv_lib_sec_acl=no \ gvfs_cv_HAVE_SOLARIS_ACLS=no \ gvfs_cv_HAVE_POSIX_ACLS=no \ - " +" FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services" FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb index f317997462..8f4a6eb297 100644 --- a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb +++ b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb @@ -9,13 +9,13 @@ PR = "r2" inherit gnome pkgconfig do_compile_append () { - cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old - sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc + cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old + sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc } SRC_URI += "\ - file://libgnomecups-0.2.3-glib.h.patch \ - file://libgnomecups-0.2.3-cups-1.6.patch \ + file://libgnomecups-0.2.3-glib.h.patch \ + file://libgnomecups-0.2.3-cups-1.6.patch \ " SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" diff --git a/meta-gnome/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta-gnome/recipes-gnome/gnome/libgnomekbd_2.26.0.bb index f2e4ec533e..640882a705 100644 --- a/meta-gnome/recipes-gnome/gnome/libgnomekbd_2.26.0.bb +++ b/meta-gnome/recipes-gnome/gnome/libgnomekbd_2.26.0.bb @@ -6,8 +6,8 @@ DEPENDS = "gconf-dbus dbus libxklavier gtk+" inherit gnome do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g } diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb index 8c8574aa20..8e31f1dcd5 100644 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb +++ b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb @@ -15,10 +15,10 @@ SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3" SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6" FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/modules/.debug \ - ${libdir}/${PN}/${PV}/modules/*/.debug \ + ${libdir}/${PN}/${PV}/modules/.debug \ + ${libdir}/${PN}/${PV}/modules/*/.debug \ " FILES_${PN}-staticdev += "\ - ${libdir}/${PN}/${PV}/modules/*.a \ - ${libdir}/${PN}/${PV}/modules/*/*.a \ + ${libdir}/${PN}/${PV}/modules/*.a \ + ${libdir}/${PN}/${PV}/modules/*/*.a \ " diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb index 0414386d8a..2cac8aa86f 100644 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb @@ -16,7 +16,7 @@ SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d SRC_URI += "file://parallel.patch" do_install_append () { - rm ${D}${libdir}/${BPN}/extensions/*.a + rm ${D}${libdir}/${BPN}/extensions/*.a } FILES_${PN} += "${datadir}/icons" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb index 3bc6b2bd38..8fe72edd30 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb @@ -12,18 +12,18 @@ EXTRA_OECONF += "--disable-gphoto2 \ --disable-samba" do_install_append() { - rm -rf ${D}${sysconfdir} - rm -rf ${D}${bindir} - rm -rf ${D}${includedir} - rm -rf ${D}${libdir}/gio - rm -rf ${D}${libdir}/lib* - rmdir --ignore-fail-on-non-empty ${D}${libdir} - rm -rf ${D}${datadir}/gvfs/mounts - rm -rf ${D}${datadir}/glib-2.0 - rm -rf ${D}${datadir}/GConf - rm -f ${D}${datadir}/dbus-1/services/gvfs-* - rm -rf ${D}${datadir}/locale - rm -f ${D}${libexecdir}/gvfsd* - rm -f ${D}${libexecdir}/gvfs-fuse-daemon - rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor + rm -rf ${D}${sysconfdir} + rm -rf ${D}${bindir} + rm -rf ${D}${includedir} + rm -rf ${D}${libdir}/gio + rm -rf ${D}${libdir}/lib* + rmdir --ignore-fail-on-non-empty ${D}${libdir} + rm -rf ${D}${datadir}/gvfs/mounts + rm -rf ${D}${datadir}/glib-2.0 + rm -rf ${D}${datadir}/GConf + rm -f ${D}${datadir}/dbus-1/services/gvfs-* + rm -rf ${D}${datadir}/locale + rm -f ${D}${libexecdir}/gvfsd* + rm -f ${D}${libexecdir}/gvfs-fuse-daemon + rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor } diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc index c69851c0f2..0e1c69cf26 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs.inc +++ b/meta-gnome/recipes-gnome/gvfs/gvfs.inc @@ -14,7 +14,7 @@ EXTRA_OECONF = "--with-samba-includes=${STAGING_INCDIR} \ --with-samba-libs=${STAGING_LIBDIR} \ --with-archive-includes=${STAGING_INCDIR} \ --with-archive-libs=${STAGING_LIBDIR} \ - " +" FILES_${PN} += "${datadir}/dbus-1/services/*" diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb index 0e39707a77..5d6467f9aa 100644 --- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb +++ b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb @@ -11,7 +11,7 @@ SRC_URI[archive.md5sum] = "f1a96c6f19c9a0bc6b4e12acc9a8a85d" SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c" do_configure_prepend() { - sed -i -e 's: doc : :g' ${S}/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am } FILES_${PN} += "${datadir}/gnome* \ diff --git a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb b/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb index f54e9dcac0..09388fb7f4 100644 --- a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb +++ b/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb @@ -10,7 +10,7 @@ SRC_URI[archive.md5sum] = "bf6a0a05051341ecb250f332e3edfb88" SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c" do_configure_prepend() { - sed -i -e 's: doc : :g' ${S}/Makefile.am + sed -i -e 's: doc : :g' ${S}/Makefile.am } FILES_${PN} += "${datadir}/gnome* \ diff --git a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb index 8d48dec8cc..53786e9395 100644 --- a/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb +++ b/meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb @@ -19,5 +19,5 @@ SRC_URI[sha256sum] = "9edca690617eaa19054951ca53501c802180262be8880ed84754ac46c9 FILES_${PN} += "${datadir}/icons" do_install_append () { - install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor + install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor } diff --git a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb index 0c0a0dfb26..08139735ae 100644 --- a/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb +++ b/meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb @@ -16,8 +16,8 @@ EXTRA_OECONF += "--disable-gtk-doc" do_configure_prepend() { sed -i -e s:docs::g ${S}/Makefile.am - echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make - echo "EXTRA_DIST = version.xml" > gtk-doc.make + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make + echo "EXTRA_DIST = version.xml" > gtk-doc.make } FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb index d1ca977e00..4b773bd7a4 100644 --- a/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb +++ b/meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb @@ -12,8 +12,8 @@ SRC_URI[archive.md5sum] = "de32a6e3e3464b566eecdc4332bf34bd" SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256" do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g } diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc index bf9ae691af..8f55909444 100644 --- a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc +++ b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc @@ -19,6 +19,6 @@ SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch" EXTRA_OECONF = "--disable-gtk-doc" do_configure_prepend() { - install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h + install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h } diff --git a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.21.bb b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.21.bb index a4f1ec2f2e..115796222c 100644 --- a/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.21.bb +++ b/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.21.bb @@ -15,9 +15,9 @@ SRC_URI[archive.md5sum] = "2b702648b853402554c97d75405c60d3" SRC_URI[archive.sha256sum] = "eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db" EXTRA_OECONF = "\ - --without-python \ - --without-gnome-vfs --without-bonobo \ - --disable-gtk-doc \ - --with-bz2" + --without-python \ + --without-gnome-vfs --without-bonobo \ + --disable-gtk-doc \ + --with-bz2" RDEPENDS_${PN} = "gconf" diff --git a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb index 891b6251bd..564a71ce2c 100644 --- a/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb +++ b/meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb @@ -8,13 +8,13 @@ PR = "r4" inherit autotools SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \ - file://gtkstylus.sh" + file://gtkstylus.sh" SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5" SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c" do_install_append() { - install -d ${D}/${sysconfdir}/X11/Xsession.d - install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus } # Horrible but rpm falls over if you use '*' diff --git a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb b/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb index 3e91e97265..0a590e3b48 100644 --- a/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb +++ b/meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb @@ -12,6 +12,6 @@ SRC_URI[archive.md5sum] = "732c9d2cd5eb6a9069264a319d330516" SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210" do_configure_prepend() { - sed -i /GTK3/d configure.ac - sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am + sed -i /GTK3/d configure.ac + sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am } diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb index df2dde1a1b..a769a5558a 100644 --- a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb +++ b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb @@ -12,14 +12,14 @@ SRC_URI[archive.sha256sum] = "dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7 EXTRA_OECONF = "--with-xkb-bin-base=${bindir}" do_configure_append() { - find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g - find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g + find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g + find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g } do_compile_append() { - sed -i -e s:${STAGING_DIR_TARGET}::g \ - -e s:/${TARGET_SYS}::g \ - libxklavier.pc + sed -i -e s:${STAGING_DIR_TARGET}::g \ + -e s:/${TARGET_SYS}::g \ + libxklavier.pc } diff --git a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb index 360520152b..23e5dda0b4 100644 --- a/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb +++ b/meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb @@ -20,10 +20,10 @@ ALTERNATIVE_TARGET[x-window-manager] = "${bindir}/metacity" ALTERNATIVE_PRIORITY = "10" EXTRA_OECONF += "--disable-verbose \ - --disable-xinerama" + --disable-xinerama" do_configure_prepend() { - sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in + sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in } FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb index 488df1cb79..a9dcaf46ee 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb @@ -24,8 +24,8 @@ EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb --enable-nst-extensi export SYSROOT = "${STAGING_DIR_HOST}" do_configure() { - sed -i -e /docs/d Makefile.am - autotools_do_configure + sed -i -e /docs/d Makefile.am + autotools_do_configure } RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils" @@ -34,9 +34,9 @@ FILES_${PN} += "${datadir}/icons \ ${datadir}/nautilus* \ ${datadir}/dbus-1 \ ${libdir}/nautilus/extensions*/*.so \ - " +" FILES_${PN}-dbg += "/usr/libexec/.debug \ - ${libdir}/nautilus/extensions*/.debug" + ${libdir}/nautilus/extensions*/.debug" # Don't make nautils drag us in PRIVATE_LIBS = "libnautilus-extension.so.1" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb index bc45342dd9..0714815f3a 100644 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb @@ -26,10 +26,10 @@ EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " export SYSROOT = "${STAGING_DIR_HOST}" do_configure() { - sed -i -e /docs/d Makefile.am - autotools_do_configure - # We need native orbit-idl with target idl files. No way to say it in a clean way: - find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; + sed -i -e /docs/d Makefile.am + autotools_do_configure + # We need native orbit-idl with target idl files. No way to say it in a clean way: + find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; } RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking" diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb index a1777974e2..9bf6b6de59 100644 --- a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb +++ b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb @@ -12,7 +12,7 @@ EXTRA_OECONF += "--disable-scrollkeeper" # Remove an autogenerated file that needs to be rebuilt do_configure_prepend () { - rm -f ${S}/src/terminal-type-builtins.c + rm -f ${S}/src/terminal-type-builtins.c } SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8" diff --git a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb index ef696f8fe7..ed4a556e21 100644 --- a/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb +++ b/meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb @@ -11,30 +11,30 @@ SRC_URI[archive.sha256sum] = "1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa8 SRC_URI += " \ file://system-tools-backends \ - " +" # This needs to move to meta-angstrom SRC_URI_append_angstrom = " \ file://add-angstrom-distro.patch \ - " +" EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " do_configure() { - rm missing || true - automake --add-missing - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in - libtoolize --force --install - aclocal + rm missing || true + automake --add-missing + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in + libtoolize --force --install + aclocal gnu-configize - oe_runconf - cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} + oe_runconf + cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} } do_install_append () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/init.d + install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ } INITSCRIPT_NAME = "system-tools-backends" diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc index e19727c569..665efa37e2 100644 --- a/meta-gnome/recipes-gnome/pimlico/contacts.inc +++ b/meta-gnome/recipes-gnome/pimlico/contacts.inc @@ -13,16 +13,16 @@ EXTRA_OECONF += "--disable-gnome-vfs" EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps + install -d ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps + install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps } FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png \ - ${datadir}/icons/hicolor" + ${datadir}/pixmaps/stock_person.png \ + ${datadir}/icons/hicolor" SRC_URI = "file://stock_contact.png \ file://stock_person.png \ file://contacts-conditionally-install-schema.patch \ - " +" diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb index da6959b13b..bdc7f4886d 100644 --- a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb +++ b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb @@ -13,6 +13,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee" do_configure_prepend () { - # It used 8 spaces to instead of a tab, but it doesn't work for us - sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am + # It used 8 spaces to instead of a tab, but it doesn't work for us + sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am } diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb index 45a6a0df4b..28e5fe23ea 100644 --- a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb +++ b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb @@ -12,7 +12,7 @@ PR = "r4" S = "${WORKDIR}/git" SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \ - file://make-382.patch" + file://make-382.patch" S = "${WORKDIR}/git" diff --git a/meta-gnome/recipes-gnome/pimlico/dates_git.bb b/meta-gnome/recipes-gnome/pimlico/dates_git.bb index cf5343d514..8966303aee 100644 --- a/meta-gnome/recipes-gnome/pimlico/dates_git.bb +++ b/meta-gnome/recipes-gnome/pimlico/dates_git.bb @@ -12,7 +12,7 @@ PR = "r9" S = "${WORKDIR}/git" SRC_URI = "git://git.gnome.org/${BPN};protocol=git \ - file://make-382.patch \ - file://dso_linking_change_build_fix.patch \ - file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \ - " + file://make-382.patch \ + file://dso_linking_change_build_fix.patch \ + file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \ +" diff --git a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb index 8c157541df..346b3244c2 100644 --- a/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +++ b/meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb @@ -13,7 +13,7 @@ EXTRA_OECONF += "--enable-all-themes --disable-hicolor-check" inherit gnome perlnative do_configure_prepend() { - sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libdir}/icon-naming-utils:g' configure.in + sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libdir}/icon-naming-utils:g' configure.in } PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb index a1fa786b84..89d95de4f0 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb @@ -13,6 +13,6 @@ SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836e EXTRA_OECONF += "--disable-scrollkeeper" # remove -I/usr/include from zenity_CPPFLAGS do_configure_prepend() { - sed -i -e '/-I$(includedir)/d' src/Makefile.am + sed -i -e '/-I$(includedir)/d' src/Makefile.am } |