diff options
author | Ross Burton <ross.burton@intel.com> | 2017-07-10 20:38:39 +0100 |
---|---|---|
committer | Ross Burton <ross.burton@intel.com> | 2017-07-20 16:34:41 +0100 |
commit | 9c4738249562631d9e2e8aaefb3660868ba49b00 (patch) | |
tree | 62557bb0bc396a7f13c31cfbf40be5e7a49ada82 /meta-gnome | |
parent | 51da7deb51fdd7e58909ed80118a0ed5175e9a87 (diff) | |
download | meta-openembedded-contrib-9c4738249562631d9e2e8aaefb3660868ba49b00.tar.gz |
gnome-settings-daemon/: remove
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch | 81 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb | 46 |
2 files changed, 0 insertions, 127 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch deleted file mode 100644 index 6dd33f3517..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001 -From: William Jon McCann <jmccann@redhat.com> -Date: Mon, 11 Oct 2010 23:35:45 -0400 -Subject: [PATCH] Require libnotify 0.6.0 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - -Upstream-Status: Backport - ---- - configure.ac | 2 +- - plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | 8 ++------ - plugins/xrandr/gsd-xrandr-manager.c | 13 +++---------- - 3 files changed, 6 insertions(+), 17 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8a90053..8624b2a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -54,7 +54,7 @@ GTK_REQUIRED_VERSION=2.91.0 - GCONF_REQUIRED_VERSION=2.6.1 - GIO_REQUIRED_VERSION=2.17.3 - GNOME_DESKTOP_REQUIRED_VERSION=2.29.92 --LIBNOTIFY_REQUIRED_VERSION=0.4.3 -+LIBNOTIFY_REQUIRED_VERSION=0.6.1 - - EXTRA_COMPILE_WARNINGS(yes) - -diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c -index 9ca820a..f5964b9 100644 ---- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c -+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c -@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager, - gsd_a11y_keyboard_manager_ensure_status_icon (manager); - manager->priv->notification = notify_notification_new (title, - message, -- "preferences-desktop-accessibility", -- NULL); -- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); -+ "preferences-desktop-accessibility"); - notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); - - notify_notification_add_action (manager->priv->notification, -@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager, - gsd_a11y_keyboard_manager_ensure_status_icon (manager); - manager->priv->notification = notify_notification_new (title, - message, -- "preferences-desktop-accessibility", -- NULL); -- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); -+ "preferences-desktop-accessibility"); - notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); - - notify_notification_add_action (manager->priv->notification, -diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c -index 02536a3..ef57d5b 100644 ---- a/plugins/xrandr/gsd-xrandr-manager.c -+++ b/plugins/xrandr/gsd-xrandr-manager.c -@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to - - g_assert (error_to_display == NULL || secondary_text == NULL); - -- if (priv->status_icon) -- notification = notify_notification_new_with_status_icon (primary_text, -- error_to_display ? error_to_display->message : secondary_text, -- GSD_XRANDR_ICON_NAME, -- priv->status_icon); -- else -- notification = notify_notification_new (primary_text, -- error_to_display ? error_to_display->message : secondary_text, -- GSD_XRANDR_ICON_NAME, -- NULL); -+ notification = notify_notification_new (primary_text, -+ error_to_display ? error_to_display->message : secondary_text, -+ GSD_XRANDR_ICON_NAME); - - notify_notification_show (notification, NULL); /* NULL-GError */ - #else --- -2.1.0 - diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb deleted file mode 100644 index c1db6d3b4b..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +++ /dev/null @@ -1,46 +0,0 @@ -SUMMARY = "GNOME settings daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PR = "r7" - -DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop" - -inherit gnome - -SRC_URI = " \ - git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32 \ - file://0001-Require-libnotify-0.6.0.patch \ -" -SRCREV = "0160f6725cfb872e017f3958f108792c3b882872" - -S = "${WORKDIR}/git" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra" -PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss" - -EXTRA_OECONF = " \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-polkit \ -" - -do_configure_prepend() { - sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac -} - -FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ - ${datadir}/dbus-1/ \ - ${datadir}/icon* \ - ${datadir}/gnome-control-center \ - ${datadir}/xsession*" - -FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" -FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" - - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted libgnomekbd - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" |