diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-sato/settings-daemon | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-sato/settings-daemon')
4 files changed, 108 insertions, 0 deletions
diff --git a/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh new file mode 100644 index 0000000000..95374135f2 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/70settings-daemon.sh | |||
@@ -0,0 +1 @@ | |||
/usr/bin/settings-daemon & | |||
diff --git a/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch new file mode 100644 index 0000000000..baf06d6b84 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/addsoundkeys.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Index: settings-daemon/settings-daemon.c | ||
4 | =================================================================== | ||
5 | --- settings-daemon.orig/settings-daemon.c 2009-05-22 14:57:05.000000000 +0100 | ||
6 | +++ settings-daemon/settings-daemon.c 2009-05-22 14:58:22.000000000 +0100 | ||
7 | @@ -187,6 +187,10 @@ | ||
8 | GCONF_VALUE_STRING, translate_string_string }, | ||
9 | { "/desktop/poky/interface/gtk_color_scheme", "Gtk/ColorScheme", | ||
10 | GCONF_VALUE_STRING, translate_string_string }, | ||
11 | + { "/desktop/gnome/sound/theme_name", "Net/SoundThemeName", | ||
12 | + GCONF_VALUE_STRING, translate_string_string }, | ||
13 | + { "/desktop/gnome/sound/event_sounds", "Net/EnableEventSounds" , | ||
14 | + GCONF_VALUE_BOOL, translate_bool_int }, | ||
15 | }; | ||
16 | |||
17 | static const TranslationEntry* | ||
18 | Index: settings-daemon/settings-daemon.schemas | ||
19 | =================================================================== | ||
20 | --- settings-daemon.orig/settings-daemon.schemas 2009-05-22 15:49:17.000000000 +0100 | ||
21 | +++ settings-daemon/settings-daemon.schemas 2009-05-22 15:51:31.000000000 +0100 | ||
22 | @@ -196,6 +196,27 @@ | ||
23 | </locale> | ||
24 | </schema> | ||
25 | |||
26 | + <schema> | ||
27 | + <key>/schemas/desktop/gnome/sound/theme_name</key> | ||
28 | + <applyto>/desktop/gnome/sound/theme_name</applyto> | ||
29 | + <owner>gnome</owner> | ||
30 | + <type>string</type> | ||
31 | + <default>freedesktop</default> | ||
32 | + <locale name="C"> | ||
33 | + <short>Sound Theme Name</short> | ||
34 | + </locale> | ||
35 | + </schema> | ||
36 | + | ||
37 | + <schema> | ||
38 | + <key>/schemas/desktop/gnome/sound/event_sounds</key> | ||
39 | + <applyto>/desktop/gnome/sound/event_sounds</applyto> | ||
40 | + <owner>gnome</owner> | ||
41 | + <type>bool</type> | ||
42 | + <default>true</default> | ||
43 | + <locale name="C"> | ||
44 | + <short>Enable Sound Events</short> | ||
45 | + </locale> | ||
46 | + </schema> | ||
47 | |||
48 | </schemalist> | ||
49 | </gconfschemafile> | ||
diff --git a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch new file mode 100644 index 0000000000..594374467a --- /dev/null +++ b/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | Upstream-Status: Inappropriate [configuration] | ||
2 | |||
3 | after gcc linking has changed, all the libraries must be explicitely specified to for linking. | ||
4 | This patch avoids this linking error: | ||
5 | |||
6 | | make all-am^M | ||
7 | | make[1]: Entering directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
8 | | 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 | ||
9 | | /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 | ||
10 | | /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libX11.so.6: could not read symbols: Bad value^M | ||
11 | | collect2: ld returned 1 exit status^M | ||
12 | | make[1]: *** [settings-daemon] Error 1^M | ||
13 | | make[1]: Leaving directory `/disk0/pokybuild/build1/tmp/work/i586-poky-linux/settings-daemon-0.0+svnr2059-r3/settings-daemon'^M | ||
14 | | make: *** [all] Error 2^M | ||
15 | |||
16 | Nitin A Kamble <nitin.a.kamble@intel.com> | ||
17 | Date: 2011/01/11 | ||
18 | |||
19 | Index: settings-daemon/configure.ac | ||
20 | =================================================================== | ||
21 | --- settings-daemon.orig/configure.ac | ||
22 | +++ settings-daemon/configure.ac | ||
23 | @@ -14,7 +14,7 @@ AC_PROG_CC | ||
24 | |||
25 | |||
26 | dnl TODO: make gconf optional | ||
27 | -PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0]) | ||
28 | +PKG_CHECK_MODULES(APP, [gconf-2.0 gdk-x11-2.0 x11]) | ||
29 | |||
30 | |||
31 | AC_SUBST(APP_CFLAGS) | ||
diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb new file mode 100644 index 0000000000..ba48d90773 --- /dev/null +++ b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb | |||
@@ -0,0 +1,27 @@ | |||
1 | SUMMARY = "Provides a bridge between gconf and xsettings" | ||
2 | HOMEPAGE = "http://svn.o-hand.com/view/matchbox/trunk/settings-daemon/" | ||
3 | BUGTRACKER = "http://bugzilla.yoctoproject.org/" | ||
4 | LICENSE = "MIT-style" | ||
5 | LIC_FILES_CHKSUM = "file://xsettings-manager.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ | ||
6 | file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" | ||
7 | DEPENDS = "gconf glib-2.0 gtk+" | ||
8 | SECTION = "x11" | ||
9 | SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1" | ||
10 | PV = "0.0+git${SRCPV}" | ||
11 | |||
12 | |||
13 | SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ | ||
14 | file://addsoundkeys.patch;apply=yes \ | ||
15 | file://70settings-daemon.sh \ | ||
16 | file://dso_linking_change_build_fix.patch" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit autotools pkgconfig gconf | ||
21 | |||
22 | FILES_${PN} = "${bindir}/* ${sysconfdir}" | ||
23 | |||
24 | do_install_append () { | ||
25 | install -d ${D}/${sysconfdir}/X11/Xsession.d | ||
26 | install -m 755 ${WORKDIR}/70settings-daemon.sh ${D}/${sysconfdir}/X11/Xsession.d/ | ||
27 | } | ||