From 26694d90e9cc3024571c756445183828e2691cd4 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. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- .../files/dso_linking_change_build_fix.patch | 31 ---------------------- .../settings-daemon/settings-daemon_0.0.2.bb | 29 ++++++++++++++++++++ .../settings-daemon/settings-daemon_git.bb | 30 --------------------- 3 files changed, 29 insertions(+), 61 deletions(-) delete mode 100644 meta/recipes-sato/settings-daemon/files/dso_linking_change_build_fix.patch create mode 100644 meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb delete mode 100644 meta/recipes-sato/settings-daemon/settings-daemon_git.bb (limited to 'meta/recipes-sato') 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) diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb new file mode 100644 index 0000000000..56eb656ecb --- /dev/null +++ b/meta/recipes-sato/settings-daemon/settings-daemon_0.0.2.bb @@ -0,0 +1,29 @@ +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+3" +SECTION = "x11" + +# SRCREV tagged 0.0.2 +SRCREV = "b2e5da502f8c5ff75e9e6da771372ef8e40fd9a2" +SRC_URI = "git://git.yoctoproject.org/xsettings-daemon \ + file://addsoundkeys.patch;apply=yes \ + file://70settings-daemon.sh \ + " + +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/ +} diff --git a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb b/meta/recipes-sato/settings-daemon/settings-daemon_git.bb deleted file mode 100644 index c0615530af..0000000000 --- a/meta/recipes-sato/settings-daemon/settings-daemon_git.bb +++ /dev/null @@ -1,30 +0,0 @@ -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/ -} -- cgit v1.2.3