From 972dcfcdbfe75dcfeb777150c136576cf1a71e99 Mon Sep 17 00:00:00 2001 From: Tudor Florea Date: Fri, 9 Oct 2015 22:59:03 +0200 Subject: initial commit for Enea Linux 5.0 arm Signed-off-by: Tudor Florea --- .../settings-daemon/files/70settings-daemon.sh | 1 + .../settings-daemon/files/addsoundkeys.patch | 49 ++++++++++++++++++++++ .../files/dso_linking_change_build_fix.patch | 31 ++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 meta/recipes-sato/settings-daemon/files/70settings-daemon.sh create mode 100644 meta/recipes-sato/settings-daemon/files/addsoundkeys.patch create mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch (limited to 'meta/recipes-sato/settings-daemon/files') 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 @@ +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 @@ + + + ++ ++ /schemas/desktop/gnome/sound/theme_name ++ /desktop/gnome/sound/theme_name ++ gnome ++ string ++ freedesktop ++ ++ Sound Theme Name ++ ++ ++ ++ ++ /schemas/desktop/gnome/sound/event_sounds ++ /desktop/gnome/sound/event_sounds ++ gnome ++ bool ++ true ++ ++ Enable Sound Events ++ ++ + + + 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 @@ +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 +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) -- cgit v1.2.3-54-g00ecf