diff options
Diffstat (limited to 'yocto-poky/meta/recipes-sato/settings-daemon')
4 files changed, 111 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh new file mode 100644 index 000000000..95374135f --- /dev/null +++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh @@ -0,0 +1 @@ +/usr/bin/settings-daemon & diff --git a/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch new file mode 100644 index 000000000..baf06d6b8 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch @@ -0,0 +1,49 @@ +Upstream-Status: Pending + +Index: settings-daemon/settings-daemon.c +=================================================================== +--- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 ++++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 +@@ -187,6 +187,10 @@ + GCONF_VALUE_STRING, translate_string_string }, + { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", + GCONF_VALUE_STRING, translate_string_string }, ++ { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", ++ GCONF_VALUE_STRING, translate_string_string }, ++ { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , ++ GCONF_VALUE_BOOL, translate_bool_int }, + }; + + static const TranslationEntry* +Index: settings-daemon/settings-daemon.schemas +=================================================================== +--- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 ++++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 +@@ -196,6 +196,27 @@ + </locale> + </schema> + ++ <schema> ++ <key>/schemas/desktop/gnome/sound/theme_name</key> ++ <applyto>/desktop/gnome/sound/theme_name</applyto> ++ <owner>gnome</owner> ++ <type>string</type> ++ <default>freedesktop</default> ++ <locale name="C"> ++ <short>Sound Theme Name</short> ++ </locale> ++ </schema> ++ ++ <schema> ++ <key>/schemas/desktop/gnome/sound/event_sounds</key> ++ <applyto>/desktop/gnome/sound/event_sounds</applyto> ++ <owner>gnome</owner> ++ <type>bool</type> ++ <default>true</default> ++ <locale name="C"> ++ <short>Enable Sound Events</short> ++ </locale> ++ </schema> + + </schemalist> + </gconfschemafile> diff --git a/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch new file mode 100644 index 000000000..594374467 --- /dev/null +++ b/yocto-poky/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch @@ -0,0 +1,31 @@ +Upstream-Status: Inappropriate [configuration] + +after gcc linking has changed, all the libraries must be explicitely specified to for linking. +This patch avoids this linking error: + +| make all-am^M +| make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M +| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -Wall -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o settings-daemon settings_daemon-xsettings-common.o settings_daemon-xsettings-manager.o settings_daemon-settings-daemon.o -pthread -lgconf-2 -ldbus-glib-1 -ldbus-1 -lpthread -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0^M +| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: *^A: invalid DSO for symbol `XCreateSimpleWindow' definition^M +| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M +| collect2: ld returned 1 exit status^M +| make[1]: *** [settings-daemon] Error 1^M +| make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M +| make: *** [all] Error 2^M + +Nitin A Kamble <nitin.a.kamble@intel.com> +Date: 2011/01/11 + +Index: settings-daemon/configure.ac +=================================================================== +--- settings-daemon.orig/configure.ac ++++ settings-daemon/configure.ac +@@ -14,7 +14,7 @@ AC_PROG_CC + + + dnl TODO: make gconf optional +-PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) ++PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) + + + AC_SUBST(APP_CFLAGS) diff --git a/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb new file mode 100644 index 000000000..c0615530a --- /dev/null +++ b/yocto-poky/meta/recipes-sato/settings-daemon/settings-daemon_git.bb @@ -0,0 +1,30 @@ +SUMMARY = "Provides a bridge between gconf and xsettings" +HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" +BUGTRACKER = "http://bugzilla.yoctoproject.org/" +LICENSE = "MIT-style" +LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ + file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" +DEPENDS = "gconf glib-2.0 gtk+" +SECTION = "x11" +SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1" +PV = "0.0+git${SRCPV}" + + +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ + file://addsoundkeys.patch;apply=yes \ + file://70settings-daemon.sh \ + file://dso_linking_change_build_fix.patch" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig gconf distro_features_check + +FILES_${PN} = "${bindir}/* ${sysconfdir}" + +# Requires gdk-x11-2.0 which is provided by gtk when x11 in DISTRO_FEATURES +REQUIRED_DISTRO_FEATURES = "x11" + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ +} |