r2009 - in trunk/oe: conf/distro/include packages packages/settings-daemon packages/settings-daemon/files
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Fri May 18 11:28:39 CEST 2007
Author: mickey
Date: 2007-05-18 11:28:38 +0200 (Fri, 18 May 2007)
New Revision: 2009
Added:
trunk/oe/packages/settings-daemon/
trunk/oe/packages/settings-daemon/files/
trunk/oe/packages/settings-daemon/files/70settings-daemon
trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
trunk/oe/packages/settings-daemon/settings-daemon_svn.bb
Modified:
trunk/oe/conf/distro/include/sane-srcdates.inc
Log:
oe: add settings-daemon and set preferred srcdate for it
Modified: trunk/oe/conf/distro/include/sane-srcdates.inc
===================================================================
--- trunk/oe/conf/distro/include/sane-srcdates.inc 2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/conf/distro/include/sane-srcdates.inc 2007-05-18 09:28:38 UTC (rev 2009)
@@ -33,6 +33,7 @@
SRCDATE_matchbox-stroke ?= "20060612"
SRCDATE_matchbox-themes-extra ?= "20060612"
SRCDATE_matchbox-wm ?= "20060612"
+SRCDATE_settings-daemon = "now"
SRCDATE_libmatchbox ?= "20060612"
SRCDATE_libfakekey ?= "20051101"
SRCDATE_zaurusd ?= "20060628"
Added: trunk/oe/packages/settings-daemon/files/70settings-daemon
===================================================================
--- trunk/oe/packages/settings-daemon/files/70settings-daemon 2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/70settings-daemon 2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/settings-daemon &
Property changes on: trunk/oe/packages/settings-daemon/files/70settings-daemon
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch
===================================================================
--- trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch 2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/change-paths-to-openmoko.patch 2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,76 @@
+Index: settings-daemon.c
+===================================================================
+--- settings-daemon.c (revision 1490)
++++ settings-daemon.c (working copy)
+@@ -130,8 +130,8 @@
+ * translations, below. The more specific the paths, the better.
+ */
+ static const char* toplevels[] = {
+- "/desktop/poky/interface",
+- "/desktop/poky/peripherals",
++ "/desktop/openmoko/interface",
++ "/desktop/openmoko/peripherals",
+ #ifdef HAVE_XFT2
+ FONT_RENDER_DIR
+ #endif
+@@ -144,42 +144,42 @@
+ /* TODO: include the Xft settings here for neatness */
+ static const TranslationEntry translations [] = {
+ /* Hardware settings */
+- { "/desktop/poky/peripherals/mouse/double_click", "Net/DoubleClickTime",
++ { "/desktop/openmoko/peripherals/mouse/double_click", "Net/DoubleClickTime",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/peripherals/mouse/drag_threshold", "Net/DndDragThreshold",
++ { "/desktop/openmoko/peripherals/mouse/drag_threshold", "Net/DndDragThreshold",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/peripherals/stylus_mode", "Gtk/StylusMode",
++ { "/desktop/openmoko/peripherals/stylus_mode", "Gtk/StylusMode",
+ GCONF_VALUE_BOOL, translate_bool_int },
+ /* Appearance */
+- { "/desktop/poky/interface/gtk-color-palette", "Gtk/ColorPalette",
++ { "/desktop/openmoko/interface/gtk-color-palette", "Gtk/ColorPalette",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/font_name", "Gtk/FontName",
++ { "/desktop/openmoko/interface/font_name", "Gtk/FontName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk_key_theme", "Gtk/KeyThemeName",
++ { "/desktop/openmoko/interface/gtk_key_theme", "Gtk/KeyThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/toolbar_style", "Gtk/ToolbarStyle",
++ { "/desktop/openmoko/interface/toolbar_style", "Gtk/ToolbarStyle",
+ GCONF_VALUE_STRING, translate_string_string_toolbar },
+- { "/desktop/poky/interface/toolbar_icon_size", "Gtk/ToolbarIconSize",
++ { "/desktop/openmoko/interface/toolbar_icon_size", "Gtk/ToolbarIconSize",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/can_change_accels", "Gtk/CanChangeAccels",
++ { "/desktop/openmoko/interface/can_change_accels", "Gtk/CanChangeAccels",
+ GCONF_VALUE_BOOL, translate_bool_int },
+- { "/desktop/poky/interface/cursor_blink", "Net/CursorBlink",
++ { "/desktop/openmoko/interface/cursor_blink", "Net/CursorBlink",
+ GCONF_VALUE_BOOL,translate_bool_int },
+- { "/desktop/poky/interface/cursor_blink_time", "Net/CursorBlinkTime",
++ { "/desktop/openmoko/interface/cursor_blink_time", "Net/CursorBlinkTime",
+ GCONF_VALUE_INT, translate_int_int },
+- { "/desktop/poky/interface/theme", "Net/ThemeName",
++ { "/desktop/openmoko/interface/theme", "Net/ThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle",
++ { "/desktop/openmoko/interface/gtk-im-preedit-style", "Gtk/IMPreeditStyle",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/gtk-im-status-style", "Gtk/IMStatusStyle",
++ { "/desktop/openmoko/interface/gtk-im-status-style", "Gtk/IMStatusStyle",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/icon_theme", "Net/IconThemeName",
++ { "/desktop/openmoko/interface/icon_theme", "Net/IconThemeName",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/file_chooser_backend", "Gtk/FileChooserBackend",
++ { "/desktop/openmoko/interface/file_chooser_backend", "Gtk/FileChooserBackend",
+ GCONF_VALUE_STRING, translate_string_string },
+- { "/desktop/poky/interface/menus_have_icons", "Gtk/MenuImages",
++ { "/desktop/openmoko/interface/menus_have_icons", "Gtk/MenuImages",
+ GCONF_VALUE_BOOL, translate_bool_int },
+- { "/desktop/poky/interface/touchscreen", "Gtk/TouchscreenMode",
++ { "/desktop/openmoko/interface/touchscreen", "Gtk/TouchscreenMode",
+ GCONF_VALUE_BOOL, translate_bool_int },
+ };
+
Added: trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch
===================================================================
--- trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch 2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/files/change-schemas-to-openmoko.patch 2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,177 @@
+Index: settings-daemon/settings-daemon.schemas
+===================================================================
+--- settings-daemon/settings-daemon.schemas (wersja 1544)
++++ settings-daemon/settings-daemon.schemas (kopia robocza)
+@@ -3,11 +3,11 @@
+ <schemalist>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/theme</key>
+- <applyto>/desktop/poky/interface/theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/theme</key>
++ <applyto>/desktop/openmoko/interface/theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+- <default>Clearlooks</default>
++ <default>openmoko-standard</default>
+ <locale name="C">
+ <short>Desktop theme</short>
+ <long>The theme name for Matchbox and GTK+ to use.</long>
+@@ -15,8 +15,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-color-palette</key>
+- <applyto>/desktop/poky/interface/gtk-color-palette</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-color-palette</key>
++ <applyto>/desktop/openmoko/interface/gtk-color-palette</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -26,8 +26,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/font_name</key>
+- <applyto>/desktop/poky/interface/font_name</applyto>
++ <key>/schemas/desktop/openmoko/interface/font_name</key>
++ <applyto>/desktop/openmoko/interface/font_name</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>Sans 8</default>
+@@ -38,8 +38,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk_key_theme</key>
+- <applyto>/desktop/poky/interface/gtk_key_theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk_key_theme</key>
++ <applyto>/desktop/openmoko/interface/gtk_key_theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>Default</default>
+@@ -50,8 +50,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/toolbar_style</key>
+- <applyto>/desktop/poky/interface/toolbar_style</applyto>
++ <key>/schemas/desktop/openmoko/interface/toolbar_style</key>
++ <applyto>/desktop/openmoko/interface/toolbar_style</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <default>icons</default>
+@@ -63,8 +63,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/toolbar_icon_size</key>
+- <applyto>/desktop/poky/interface/toolbar_icon_size</applyto>
++ <key>/schemas/desktop/openmoko/interface/toolbar_icon_size</key>
++ <applyto>/desktop/openmoko/interface/toolbar_icon_size</applyto>
+ <type>int</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -74,8 +74,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/can_change_accels</key>
+- <applyto>/desktop/poky/interface/can_change_accels</applyto>
++ <key>/schemas/desktop/openmoko/interface/can_change_accels</key>
++ <applyto>/desktop/openmoko/interface/can_change_accels</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>false</default>
+@@ -87,8 +87,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/cursor_blink</key>
+- <applyto>/desktop/poky/interface/cursor_blink</applyto>
++ <key>/schemas/desktop/openmoko/interface/cursor_blink</key>
++ <applyto>/desktop/openmoko/interface/cursor_blink</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>true</default>
+@@ -99,8 +99,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/cursor_blink_time</key>
+- <applyto>/desktop/poky/interface/cursor_blink_time</applyto>
++ <key>/schemas/desktop/openmoko/interface/cursor_blink_time</key>
++ <applyto>/desktop/openmoko/interface/cursor_blink_time</applyto>
+ <type>int</type>
+ <owner>settings-daemon</owner>
+ <default>1200</default>
+@@ -111,11 +111,11 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/icon_theme</key>
+- <applyto>/desktop/poky/interface/icon_theme</applyto>
++ <key>/schemas/desktop/openmoko/interface/icon_theme</key>
++ <applyto>/desktop/openmoko/interface/icon_theme</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+- <default>Sato</default>
++ <default>openmoko-standard</default>
+ <locale name="C">
+ <short>Icon Theme</short>
+ <long>The name of the icon theme to use in applications</long>
+@@ -123,8 +123,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/file_chooser_backend</key>
+- <applyto>/desktop/poky/interface/file_chooser_backend</applyto>
++ <key>/schemas/desktop/openmoko/interface/file_chooser_backend</key>
++ <applyto>/desktop/openmoko/interface/file_chooser_backend</applyto>
+ <type>string</type>
+ <owner>settings-daemon</owner>
+ <locale name="C">
+@@ -136,8 +136,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/menus_have_icons</key>
+- <applyto>/desktop/poky/interface/menus_have_icons</applyto>
++ <key>/schemas/desktop/openmoko/interface/menus_have_icons</key>
++ <applyto>/desktop/openmoko/interface/menus_have_icons</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>false</default>
+@@ -148,8 +148,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/touchscreen</key>
+- <applyto>/desktop/poky/interface/touchscreen</applyto>
++ <key>/schemas/desktop/openmoko/interface/touchscreen</key>
++ <applyto>/desktop/openmoko/interface/touchscreen</applyto>
+ <type>bool</type>
+ <owner>settings-daemon</owner>
+ <default>true</default>
+@@ -162,8 +162,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-im-preedit-style</key>
+- <applyto>/desktop/poky/interface/gtk-im-preedit-style</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-im-preedit-style</key>
++ <applyto>/desktop/openmoko/interface/gtk-im-preedit-style</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default>callback</default>
+@@ -174,8 +174,8 @@
+ </schema>
+
+ <schema>
+- <key>/schemas/desktop/poky/interface/gtk-im-status-style</key>
+- <applyto>/desktop/poky/interface/gtk-im-status-style</applyto>
++ <key>/schemas/desktop/openmoko/interface/gtk-im-status-style</key>
++ <applyto>/desktop/openmoko/interface/gtk-im-status-style</applyto>
+ <owner>gnome</owner>
+ <type>string</type>
+ <default>callback</default>
Added: trunk/oe/packages/settings-daemon/settings-daemon_svn.bb
===================================================================
--- trunk/oe/packages/settings-daemon/settings-daemon_svn.bb 2007-05-18 09:13:46 UTC (rev 2008)
+++ trunk/oe/packages/settings-daemon/settings-daemon_svn.bb 2007-05-18 09:28:38 UTC (rev 2009)
@@ -0,0 +1,27 @@
+DESCRIPTION = "Settings-daemon is a bridge between xst/gpe-confd and gconf"
+LICENSE = "GPL"
+DEPENDS = "gconf xst glib-2.0"
+SECTION = "x11"
+PR = "r2"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
+ file://70settings-daemon "
+
+S = "${WORKDIR}/${PN}"
+
+inherit autotools pkgconfig gettext
+
+do_configure_append() {
+ if [ "${DISTRO}" = "openmoko" ]; then
+ sed -i -e "s,poky,openmoko," settings-daemon.c
+ sed -i -e "s,poky,openmoko," settings-daemon.schemas
+ sed -i -e "s,Clearlooks,openmoko-standard," settings-daemon.schemas
+ fi
+}
+
+do_install_append () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d
+ install -m 755 ${WORKDIR}/70settings-daemon ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+FILES_${PN} = "${bindir}/* ${sysconfdir}"
More information about the commitlog
mailing list
