summaryrefslogtreecommitdiff
path: root/recipes/gnome
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/gnome')
-rw-r--r--recipes/gnome/at-spi_1.26.0.bb27
-rw-r--r--recipes/gnome/files/libproxy-move-define-__USE_BSD.patch17
-rw-r--r--recipes/gnome/gconf-2.26.2/org.gnome.GConf.Defaults.service4
-rw-r--r--recipes/gnome/gconf-2.26.2/org.gnome.GConf.service3
-rw-r--r--recipes/gnome/gconf-editor_2.26.0.bb11
-rw-r--r--recipes/gnome/gconf_2.26.2.bb51
-rw-r--r--recipes/gnome/gdm-2.26.1/%gconf-tree.xml492
-rw-r--r--recipes/gnome/gdm-2.26.1/Default11
-rw-r--r--recipes/gnome/gdm-2.26.1/cross-xdetection.diff66
-rwxr-xr-xrecipes/gnome/gdm-2.26.1/gdm78
-rw-r--r--recipes/gnome/gdm-2.26.1/gdm-pam11
-rw-r--r--recipes/gnome/gdm-2.26.1/gdm-xklavier.patch11
-rw-r--r--recipes/gnome/gdm-2.26.1/gdm.conf80
-rw-r--r--recipes/gnome/gdm-2.26.1/other17
-rw-r--r--recipes/gnome/gdm_2.26.1.bb82
-rw-r--r--recipes/gnome/gedit_2.26.2.bb21
-rw-r--r--recipes/gnome/gnome-common-2.20.0/omf.patch13
-rw-r--r--recipes/gnome/gnome-common.inc28
-rw-r--r--recipes/gnome/gnome-common/omf.patch (renamed from recipes/gnome/gnome-common-2.18.0/omf.patch)0
-rw-r--r--recipes/gnome/gnome-common_2.18.0.bb29
-rw-r--r--recipes/gnome/gnome-common_2.20.0.bb29
-rw-r--r--recipes/gnome/gnome-common_2.26.0.bb1
-rw-r--r--recipes/gnome/gnome-desktop.inc4
-rw-r--r--recipes/gnome/gnome-games_2.24.0.bb4
-rw-r--r--recipes/gnome/gnome-keyring_2.26.0.bb1
-rw-r--r--recipes/gnome/gnome-power-manager_2.24.2.bb4
-rw-r--r--recipes/gnome/gnome-python-extras_2.25.3.bb21
-rw-r--r--recipes/gnome/gnome-python_2.26.1.bb22
-rw-r--r--recipes/gnome/gnome-terminal_2.26.2.bb17
-rw-r--r--recipes/gnome/gnome-vfs/gconftool-lossage.patch (renamed from recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch)0
-rw-r--r--recipes/gnome/gnome-vfs/gnome-vfs-no-kerberos.patch (renamed from recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch)0
-rw-r--r--recipes/gnome/gnome-vfs_2.24.1.bb49
-rw-r--r--recipes/gnome/gvfs_1.3.3.bb21
-rw-r--r--recipes/gnome/libart-lgpl_2.3.20.bb4
-rw-r--r--recipes/gnome/libbonobo_2.24.1.bb2
-rw-r--r--recipes/gnome/libbonoboui_2.24.1.bb61
-rw-r--r--recipes/gnome/libgail-gnome_1.20.1.bb16
-rw-r--r--recipes/gnome/libgnomecanvas_2.26.0.bb21
-rw-r--r--recipes/gnome/libgnomeui.inc24
-rw-r--r--recipes/gnome/libgnomeui_2.18.1.bb24
-rw-r--r--recipes/gnome/libgnomeui_2.23.90.bb24
-rw-r--r--recipes/gnome/libgnomeui_2.24.0.bb24
-rw-r--r--recipes/gnome/libgnomeui_2.24.1.bb2
-rw-r--r--recipes/gnome/libgweather_2.26.2.1.bb28
-rw-r--r--recipes/gnome/liboobs_2.22.0.bb8
-rw-r--r--recipes/gnome/libproxy_0.2.3.bb6
-rw-r--r--recipes/gnome/libxklavier_4.0.bb26
-rw-r--r--recipes/gnome/system-tools-backends/angstrom.patch54
-rwxr-xr-xrecipes/gnome/system-tools-backends/system-tools-backends74
-rw-r--r--recipes/gnome/system-tools-backends_2.6.1.bb36
50 files changed, 1518 insertions, 141 deletions
diff --git a/recipes/gnome/at-spi_1.26.0.bb b/recipes/gnome/at-spi_1.26.0.bb
new file mode 100644
index 0000000000..c2e8744b3c
--- /dev/null
+++ b/recipes/gnome/at-spi_1.26.0.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = "Assistive Technology Service Provider Interface for GNOME."
+SECTION = "x11/libs"
+PRIORITY = "optional"
+LICENSE = "LGPL"
+
+DEPENDS = "gtk+ atk libbonobo orbit2"
+RDEPENDS_${PN} = "libgail-gnome gtk-module-gail"
+
+inherit gnome
+
+do_stage () {
+ autotools_stage_all
+}
+
+FILES_${PN} += " \
+ ${libdir}/bonobo \
+ ${libdir}/gtk-2.0 \
+ ${libdir}/orbit-2.0 \
+ ${datadir}/idl \
+ "
+
+FILES_${PN}-dbg += " \
+ ${libdir}/gtk-2.0/modules/.debug \
+ ${libdir}/orbit-2.0/.debug \
+ "
+
+
diff --git a/recipes/gnome/files/libproxy-move-define-__USE_BSD.patch b/recipes/gnome/files/libproxy-move-define-__USE_BSD.patch
new file mode 100644
index 0000000000..b65b3608d4
--- /dev/null
+++ b/recipes/gnome/files/libproxy-move-define-__USE_BSD.patch
@@ -0,0 +1,17 @@
+Index: libproxy-0.2.3/src/lib/dns.c
+===================================================================
+--- libproxy-0.2.3.orig/src/lib/dns.c 2009-08-14 14:13:21.123557812 -0700
++++ libproxy-0.2.3/src/lib/dns.c 2009-08-14 14:13:31.954575500 -0700
+@@ -17,11 +17,11 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ ******************************************************************************/
+
++#define __USE_BSD
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
+ #include <netdb.h>
+-#define __USE_BSD
+ #include <unistd.h>
+
+ #include "misc.h"
diff --git a/recipes/gnome/gconf-2.26.2/org.gnome.GConf.Defaults.service b/recipes/gnome/gconf-2.26.2/org.gnome.GConf.Defaults.service
new file mode 100644
index 0000000000..d6e4e072b2
--- /dev/null
+++ b/recipes/gnome/gconf-2.26.2/org.gnome.GConf.Defaults.service
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.GConf.Defaults
+Exec=/usr/libexec/gconf-defaults-mechanism
+User=root
diff --git a/recipes/gnome/gconf-2.26.2/org.gnome.GConf.service b/recipes/gnome/gconf-2.26.2/org.gnome.GConf.service
new file mode 100644
index 0000000000..6939fd028b
--- /dev/null
+++ b/recipes/gnome/gconf-2.26.2/org.gnome.GConf.service
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=org.gnome.GConf
+Exec=/usr/libexec/gconfd-2
diff --git a/recipes/gnome/gconf-editor_2.26.0.bb b/recipes/gnome/gconf-editor_2.26.0.bb
new file mode 100644
index 0000000000..d373b1022a
--- /dev/null
+++ b/recipes/gnome/gconf-editor_2.26.0.bb
@@ -0,0 +1,11 @@
+DESCRIPTION = "Editor for the gnome registry"
+LICENSE = "GPLv2"
+DEPENDS = "gnome-doc-utils gconf"
+
+inherit gnome gconf
+
+do_configure_prepend() {
+ sed -i -e s:docs::g ${S}/Makefile.am
+}
+
+FILES_${PN} += "${datadir}/icons"
diff --git a/recipes/gnome/gconf_2.26.2.bb b/recipes/gnome/gconf_2.26.2.bb
new file mode 100644
index 0000000000..005ab47cfc
--- /dev/null
+++ b/recipes/gnome/gconf_2.26.2.bb
@@ -0,0 +1,51 @@
+DESCRIPTION = "GNOME configuration database system"
+SECTION = "x11/gnome"
+LICENSE = "LGPL"
+DEPENDS = "orbit2 glib-2.0 libxml2 policykit"
+ORBIT_IDL_SRC = "${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+PR = "r1"
+
+S = "${WORKDIR}/GConf-${PV}"
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.26/GConf-${PV}.tar.bz2 \
+ file://org.gnome.GConf.service \
+ file://org.gnome.GConf.Defaults.service \
+ "
+
+EXTRA_OECONF = "--disable-gtk-doc"
+HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
+
+inherit autotools pkgconfig gettext
+
+do_compile() {
+ oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}"
+}
+
+do_stage() {
+ oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
+ install -d ${STAGING_INCDIR}/gconf/2/gconf/
+ ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
+ install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+}
+
+do_install() {
+ oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install
+
+ install -d ${D}/${datadir}/dbus-1/services/
+ install -m 0644 ${WORKDIR}/org.gnome.GConf.service ${D}/${datadir}/dbus-1/services/
+
+ install -d ${D}/${datadir}/dbus-1/system-services/
+ install -m 0644 ${WORKDIR}/org.gnome.GConf.Defaults.service ${D}/${datadir}/dbus-1/system-services/
+
+ # this directory need to be created to avoid an Error 256 at gdm launch
+ install -d ${D}/${sysconfdir}/gconf/gconf.xml.system
+}
+
+FILES_${PN} += "${libdir}/GConf/* \
+ ${datadir}/dbus-1/services \
+ ${datadir}/dbus-1/system-services \
+ "
+
+FILES_${PN}-dbg += "${libdir}/*/*/.debug"
+FILES_${PN}-dev += "${libdir}/GConf/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+
diff --git a/recipes/gnome/gdm-2.26.1/%gconf-tree.xml b/recipes/gnome/gdm-2.26.1/%gconf-tree.xml
new file mode 100644
index 0000000000..f8c2e9cc20
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/%gconf-tree.xml
@@ -0,0 +1,492 @@
+<?xml version="1.0"?>
+<gconf>
+ <dir name="desktop">
+ <dir name="gnome">
+ <dir name="url-handlers">
+ <dir name="ymsgr">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="xmpp">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="webcal">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="uvox">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="trash">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="sip">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="rtsp">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="rtp">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="pnm">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="note">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="net">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="msnim">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="mmsh">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="mms">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="man">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="mailto">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="lastfm">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="itpc">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="itms">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="irc">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="info">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="icyx">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="icy">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="icq">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="https">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="http">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="h323">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="ghelp">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="gg">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="ftp">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="file">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="feed">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="cdda">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="callto">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="aim">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ <dir name="about">
+ <entry name="command" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ </dir>
+ <dir name="lockdown">
+ <entry name="disable_url_handlers" mtime="1227173197" type="bool" value="true">
+ </entry>
+ <entry name="disable_save_to_disk" mtime="1227173197" type="bool" value="true">
+ </entry>
+ <entry name="disable_print_setup" mtime="1227173197" type="bool" value="true">
+ </entry>
+ <entry name="disable_printing" mtime="1227173197" type="bool" value="true">
+ </entry>
+ <entry name="disable_lock_screen" mtime="1227173197" type="bool" value="true">
+ </entry>
+ <entry name="disable_command_line" mtime="1227173197" type="bool" value="true">
+ </entry>
+ </dir>
+ <dir name="applications">
+ <dir name="terminal">
+ <entry name="exec" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ </dir>
+ </dir>
+ <dir name="accessibility">
+ <dir name="keyboard">
+ <entry name="enable" mtime="1227173197" type="bool" value="true">
+ </entry>
+ </dir>
+ </dir>
+ </dir>
+ </dir>
+ <dir name="apps">
+ <dir name="gnome_settings_daemon">
+ <dir name="keybindings">
+ <entry name="www" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="stop" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="sleep" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="search" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="screensaver" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="previous" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="power" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="play" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="pause" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="next" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="media" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="home" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="help" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="email" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="calculator" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="eject" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ </dir>
+ </dir>
+ <dir name="metacity">
+ <dir name="keybinding_commands">
+ <entry name="command_window_screenshot" mtime="1227173197" type="string">
+ <stringvalue>/bin/true</stringvalue>
+ </entry>
+ <entry name="command_screenshot" mtime="1227173197" type="string">
+ <stringvalue>gdm-screenshot</stringvalue>
+ </entry>
+ </dir>
+ <dir name="global_keybindings">
+ <entry name="switch_to_workspace_up" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="switch_to_workspace_right" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="switch_to_workspace_left" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="switch_to_workspace_down" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="switch_group" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="show_desktop" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="run_command_window_screenshot" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="run_command_screenshot" mtime="1227173197" type="string">
+ <stringvalue>Print</stringvalue>
+ </entry>
+ <entry name="panel_run_dialog" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ <entry name="panel_main_menu" mtime="1227173197" type="string">
+ <stringvalue>disabled</stringvalue>
+ </entry>
+ </dir>
+ <dir name="general">
+ <entry name="num_workspaces" mtime="1227173197" type="int" value="1">
+ </entry>
+ </dir>
+ </dir>
+ <dir name="compiz">
+ <dir name="general">
+ <dir name="allscreens">
+ <dir name="options">
+ <entry name="run_command11_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command11_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command10_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command10_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command8_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command8_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command7_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command7_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command6_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command6_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command5_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command5_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command4_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command4_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command3_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command3_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command2_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command2_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command1_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command1_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command0_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_command0_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="run_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="main_menu_key" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="main_menu_button" mtime="1227173197" type="string">
+ <stringvalue>Disabled</stringvalue>
+ </entry>
+ <entry name="command_window_screenshot" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command11" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command10" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command9" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command8" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command7" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command6" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command5" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command4" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command3" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command2" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command1" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command0" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command_terminal" mtime="1227173197" type="string">
+ <stringvalue></stringvalue>
+ </entry>
+ <entry name="command_screenshot" mtime="1227173197" type="string">
+ <stringvalue>gdm-screenshot</stringvalue>
+ </entry>
+ <entry name="active_plugins" mtime="1227173197" type="list" ltype="string">
+ <li type="string">
+ <stringvalue>cube</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>decoration</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>gconf</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>glib</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>move</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>place</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>resize</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>screenshot</stringvalue>
+ </li>
+ <li type="string">
+ <stringvalue>wobbly</stringvalue>
+ </li>
+ </entry>
+ </dir>
+ </dir>
+ </dir>
+ </dir>
+ <dir name="gnome-power-manager">
+ <dir name="ui">
+ <entry name="show_context_menu" mtime="1227173197" type="bool" value="false">
+ </entry>
+ </dir>
+ </dir>
+ <dir name="gnome-screensaver">
+ <entry name="power_management_delay" mtime="1227173197" type="int" value="30">
+ </entry>
+ </dir>
+ <dir name="nautilus">
+ <dir name="preferences">
+ <entry name="show_desktop" mtime="1227173197" type="bool" value="false">
+ </entry>
+ </dir>
+ </dir>
+ </dir>
+</gconf>
diff --git a/recipes/gnome/gdm-2.26.1/Default b/recipes/gnome/gdm-2.26.1/Default
new file mode 100644
index 0000000000..2f4c0b0910
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/Default
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# Note that any setup should come before the sessreg command as
+# that must be 'exec'ed for the pid to be correct (sessreg uses the parent
+# pid)
+#
+# Note that output goes into the .xsession-errors file for easy debugging
+#
+PATH="/usr/bin:$PATH:/bin:/usr/bin"
+start-pulseaudio-x11
+
diff --git a/recipes/gnome/gdm-2.26.1/cross-xdetection.diff b/recipes/gnome/gdm-2.26.1/cross-xdetection.diff
new file mode 100644
index 0000000000..150f79763a
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/cross-xdetection.diff
@@ -0,0 +1,66 @@
+--- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700
++++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700
+@@ -1085,62 +1085,10 @@ dnl ------------------------------------
+ # and /usr/X11 since they often symlink to each other, and configure
+ # should use the more stable location (the real directory) if possible.
+ #
+-if test -x /usr/X11/bin/Xserver; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/Xserver"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+- X_PATH="/usr/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11R6/bin/X; then
+- X_PATH="/usr/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/Xorg; then
+- X_PATH="/usr/bin"
+- X_SERVER_PATH="/usr/bin"
+- X_SERVER="/usr/bin/Xorg"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/X11/bin/X; then
+- X_PATH="/usr/X11/bin"
+- X_SERVER_PATH="/usr/X11/bin"
+- X_SERVER="/usr/X11/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/openwin/bin/Xsun; then
+- # Do not add /usr/openwin/bin here because on Solaris you need
+- # /usr/openwin/bin in your PATH even if you are using the Xorg
+- # Xserver. We add this to the path below.
+- X_PATH="/usr/openwin/bin"
+- X_SERVER_PATH="/usr/openwin/bin"
+- X_SERVER="/usr/openwin/bin/Xsun"
+- X_CONFIG_OPTIONS="-audit 0 -nobanner"
+-elif test -x /opt/X11R6/bin/X; then
+- X_PATH="/opt/X11R6/bin"
+- X_SERVER_PATH="/opt/X11R6/bin"
+- X_SERVER="/opt/X11R6/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-elif test -x /usr/bin/X; then
+ X_PATH="/usr/bin"
+ X_SERVER_PATH="/usr/bin"
+- X_SERVER="/usr/bin/X"
++ X_SERVER="/usr/bin/X"
+ X_CONFIG_OPTIONS="-audit 0"
+-else
+- # what to do, what to do, this is wrong, but this just sets the
+- # defaults, perhaps this user is cross compiling or some such
+- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
+- X_SERVER_PATH="/usr/X11R6/bin"
+- X_SERVER="/usr/X11R6/bin/X"
+- X_CONFIG_OPTIONS="-audit 0"
+-fi
+
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for Xnest / Xephyr support
diff --git a/recipes/gnome/gdm-2.26.1/gdm b/recipes/gnome/gdm-2.26.1/gdm
new file mode 100755
index 0000000000..fed9c06ad7
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/gdm
@@ -0,0 +1,78 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: gdm
+# Should-Start: console-screen acpid dbus hal network-manager
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: GNOME Display Manager
+# Description: Debian init script for the GNOME Display Manager
+### END INIT INFO
+#
+# Author: Ryan Murray <rmurray@debian.org>
+#
+set -e
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/gdm
+
+test -x $DAEMON || exit 0
+
+if [ -r /etc/default/locale ]; then
+ . /etc/default/locale
+ export LANG LANGUAGE
+fi
+
+# To start gdm even if it is not the default display manager, change
+# HEED_DEFAULT_DISPLAY_MANAGER to "false."
+HEED_DEFAULT_DISPLAY_MANAGER=true
+DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
+
+case "$1" in
+ start)
+ # make needed directories in volatile
+ mkdir -m 01770 /var/log/gdm
+ chown gdm:gdm /var/log/gdm
+ mkdir -m 01777 /tmp/.ICE-unix
+ chown root:root /tmp/.ICE-unix
+ CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
+ if grep -wqs text /proc/cmdline; then
+ echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
+ elif [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ] && \
+ [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && \
+ [ "$CONFIGURED_DAEMON" != gdm ] ; then
+ echo "Not starting GNOME Display Manager; it is not the default display manager"
+ else
+ echo "Starting GNOME Display Manager" "gdm"
+ start-stop-daemon --start -b --exec $DAEMON
+ fi
+ ;;
+ stop)
+ echo "Stopping GNOME Display Manager" "gdm"
+ set +e
+ start-stop-daemon --stop --quiet --pidfile /var/run/gdm.pid \
+ --name gdm --retry 5
+ set -e
+ ;;
+ reload)
+ echo "Scheduling reload of GNOME Display Manager configuration" "gdm"
+ set +e
+ start-stop-daemon --stop --signal USR1 --quiet --pidfile \
+ /var/run/gdm.pid --name gdm
+ set -e
+ ;;
+ status)
+ status_of_proc -p "$PIDFILE" "$DAEMON" gdm && exit 0 || exit $?
+ ;;
+ restart|force-reload)
+ $0 stop
+ $0 start
+ ;;
+ *)
+ echo "Usage: /etc/init.d/gdm {start|stop|restart|reload|force-reload|status}"
+ exit 1
+ ;;
+esac
+
+exit 0
diff --git a/recipes/gnome/gdm-2.26.1/gdm-pam b/recipes/gnome/gdm-2.26.1/gdm-pam
new file mode 100644
index 0000000000..f9fafed9d6
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/gdm-pam
@@ -0,0 +1,11 @@
+#
+# default; standard UN*X access
+#
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
+
+auth optional pam_gnome_keyring.so
+session optional pam_gnome_keyring.so auto_start
+
diff --git a/recipes/gnome/gdm-2.26.1/gdm-xklavier.patch b/recipes/gnome/gdm-2.26.1/gdm-xklavier.patch
new file mode 100644
index 0000000000..a54396e99e
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/gdm-xklavier.patch
@@ -0,0 +1,11 @@
+--- gdm-2.26.1/gui/simple-greeter/gdm-layouts.c-orig 2009-03-27 07:28:45.000000000 -0700
++++ gdm-2.26.1/gui/simple-greeter/gdm-layouts.c 2009-07-28 09:43:05.000000000 -0700
+@@ -52,7 +52,7 @@ init_xkl (void)
+ engine = xkl_engine_get_instance (GDK_DISPLAY ());
+ xkl_engine_backup_names_prop (engine);
+ config_registry = xkl_config_registry_get_instance (engine);
+- xkl_config_registry_load (config_registry);
++ xkl_config_registry_load (config_registry, FALSE);
+
+ initial_config = xkl_config_rec_new ();
+ if (!xkl_config_rec_get_from_backup (initial_config, engine)) {
diff --git a/recipes/gnome/gdm-2.26.1/gdm.conf b/recipes/gnome/gdm-2.26.1/gdm.conf
new file mode 100644
index 0000000000..559823b863
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/gdm.conf
@@ -0,0 +1,80 @@
+# GDM Custom Configuration file.
+#
+# This file is the appropriate place for specifying your customizations to the
+# GDM configuration. If you run gdmsetup, it will automatically edit this
+# file for you and will cause the daemon and any running GDM GUI programs to
+# automatically update with the new configuration. Not all configuration
+# options are supported by gdmsetup, so to modify some values it may be
+# necessary to modify this file directly by hand.
+#
+# This file overrides the default configuration settings. These settings
+# are stored in the GDM System Defaults configuration file, which is found
+# at the following location.
+#
+# /usr/share/gdm/defaults.conf.
+#
+# This file contains comments about the meaning of each configuration option,
+# so is also a useful reference. Also refer to the documentation links at
+# the end of this comment for further information. In short, to hand-edit
+# this file, simply add or modify the key=value combination in the
+# appropriate section in the template below this comment section.
+#
+# For example, if you want to specify a different value for the Enable key
+# in the "[debug]" section of your GDM System Defaults configuration file,
+# then add "Enable=true" in the "[debug]" section of this file. If the
+# key already exists in this file, then simply modify it.
+#
+# Older versions of GDM used the "gdm.conf" file for configuration. If your
+# system has an old gdm.conf file on the system, it will be used instead of
+# this file - so changes made to this file will not take effect. Consider
+# migrating your configuration to this file and removing the gdm.conf file.
+#
+# If you hand edit a GDM configuration file, you can run the following
+# command and the GDM daemon will immediately reflect the change. Any
+# running GDM GUI programs will also be notified to update with the new
+# configuration.
+#
+# gdmflexiserver --command="UPDATE_CONFIG <configuration key>"
+#
+# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
+#
+# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
+# re-read the new configuration settings. You can also restart GDM by sending
+# a HUP or USR1 signal to the daemon. HUP behaves like gdm-restart and causes
+# any user session started by GDM to exit immediately while USR1 behaves like
+# gdm-safe-restart and will wait until all users log out before restarting GDM.
+#
+# For full reference documentation see the gnome help browser under
+# GNOME|System category. You can also find the docs in HTML form on
+# http://www.gnome.org/projects/gdm/
+#
+# NOTE: Lines that begin with "#" are considered comments.
+#
+# Have fun!
+
+[daemon]
+
+[security]
+
+[xdmcp]
+
+[gui]
+
+[greeter]
+
+[chooser]
+
+[debug]
+
+# Note that to disable servers defined in the GDM System Defaults
+# configuration file (such as 0=Standard, you must put a line in this file
+# that says 0=inactive, as described in the Configuration section of the GDM
+# documentation.
+#
+[servers]
+
+# Also note, that if you redefine a [server-foo] section, then GDM will
+# use the definition in this file, not the GDM System Defaults configuration
+# file. It is currently not possible to disable a [server-foo] section
+# defined in the GDM System Defaults configuration file.
+#
diff --git a/recipes/gnome/gdm-2.26.1/other b/recipes/gnome/gdm-2.26.1/other
new file mode 100644
index 0000000000..1fe5756178
--- /dev/null
+++ b/recipes/gnome/gdm-2.26.1/other
@@ -0,0 +1,17 @@
+#
+# /etc/pam.d/other - specify the PAM fallback behaviour
+#
+# Note that this file is used for any unspecified service; for example
+#if /etc/pam.d/cron specifies no session modules but cron calls
+#pam_open_session, the session module out of /etc/pam.d/other is
+#used. If you really want nothing to happen then use pam_permit.so or
+#pam_deny.so as appropriate.
+
+#
+# default; standard UN*X access
+#
+auth required pam_unix.so
+account required pam_unix.so
+password required pam_unix.so
+session required pam_unix.so
+
diff --git a/recipes/gnome/gdm_2.26.1.bb b/recipes/gnome/gdm_2.26.1.bb
new file mode 100644
index 0000000000..15056118ef
--- /dev/null
+++ b/recipes/gnome/gdm_2.26.1.bb
@@ -0,0 +1,82 @@
+DESCRIPTION = "Graphical login manager"
+LICENSE = "GPL"
+
+DEPENDS = "xinput dbus-glib glib-2.0 gtk+ pango libglade gconf policykit policykit-gnome gnome-panel libxklavier fontconfig"
+
+PR = "r1"
+
+inherit gnome update-rc.d
+
+SRC_URI += " \
+ file://cross-xdetection.diff;patch=1 \
+ file://gdm-xklavier.patch;patch=1 \
+ file://%gconf-tree.xml \
+ file://gdm \
+ file://gdm.conf \
+ file://gdm-pam \
+ file://other \
+ file://Default \
+ "
+
+EXTRA_OECONF = " --enable-authentication-scheme=shadow \
+ --enable-debug=yes \
+ --with-console-kit \
+ --disable-scrollkeeper "
+
+do_install_prepend() {
+ 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}/gdm
+ install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/
+
+ install -d ${D}/${sysconfdir}/gdm/PreSession
+ install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/PreSession
+
+ install -d ${D}/${sysconfdir}/pam.d
+ install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm
+ install -m 0755 ${WORKDIR}/other ${D}/${sysconfdir}/pam.d/
+}
+
+FILES_${PN} += "${datadir}/icon* \
+ ${datadir}/xsession* \
+ "
+
+CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm"
+
+INITSCRIPT_NAME = "gdm"
+INITSCRIPT_PARAMS = "start 99 5 2 . stop 20 0 1 6 ."
+
+pkg_postinst_${PN} () {
+ # can't do this offline
+ if [ "x$D" != "x" ]; then
+ exit 1
+ fi
+ grep "^gdm:" /etc/group > /dev/null || addgroup gdm
+ 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
+fi
+
+# Register up as default dm
+mkdir -p ${sysconfdir}/X11/
+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
+}
+
+
+
+
diff --git a/recipes/gnome/gedit_2.26.2.bb b/recipes/gnome/gedit_2.26.2.bb
new file mode 100644
index 0000000000..10e5b54f97
--- /dev/null
+++ b/recipes/gnome/gedit_2.26.2.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "GNOME editor"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+
+DEPENDS = "iso-codes gnome-common glib-2.0 gtk+ gconf gtksourceview2"
+RDEPENDS += " gtksourceview2"
+
+inherit gnome pkgconfig
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${libdir} ${datadir}/gedit-2"
+FILES_${PN}-dbg += "${libdir}/gedit-2/plugin-loaders/.debug ${libdir}/gedit-2/plugins/.debug"
diff --git a/recipes/gnome/gnome-common-2.20.0/omf.patch b/recipes/gnome/gnome-common-2.20.0/omf.patch
deleted file mode 100644
index 0d85b001e0..0000000000
--- a/recipes/gnome/gnome-common-2.20.0/omf.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700
-+++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700
-@@ -43,7 +43,9 @@
- install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
-- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ if [ -f $$file.out ]; then \
-+ $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
-+ fi; \
- done
- -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
diff --git a/recipes/gnome/gnome-common.inc b/recipes/gnome/gnome-common.inc
new file mode 100644
index 0000000000..9d1cdb00bf
--- /dev/null
+++ b/recipes/gnome/gnome-common.inc
@@ -0,0 +1,28 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome"
+DESCRIPTION = "Common macros for building GNOME applications"
+
+inherit gnome
+
+# The omf.make file failed if scrollkeeper doesn't happen to be
+# installed
+
+SRC_URI += "file://omf.patch;patch=1"
+
+EXTRA_AUTORECONF = ""
+DEPENDS = ""
+
+FILES_${PN} += "${datadir}/aclocal"
+FILES_${PN}-dev = ""
+
+do_stage () {
+ rm -rf ${STAGE_TEMP}
+ mkdir -p ${STAGE_TEMP}
+ make DESTDIR="${STAGE_TEMP}" install
+ cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE}
+ install -d ${STAGING_DATADIR}/gnome-common
+ install -d ${STAGING_DATADIR}/aclocal
+ cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
+ cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
+ rm -rf ${STAGE_TEMP}
+}
diff --git a/recipes/gnome/gnome-common-2.18.0/omf.patch b/recipes/gnome/gnome-common/omf.patch
index 0d85b001e0..0d85b001e0 100644
--- a/recipes/gnome/gnome-common-2.18.0/omf.patch
+++ b/recipes/gnome/gnome-common/omf.patch
diff --git a/recipes/gnome/gnome-common_2.18.0.bb b/recipes/gnome/gnome-common_2.18.0.bb
index 41c25b69c2..252b1c25a9 100644
--- a/recipes/gnome/gnome-common_2.18.0.bb
+++ b/recipes/gnome/gnome-common_2.18.0.bb
@@ -1,28 +1 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "Common macros for building GNOME applications"
-inherit gnome
-
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
-
-SRC_URI += "file://omf.patch;patch=1"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
-
-do_stage () {
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- make DESTDIR="${STAGE_TEMP}" install
- cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE}
- install -d ${STAGING_DATADIR}/gnome-common
- install -d ${STAGING_DATADIR}/aclocal
- cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
- cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
- rm -rf ${STAGE_TEMP}
-}
+require gnome-common.inc
diff --git a/recipes/gnome/gnome-common_2.20.0.bb b/recipes/gnome/gnome-common_2.20.0.bb
index 41c25b69c2..252b1c25a9 100644
--- a/recipes/gnome/gnome-common_2.20.0.bb
+++ b/recipes/gnome/gnome-common_2.20.0.bb
@@ -1,28 +1 @@
-LICENSE = "GPL"
-SECTION = "x11/gnome"
-PR = "r0"
-DESCRIPTION = "Common macros for building GNOME applications"
-inherit gnome
-
-# The omf.make file failed if scrollkeeper doesn't happen to be
-# installed
-
-SRC_URI += "file://omf.patch;patch=1"
-
-EXTRA_AUTORECONF = ""
-DEPENDS = ""
-
-FILES_${PN} += "${datadir}/aclocal"
-FILES_${PN}-dev = ""
-
-do_stage () {
- rm -rf ${STAGE_TEMP}
- mkdir -p ${STAGE_TEMP}
- make DESTDIR="${STAGE_TEMP}" install
- cp -pPR ${STAGE_TEMP}${bindir}/* ${STAGING_BINDIR_NATIVE}
- install -d ${STAGING_DATADIR}/gnome-common
- install -d ${STAGING_DATADIR}/aclocal
- cp -pPR ${STAGE_TEMP}${datadir}/gnome-common/* ${STAGING_DATADIR}/gnome-common
- cp -pPR ${STAGE_TEMP}${datadir}/aclocal/* ${STAGING_DATADIR}/aclocal
- rm -rf ${STAGE_TEMP}
-}
+require gnome-common.inc
diff --git a/recipes/gnome/gnome-common_2.26.0.bb b/recipes/gnome/gnome-common_2.26.0.bb
new file mode 100644
index 0000000000..252b1c25a9
--- /dev/null
+++ b/recipes/gnome/gnome-common_2.26.0.bb
@@ -0,0 +1 @@
+require gnome-common.inc
diff --git a/recipes/gnome/gnome-desktop.inc b/recipes/gnome/gnome-desktop.inc
index aeabf4f41e..327f161d10 100644
--- a/recipes/gnome/gnome-desktop.inc
+++ b/recipes/gnome/gnome-desktop.inc
@@ -9,6 +9,10 @@ do_configure_prepend () {
cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
}
+do_install_append() {
+ sed -i 's:#!.*/usr/bin/python:#!/usr/bin/python:' ${D}${bindir}/gnome-about
+}
+
do_stage () {
autotools_stage_all
}
diff --git a/recipes/gnome/gnome-games_2.24.0.bb b/recipes/gnome/gnome-games_2.24.0.bb
index 2f7800df03..cc795e14a5 100644
--- a/recipes/gnome/gnome-games_2.24.0.bb
+++ b/recipes/gnome/gnome-games_2.24.0.bb
@@ -3,7 +3,7 @@ DEPENDS = " guile libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui l
inherit gnome distutils-base gconf
-PR = "r4"
+PR = "r5"
SRC_URI += "file://ggz-unbreak-m4.patch;patch=1 \
"
@@ -24,7 +24,7 @@ do_configure_prepend() {
do_configure_append() {
for i in $(find ${S} -name "Makefile") ; do
- sed -i -e s:'-I /usr/include -I /usr/local/include'::g $i
+ sed -i -e s:'I/usr/include'::g -e s:'-I /usr/include -I /usr/local/include'::g $i
done
}
diff --git a/recipes/gnome/gnome-keyring_2.26.0.bb b/recipes/gnome/gnome-keyring_2.26.0.bb
index fc756fec92..abec0f1b38 100644
--- a/recipes/gnome/gnome-keyring_2.26.0.bb
+++ b/recipes/gnome/gnome-keyring_2.26.0.bb
@@ -4,6 +4,7 @@ SECTION = "x11/gnome"
inherit autotools gnome pkgconfig
DEPENDS = "gconf-dbus gtk+ libtasn1 libtasn1-native libgcrypt"
+DEPENDS = " libpam gconf gtk+ libtasn1 libtasn1-native libgcrypt"
EXTRA_OECONF = "--disable-gtk-doc"
diff --git a/recipes/gnome/gnome-power-manager_2.24.2.bb b/recipes/gnome/gnome-power-manager_2.24.2.bb
index 59e1f6f484..6a06eff0b7 100644
--- a/recipes/gnome/gnome-power-manager_2.24.2.bb
+++ b/recipes/gnome/gnome-power-manager_2.24.2.bb
@@ -12,6 +12,10 @@ EXTRA_OECONF = " --disable-scrollkeeper \
ac_cv_header_X11_extensions_dpms_h=yes \
"
+do_configure_prepend() {
+ 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
diff --git a/recipes/gnome/gnome-python-extras_2.25.3.bb b/recipes/gnome/gnome-python-extras_2.25.3.bb
new file mode 100644
index 0000000000..9d8e786241
--- /dev/null
+++ b/recipes/gnome/gnome-python-extras_2.25.3.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL/LGPL"
+DEPENDS = "python-pygtk libwnck"
+
+inherit gnome distutils-base
+
+SRC_URI += "file://acinclude.m4"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
+}
+
+do_configure_prepend() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+}
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN}-dev += "${datadir}/pygtk"
diff --git a/recipes/gnome/gnome-python_2.26.1.bb b/recipes/gnome/gnome-python_2.26.1.bb
new file mode 100644
index 0000000000..1027437b7a
--- /dev/null
+++ b/recipes/gnome/gnome-python_2.26.1.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "GNOME Python miscellaneous bindings"
+LICENSE = "LGPL"
+DEPENDS = "libgnomeui pyorbit python-pygtk"
+RDEPENDS = "pyorbit"
+
+inherit gnome distutils-base pkgconfig
+
+do_configure() {
+ sed -i -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g ${S}/configure.ac
+ export HOST_SYS=${HOST_SYS}
+ export BUILD_SYS=${BUILD_SYS}
+ autotools_do_configure
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}"
+FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
+
+
diff --git a/recipes/gnome/gnome-terminal_2.26.2.bb b/recipes/gnome/gnome-terminal_2.26.2.bb
new file mode 100644
index 0000000000..3a31bf3fbe
--- /dev/null
+++ b/recipes/gnome/gnome-terminal_2.26.2.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "GNOME terminal"
+SECTION = "x11/gnome"
+LICENSE = "GPL"
+DEPENDS = "gnome-common glib-2.0 gtk+ gconf vte"
+inherit gnome pkgconfig
+
+EXTRA_OECONF = "--disable-scrollkeeper"
+
+do_configure_prepend () {
+ cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
+
diff --git a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch b/recipes/gnome/gnome-vfs/gconftool-lossage.patch
index 3dbc130ddc..3dbc130ddc 100644
--- a/recipes/gnome/gnome-vfs-2.22.0/gconftool-lossage.patch
+++ b/recipes/gnome/gnome-vfs/gconftool-lossage.patch
diff --git a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch b/recipes/gnome/gnome-vfs/gnome-vfs-no-kerberos.patch
index e25ecdd66f..e25ecdd66f 100644
--- a/recipes/gnome/gnome-vfs-2.22.0/gnome-vfs-no-kerberos.patch
+++ b/recipes/gnome/gnome-vfs/gnome-vfs-no-kerberos.patch
diff --git a/recipes/gnome/gnome-vfs_2.24.1.bb b/recipes/gnome/gnome-vfs_2.24.1.bb
new file mode 100644
index 0000000000..511aabe5a7
--- /dev/null
+++ b/recipes/gnome/gnome-vfs_2.24.1.bb
@@ -0,0 +1,49 @@
+LICENSE = "GPL"
+DEPENDS = "libxml2 gconf gnutls avahi dbus dbus-glib bzip2 gnome-mime-data zlib gtk-doc-native"
+RRECOMMENDS = "gnome-vfs-plugin-file shared-mime-info"
+# Some legacy packages will require gnome-mime-data to be installed, but use of
+# it is deprecated.
+PR = "r1"
+
+inherit gnome
+
+SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \
+ file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0"
+
+# This is to provide compatibility with the gnome-vfs DBus fork
+PROVIDES = "gnome-vfs-plugin-dbus"
+RREPLACES = "gnome-vfs-dbus"
+
+EXTRA_OECONF = " \
+ --disable-openssl \
+ --enable-gnutls \
+ --enable-avahi \
+ --with-samba-includes=${STAGING_INCDIR} \
+ "
+
+do_configure_prepend() {
+ sed -i -e 's: doc ::g' Makefile.am
+}
+
+do_stage () {
+ autotools_stage_all
+}
+
+PACKAGES_DYNAMIC = "gnome-vfs-plugin-*"
+
+python populate_packages_prepend () {
+ print bb.data.getVar('FILES_gnome-vfs', d, 1)
+
+ plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d)
+ do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s')
+}
+
+FILES_${PN} += "${libdir}/vfs ${datadir}/dbus-1/services"
+FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug"
+FILES_${PN}-dev += "${libdir}/gnome-vfs-2.0/include \
+ ${libdir}/gnome-vfs-2.0/modules/*.a \
+ ${libdir}/gnome-vfs-2.0/modules/*.la \
+ "
+FILES_${PN}-doc += "${datadir}/gtk-doc"
+
+
diff --git a/recipes/gnome/gvfs_1.3.3.bb b/recipes/gnome/gvfs_1.3.3.bb
new file mode 100644
index 0000000000..9137168eee
--- /dev/null
+++ b/recipes/gnome/gvfs_1.3.3.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "gvfs is a userspace virtual filesystem"
+LICENSE = "LGPL"
+DEPENDS = "gawk-native gnome-keyring glib-2.0 obexftp fuse avahi fuse hal gconf samba gphoto2"
+
+inherit gnome
+
+EXTRA_OECONF = "--enable-samba --with-archive-includes=${STAGING_INCDIR} --with-samba-includes=${STAGING_INCDIR}"
+
+PACKAGES =+ "gvfsd-ftp gvfsd-sftp gvfsd-trash"
+
+FILES_${PN} += "${datadir}/dbus-1/services/* ${libdir}/gio/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/*"
+FILES_${PN}-dev += "${libdir}/gio/modules/*.la"
+
+FILES_gvfsd-ftp = "${libexecdir}/gvfsd-ftp ${sysconfdir}/gvfs/mounts/ftp.mount"
+FILES_gvfsd-sftp = "${libexecdir}/gvfsd-sftp ${sysconfdir}/gvfs/mounts/sftp.mount"
+FILES_gvfsd-trash = "${libexecdir}/gvfsd-trash ${sysconfdir}/gvfs/mounts/trash.mount"
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libart-lgpl_2.3.20.bb b/recipes/gnome/libart-lgpl_2.3.20.bb
new file mode 100644
index 0000000000..99f8f8b280
--- /dev/null
+++ b/recipes/gnome/libart-lgpl_2.3.20.bb
@@ -0,0 +1,4 @@
+require libart-lgpl.inc
+
+PR = "${INC_PR}.1"
+
diff --git a/recipes/gnome/libbonobo_2.24.1.bb b/recipes/gnome/libbonobo_2.24.1.bb
new file mode 100644
index 0000000000..efc71d24a8
--- /dev/null
+++ b/recipes/gnome/libbonobo_2.24.1.bb
@@ -0,0 +1,2 @@
+require libbonobo.inc
+
diff --git a/recipes/gnome/libbonoboui_2.24.1.bb b/recipes/gnome/libbonoboui_2.24.1.bb
new file mode 100644
index 0000000000..447dc2e8ae
--- /dev/null
+++ b/recipes/gnome/libbonoboui_2.24.1.bb
@@ -0,0 +1,61 @@
+#DEFAULT_PREFERENCE = "-1"
+
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+PR = "r0"
+
+inherit gnome pkgconfig
+
+FILES_${PN} += "${libdir}/libglade/2.0/*.so"
+FILES_${PN}-dev += "${libdir}/libglade/2.0/* ${datadir}/gnome-2.0/ui \
+ ${libdir}/bonobo-2.0/samples"
+FILES_${PN}-dbg += "${libdir}/bonobo-2.0/samples/.debug \
+ ${libdir}/libglade/2.0/.debug"
+
+DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+HEADERS = " \
+bonobo/bonobo-zoomable.h \
+bonobo/bonobo-ui-component.h \
+bonobo/bonobo-dock-layout.h \
+bonobo/bonobo-ui-type-builtins.h \
+bonobo/bonobo-canvas-component.h \
+bonobo/bonobo-widget.h \
+bonobo/bonobo-ui-engine.h \
+bonobo/bonobo-window.h \
+bonobo/bonobo-ui-toolbar.h \
+bonobo/bonobo-dock-band.h \
+bonobo/bonobo-ui-toolbar-item.h \
+bonobo/bonobo-control.h \
+bonobo/bonobo-dock-item.h \
+bonobo/bonobo-ui-config-widget.h \
+bonobo/bonobo-zoomable-frame.h \
+bonobo/bonobo-control-frame.h \
+bonobo/bonobo-dock.h \
+bonobo/bonobo-ui-main.h \
+bonobo/bonobo-canvas-item.h \
+bonobo/bonobo-ui-node.h \
+bonobo/bonobo-socket.h \
+bonobo/bonobo-selector.h \
+bonobo/bonobo-ui-sync.h \
+bonobo/bonobo-ui-util.h \
+bonobo/bonobo-plug.h \
+bonobo/bonobo-ui-toolbar-button-item.h \
+bonobo/bonobo-ui-toolbar-toggle-button-item.h \
+bonobo/bonobo-ui-container.h \
+bonobo/bonobo-file-selector-util.h \
+bonobo/bonobo-property-control.h \
+bonobo/bonobo-selector-widget.h \
+libbonoboui.h \
+bonobo.h \
+"
+
+do_stage() {
+ install -d ${STAGING_INCDIR}/libbonoboui-2.0/bonobo
+ for i in ${HEADERS}; do
+ install -m 0644 $i ${STAGING_INCDIR}/libbonoboui-2.0/$i
+ done
+ oe_libinstall -C bonobo -a -so libbonoboui-2 ${STAGING_LIBDIR}
+}
diff --git a/recipes/gnome/libgail-gnome_1.20.1.bb b/recipes/gnome/libgail-gnome_1.20.1.bb
new file mode 100644
index 0000000000..a7527cacef
--- /dev/null
+++ b/recipes/gnome/libgail-gnome_1.20.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION="Gnome Accessibility library"
+LICENSE="GPLv2"
+
+PR ="r0"
+
+DEPENDS="atk gtk+ libbonobo libbonoboui gnome-panel at-spi"
+
+inherit gnome
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug"
+
diff --git a/recipes/gnome/libgnomecanvas_2.26.0.bb b/recipes/gnome/libgnomecanvas_2.26.0.bb
new file mode 100644
index 0000000000..d9b442a480
--- /dev/null
+++ b/recipes/gnome/libgnomecanvas_2.26.0.bb
@@ -0,0 +1,21 @@
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DESCRIPTION = "A powerful object-oriented display"
+
+inherit gnome
+
+DEPENDS = "libglade libart-lgpl virtual/gail"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+FILES_${PN} += "${libdir}/libglade/*/libcanvas.so"
+FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/"
+FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a"
+
+do_configure_prepend() {
+ sed -i -e s:docs::g ${S}/Makefile.am
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc
new file mode 100644
index 0000000000..6cde2362d2
--- /dev/null
+++ b/recipes/gnome/libgnomeui.inc
@@ -0,0 +1,24 @@
+DESCRIPTION = "GNOME User Interface Library"
+LICENSE = "GPL"
+SECTION = "x11/gnome/libs"
+DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+
+inherit gnome
+
+FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
+ ${libdir}/libglade/*/lib*.so \
+ ${datadir}/pixmaps/gnome-about-logo.png"
+FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
+FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
+
+SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
+
+EXTRA_OECONF = "--disable-gtk-doc"
+
+do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
+}
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libgnomeui_2.18.1.bb b/recipes/gnome/libgnomeui_2.18.1.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.18.1.bb
+++ b/recipes/gnome/libgnomeui_2.18.1.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
-inherit gnome
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
- ${libdir}/libglade/*/lib*.so \
- ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
- install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.23.90.bb b/recipes/gnome/libgnomeui_2.23.90.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.23.90.bb
+++ b/recipes/gnome/libgnomeui_2.23.90.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
-inherit gnome
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
- ${libdir}/libglade/*/lib*.so \
- ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
- install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.24.0.bb b/recipes/gnome/libgnomeui_2.24.0.bb
index 6cde2362d2..3e848aefa9 100644
--- a/recipes/gnome/libgnomeui_2.24.0.bb
+++ b/recipes/gnome/libgnomeui_2.24.0.bb
@@ -1,24 +1,2 @@
-DESCRIPTION = "GNOME User Interface Library"
-LICENSE = "GPL"
-SECTION = "x11/gnome/libs"
-DEPENDS = "libgnome libgnomecanvas libbonoboui gnome-keyring"
+require libgnomeui.inc
-inherit gnome
-
-FILES_${PN} += "${libdir}/gtk-2.0/*/filesystems/lib*.so \
- ${libdir}/libglade/*/lib*.so \
- ${datadir}/pixmaps/gnome-about-logo.png"
-FILES_${PN}-dev += "${libdir}/gtk-2.0/*/filesystems/*.la ${libdir}/gtk-2.0/*/filesystems/*.a ${libdir}/libglade/*/*.la ${libdir}/libglade/*/*.a"
-FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/filesystems/.debug/ ${libdir}/libglade/*/.debug/"
-
-SRC_URI += "file://gnome-stock-pixbufs.h file://no-pixbuf-csource.patch;patch=1"
-
-EXTRA_OECONF = "--disable-gtk-doc"
-
-do_configure_prepend() {
- install -m 0644 ${WORKDIR}/gnome-stock-pixbufs.h ${S}/libgnomeui/pixmaps/gnome-stock-pixbufs.h
-}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/recipes/gnome/libgnomeui_2.24.1.bb b/recipes/gnome/libgnomeui_2.24.1.bb
new file mode 100644
index 0000000000..3e848aefa9
--- /dev/null
+++ b/recipes/gnome/libgnomeui_2.24.1.bb
@@ -0,0 +1,2 @@
+require libgnomeui.inc
+
diff --git a/recipes/gnome/libgweather_2.26.2.1.bb b/recipes/gnome/libgweather_2.26.2.1.bb
new file mode 100644
index 0000000000..e97bff1aee
--- /dev/null
+++ b/recipes/gnome/libgweather_2.26.2.1.bb
@@ -0,0 +1,28 @@
+LICENSE = "LGPL"
+DEPENDS = "libgnome libsoup-2.4 gtk+"
+
+PR = "r1"
+
+inherit gnome
+
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
+do_configure_prepend() {
+ sed -i -e 's:help::' ${S}/Makefile.am
+ sed -i -e 's: doc : :g' ${S}/Makefile.am
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
+FILES_${PN} += "${datadir}/gnome* \
+ ${datadir}/icons"
+
+PACKAGES =+ "${PN}-locationdata"
+FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*"
+
+PACKAGES =+ "libpanel-applet"
+FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
+
+
diff --git a/recipes/gnome/liboobs_2.22.0.bb b/recipes/gnome/liboobs_2.22.0.bb
new file mode 100644
index 0000000000..61c9aa1f06
--- /dev/null
+++ b/recipes/gnome/liboobs_2.22.0.bb
@@ -0,0 +1,8 @@
+LICENSE = "LGPL"
+DEPENDS = "glib-2.0 dbus system-tools-backends"
+
+inherit gnome lib_package
+
+do_stage() {
+ autotools_stage_all
+}
diff --git a/recipes/gnome/libproxy_0.2.3.bb b/recipes/gnome/libproxy_0.2.3.bb
index c04be6b5f3..fd405cba77 100644
--- a/recipes/gnome/libproxy_0.2.3.bb
+++ b/recipes/gnome/libproxy_0.2.3.bb
@@ -2,7 +2,11 @@ DESCRIPTION = "A library handling all the details of proxy configuration"
LICENSE = "LGPL"
DEPENDS = "libxmu gconf virtual/libx11"
-SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz"
+PR = "r1"
+
+SRC_URI = "http://libproxy.googlecode.com/files/libproxy-${PV}.tar.gz \
+ file://libproxy-move-define-__USE_BSD.patch;patch=1 \
+ "
inherit autotools_stage
diff --git a/recipes/gnome/libxklavier_4.0.bb b/recipes/gnome/libxklavier_4.0.bb
new file mode 100644
index 0000000000..fb74980560
--- /dev/null
+++ b/recipes/gnome/libxklavier_4.0.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Helper lib for keyboard management"
+LICENSE = "LGPL"
+
+PR = "r2"
+
+DEPENDS = "xkbcomp gtk+ iso-codes "
+
+inherit gnome
+
+EXTRA_OECONF = "--with-xkb-bin-base=/usr/bin"
+
+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
+}
+
+do_compile_append() {
+ sed -i -e s:${STAGING_DIR_TARGET}::g \
+ -e s:/${TARGET_SYS}::g \
+ libxklavier.pc
+}
+
+do_stage() {
+ autotools_stage_all
+}
+
diff --git a/recipes/gnome/system-tools-backends/angstrom.patch b/recipes/gnome/system-tools-backends/angstrom.patch
new file mode 100644
index 0000000000..d5956a945a
--- /dev/null
+++ b/recipes/gnome/system-tools-backends/angstrom.patch
@@ -0,0 +1,54 @@
+--- system-tools-backends-2.6.1/Utils/Platform.pm-orig
++++ system-tools-backends-2.6.1/Utils/Platform.pm
+@@ -99,6 +99,7 @@ my $PLATFORM_INFO = {
+ "nexenta-1.0" => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ],
+ "yellowdog-4.1" => [ "Yellow Dog Linux", "4.1", "Sagitta" ],
+ "guadalinex-v4" => [ "Guadalinex", "v4", "Toro" ],
++ "angstrom" => [ "Angstrom", "", "" ],
+ };
+
+ sub get_platform_info
+@@ -157,6 +158,7 @@ sub ensure_distro_map
+ "vlos-1.2" => "gentoo",
+ "nexenta-1.0" => "solaris-2.11",
+ "guadalinex-v4" => "debian-3.0",
++ "angstrom" => "debian-3.0",
+ );
+
+ return $metamap{$distro} if ($metamap{$distro});
+@@ -389,6 +391,7 @@ sub guess
+ [ \&check_ark ],
+ [ \&check_yoper ],
+ [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ],
++ [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ],
+ ],
+ "FreeBSD" => [[ \&check_freebsd ]],
+ "SunOS" => [[ \&check_solaris ]]
+--- system-tools-backends-2.6.1/Users/Groups.pm-orig
++++ system-tools-backends-2.6.1/Users/Groups.pm
+@@ -39,8 +39,9 @@ $cmd_groupdel = &Utils::File::locate_too
+ $cmd_groupadd = &Utils::File::locate_tool ("groupadd");
+ $cmd_groupmod = &Utils::File::locate_tool ("groupmod");
+
+-$cmd_delgroup = &Utils::File::locate_tool ("delgroup");
+-$cmd_addgroup = &Utils::File::locate_tool ("addgroup");
++# disable use of the busybox tools, since they lack full functionality
++$cmd_delgroup = "";
++$cmd_addgroup = "";
+
+ $cmd_usermod = &Utils::File::locate_tool ("usermod");
+ $cmd_gpasswd = &Utils::File::locate_tool ("gpasswd");
+--- system-tools-backends-2.6.1/Users/Users.pm-orig
++++ system-tools-backends-2.6.1/Users/Users.pm
+@@ -66,8 +66,9 @@ $cmd_usermod = &Utils::File::locate_too
+ $cmd_userdel = &Utils::File::locate_tool ("userdel");
+ $cmd_useradd = &Utils::File::locate_tool ("useradd");
+
+-$cmd_adduser = &Utils::File::locate_tool ("adduser");
+-$cmd_deluser = &Utils::File::locate_tool ("deluser");
++# disable use of the busybox tools, since they lack full functionality
++$cmd_adduser = "";
++$cmd_deluser = "";
+
+ $cmd_chfn = &Utils::File::locate_tool ("chfn");
+ $cmd_pw = &Utils::File::locate_tool ("pw");
diff --git a/recipes/gnome/system-tools-backends/system-tools-backends b/recipes/gnome/system-tools-backends/system-tools-backends
new file mode 100755
index 0000000000..704c36dbf4
--- /dev/null
+++ b/recipes/gnome/system-tools-backends/system-tools-backends
@@ -0,0 +1,74 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: system-tools-backends
+# Required-Start: $local_fs dbus
+# Required-Stop: $local_fs dbus
+# Should-Start: $syslog
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 1
+# Short-Description: Gnome System Tools Backends
+# Description: The Gnome System Tools Backends daemon handles root-needed
+# operations to configure your machine with the Gnome System
+# Tools.
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/bin/system-tools-backends
+PIDDIR=/var/run
+PIDFILE=$PIDDIR/system-tools-backends.pid
+NAME=system-tools-backends
+DESC="System Tools Backends"
+
+test -x $DAEMON || exit 0
+
+set -e
+
+do_start() {
+ echo "Starting $DESC"
+ start-stop-daemon --start --startas $DAEMON --quiet --pidfile $PIDFILE
+}
+
+do_stop() {
+ echo "Stopping $DESC"
+ start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE --startas $DAEMON
+}
+
+case "$1" in
+ start)
+ do_start
+ ;;
+ stop)
+ do_stop
+ ;;
+ #reload)
+ #
+ # If the daemon can reload its config files on the fly
+ # for example by sending it SIGHUP, do it here.
+ #
+ # If the daemon responds to changes in its config file
+ # directly anyway, make this a do-nothing entry.
+ #
+ # echo "Reloading $DESC configuration files."
+ # start-stop-daemon --stop --signal 1 --quiet --pidfile \
+ # /var/run/$NAME.pid --exec $DAEMON
+ #;;
+ restart|force-reload)
+ #
+ # If the "reload" option is implemented, move the "force-reload"
+ # option to the "reload" entry above. If not, "force-reload" is
+ # just the same as "restart".
+ #
+ do_stop
+ sleep 5
+ do_start
+ ;;
+ *)
+ N=/etc/init.d/$NAME
+ echo "Usage: $N {start|stop|restart|reload|force-reload|status}" >&2
+ exit 1
+ ;;
+esac
+
+exit 0
+
diff --git a/recipes/gnome/system-tools-backends_2.6.1.bb b/recipes/gnome/system-tools-backends_2.6.1.bb
new file mode 100644
index 0000000000..08086188be
--- /dev/null
+++ b/recipes/gnome/system-tools-backends_2.6.1.bb
@@ -0,0 +1,36 @@
+DESCRIPTION = "gnome system tools backends"
+LICENSE = "GPL"
+
+DEPENDS = "dbus dbus-glib glib-2.0 policykit"
+
+inherit gnome pkgconfig update-rc.d
+
+SRC_URI += " \
+ file://angstrom.patch;patch=1 \
+ file://system-tools-backends \
+ "
+
+do_configure_prepend() {
+ sed -i -e /IT_PROG_INTLTOOL/d ${S}/configure.in
+ sed -i -e /Makefile.in/d ${S}/configure.in
+ sed -i -e 's: po : :g' ${S}/Makefile.am
+ sed -i -e /policy/d ${S}/Makefile.am
+ sed -i -e 's:org.freedesktop.SystemToolsBackends.service \\:org.freedesktop.SystemToolsBackends.service:g' ${S}/Makefile.am
+ sed -i -e 's:@INTLTOOL_POLICY_RULE@::g' ${S}/Makefile.am
+ sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am
+}
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/init.d
+ install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/
+}
+
+INITSCRIPT_NAME = "system-tools-backends"
+INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ."
+
+FILES_${PN} += " ${sysconfdir}/dbus-1/system.d"
+FILES_${PN} += " ${libdir}/pkgconfig"
+FILES_${PN} += " ${datadir}/dbus-1/system-services"
+FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files"
+FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts"
+