summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2013-04-13 22:49:41 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2013-04-15 16:23:17 +0200
commita45830a39bb47a9eab27980d52966226c9504ea4 (patch)
tree001209d9740e8668b2eeeac4212b3561aecebf29 /meta-gnome/recipes-gnome
parent6f48cf899aed0622f8fb26ffa144656a1143c9c5 (diff)
downloadmeta-openembedded-a45830a39bb47a9eab27980d52966226c9504ea4.tar.gz
recipes: Unify indentation
* This change is only aesthetic (unlike indentation in Python tasks). * Some recipes were using tabs. * Some were using 8 spaces. * Some were using mix or different number of spaces. * Make them consistently use 4 spaces everywhere. * Yocto styleguide advises to use tabs (but the only reason to keep tabs is the need to update a lot of recipes). Lately this advice was also merged into the styleguide on the OE wiki. * Using 4 spaces in both types of tasks is better because it's less error prone when someone is not sure if e.g. do_generate_toolchain_file() is Python or shell task and also allows to highlight every tab used in .bb, .inc, .bbappend, .bbclass as potentially bad (shouldn't be used for indenting of multiline variable assignments and cannot be used for Python tasks). * Don't indent closing quote on multiline variables we're quite inconsistent wheater it's first character on line under opening quote or under first non-whitespace character in previous line. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Acked-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome/recipes-gnome')
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword.inc34
-rw-r--r--meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb6
-rw-r--r--meta-gnome/recipes-gnome/bonobo/libbonobo.inc18
-rw-r--r--meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb2
-rw-r--r--meta-gnome/recipes-gnome/devilspie/devilspie2_0.24.bb20
-rw-r--r--meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb4
-rw-r--r--meta-gnome/recipes-gnome/epiphany/epiphany_2.30.6.bb4
-rw-r--r--meta-gnome/recipes-gnome/evince/evince_2.32.0.bb6
-rw-r--r--meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb2
-rw-r--r--meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb42
-rw-r--r--meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_2.32.0.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb10
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb10
-rw-r--r--meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb14
-rw-r--r--meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb30
-rw-r--r--meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb8
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb8
-rw-r--r--meta-gnome/recipes-gnome/gnome/libgnomekbd_2.26.0.bb4
-rw-r--r--meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.7.bb8
-rw-r--r--meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb2
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs-gdu-volume-monitor_1.8.2.bb28
-rw-r--r--meta-gnome/recipes-gnome/gvfs/gvfs.inc2
-rw-r--r--meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb2
-rw-r--r--meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb2
-rw-r--r--meta-gnome/recipes-gnome/hicolor-icon-theme/hicolor-icon-theme_0.12.bb2
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnome_2.32.1.bb4
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomekbd_2.32.0.bb4
-rw-r--r--meta-gnome/recipes-gnome/libgnome/libgnomeui.inc2
-rw-r--r--meta-gnome/recipes-gnome/libgsf/libgsf_1.14.21.bb8
-rw-r--r--meta-gnome/recipes-gnome/libgtkstylus/libgtkstylus_0.5.bb6
-rw-r--r--meta-gnome/recipes-gnome/libnotify/libnotify_0.6.0.bb4
-rw-r--r--meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb10
-rw-r--r--meta-gnome/recipes-gnome/metacity/metacity_2.34.13.bb4
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb8
-rw-r--r--meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb8
-rw-r--r--meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb2
-rw-r--r--meta-gnome/recipes-gnome/nonworking/system-tools/system-tools-backends_2.10.2.bb24
-rw-r--r--meta-gnome/recipes-gnome/pimlico/contacts.inc12
-rw-r--r--meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb4
-rw-r--r--meta-gnome/recipes-gnome/pimlico/contacts_git.bb2
-rw-r--r--meta-gnome/recipes-gnome/pimlico/dates_git.bb8
-rw-r--r--meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb2
-rw-r--r--meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb2
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 8fbcd3bb2..39c590c41 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword.inc
+++ b/meta-gnome/recipes-gnome/abiword/abiword.inc
@@ -20,15 +20,15 @@ CVSSRC = "${WORKDIR}/abi"
20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" 20SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
21 21
22FILES_${PN} += " \ 22FILES_${PN} += " \
23 ${datadir}/icons/* \ 23 ${datadir}/icons/* \
24 ${datadir}/mime-info \ 24 ${datadir}/mime-info \
25 ${datadir}/abiword-${SHRT_VER}/glade \ 25 ${datadir}/abiword-${SHRT_VER}/glade \
26 ${datadir}/abiword-${SHRT_VER}/system.profile-en \ 26 ${datadir}/abiword-${SHRT_VER}/system.profile-en \
27 ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \ 27 ${datadir}/abiword-${SHRT_VER}/system.profile-en-GB \
28 " 28"
29 29
30# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \ 30# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
31# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \ 31# ${datadir}/abiword-${SHRT_VER}/templates/normal.awt-en_GB \
32 32
33inherit autotools pkgconfig 33inherit autotools pkgconfig
34 34
@@ -40,10 +40,10 @@ PARALLEL_MAKE = ""
40# --disable-exports options 40# --disable-exports options
41 41
42EXTRA_OECONF = " --enable-embedded=poky \ 42EXTRA_OECONF = " --enable-embedded=poky \
43 --disable-printing \ 43 --disable-printing \
44 --with-sys-wv \ 44 --with-sys-wv \
45 --disable-exports \ 45 --disable-exports \
46 --disable-spellcheck" 46 --disable-spellcheck"
47 47
48# TODO -- refactor this, so that instead of two strings and profiles 48# TODO -- refactor this, so that instead of two strings and profiles
49# packages we have lots of locale packages, each with a set of strings and 49# packages we have lots of locale packages, each with a set of strings and
@@ -51,14 +51,14 @@ EXTRA_OECONF = " --enable-embedded=poky \
51# 51#
52PACKAGES += " abiword-strings abiword-systemprofiles" 52PACKAGES += " abiword-strings abiword-systemprofiles"
53 53
54FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings" 54FILES_abiword-strings += "${datadir}/abiword-${SHRT_VER}/strings"
55FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*" 55FILES_abiword-systemprofiles += "${datadir}/abiword-${SHRT_VER}/system.profile*"
56 56
57# AbiWord configure.ac does not play nicely with autoreconf 57# AbiWord configure.ac does not play nicely with autoreconf
58# so use the autogen.sh script that comes with AbiWord 58# so use the autogen.sh script that comes with AbiWord
59# 59#
60do_configure() { 60do_configure() {
61 cd ${S} 61 cd ${S}
62 export NOCONFIGURE="no"; ./autogen.sh 62 export NOCONFIGURE="no"; ./autogen.sh
63 oe_runconf 63 oe_runconf
64} 64}
diff --git a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
index a2cd1cc16..1aa88cbe3 100644
--- a/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
+++ b/meta-gnome/recipes-gnome/abiword/abiword_2.8.6.bb
@@ -50,9 +50,9 @@ do_configure() {
50} 50}
51 51
52do_install_append() { 52do_install_append() {
53 install -d ${D}${datadir}/pixmaps/ 53 install -d ${D}${datadir}/pixmaps/
54 mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/ 54 mv ${D}${datadir}/icons/* ${D}${datadir}/pixmaps/
55 rmdir ${D}${datadir}/icons 55 rmdir ${D}${datadir}/icons
56} 56}
57 57
58PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates " 58PACKAGES += " ${PN}-clipart ${PN}-icons ${PN}-strings ${PN}-systemprofiles ${PN}-templates "
diff --git a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
index d9a861804..9f0857701 100644
--- a/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
+++ b/meta-gnome/recipes-gnome/bonobo/libbonobo.inc
@@ -9,13 +9,13 @@ inherit gnome
9 9
10SRC_URI += "file://gtk-doc.m4 \ 10SRC_URI += "file://gtk-doc.m4 \
11 file://gtk-doc.make \ 11 file://gtk-doc.make \
12 " 12"
13 13
14ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2" 14ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
15 15
16FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so" 16FILES_${PN} += "${libdir}/orbit-2.0/*.so ${libdir}/bonobo/monikers/*.so"
17FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \ 17FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug \
18 ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug" 18 ${libdir}/bonobo-2.0/samples/.debug ${libdir}/orbit-2.0/.debug"
19FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples" 19FILES_${PN}-dev += "${libdir}/orbit-2.0/*.la ${libdir}/bonobo/monikers/*.la ${libdir}/bonobo-2.0/samples"
20FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a" 20FILES_${PN}-staticdev += "${libdir}/orbit-2.0/*.a ${libdir}/bonobo/monikers/*.a"
21 21
@@ -24,17 +24,17 @@ LEAD_SONAME = "libbonobo-2.so"
24PARALLEL_MAKE = "" 24PARALLEL_MAKE = ""
25 25
26do_configure_prepend() { 26do_configure_prepend() {
27 install -d m4 27 install -d m4
28 install ${WORKDIR}/gtk-doc.m4 m4/ 28 install ${WORKDIR}/gtk-doc.m4 m4/
29 install ${WORKDIR}/gtk-doc.make ./ 29 install ${WORKDIR}/gtk-doc.make ./
30} 30}
31 31
32do_compile() { 32do_compile() {
33 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" 33 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
34} 34}
35 35
36do_install() { 36do_install() {
37 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install 37 oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
38 install -d ${D}${datadir}/idl/bonobo-activation-2.0/ 38 install -d ${D}${datadir}/idl/bonobo-activation-2.0/
39 install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/ 39 install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/
40} 40}
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 af9a83a1f..ba14e8848 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"
19FILES_dconf-editor = "${bindir}/dconf-editor ${datadir}/dconf-editor/" 19FILES_dconf-editor = "${bindir}/dconf-editor ${datadir}/dconf-editor/"
20FILES_${PN} += "${datadir}/dbus-1/ \ 20FILES_${PN} += "${datadir}/dbus-1/ \
21 ${libdir}/gio/modules/*.so \ 21 ${libdir}/gio/modules/*.so \
22 " 22"
23FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so" 23FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
24 24
25pkg_postinst_${PN} () { 25pkg_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 05311fd54..9e6ba9042 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 \
7DEPENDS = "gtk+ glib-2.0 libwnck lua5.1 virtual/libx11" 7DEPENDS = "gtk+ glib-2.0 libwnck lua5.1 virtual/libx11"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \ 10 http://www.gusnan.se/devilspie2/download/devilspie2_${PV}-src.tar.gz \
11 file://default.lua \ 11 file://default.lua \
12 file://devilspie2.desktop \ 12 file://devilspie2.desktop \
13" 13"
14SRC_URI[md5sum] = "90b354662659e2922bd051fdde3b0971" 14SRC_URI[md5sum] = "90b354662659e2922bd051fdde3b0971"
15SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d465a646a" 15SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d465a646a"
@@ -17,14 +17,14 @@ SRC_URI[sha256sum] = "9c94fa13ed8c0bf6914fdda513e21a4bd527821b97a53d8004168a8d46
17inherit pkgconfig 17inherit pkgconfig
18 18
19do_compile() { 19do_compile() {
20 export GTK2=1 20 export GTK2=1
21 oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}" 21 oe_runmake CC="${CC}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" -ldl -lm ${LDFLAGS}"
22} 22}
23 23
24do_install() { 24do_install() {
25 oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install 25 oe_runmake DESTDIR="${D}" PREFIX="${prefix}" install
26 install -d ${D}/${sysconfdir}/devilspie2 26 install -d ${D}/${sysconfdir}/devilspie2
27 install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2 27 install -m 644 ${WORKDIR}/default.lua ${D}/${sysconfdir}/devilspie2
28 install -d ${D}/${sysconfdir}/xdg/autostart 28 install -d ${D}/${sysconfdir}/xdg/autostart
29 install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart 29 install -m 644 ${WORKDIR}/devilspie2.desktop ${D}/${sysconfdir}/xdg/autostart
30} 30}
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 958a90cca..23a6cefeb 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"
40#PARALLEL_MAKE = "" 40#PARALLEL_MAKE = ""
41 41
42do_configure_append () { 42do_configure_append () {
43 cp ${WORKDIR}/iconv-detect.h ${S} 43 cp ${WORKDIR}/iconv-detect.h ${S}
44 sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile 44 sed -i 's/-DG_DISABLE_DEPRECATED//g' ${S}/libedataserver/Makefile
45} 45}
46 46
47EXTRA_OECONF = "--without-openldap --with-dbus --without-bug-buddy \ 47EXTRA_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 de02e261c..495172d29 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
11EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file" 11EXTRA_OECONF += " --disable-nss --with-distributor-name=${DISTRO} --without-ca-file"
12 12
13do_configure_prepend() { 13do_configure_prepend() {
14 touch ${S}/gnome-doc-utils.make 14 touch ${S}/gnome-doc-utils.make
15 sed -i -e s:help::g Makefile.am 15 sed -i -e s:help::g Makefile.am
16} 16}
17 17
18FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" 18FILES_${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 74958d84f..986cd7198 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 \
18 --disable-scrollkeeper \ 18 --disable-scrollkeeper \
19 --enable-pixbuf \ 19 --enable-pixbuf \
20 --disable-help \ 20 --disable-help \
21 " 21"
22 22
23do_install_append() { 23do_install_append() {
24 install -d install -d ${D}${datadir}/pixmaps 24 install -d install -d ${D}${datadir}/pixmaps
25 install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/ 25 install -m 0755 ${S}/data/icons/48x48/apps/evince.png ${D}${datadir}/pixmaps/
26} 26}
27 27
28RDEPENDS_${PN} += "glib-2.0-utils" 28RDEPENDS_${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 88cf1d6ca..d5a175139 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
14inherit autotools pkgconfig gsettings 14inherit autotools pkgconfig gsettings
15 15
16do_configure_prepend() { 16do_configure_prepend() {
17 sed -i -e "s: help: :g" ${S}/Makefile.am 17 sed -i -e "s: help: :g" ${S}/Makefile.am
18} 18}
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 45bddc8f0..1e55dd988 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 += " \
18 file://gdm-pam \ 18 file://gdm-pam \
19 file://Default \ 19 file://Default \
20 file://gdm.service.in \ 20 file://gdm.service.in \
21 " 21"
22 22
23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" 23SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e"
24SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703" 24SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703"
@@ -29,36 +29,36 @@ EXTRA_OECONF = " --enable-authentication-scheme=shadow \
29 --disable-scrollkeeper" 29 --disable-scrollkeeper"
30 30
31do_configure_prepend() { 31do_configure_prepend() {
32 sed -i -e "s:\bdocs::g" ${S}/Makefile.am 32 sed -i -e "s:\bdocs::g" ${S}/Makefile.am
33} 33}
34 34
35do_install_prepend() { 35do_install_prepend() {
36 mkdir -p ${D}/var/lib/gdm/.gconf.mandatory 36 mkdir -p ${D}/var/lib/gdm/.gconf.mandatory
37 cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/ 37 cp ${WORKDIR}/%gconf-tree.xml ${D}/var/lib/gdm/.gconf.mandatory/
38} 38}
39 39
40do_install_append() { 40do_install_append() {
41 install -d ${D}/${sysconfdir}/init.d 41 install -d ${D}/${sysconfdir}/init.d
42 install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ 42 install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/
43 43
44 install -d ${D}/${sysconfdir}/gdm 44 install -d ${D}/${sysconfdir}/gdm
45 install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ 45 install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
46 46
47 install -d ${D}/${sysconfdir}/pam.d 47 install -d ${D}/${sysconfdir}/pam.d
48 install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm 48 install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm
49 49
50 install -d ${D}/${sysconfdir}/gdm/Init 50 install -d ${D}/${sysconfdir}/gdm/Init
51 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init 51 install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init
52 52
53 install -d ${D}${systemd_unitdir}/system 53 install -d ${D}${systemd_unitdir}/system
54 sed -e 's,%sbindir%,${sbindir},g' \ 54 sed -e 's,%sbindir%,${sbindir},g' \
55 < ${WORKDIR}/gdm.service.in \ 55 < ${WORKDIR}/gdm.service.in \
56 > ${D}${systemd_unitdir}/system/gdm.service 56 > ${D}${systemd_unitdir}/system/gdm.service
57} 57}
58 58
59FILES_${PN} += "${datadir}/icon* \ 59FILES_${PN} += "${datadir}/icon* \
60 ${datadir}/xsession* \ 60 ${datadir}/xsession* \
61 " 61"
62 62
63RDEPENDS_${PN} += "grep dbus-x11 shadow" 63RDEPENDS_${PN} += "grep dbus-x11 shadow"
64# "libpam-base-files" 64# "libpam-base-files"
@@ -81,8 +81,8 @@ pkg_postinst_${PN} () {
81 grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm 81 grep "^gdm:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/gdm gdm --ingroup gdm -g gdm
82 82
83if [ -d /var/lib/gdm ]; then 83if [ -d /var/lib/gdm ]; then
84 chown -R gdm:gdm /var/lib/gdm 84 chown -R gdm:gdm /var/lib/gdm
85 chmod 0750 /var/lib/gdm 85 chmod 0750 /var/lib/gdm
86fi 86fi
87 87
88# Register up as default dm 88# Register up as default dm
@@ -94,5 +94,5 @@ echo "${bindir}/gdm" > ${sysconfdir}/X11/default-display-manager
94pkg_postrm_${PN} () { 94pkg_postrm_${PN} () {
95 deluser gdm || true 95 deluser gdm || true
96 delgroup gdm || true 96 delgroup gdm || true
97 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true 97 sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true
98} 98}
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 11e0945f8..11f1a60c1 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 \
16 --enable-gvfs-metadata" 16 --enable-gvfs-metadata"
17 17
18do_configure_prepend() { 18do_configure_prepend() {
19 gnome-doc-common --copy || true 19 gnome-doc-common --copy || true
20 gnome-doc-prepare --force --copy || true 20 gnome-doc-prepare --force --copy || true
21} 21}
22 22
23FILES_${PN} += "${libdir}/gedit-2/plugin* ${datadir}/gedit-2" 23FILES_${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 2b4ccbb8b..a2037cff0 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"
19 19
20# No native docbook XSL stylesheets recipe in OE yet 20# No native docbook XSL stylesheets recipe in OE yet
21do_configure_prepend() { 21do_configure_prepend() {
22 sed -i s/help// Makefile.am 22 sed -i s/help// Makefile.am
23} 23}
24 24
25do_configure_append() { 25do_configure_append() {
26 sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool 26 sed -i 's,func_fatal_error "error: cannot install,echo "bogus message about,' ${HOST_SYS}-libtool
27} 27}
28 28
29RRECOMMENDS_${PN} += "obexd obex-data-server" 29RRECOMMENDS_${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 ea4ce4b09..ef04c8d54 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
14LDFLAGS += "-lgthread-2.0 -lxml2" 14LDFLAGS += "-lgthread-2.0 -lxml2"
15 15
16do_configure_prepend() { 16do_configure_prepend() {
17 sed -i s:help::g Makefile.am 17 sed -i s:help::g Makefile.am
18} 18}
19 19
20FILES_${PN} += "${datadir}/icon* \ 20FILES_${PN} += "${datadir}/icon* \
@@ -22,7 +22,7 @@ FILES_${PN} += "${datadir}/icon* \
22 ${libdir}/window-manager-settings/*.so \ 22 ${libdir}/window-manager-settings/*.so \
23 ${datadir}/gnome \ 23 ${datadir}/gnome \
24 ${datadir}/desktop-directories \ 24 ${datadir}/desktop-directories \
25 " 25"
26FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" 26FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug"
27FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" 27FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la"
28FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" 28FILES_${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 612e88fd3..333f8cbe3 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"
16EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs" 16EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
17 17
18do_configure_prepend () { 18do_configure_prepend () {
19 cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S} 19 cp ${STAGING_DATADIR_NATIVE}/gnome-common/data/omf.make ${S}
20 sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in 20 sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in
21} 21}
22 22
23PACKAGES =+ "libgnome-desktop" 23PACKAGES =+ "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 595d9dc6b..a0fd9bdba 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"
12SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" 12SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
13 13
14SRC_URI += "\ 14SRC_URI += "\
15 file://disable-scrollkeeper.patch \ 15 file://disable-scrollkeeper.patch \
16 file://fix-dbus-interfaces.patch \ 16 file://fix-dbus-interfaces.patch \
17 file://sysrooted-pkg-config.patch \ 17 file://sysrooted-pkg-config.patch \
18 " 18"
19 19
20EXTRA_OECONF += "--disable-scrollkeeper" 20EXTRA_OECONF += "--disable-scrollkeeper"
21 21
22do_configure_prepend() { 22do_configure_prepend() {
23 sed -i -e "s: help : :g" ${S}/Makefile.am 23 sed -i -e "s: help : :g" ${S}/Makefile.am
24} 24}
25 25
26PACKAGES =+ "${PN}-nautilus-extension" 26PACKAGES =+ "${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 13614a062..a82ceb931 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
27EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" 27EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none"
28 28
29do_configure_prepend() { 29do_configure_prepend() {
30 gnome-doc-prepare --automake 30 gnome-doc-prepare --automake
31 sed -i -e s:help:: ${S}/Makefile.am 31 sed -i -e s:help:: ${S}/Makefile.am
32} 32}
33 33
34pkg_postinst_${PN}_append () { 34pkg_postinst_${PN}_append () {
35 gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ 35 gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \
36 --direct --load /etc/gconf/schemas/panel-default-setup.entries 36 --direct --load /etc/gconf/schemas/panel-default-setup.entries
37} 37}
38 38
39PACKAGES =+ "libpanel-applet" 39PACKAGES =+ "libpanel-applet"
@@ -44,6 +44,6 @@ FILES_${PN} =+ "${datadir}/gnome* \
44 ${datadir}/icons \ 44 ${datadir}/icons \
45 ${datadir}/PolicyKit \ 45 ${datadir}/PolicyKit \
46 ${libdir}/bonobo \ 46 ${libdir}/bonobo \
47 " 47"
48 48
49 49
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 e54579d6d..c4465a55a 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"
21EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" 21EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none"
22 22
23do_configure_prepend() { 23do_configure_prepend() {
24 gnome-doc-prepare --automake 24 gnome-doc-prepare --automake
25 sed -i -e s:help:: ${S}/Makefile.am 25 sed -i -e s:help:: ${S}/Makefile.am
26 sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in 26 sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in
27} 27}
28 28
29pkg_postinst_${PN}_append () { 29pkg_postinst_${PN}_append () {
30if [ -n "$D" ]; then 30if [ -n "$D" ]; then
31 exit 1 31 exit 1
32fi 32fi
33 gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \ 33 gconftool-2 --config-source=xml:readwrite:${sysconfdir}/gconf/gconf.xml.defaults \
34 --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries 34 --direct --load ${sysconfdir}/gconf/schemas/panel-default-setup.entries
35} 35}
36 36
37PACKAGES =+ "libpanel-applet" 37PACKAGES =+ "libpanel-applet"
@@ -42,6 +42,6 @@ FILES_${PN} =+ "${datadir}/gnome* \
42 ${datadir}/icons \ 42 ${datadir}/icons \
43 ${datadir}/PolicyKit \ 43 ${datadir}/PolicyKit \
44 ${libdir}/bonobo \ 44 ${libdir}/bonobo \
45 " 45"
46 46
47 47
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 aeaf68891..cc4c0c478 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 \
21 --with-dpms-ext=${STAGING_INCDIR}/.. \ 21 --with-dpms-ext=${STAGING_INCDIR}/.. \
22 --enable-compile-warnings=no \ 22 --enable-compile-warnings=no \
23 ac_cv_header_X11_extensions_dpms_h=yes \ 23 ac_cv_header_X11_extensions_dpms_h=yes \
24 " 24"
25 25
26do_configure_prepend() { 26do_configure_prepend() {
27 sed -i -e 's: man ::g' ${S}/Makefile.am 27 sed -i -e 's: man ::g' ${S}/Makefile.am
28} 28}
29 29
30do_configure_append() { 30do_configure_append() {
31 rm config.log 31 rm config.log
32 # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror 32 # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror
33 for i in $(find ${S} -name "Makefile") ; do 33 for i in $(find ${S} -name "Makefile") ; do
34 sed -i -e s:-Werror::g $i 34 sed -i -e s:-Werror::g $i
35 done 35 done
36 sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile 36 sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${S}/src/Makefile
37} 37}
38 38
39PACKAGES =+ "${PN}-applets" 39PACKAGES =+ "${PN}-applets"
40 40
41FILES_${PN}-applets = "${bindir}/*applet* \ 41FILES_${PN}-applets = "${bindir}/*applet* \
42 ${libdir}/bonobo/servers \ 42 ${libdir}/bonobo/servers \
43 ${datadir}/gnome-2.0/ui" 43 ${datadir}/gnome-2.0/ui \
44"
44 45
45FILES_${PN} += "${datadir}/icons \ 46FILES_${PN} += "${datadir}/icons \
46 ${datadir}/dbus-1 \ 47 ${datadir}/dbus-1 \
47 ${datadir}/gnome/autostart \ 48 ${datadir}/gnome/autostart \
48 " 49"
49 50
50FILES_${PN}-doc += "${datadir}/omf \ 51FILES_${PN}-doc += "${datadir}/omf \
51 ${datadir}/gnome/help " 52 ${datadir}/gnome/help \
53"
52 54
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 e1fa51951..93b0284a2 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
15EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs" 15EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs"
16 16
17do_configure_append() { 17do_configure_append() {
18 for i in $(find ${S} -name "Makefile") ; do 18 for i in $(find ${S} -name "Makefile") ; do
19 sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i 19 sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i
20 sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i 20 sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i
21 done 21 done
22} 22}
23 23
24RRECOMMENDS_${PN} += "${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" 24RRECOMMENDS_${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 f5f394e1b..47baea694 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 \
17 --x-includes=${STAGING_INCDIR} \ 17 --x-includes=${STAGING_INCDIR} \
18 --x-libraries=${STAGING_LIBDIR} \ 18 --x-libraries=${STAGING_LIBDIR} \
19 --enable-polkit \ 19 --enable-polkit \
20 " 20"
21 21
22do_configure_prepend() { 22do_configure_prepend() {
23 sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac 23 sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' configure.ac
24} 24}
25 25
26FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ 26FILES_${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 98b7b8ddf..7764b7143 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
12SRC_URI += "file://0001-Fix-glib-includes.patch" 12SRC_URI += "file://0001-Fix-glib-includes.patch"
13 13
14do_configure_prepend() { 14do_configure_prepend() {
15 sed -i -e s:help::g ${S}/Makefile.am 15 sed -i -e s:help::g ${S}/Makefile.am
16} 16}
17 17
18FILES_${PN} += "${datadir}/icons \ 18FILES_${PN} += "${datadir}/icons \
19 ${datadir}/dbus-1 \ 19 ${datadir}/dbus-1 \
20 ${datadir}/gnome/autostart \ 20 ${datadir}/gnome/autostart \
21 " 21"
22 22
23FILES_${PN}-doc += "${datadir}/omf \ 23FILES_${PN}-doc += "${datadir}/omf \
24 ${datadir}/gnome/help " 24 ${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 cfe7125dd..78cd1d682 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
21RPROVIDES_${PN} = "gnome-vfs-plugin-dbus" 21RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
22 22
23SRC_URI += "file://gconftool-lossage.patch \ 23SRC_URI += "file://gconftool-lossage.patch \
24 file://gnome-vfs-no-kerberos.patch;striplevel=0" 24 file://gnome-vfs-no-kerberos.patch;striplevel=0"
25 25
26SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e" 26SRC_URI[archive.md5sum] = "a05fab03eeef10a47dd156b758982f2e"
27SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa" 27SRC_URI[archive.sha256sum] = "62de64b5b804eb04104ff98fcd6a8b7276d510a49fbd9c0feb568f8996444faa"
@@ -33,7 +33,7 @@ EXTRA_OECONF = " --disable-hal \
33 ac_cv_lib_sec_acl=no \ 33 ac_cv_lib_sec_acl=no \
34 gvfs_cv_HAVE_SOLARIS_ACLS=no \ 34 gvfs_cv_HAVE_SOLARIS_ACLS=no \
35 gvfs_cv_HAVE_POSIX_ACLS=no \ 35 gvfs_cv_HAVE_POSIX_ACLS=no \
36 " 36"
37 37
38FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services" 38FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services"
39FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" 39FILES_${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 f31799746..8f4a6eb29 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"
9inherit gnome pkgconfig 9inherit gnome pkgconfig
10 10
11do_compile_append () { 11do_compile_append () {
12 cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old 12 cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old
13 sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc 13 sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc
14} 14}
15 15
16SRC_URI += "\ 16SRC_URI += "\
17 file://libgnomecups-0.2.3-glib.h.patch \ 17 file://libgnomecups-0.2.3-glib.h.patch \
18 file://libgnomecups-0.2.3-cups-1.6.patch \ 18 file://libgnomecups-0.2.3-cups-1.6.patch \
19" 19"
20 20
21SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" 21SRC_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 f2e4ec533..640882a70 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+"
6inherit gnome 6inherit gnome
7 7
8do_configure_append() { 8do_configure_append() {
9 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g 9 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
10 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g 10 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
11} 11}
12 12
13 13
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 8c8574aa2..8e31f1dcd 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"
15SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6" 15SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6"
16 16
17FILES_${PN}-dbg += "\ 17FILES_${PN}-dbg += "\
18 ${libdir}/${PN}/${PV}/modules/.debug \ 18 ${libdir}/${PN}/${PV}/modules/.debug \
19 ${libdir}/${PN}/${PV}/modules/*/.debug \ 19 ${libdir}/${PN}/${PV}/modules/*/.debug \
20" 20"
21FILES_${PN}-staticdev += "\ 21FILES_${PN}-staticdev += "\
22 ${libdir}/${PN}/${PV}/modules/*.a \ 22 ${libdir}/${PN}/${PV}/modules/*.a \
23 ${libdir}/${PN}/${PV}/modules/*/*.a \ 23 ${libdir}/${PN}/${PV}/modules/*/*.a \
24" 24"
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 0414386d8..2cac8aa86 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
16SRC_URI += "file://parallel.patch" 16SRC_URI += "file://parallel.patch"
17 17
18do_install_append () { 18do_install_append () {
19 rm ${D}${libdir}/${BPN}/extensions/*.a 19 rm ${D}${libdir}/${BPN}/extensions/*.a
20} 20}
21 21
22FILES_${PN} += "${datadir}/icons" 22FILES_${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 3bc6b2bd3..8fe72edd3 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 \
12 --disable-samba" 12 --disable-samba"
13 13
14do_install_append() { 14do_install_append() {
15 rm -rf ${D}${sysconfdir} 15 rm -rf ${D}${sysconfdir}
16 rm -rf ${D}${bindir} 16 rm -rf ${D}${bindir}
17 rm -rf ${D}${includedir} 17 rm -rf ${D}${includedir}
18 rm -rf ${D}${libdir}/gio 18 rm -rf ${D}${libdir}/gio
19 rm -rf ${D}${libdir}/lib* 19 rm -rf ${D}${libdir}/lib*
20 rmdir --ignore-fail-on-non-empty ${D}${libdir} 20 rmdir --ignore-fail-on-non-empty ${D}${libdir}
21 rm -rf ${D}${datadir}/gvfs/mounts 21 rm -rf ${D}${datadir}/gvfs/mounts
22 rm -rf ${D}${datadir}/glib-2.0 22 rm -rf ${D}${datadir}/glib-2.0
23 rm -rf ${D}${datadir}/GConf 23 rm -rf ${D}${datadir}/GConf
24 rm -f ${D}${datadir}/dbus-1/services/gvfs-* 24 rm -f ${D}${datadir}/dbus-1/services/gvfs-*
25 rm -rf ${D}${datadir}/locale 25 rm -rf ${D}${datadir}/locale
26 rm -f ${D}${libexecdir}/gvfsd* 26 rm -f ${D}${libexecdir}/gvfsd*
27 rm -f ${D}${libexecdir}/gvfs-fuse-daemon 27 rm -f ${D}${libexecdir}/gvfs-fuse-daemon
28 rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor 28 rm -f ${D}${libexecdir}/gvfs-gphoto2-volume-monitor
29} 29}
diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs.inc b/meta-gnome/recipes-gnome/gvfs/gvfs.inc
index c69851c0f..0e1c69cf2 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} \
14 --with-samba-libs=${STAGING_LIBDIR} \ 14 --with-samba-libs=${STAGING_LIBDIR} \
15 --with-archive-includes=${STAGING_INCDIR} \ 15 --with-archive-includes=${STAGING_INCDIR} \
16 --with-archive-libs=${STAGING_LIBDIR} \ 16 --with-archive-libs=${STAGING_LIBDIR} \
17 " 17"
18 18
19FILES_${PN} += "${datadir}/dbus-1/services/*" 19FILES_${PN} += "${datadir}/dbus-1/services/*"
20 20
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 0e39707a7..5d6467f9a 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"
11SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c" 11SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c"
12 12
13do_configure_prepend() { 13do_configure_prepend() {
14 sed -i -e 's: doc : :g' ${S}/Makefile.am 14 sed -i -e 's: doc : :g' ${S}/Makefile.am
15} 15}
16 16
17FILES_${PN} += "${datadir}/gnome* \ 17FILES_${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 f54e9dcac..09388fb7f 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"
10SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c" 10SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c"
11 11
12do_configure_prepend() { 12do_configure_prepend() {
13 sed -i -e 's: doc : :g' ${S}/Makefile.am 13 sed -i -e 's: doc : :g' ${S}/Makefile.am
14} 14}
15 15
16FILES_${PN} += "${datadir}/gnome* \ 16FILES_${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 8d48dec8c..53786e939 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
19FILES_${PN} += "${datadir}/icons" 19FILES_${PN} += "${datadir}/icons"
20 20
21do_install_append () { 21do_install_append () {
22 install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor 22 install -m 0644 ${WORKDIR}/index.theme ${D}/${datadir}/icons/hicolor
23} 23}
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 0c0a0dfb2..08139735a 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"
16 16
17do_configure_prepend() { 17do_configure_prepend() {
18 sed -i -e s:docs::g ${S}/Makefile.am 18 sed -i -e s:docs::g ${S}/Makefile.am
19 echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make 19 echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make
20 echo "EXTRA_DIST = version.xml" > gtk-doc.make 20 echo "EXTRA_DIST = version.xml" > gtk-doc.make
21} 21}
22 22
23FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ 23FILES_${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 d1ca977e0..4b773bd7a 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"
12SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256" 12SRC_URI[archive.sha256sum] = "ddd52c4cc7d83ad7ef964a1bcb4db87407e65b00ffc3e70c088ca4ee7383d256"
13 13
14do_configure_append() { 14do_configure_append() {
15 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g 15 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
16 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g 16 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
17} 17}
18 18
19 19
diff --git a/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc b/meta-gnome/recipes-gnome/libgnome/libgnomeui.inc
index bf9ae691a..8f5590944 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"
19EXTRA_OECONF = "--disable-gtk-doc" 19EXTRA_OECONF = "--disable-gtk-doc"
20 20
21do_configure_prepend() { 21do_configure_prepend() {
22 install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h 22 install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
23} 23}
24 24
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 a4f1ec2f2..115796222 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"
15SRC_URI[archive.sha256sum] = "eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db" 15SRC_URI[archive.sha256sum] = "eef0a9d6eca4e6af6c16b208947e3c958c428b94d22792bdd0b80c08a4b301db"
16 16
17EXTRA_OECONF = "\ 17EXTRA_OECONF = "\
18 --without-python \ 18 --without-python \
19 --without-gnome-vfs --without-bonobo \ 19 --without-gnome-vfs --without-bonobo \
20 --disable-gtk-doc \ 20 --disable-gtk-doc \
21 --with-bz2" 21 --with-bz2"
22 22
23RDEPENDS_${PN} = "gconf" 23RDEPENDS_${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 891b6251b..564a71ce2 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"
8inherit autotools 8inherit autotools
9 9
10SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \ 10SRC_URI = "http://burtonini.com/temp/${PN}-${PV}.tar.gz \
11 file://gtkstylus.sh" 11 file://gtkstylus.sh"
12SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5" 12SRC_URI[md5sum] = "fa1c82cd9fd2fafd7ff10d78eb5781c5"
13SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c" 13SRC_URI[sha256sum] = "383e0a22a537f653b8d41688277560f95678a042967198085ec7caa1a5cc2f4c"
14 14
15do_install_append() { 15do_install_append() {
16 install -d ${D}/${sysconfdir}/X11/Xsession.d 16 install -d ${D}/${sysconfdir}/X11/Xsession.d
17 install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus 17 install -m 755 ${WORKDIR}/gtkstylus.sh ${D}/${sysconfdir}/X11/Xsession.d/45gtkstylus
18} 18}
19 19
20# Horrible but rpm falls over if you use '*' 20# 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 3e91e9726..0a590e3b4 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"
12SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210" 12SRC_URI[archive.sha256sum] = "73b16a79bb2fed62dcf146b11c4405776cb96a09dce66379ca541da7dbd64210"
13 13
14do_configure_prepend() { 14do_configure_prepend() {
15 sed -i /GTK3/d configure.ac 15 sed -i /GTK3/d configure.ac
16 sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am 16 sed -i -e /test-gtk3/d -e 's/test-xy-stress \\/test-xy-stress/' tests/Makefile.am
17} 17}
diff --git a/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb b/meta-gnome/recipes-gnome/libxklavier/libxklavier_5.0.bb
index df2dde1a1..a769a5558 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
12EXTRA_OECONF = "--with-xkb-bin-base=${bindir}" 12EXTRA_OECONF = "--with-xkb-bin-base=${bindir}"
13 13
14do_configure_append() { 14do_configure_append() {
15 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g 15 find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g
16 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g 16 find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g
17} 17}
18 18
19do_compile_append() { 19do_compile_append() {
20 sed -i -e s:${STAGING_DIR_TARGET}::g \ 20 sed -i -e s:${STAGING_DIR_TARGET}::g \
21 -e s:/${TARGET_SYS}::g \ 21 -e s:/${TARGET_SYS}::g \
22 libxklavier.pc 22 libxklavier.pc
23} 23}
24 24
25 25
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 360520152..23e5dda0b 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"
20ALTERNATIVE_PRIORITY = "10" 20ALTERNATIVE_PRIORITY = "10"
21 21
22EXTRA_OECONF += "--disable-verbose \ 22EXTRA_OECONF += "--disable-verbose \
23 --disable-xinerama" 23 --disable-xinerama"
24 24
25do_configure_prepend() { 25do_configure_prepend() {
26 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in 26 sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in
27} 27}
28 28
29FILES_${PN} += "${datadir}/themes ${datadir}/gnome-control-center ${datadir}/gnome" 29FILES_${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 488df1cb7..a9dcaf46e 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
24export SYSROOT = "${STAGING_DIR_HOST}" 24export SYSROOT = "${STAGING_DIR_HOST}"
25 25
26do_configure() { 26do_configure() {
27 sed -i -e /docs/d Makefile.am 27 sed -i -e /docs/d Makefile.am
28 autotools_do_configure 28 autotools_do_configure
29} 29}
30 30
31RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils" 31RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils"
@@ -34,9 +34,9 @@ FILES_${PN} += "${datadir}/icons \
34 ${datadir}/nautilus* \ 34 ${datadir}/nautilus* \
35 ${datadir}/dbus-1 \ 35 ${datadir}/dbus-1 \
36 ${libdir}/nautilus/extensions*/*.so \ 36 ${libdir}/nautilus/extensions*/*.so \
37 " 37"
38FILES_${PN}-dbg += "/usr/libexec/.debug \ 38FILES_${PN}-dbg += "/usr/libexec/.debug \
39 ${libdir}/nautilus/extensions*/.debug" 39 ${libdir}/nautilus/extensions*/.debug"
40 40
41# Don't make nautils drag us in 41# Don't make nautils drag us in
42PRIVATE_LIBS = "libnautilus-extension.so.1" 42PRIVATE_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 bc45342dd..0714815f3 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 "
26export SYSROOT = "${STAGING_DIR_HOST}" 26export SYSROOT = "${STAGING_DIR_HOST}"
27 27
28do_configure() { 28do_configure() {
29 sed -i -e /docs/d Makefile.am 29 sed -i -e /docs/d Makefile.am
30 autotools_do_configure 30 autotools_do_configure
31 # We need native orbit-idl with target idl files. No way to say it in a clean way: 31 # We need native orbit-idl with target idl files. No way to say it in a clean way:
32 find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; 32 find -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \;
33} 33}
34 34
35RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking" 35RDEPENDS_${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 a1777974e..9bf6b6de5 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"
12 12
13# Remove an autogenerated file that needs to be rebuilt 13# Remove an autogenerated file that needs to be rebuilt
14do_configure_prepend () { 14do_configure_prepend () {
15 rm -f ${S}/src/terminal-type-builtins.c 15 rm -f ${S}/src/terminal-type-builtins.c
16} 16}
17 17
18SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8" 18SRC_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 ef696f8fe..ed4a556e2 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
11 11
12SRC_URI += " \ 12SRC_URI += " \
13 file://system-tools-backends \ 13 file://system-tools-backends \
14 " 14"
15 15
16# This needs to move to meta-angstrom 16# This needs to move to meta-angstrom
17SRC_URI_append_angstrom = " \ 17SRC_URI_append_angstrom = " \
18 file://add-angstrom-distro.patch \ 18 file://add-angstrom-distro.patch \
19 " 19"
20 20
21EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " 21EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 "
22 22
23do_configure() { 23do_configure() {
24 rm missing || true 24 rm missing || true
25 automake --add-missing 25 automake --add-missing
26 sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am 26 sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am
27 sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in 27 sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in
28 libtoolize --force --install 28 libtoolize --force --install
29 aclocal 29 aclocal
30 gnu-configize 30 gnu-configize
31 oe_runconf 31 oe_runconf
32 cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} 32 cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S}
33} 33}
34 34
35do_install_append () { 35do_install_append () {
36 install -d ${D}/${sysconfdir}/init.d 36 install -d ${D}/${sysconfdir}/init.d
37 install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ 37 install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/
38} 38}
39 39
40INITSCRIPT_NAME = "system-tools-backends" 40INITSCRIPT_NAME = "system-tools-backends"
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc
index e19727c56..665efa37e 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"
13EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" 13EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
14 14
15do_install_append () { 15do_install_append () {
16 install -d ${D}/${datadir}/pixmaps 16 install -d ${D}/${datadir}/pixmaps
17 install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps 17 install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps
18 install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps 18 install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps
19} 19}
20 20
21FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ 21FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
22 ${datadir}/pixmaps/stock_person.png \ 22 ${datadir}/pixmaps/stock_person.png \
23 ${datadir}/icons/hicolor" 23 ${datadir}/icons/hicolor"
24 24
25SRC_URI = "file://stock_contact.png \ 25SRC_URI = "file://stock_contact.png \
26 file://stock_person.png \ 26 file://stock_person.png \
27 file://contacts-conditionally-install-schema.patch \ 27 file://contacts-conditionally-install-schema.patch \
28 " 28"
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb
index da6959b13..bdc7f4886 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 \
13 file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee" 13 file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee"
14 14
15do_configure_prepend () { 15do_configure_prepend () {
16 # It used 8 spaces to instead of a tab, but it doesn't work for us 16 # It used 8 spaces to instead of a tab, but it doesn't work for us
17 sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am 17 sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am
18} 18}
diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb
index 45a6a0df4..28e5fe23e 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"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \ 14SRC_URI =+ "git://git.gnome.org/${BPN};protocol=git \
15 file://make-382.patch" 15 file://make-382.patch"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
diff --git a/meta-gnome/recipes-gnome/pimlico/dates_git.bb b/meta-gnome/recipes-gnome/pimlico/dates_git.bb
index cf5343d51..8966303ae 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"
12S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
13 13
14SRC_URI = "git://git.gnome.org/${BPN};protocol=git \ 14SRC_URI = "git://git.gnome.org/${BPN};protocol=git \
15 file://make-382.patch \ 15 file://make-382.patch \
16 file://dso_linking_change_build_fix.patch \ 16 file://dso_linking_change_build_fix.patch \
17 file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \ 17 file://uclibc-NL_TIME_FIRST_WEEKDAY-absent.patch \
18 " 18"
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 8c157541d..346b3244c 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"
13inherit gnome perlnative 13inherit gnome perlnative
14 14
15do_configure_prepend() { 15do_configure_prepend() {
16 sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libdir}/icon-naming-utils:g' configure.in 16 sed -i -e 's:`$PKG_CONFIG --variable=program_path icon-naming-utils`:${STAGING_DIR_NATIVE}${libdir}/icon-naming-utils:g' configure.in
17} 17}
18 18
19PACKAGES =+ " gnome-theme-crux gnome-theme-highcontrast gnome-theme-highcontrastinverse gnome-theme-highcontrastlargeprint gnome-theme-highcontrastlargeprintinverse gnome-theme-largeprint gnome-theme-mist" 19PACKAGES =+ " 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 a1fa786b8..89d95de4f 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
13EXTRA_OECONF += "--disable-scrollkeeper" 13EXTRA_OECONF += "--disable-scrollkeeper"
14# remove -I/usr/include from zenity_CPPFLAGS 14# remove -I/usr/include from zenity_CPPFLAGS
15do_configure_prepend() { 15do_configure_prepend() {
16 sed -i -e '/-I$(includedir)/d' src/Makefile.am 16 sed -i -e '/-I$(includedir)/d' src/Makefile.am
17} 17}
18 18