From 547b742b51953c65c5001a018ec9e4bc20cce822 Mon Sep 17 00:00:00 2001 From: Bruce Leidl Date: Sat, 24 Mar 2018 14:08:23 -0400 Subject: [PATCH] update gnome-settings-daemon for 3.28 --- .../gnome-settings-daemon.inc | 18 ------- .../gnome-settings-daemon_3.26.1.bb | 3 -- .../gnome-settings-daemon_3.26.2.bb | 3 -- .../gnome-settings-daemon_3.28.0.bb | 51 +++++++++++++++++++ 4 files changed, 51 insertions(+), 24 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb delete mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc deleted file mode 100644 index 46afbe3..0000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon.inc +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "A set of daemons that manage and provide various parameters to applications" -HOMEPAGE = "https://wiki.gnome.org/Initiatives/Wayland/gnome-settings-daemon" -LICENSE = "GPLv2 & LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" - -DEPENDS = "pango gnome-desktop kbproto libnotify fontconfig libgudev libxext wayland glib-2.0 libxi libx11 libwacom libxtst gsettings-desktop-schemas nss intltool-native gtk+3 polkit upower lcms glib-2.0-native wayland colord geoclue libcanberra geocode-glib libgweather pulseaudio networkmanager" - -FILES_${PN} += "\ - ${libdir}/gnome-settings-daemon-3.0 \ -" - -FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" - -inherit gettext gnome - -EXTRA_OECONF = "--disable-cups" - diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb deleted file mode 100644 index d3be3de..0000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.1.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gnome-settings-daemon.inc -SRC_URI[archive.md5sum] = "c214fe5e6166481cfabf8450756c51fe" -SRC_URI[archive.sha256sum] = "711ac9bad06f6a4225f5eb2f4796474662f81f7077e16a4b7ee7ab974b65d893" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb deleted file mode 100644 index eae403e..0000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.26.2.bb +++ /dev/null @@ -1,3 +0,0 @@ -require gnome-settings-daemon.inc -SRC_URI[md5sum] = "77f335b7330573595e6349095c8d3630" -SRC_URI[sha256sum] = "5a3d156b35e03fa3c28fddd0321f6726082a711973dee2af686370faae2e75e4" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb new file mode 100644 index 0000000..e82bd0b --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_3.28.0.bb @@ -0,0 +1,51 @@ + +SUMMARY = "A set of daemons that manage and provide various parameters to applications" +HOMEPAGE = "https://wiki.gnome.org/Initiatives/Wayland/gnome-settings-daemon" +LICENSE = "GPLv2 & LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ + file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "pango gnome-desktop kbproto libnotify fontconfig libgudev libxext wayland glib-2.0 libxi libx11 libwacom libxtst gsettings-desktop-schemas nss intltool-native gtk+3 polkit upower lcms glib-2.0-native wayland colord geoclue libcanberra geocode-glib libgweather pulseaudio networkmanager" + +FILES_${PN} += "\ + ${libdir}/gnome-settings-daemon-3.0 \ +" + +FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-3.0/libgsd.a" + + +SRC_URI[archive.md5sum] = "508f36ade9b97afebd32a3437b1a4c56" +SRC_URI[archive.sha256sum] = "de3eeef55c8736cbb8c25fcda2e861879a3b612931758fe1387f61a288636cdc" +GNOMEBASEBUILDCLASS = "meson" + +inherit gnomebase gobject-introspection gettext + +EXTRA_OEMESON = "--buildtype=release -Dcups=false" + + +# This probably belongs in meson.bbclass +# +# 1) write out a wrapper script that can execute target binaries +# +# 2) add exe_wrapper line to the end of [binaries] section in the +# meson.cross file that meson.bbclass generated +# +setup_wrapper() { + if [ ! -e ${B}/wrapper ]; then + cat > ${B}/wrapper << EOF +#!/bin/sh +${STAGING_LIBDIR}/ld-linux-x86-64.so.2 --library-path ${STAGING_LIBDIR} \$@ +EOF + chmod +x ${B}/wrapper + fi + + if ! grep -q "^exe_wrapper" ${WORKDIR}/meson.cross; then + cat ${WORKDIR}/meson.cross | sed "/pkgconfig/ a\ +exe_wrapper = '${B}/wrapper'" > ${WORKDIR}/meson.cross.tmp + mv ${WORKDIR}/meson.cross.tmp ${WORKDIR}/meson.cross + fi +} + +do_configure_prepend() { + setup_wrapper +}