From 8072c7020f61c5e1a6e28d254dd967649e5a70c4 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Mon, 29 Feb 2016 13:41:37 +0200 Subject: settings-daemon: Upgrade to 0.0.2 * New versions builds with gdk-x11-3.0 and supports gconf key "matchbox_theme". * Remove patch that's already upstream. (From OE-Core rev: 26694d90e9cc3024571c756445183828e2691cd4) Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../files/dso_linking_change_build_fix.patch | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch (limited to 'meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch') 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 deleted file mode 100644 index 594374467a..0000000000 --- a/meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -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