sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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 <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Jussi Kukkonen 2016-02-29 13:41:37 +02:00 committed by Richard Purdie
parent f1dcc26187
commit 8072c7020f
2 changed files with 4 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch
View File

@ -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 <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)

9
meta/recipes-sato/settings-daemon/settings-daemon_git.bb → meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb
View File

@ -4,16 +4,15 @@ 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+"
DEPENDS = "gconf glib-2.0 gtk+3"
SECTION = "x11"
SRCREV = "9a99528b02255450db81176abd9bbcc1dab9a4c1"
PV = "0.0+git${SRCPV}"
# SRCREV tagged 0.0.2
SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2"
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"