diff options
| author | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
|---|---|---|
| committer | Klaus Kurzmann <mok@fluxnetz.de> | 2010-04-03 18:50:45 +0200 |
| commit | 82b51b6abd7b43ae6fa1c7d01b780d0c99d22804 (patch) | |
| tree | b1455904c992c92a18dc5f48253d0f37c4ff7590 /recipes/gnome | |
| parent | 5eef2a8892b12b3215f52065c2c177f576c41959 (diff) | |
| parent | d2bd4a770d2a5b3fd56bd3a8584935240d9012f8 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git.openembedded.net/openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/gnome')
43 files changed, 1465 insertions, 60 deletions
diff --git a/recipes/gnome/epiphany_2.30.0.bb b/recipes/gnome/epiphany_2.30.0.bb new file mode 100644 index 0000000000..04bd10212b --- /dev/null +++ b/recipes/gnome/epiphany_2.30.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GNOME default webbrowser" +DEPENDS = "libsoup-2.4 gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" +RDEPENDS = "gnome-vfs-plugin-http iso-codes" + +inherit gnome + +SRC_URI[archive.md5sum] = "c78e40f61dae39b490fcf94e296aa239" +SRC_URI[archive.sha256sum] = "2e403ab0fe04575575fa99cdb6b3007007fa8e961e2c2fd4308b13e27bbf58d4" + +EXTRA_OECONF = "--disable-nss --with-engine=webkit --with-distributor-name=${DISTRO}" + +do_configure_prepend() { + touch ${S}/gnome-doc-utils.make + sed -i -e s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icons ${datadir}/dbus-1" + + diff --git a/recipes/gnome/epiphany_svn.bb b/recipes/gnome/epiphany_svn.bb index 12f2bc5905..6629c5b67b 100644 --- a/recipes/gnome/epiphany_svn.bb +++ b/recipes/gnome/epiphany_svn.bb @@ -2,6 +2,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS = "gnome-vfs-plugin-http iso-codes" +SRCREV = "7837" PV = "2.20.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/gnome/gconf-dbus_svn.bb b/recipes/gnome/gconf-dbus_svn.bb index 671d9f4c11..4deae5747b 100644 --- a/recipes/gnome/gconf-dbus_svn.bb +++ b/recipes/gnome/gconf-dbus_svn.bb @@ -5,6 +5,8 @@ SECTION = "x11/utils" PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" + +SRCREV = "641" PV = "2.16.0+svnr${SRCPV}" PR = "r0" diff --git a/recipes/gnome/gdm-2.30.0/%gconf-tree.xml b/recipes/gnome/gdm-2.30.0/%gconf-tree.xml new file mode 100644 index 0000000000..f8c2e9cc20 --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/%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.30.0/cross-xdetection.diff b/recipes/gnome/gdm-2.30.0/cross-xdetection.diff new file mode 100644 index 0000000000..150f79763a --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/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.30.0/gdm b/recipes/gnome/gdm-2.30.0/gdm new file mode 100755 index 0000000000..43eae95177 --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/gdm @@ -0,0 +1,89 @@ +#! /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 + + if [ -e /var/log/gdm ] ; then + rm -rf /var/log/gdm + fi + + mkdir -m 01770 /var/log/gdm + chown gdm:gdm /var/log/gdm + + if [ -e /tmp/.ICE-unix ] ; then + rm -rf /tmp/.ICE-unix + fi + + 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.30.0/gdm-nodocs.patch b/recipes/gnome/gdm-2.30.0/gdm-nodocs.patch new file mode 100644 index 0000000000..395fa627eb --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/gdm-nodocs.patch @@ -0,0 +1,12 @@ +--- /tmp/Makefile.am 2006-07-26 11:37:52.000000000 +0200 ++++ gdm-2.14.9/Makefile.am 2006-07-26 11:38:01.734411000 +0200 +@@ -5,8 +5,7 @@ + vicious-extensions \ + daemon \ + gui \ +- utils \ +- docs ++ utils + + # add these when help gets added back + # docs omf-install diff --git a/recipes/gnome/gdm-2.30.0/gdm-pam b/recipes/gnome/gdm-2.30.0/gdm-pam new file mode 100644 index 0000000000..f9fafed9d6 --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/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.30.0/gdm.conf b/recipes/gnome/gdm-2.30.0/gdm.conf new file mode 100644 index 0000000000..559823b863 --- /dev/null +++ b/recipes/gnome/gdm-2.30.0/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.30.0.bb b/recipes/gnome/gdm_2.30.0.bb new file mode 100644 index 0000000000..c461d86cde --- /dev/null +++ b/recipes/gnome/gdm_2.30.0.bb @@ -0,0 +1,78 @@ +DESCRIPTION = "Graphical login manager" +LICENSE = "GPL" + +DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb" + +inherit gnome update-rc.d + +RDEPENDS_${PN} += "grep dbus-x11 shadow libpam-base-files" + +SRC_URI += " \ + file://cross-xdetection.diff;patch=1 \ + file://%gconf-tree.xml \ + file://gdm \ + file://gdm.conf \ + file://gdm-pam \ + " + +SRC_URI[archive.md5sum] = "0da84637abbcbf1666529d6192a81e6b" +SRC_URI[archive.sha256sum] = "ac2c367766b8fa20ebeb41033931fc4d91482ad3d377823f1c7ad84eee12dc15" + +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}/pam.d + install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm +} + +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/gnome-applets_2.30.0.bb b/recipes/gnome/gnome-applets_2.30.0.bb new file mode 100644 index 0000000000..933cb21b98 --- /dev/null +++ b/recipes/gnome/gnome-applets_2.30.0.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "Misc applets for Gnome panel" +LICENSE = "GPL" +SECTION = "x11/gnome" + +inherit gnome + +SRC_URI[archive.md5sum] = "2afcbedc10b1a0e8072ac4eefdc8d770" +SRC_URI[archive.sha256sum] = "41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d" + +DEPENDS = "gtk+ glib-2.0 gconf libgnome libxklavier libnotify dbus-glib gnome-icon-theme libxml2 policykit networkmanager" + +EXTRA_OECONF = "--disable-gtk-doc" + +do_configure_prepend () { + for i in $(find . -name "Makefile.am") ; do + sed -i -e 's:-I$(includedir)::g' $i + done +} + +FILES_${PN} += " \ + ${datadir}/dbus-1/ \ + ${datadir}/PolicyKit/ \ + ${datadir}/xmodmap/ \ + " + diff --git a/recipes/gnome/gnome-bluetooth_git.bb b/recipes/gnome/gnome-bluetooth_git.bb index 2e57df3888..6d2eae3cfb 100644 --- a/recipes/gnome/gnome-bluetooth_git.bb +++ b/recipes/gnome/gnome-bluetooth_git.bb @@ -23,7 +23,8 @@ RCONFLICTS_${PN} = "bluez-gnome" do_configure_prepend() { cp ${WORKDIR}/gtk-doc.make ${S}/ - sed -i -e s:docs::g ${S}/Makefile.am + sed -i -e s:docs::g ${S}/Makefile.am + sed -i -e s:gnome-bluetooth/plugins/:gnome-bluetooth/plugins:g ${S}/lib/plugins/Makefile.am echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make } diff --git a/recipes/gnome/gnome-control-center_2.30.0.bb b/recipes/gnome/gnome-control-center_2.30.0.bb new file mode 100644 index 0000000000..06a0731384 --- /dev/null +++ b/recipes/gnome/gnome-control-center_2.30.0.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "GNOME control center" +LICENSE = "GPL" + +DEPENDS = "metacity eel gstreamer libcanberra gnome-settings-daemon libgnomeui gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl atk" + +inherit gnome + +SRC_URI[archive.md5sum] = "ff7a638c2aa733997c7062449c02ccca" +SRC_URI[archive.sha256sum] = "aa279706d7a1a4f5a4ba4767cc80ac3cae2855d3bc6600b5c039dc650d754828" + + +LDFLAGS += "-lgthread-2.0 -lxml2" + +do_configure_prepend() { + sed -i s:help::g Makefile.am +} + +FILES_${PN} += "${datadir}/icon* \ + ${datadir}/xsession* \ + ${libdir}/window-manager-settings/*.so \ + ${datadir}/gnome \ + ${datadir}/desktop-directories \ + " +FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" +FILES_${PN}-dev += "${libdir}/window-manager-settings/*a" + + + + diff --git a/recipes/gnome/gnome-desktop.inc b/recipes/gnome/gnome-desktop.inc index bf020672ae..b96e34b76a 100644 --- a/recipes/gnome/gnome-desktop.inc +++ b/recipes/gnome/gnome-desktop.inc @@ -15,8 +15,4 @@ do_install_append() { sed -i 's:#!.*/usr/bin/python:#!/usr/bin/python:' ${D}${bindir}/gnome-about } -do_stage () { - autotools_stage_all -} - FILES_${PN} += "${datadir}/gnome-about ${datadir}/libgnome-desktop" diff --git a/recipes/gnome/gnome-desktop_2.30.0.bb b/recipes/gnome/gnome-desktop_2.30.0.bb new file mode 100644 index 0000000000..3c458a41ce --- /dev/null +++ b/recipes/gnome/gnome-desktop_2.30.0.bb @@ -0,0 +1,11 @@ +require gnome-desktop.inc + +inherit gnome pkgconfig + +SRC_URI[archive.md5sum] = "211818d93cd1b5b54b880520fe5444c4" +SRC_URI[archive.sha256sum] = "cb80b676966127d8ee1a9b5ebbed1c23646d62ecdfccbb46d40f59633b4b127f" + +DEPENDS += "gnome-doc-utils gnome-vfs libxrandr" + +# FIXME: docs build requires gnome-doc-utils-native (for xml2po) and docbook +SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0" diff --git a/recipes/gnome/gnome-panel-2.30.0/idl-sysroot.patch b/recipes/gnome/gnome-panel-2.30.0/idl-sysroot.patch new file mode 100644 index 0000000000..de4cd8486c --- /dev/null +++ b/recipes/gnome/gnome-panel-2.30.0/idl-sysroot.patch @@ -0,0 +1,22 @@ +--- /tmp/Makefile.am 2009-10-26 16:53:20.000000000 +0100 ++++ gnome-panel-2.28.0/gnome-panel/Makefile.am 2009-10-26 16:53:51.000000000 +0100 +@@ -43,7 +43,7 @@ + $(NULL) + + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) +- $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl ++ $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl + + BUILT_SOURCES = \ + $(CORBA_SRCLIST) \ +--- /tmp/Makefile.am 2009-10-26 16:54:17.000000000 +0100 ++++ gnome-panel-2.28.0/libpanel-applet/Makefile.am 2009-10-26 16:54:34.000000000 +0100 +@@ -45,7 +45,7 @@ + GNOME_Panel.h + + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) +- $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl ++ $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl + + noinst_PROGRAMS = test-bonobo-applet + diff --git a/recipes/gnome/gnome-panel_2.30.0.bb b/recipes/gnome/gnome-panel_2.30.0.bb new file mode 100644 index 0000000000..ecbc2bd97a --- /dev/null +++ b/recipes/gnome/gnome-panel_2.30.0.bb @@ -0,0 +1,38 @@ +DESCRIPTION = "GNOME panel" +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "gconf librsvg libgweather startup-notification libwnck orbit2 gtk+ libbonoboui libglade libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native" + +inherit gnome pkgconfig + +SRC_URI += "file://idl-sysroot.patch;patch=1" + +SRC_URI[archive.md5sum] = "e17f25417b2c9011ed1c3ebd75706de6" +SRC_URI[archive.sha256sum] = "7e8f99d3105bc0dda038b5859ab56d0a9740e244d7853786f1deb2df0a692220" + +CPPFLAGS += " -I${STAGING_INCDIR}/gnome-desktop-2.0" +export SYSROOT = "${STAGING_DIR_HOST}" + +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}" +EXTRA_OECONF = "--disable-scrollkeeper --disable-eds" + +do_configure_prepend() { + sed -i -e s:help:: ${S}/Makefile.am +} + +pkg_postinst_append () { + gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ + --direct --load /etc/gconf/schemas/panel-default-setup.entries +} + +PACKAGES =+ "libpanel-applet" +FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" + +FILES_${PN} =+ "${datadir}/gnome* \ + ${datadir}/dbus-1 \ + ${datadir}/icons \ + ${datadir}/PolicyKit \ + ${libdir}/bonobo \ + " + + diff --git a/recipes/gnome/gnome-python_2.28.0.bb b/recipes/gnome/gnome-python_2.28.0.bb index 289428a0ac..e4dea8f254 100644 --- a/recipes/gnome/gnome-python_2.28.0.bb +++ b/recipes/gnome/gnome-python_2.28.0.bb @@ -27,11 +27,6 @@ do_configure_prepend() { EXTRA_OECONF = " ac_cv_path_PYGOBJECT_CODEGEN=${STAGING_DATADIR}/pygobject/2.0/codegen/codegen.py " - -do_stage() { - autotools_stage_all -} - FILES_${PN} += "${datadir}" FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" diff --git a/recipes/gnome/gnome-python_2.28.1.bb b/recipes/gnome/gnome-python_2.28.1.bb new file mode 100644 index 0000000000..2bfaf4bd91 --- /dev/null +++ b/recipes/gnome/gnome-python_2.28.1.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "GNOME Python miscellaneous bindings" +LICENSE = "LGPL" +DEPENDS = "libgnomeui pyorbit python-pygtk" +RDEPENDS = "pyorbit" + +inherit gnome distutils-base pkgconfig + +SRC_URI[archive.md5sum] = "a17ad952813ed86f520de8e07194a2bf" +SRC_URI[archive.sha256sum] = "759ce9344cbf89cf7f8449d945822a0c9f317a494f56787782a901e4119b96d8" + +do_configure_prepend() { + export HOST_SYS=${HOST_SYS} + export BUILD_SYS=${BUILD_SYS} + sed -i \ + -e s:'`$PKG_CONFIG --variable defsdir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=defsdir pygtk-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=pygtkincludedir pygobject-2.0`':\"${STAGING_INCDIR}/pygtk-2.0\":g \ + -e s:'`$PKG_CONFIG --variable=datadir pygobject-2.0`':\"${STAGING_DATADIR}\":g \ + -e s:'`$PKG_CONFIG --variable codegendir pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ + -e s:'`$PKG_CONFIG --variable=codegendir pygtk-2.0`':\"${STAGING_DATADIR}/pygobject/2.0/codegen\":g \ + -e s:'`$PKG_CONFIG --variable=fixxref pygobject-2.0`':\"${STAGING_DATADIR}/pygobject/xsl/fixxref.py\":g \ + -e 's:PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION":PYTHON_CFLAGS="-I${STAGING_INCDIR}/python$PYTHON_VERSION":g' \ + -e s:'`$PKG_CONFIG --variable=defsdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/defs\":g \ + -e s:'`$PKG_CONFIG --variable=argtypesdir gnome-python-2.0`':\"${STAGING_DATADIR}/pygtk/2.0/argtypes/\":g \ + ${S}/configure.ac +} + +EXTRA_OECONF = " ac_cv_path_PYGOBJECT_CODEGEN=${STAGING_DATADIR}/pygobject/2.0/codegen/codegen.py " + +FILES_${PN} += "${datadir}" +FILES_${PN}-dbg += "${libdir}/gnome-vfs-2.0/modules/.debug" + + diff --git a/recipes/gnome/gnome-settings-daemon_2.28.0.bb b/recipes/gnome/gnome-settings-daemon_2.28.0.bb index 43585f3425..cce5df981e 100644 --- a/recipes/gnome/gnome-settings-daemon_2.28.0.bb +++ b/recipes/gnome/gnome-settings-daemon_2.28.0.bb @@ -4,6 +4,8 @@ LICENSE = "GPL" DEPENDS = "libxklavier libgnomekbd libgnomeui gnome-desktop gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" +PR = "r1" + inherit gnome LDFLAGS += "-lgthread-2.0" @@ -22,7 +24,4 @@ do_configure_prepend () { sed -i 's:$CPPFLAGS -I$includedir:$CPPFLAGS:' ${S}/configure.ac } -do_stage() { - autotools_stage_all -} diff --git a/recipes/gnome/gnome-settings-daemon_2.30.0.bb b/recipes/gnome/gnome-settings-daemon_2.30.0.bb new file mode 100644 index 0000000000..62547af732 --- /dev/null +++ b/recipes/gnome/gnome-settings-daemon_2.30.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "GNOME settings daemon" +SECTION = "x11/gnome" +LICENSE = "GPL" + +DEPENDS = "libxklavier libgnomekbd libgnomeui gnome-desktop gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl" + +inherit gnome + +SRC_URI[archive.md5sum] = "a21485e7deca785f2ffb8ded58c4ae6a" +SRC_URI[archive.sha256sum] = "cb759f2aa403ad10f7b0a196c523fa0b3842cf4432b26a4b308ed1e5bf67e6aa" + +LDFLAGS += "-lgthread-2.0" + +FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so \ + ${libdir}/gnome-settings-daemon-2.0/*plugin \ + ${datadir}/dbus-1/ \ + ${datadir}/gnome-control-center \ + ${datadir}/icons \ + " + +FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" +FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la" + +do_configure_prepend () { + sed -i 's:$CPPFLAGS -I$includedir:$CPPFLAGS:' ${S}/configure.ac +} + diff --git a/recipes/gnome/gnome-system-monitor_2.28.1.bb b/recipes/gnome/gnome-system-monitor_2.28.1.bb new file mode 100644 index 0000000000..9f4bd84394 --- /dev/null +++ b/recipes/gnome/gnome-system-monitor_2.28.1.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "Gnome system monitor" +LICENSE = "GPL" +SECTION = "x11/gnome" +DEPENDS = "libgtop gtkmm glibmm libnotify libgnomeui gnome-panel gnome-doc-utils libwnck gtk+ gnome-keyring libglade hal dbus-glib " + +inherit gnome + +SRC_URI[archive.md5sum] = "064cf1a97d3dd1946bc3e55d8272c2c8" +SRC_URI[archive.sha256sum] = "25b2566af336c44dc279afd7a522e3616b68047f1a1a34c8a5024a52f894429b" + +do_configure_prepend() { + sed -i -e s:help::g ${S}/Makefile.am +} + +PACKAGES =+ "${PN}-applets" + +FILES_${PN}-applets = "${bindir}/*applet* \ + ${libdir}/bonobo/servers \ + ${datadir}/gnome-2.0/ui" + +FILES_${PN} += "${datadir}/icons \ + ${datadir}/dbus-1 \ + ${datadir}/gnome/autostart \ + " + +FILES_${PN}-doc += "${datadir}/omf \ + ${datadir}/gnome/help " + diff --git a/recipes/gnome/gnome-system-tools_2.30.0.bb b/recipes/gnome/gnome-system-tools_2.30.0.bb new file mode 100644 index 0000000000..69f32d9a4d --- /dev/null +++ b/recipes/gnome/gnome-system-tools_2.30.0.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GNOME utilities" +SECTION = "x11/gnome" +LICENSE = "GPL" +DEPENDS = "policykit-gnome nautilus gnome-common glib-2.0 gtk+ gconf liboobs system-tools-backends gnome-control-center" +inherit gnome pkgconfig + +SRC_URI += "file://remove-docs.patch;patch=1" + +SRC_URI[archive.md5sum] = "e3e779c8a31c34993315a6c6c78a5ed5" +SRC_URI[archive.sha256sum] = "7bf41b88566f715ede95fd0e4297b64a95450af7f9d63a6741bb9e65ba361c7d" + +EXTRA_OECONF = "--disable-scrollkeeper \ + " +LDFLAGS += "-lgthread-2.0" + +FILES_${PN} += "${libdir}/nautilus/extensions-2.0" + +FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug" + diff --git a/recipes/gnome/libart-lgpl.inc b/recipes/gnome/libart-lgpl.inc index 4dad51e4db..52ee9b5314 100644 --- a/recipes/gnome/libart-lgpl.inc +++ b/recipes/gnome/libart-lgpl.inc @@ -4,9 +4,9 @@ LICENSE = "LGPL" ART_CONFIG = "${HOST_ARCH}/art_config.h" -INC_PR = "r4" +INC_PR = "r5" -# can't use gnome.oeclass due to _ in filename +# can't use gnome.bbclass due to _ in filename SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ file://${ART_CONFIG} \ file://Makefile.am.patch;patch=1" @@ -30,7 +30,3 @@ EXTRA_OECONF = "--disable-gtk-doc" export MKDIR_P = "mkdir -p" export mkdir_p = "mkdir -p" -do_stage() { - autotools_stage_includes - oe_libinstall -a -so libart_lgpl_2 ${STAGING_LIBDIR} -} diff --git a/recipes/gnome/libbonobo.inc b/recipes/gnome/libbonobo.inc index 9f3642b80b..e1ad45b27a 100644 --- a/recipes/gnome/libbonobo.inc +++ b/recipes/gnome/libbonobo.inc @@ -27,38 +27,12 @@ do_configure_prepend() { install ${WORKDIR}/gtk-doc.make ./ } -ACTIVATION_HEADERS = "Bonobo_Unknown.h Bonobo_GenericFactory.h Bonobo_Activation_types.h \ - bonobo-activation.h bonobo-activation-async.h bonobo-activation-activate.h \ - bonobo-activation-init.h bonobo-activation-shlib.h bonobo-activation-register.h \ - bonobo-activation-server-info.h bonobo-activation-version.h" - -BONOBO_HEADERS = "Bonobo.h bonobo-arg.h bonobo-context.h bonobo-event-source.h bonobo-exception.h \ - bonobo-generic-factory.h bonobo-item-container.h bonobo-item-handler.h \ - bonobo-listener.h bonobo-main.h bonobo-macros.h bonobo-moniker-extender.h \ - bonobo-moniker-simple.h bonobo-moniker-util.h bonobo-moniker.h bonobo-object.h \ - bonobo-foreign-object.h bonobo-persist-file.h bonobo-persist-stream.h \ - bonobo-persist.h bonobo-persist-client.h bonobo-property-bag.h \ - bonobo-property-bag-client.h bonobo-shlib-factory.h bonobo-storage.h \ - bonobo-stream.h bonobo-stream-client.h bonobo-stream-memory.h \ - bonobo-storage-memory.h bonobo-xobject.h bonobo-i18n.h bonobo-types.h \ - bonobo-app-client.h bonobo-application.h" - do_compile() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" } -do_stage() { - install -d ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation - for i in ${ACTIVATION_HEADERS}; do install -m 0644 bonobo-activation/$i ${STAGING_INCDIR}/bonobo-activation-2.0/bonobo-activation/; done - install -d ${STAGING_INCDIR}/libbonobo-2.0/bonobo - for i in ${BONOBO_HEADERS}; do install -m 0644 bonobo/$i ${STAGING_INCDIR}/libbonobo-2.0/bonobo/; done - install -m 0644 libbonobo.h ${STAGING_INCDIR}/libbonobo-2.0/ - install -d ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ - install idl/*.idl ${STAGING_DATADIR}/idl/bonobo-activation-2.0/ - oe_libinstall -so -C bonobo libbonobo-2 ${STAGING_LIBDIR} - oe_libinstall -so -C bonobo-activation libbonobo-activation ${STAGING_LIBDIR} -} - do_install() { oe_runmake ORBIT_IDL="${ORBIT_IDL_SRC}" DESTDIR="${D}" install + install -d ${D}${datadir}/idl/bonobo-activation-2.0/ + install idl/*.idl ${D}${datadir}/idl/bonobo-activation-2.0/ } diff --git a/recipes/gnome/libbonobo_2.24.3.bb b/recipes/gnome/libbonobo_2.24.3.bb new file mode 100644 index 0000000000..c878286cef --- /dev/null +++ b/recipes/gnome/libbonobo_2.24.3.bb @@ -0,0 +1,3 @@ +require libbonobo.inc +SRC_URI[archive.md5sum] = "b217cef6a187505290c66c5bf8225d38" +SRC_URI[archive.sha256sum] = "5310957fa90691689c0557218b8833f681666cae160bd84e1f2c2705189a4ebe" diff --git a/recipes/gnome/libbonoboui_2.24.3.bb b/recipes/gnome/libbonoboui_2.24.3.bb new file mode 100644 index 0000000000..11b71f8185 --- /dev/null +++ b/recipes/gnome/libbonoboui_2.24.3.bb @@ -0,0 +1,17 @@ +SECTION = "x11/gnome/libs" +LICENSE = "GPL" + +inherit gnome pkgconfig + +SRC_URI[archive.md5sum] = "3a754b1df0a4d5fd4836a05020a0bb4a" +SRC_URI[archive.sha256sum] = "0be51ee3069a2ef21d98561ee28036dd263ac08b401776fe9164e084825ffd84" + +DEPENDS = "libgnomecanvas libbonobo libgnome glib-2.0 gtk-doc gconf libxml2 libglade" + +EXTRA_OECONF = "--disable-gtk-doc" + +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" diff --git a/recipes/gnome/libgnome_2.30.0.bb b/recipes/gnome/libgnome_2.30.0.bb new file mode 100644 index 0000000000..307624dea6 --- /dev/null +++ b/recipes/gnome/libgnome_2.30.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Gnome application programming libraries" +LICENSE = "GPL" +SECTION = "x11/gnome/libs" + +inherit gnome lib_package + +SRC_URI[archive.md5sum] = "1f85adc40b242b953c0e96ad017c2616" +SRC_URI[archive.sha256sum] = "3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f" + +DEPENDS = "gconf-native gnome-vfs libbonobo esound" + +EXTRA_OECONF = "--disable-gtk-doc" + +FILES_${PN} += "${libdir}/bonobo/servers ${libdir}/bonobo/monikers/*.so \ + ${datadir}/gnome-background-properties ${datadir}/pixmaps" +FILES_${PN}-dev += "${libdir}/bonobo/monikers/*a" +FILES_${PN}-dbg += "${libdir}/bonobo/monikers/.debug" + +do_configure_prepend() { + sed -i -e s:docs::g ${S}/Makefile.am + echo "EXTRA_DIST = version.xml" > gnome-doc-utils.make + echo "EXTRA_DIST = version.xml" > gtk-doc.make +} + diff --git a/recipes/gnome/libgnomekbd_2.30.0.bb b/recipes/gnome/libgnomekbd_2.30.0.bb new file mode 100644 index 0000000000..30e051b79c --- /dev/null +++ b/recipes/gnome/libgnomekbd_2.30.0.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "GNOME keyboard library" +LICENSE = "LGPL" +SECTION = "x11/gnome/libs" + +DEPENDS = "gconf libgnome libxklavier" + +inherit gnome + +SRC_URI[archive.md5sum] = "2c3a2dfac0da5c3748a06db905264429" +SRC_URI[archive.sha256sum] = "fc8f688901dfa293b1e5c14a0b56866837f0003d5b6a9ce971841735084d5b04" + +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 +} + + + + + diff --git a/recipes/gnome/libgnomeprint_2.18.7.bb b/recipes/gnome/libgnomeprint_2.18.7.bb new file mode 100644 index 0000000000..8238310e04 --- /dev/null +++ b/recipes/gnome/libgnomeprint_2.18.7.bb @@ -0,0 +1,13 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" + +DEPENDS = "libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common" + +inherit flow-lossage pkgconfig gnome + +SRC_URI[archive.md5sum] = "d66b81ee8aa3b3a33f5efc9a47ce07e3" +SRC_URI[archive.sha256sum] = "8b34f81599423ef3da9c43775495da602f83cbbee069c9e760ffeae6aa4768e6" + +FILES_${PN}-dbg += "${libdir}/libgnomeprint/${PV}/modules/transports/.debug \ + ${libdir}/libgnomeprint/${PV}/modules/.debug ${libdir}/libgnomeprint/${PV}/modules/*/.debug" + diff --git a/recipes/gnome/libgnomeprintui_2.18.5.bb b/recipes/gnome/libgnomeprintui_2.18.5.bb new file mode 100644 index 0000000000..0fa483d228 --- /dev/null +++ b/recipes/gnome/libgnomeprintui_2.18.5.bb @@ -0,0 +1,11 @@ +LICENSE = "GPL" +SECTION = "x11/gnome/libs" +DEPENDS = "libgnomeprint gtk+ libgnomecanvas gnome-icon-theme" + +inherit gnome pkgconfig + +SRC_URI[archive.md5sum] = "66c1cf3a9ead428585c2c44e6110ebb7" +SRC_URI[archive.sha256sum] = "48ef73621dc2d208f81031dc87d18757879761ca176df80f46fafcfd9af9449f" + +EXTRA_OECONF = "use_local_libgnomeprint_la=no" + diff --git a/recipes/gnome/libgnomeui.inc b/recipes/gnome/libgnomeui.inc index 6cde2362d2..537eb5a08d 100644 --- a/recipes/gnome/libgnomeui.inc +++ b/recipes/gnome/libgnomeui.inc @@ -19,6 +19,3 @@ 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.3.bb b/recipes/gnome/libgnomeui_2.24.3.bb new file mode 100644 index 0000000000..56f2840557 --- /dev/null +++ b/recipes/gnome/libgnomeui_2.24.3.bb @@ -0,0 +1,4 @@ +require libgnomeui.inc + +SRC_URI[archive.md5sum] = "ceab6f4370581d1a03c09f15cc103099" +SRC_URI[archive.sha256sum] = "04c81f3bb5a337cdf3ed1230916f82d29857ee95eb884f58dd2f5c6860efe803" diff --git a/recipes/gnome/libgtop_2.28.1.bb b/recipes/gnome/libgtop_2.28.1.bb new file mode 100644 index 0000000000..737f3a74c7 --- /dev/null +++ b/recipes/gnome/libgtop_2.28.1.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPL" +DEPENDS = "glib-2.0" + +inherit gnome lib_package + +SRC_URI[archive.md5sum] = "994c299b6dba330524a67ea45776b3ab" +SRC_URI[archive.sha256sum] = "0a7e0e7d736a608a5ed25f8e475a87bf38e61dbef66822e25e8ef50705cf70f6" + + diff --git a/recipes/gnome/liboobs_2.30.0.bb b/recipes/gnome/liboobs_2.30.0.bb new file mode 100644 index 0000000000..51fb1beff9 --- /dev/null +++ b/recipes/gnome/liboobs_2.30.0.bb @@ -0,0 +1,9 @@ +LICENSE = "LGPL" +DEPENDS = "glib-2.0 dbus system-tools-backends" + +inherit gnome lib_package + +SRC_URI[archive.md5sum] = "69ee6d329cd919c69aae3dae7302b796" +SRC_URI[archive.sha256sum] = "b0c18e038a6c1eba15c68a8e9fabfc21144c9240c17f3bd19042bae1ea04a5ce" + + diff --git a/recipes/gnome/libxklavier_4.0.bb b/recipes/gnome/libxklavier_4.0.bb index fb74980560..6f3985413b 100644 --- a/recipes/gnome/libxklavier_4.0.bb +++ b/recipes/gnome/libxklavier_4.0.bb @@ -20,7 +20,4 @@ do_compile_append() { libxklavier.pc } -do_stage() { - autotools_stage_all -} diff --git a/recipes/gnome/libxklavier_5.0.bb b/recipes/gnome/libxklavier_5.0.bb new file mode 100644 index 0000000000..9c70d6f5f9 --- /dev/null +++ b/recipes/gnome/libxklavier_5.0.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Helper lib for keyboard management" +LICENSE = "LGPL" + +DEPENDS = "xkbcomp gtk+ iso-codes " + +inherit gnome + +SRC_URI[archive.md5sum] = "134c7ea177ff901123b909de77394780" +SRC_URI[archive.sha256sum] = "dfd94b17a752b2839281764f0a16af2b338024c8867c10fba7015f276dec4db0" + +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 +} + + diff --git a/recipes/gnome/metacity/crosscompile.patch b/recipes/gnome/metacity/crosscompile.patch new file mode 100644 index 0000000000..bc33dfb8e4 --- /dev/null +++ b/recipes/gnome/metacity/crosscompile.patch @@ -0,0 +1,53 @@ +Index: git/src/Makefile.am +=================================================================== +--- git.orig/src/Makefile.am 2009-01-27 15:25:31.000000000 +0000 ++++ git/src/Makefile.am 2009-01-27 15:39:54.000000000 +0000 +@@ -168,11 +168,9 @@ + metacity_dialog_SOURCES= \ + ui/metacity-dialog.c + +-schema_bindings_SOURCES = \ +- core/schema-bindings.c \ +- metacity.schemas.in.in ++schema_bindings: ++ @CC_FOR_BUILD@ core/schema-bindings.c -I./include -I$(STAGING_LIBDIR_NATIVE)/glib-2.0/include -I$(STAGING_INCDIR_NATIVE)/glib-2.0 -I$(STAGING_INCDIR_NATIVE) -I../ @CFLAGS_FOR_BUILD@ @LDFLAGS_FOR_BUILD@ -L$(STAGING_LIBDIR_NATIVE) -lglib-2.0 -o schema_bindings + +-schema_bindings_LDADD = @METACITY_LIBS@ + metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in + @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in + ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in +--- /tmp/configure.in 2010-04-01 20:52:17.000000000 +0200 ++++ metacity-2.30.0/configure.in 2010-04-01 20:53:14.000000000 +0200 +@@ -31,6 +31,32 @@ + AC_LIBTOOL_WIN32_DLL + AM_PROG_LIBTOOL + ++if test x"$CC_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) ++ else ++ CC_FOR_BUILD="$CC" ++ fi ++fi ++AC_SUBST([CC_FOR_BUILD]) ++if test x"$CFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ CFLAGS_FOR_BUILD="$CFLAGS" ++ fi ++fi ++AC_SUBST([CFLAGS_FOR_BUILD]) ++if test x"$LDFLAGS_FOR_BUILD" = x; then ++ if test x"$cross_compiling" = xyes; then ++ echo boo! ++ else ++ LDFLAGS_FOR_BUILD="$LDFLAGS" ++ fi ++fi ++AC_SUBST([LDFLAGS_FOR_BUILD]) ++ ++ + #### Integer sizes + + AC_CHECK_SIZEOF(char) diff --git a/recipes/gnome/metacity_2.30.0.bb b/recipes/gnome/metacity_2.30.0.bb new file mode 100644 index 0000000000..7b59b436bf --- /dev/null +++ b/recipes/gnome/metacity_2.30.0.bb @@ -0,0 +1,32 @@ +DEFAULT_PREFERENCE = "-1" + +SECTION = "x11/wm" +DESCRIPTION = "Metacity is the boring window manager for the adult in you." +LICENSE = "GPL" +DEPENDS = "libcanberra libwnck startup-notification gtk+ gconf gdk-pixbuf-csource-native" + +inherit gnome update-alternatives + +SRC_URI += "file://crosscompile.patch;patch=1 " + +SRC_URI[archive.md5sum] = "7c8a4c8f3b667efcc60f286adb445d4c" +SRC_URI[archive.sha256sum] = "5c4e2af2216de022181f692f15427361a1dae3d30756ef89b97a11ff5bd50b22" + +EXTRA_OECONF += "--disable-verbose \ + --disable-xinerama \ + --without-introspectiom \ +" + +do_configure_prepend() { + sed -i -e 's:$ZENITY:$NOZENITY:g' -e 's:-Werror::g' ${S}/configure.in +} + +EXTRA_OEMAKE = ' STAGING_INCDIR_NATIVE="${STAGING_INCDIR_NATIVE}" STAGING_LIBDIR_NATIVE="${STAGING_LIBDIR_NATIVE}"' + +ALTERNATIVE_NAME = "x-window-manager" +ALTERNATIVE_LINK = "${bindir}/x-window-manager" +ALTERNATIVE_PATH = "${bindir}/metacity" +ALTERNATIVE_PRIORITY = "30" + +RDEPENDS_${PN} = "zenity" +FILES_${PN} += "${datadir}/themes ${datadir}/gnome*" diff --git a/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch b/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch new file mode 100644 index 0000000000..f258f326c1 --- /dev/null +++ b/recipes/gnome/system-tools-backends-2.10.0/add-angstrom-distro.patch @@ -0,0 +1,28 @@ +Index: system-tools-backends-2.8.3/Utils/Platform.pm +=================================================================== +--- system-tools-backends-2.8.3.orig/Utils/Platform.pm 2010-01-17 16:05:55.794914937 +0000 ++++ system-tools-backends-2.8.3/Utils/Platform.pm 2010-01-17 16:13:07.271917106 +0000 +@@ -91,6 +91,7 @@ + "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 +@@ -141,6 +142,7 @@ + "vine-3.1" => "vine-3.0", + "vlos-1.2" => "gentoo", + "nexenta-1.0" => "solaris-2.11", ++ "angstrom" => "debian-3.0", + ); + + return $metamap{$distro} if ($metamap{$distro}); +@@ -373,6 +375,7 @@ + [ \&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 ]] diff --git a/recipes/gnome/system-tools-backends-2.10.0/system-tools-backends b/recipes/gnome/system-tools-backends-2.10.0/system-tools-backends new file mode 100644 index 0000000000..704c36dbf4 --- /dev/null +++ b/recipes/gnome/system-tools-backends-2.10.0/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.10.0.bb b/recipes/gnome/system-tools-backends_2.10.0.bb new file mode 100644 index 0000000000..393f971075 --- /dev/null +++ b/recipes/gnome/system-tools-backends_2.10.0.bb @@ -0,0 +1,45 @@ +DESCRIPTION = "gnome system tools backends" +LICENSE = "GPL" + +DEPENDS = "dbus dbus-glib glib-2.0 policykit" + +# Shadow added so there is a full adduser/deluser +# (Gnome images tend to pull in shadow anyway) +RDEPENDS = "shadow" + +inherit gnome pkgconfig update-rc.d + +SRC_URI += " \ + file://system-tools-backends \ + " + +SRC_URI_append_angstrom = " \ + file://add-angstrom-distro.patch;patch=1 \ + " + +SRC_URI[archive.md5sum] = "01fd8fcfbe5f68492186404c96af915a" +SRC_URI[archive.sha256sum] = "5afea48c0c195dd3b6e0b87a586c08bf614942d4bcb60449fd9f65d95418b60d" + +EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " + +do_configure() { + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in + gnu-configize + oe_runconf +} + +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" +FILES_${PN} += " ${datadir}/polkit*" diff --git a/recipes/gnome/system-tools-backends_2.8.3.bb b/recipes/gnome/system-tools-backends_2.8.3.bb index 117882395e..257b80e2a6 100644 --- a/recipes/gnome/system-tools-backends_2.8.3.bb +++ b/recipes/gnome/system-tools-backends_2.8.3.bb @@ -1,6 +1,8 @@ DESCRIPTION = "gnome system tools backends" LICENSE = "GPL" +PR = "r2" + DEPENDS = "dbus dbus-glib glib-2.0 policykit" # Shadow added so there is a full adduser/deluser @@ -17,14 +19,13 @@ SRC_URI_append_angstrom = " \ file://add-angstrom-distro.patch;patch=1 \ " -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 +EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " + +do_configure() { sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am + sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in + gnu-configize + oe_runconf } do_install_append () { @@ -40,3 +41,4 @@ 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" +FILES_${PN} += " ${datadir}/polkit*" |