summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-settings-daemon
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2017-04-27 11:04:51 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-31 10:18:33 +0200
commitec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch)
treee16d2a838f4561d5538928a58f805e5f1373225a /meta-gnome/recipes-gnome/gnome-settings-daemon
parent6775acb048dabd624c5c8197b683aba45ed91569 (diff)
downloadmeta-openembedded-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz
recipes: remove blacklisted recipes
* as PNBLACKLIST message says, these recipes are blacklisted for long time and nobody showed any interest to fix them * remove all unused .patch and .inc files as well Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-settings-daemon')
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch81
-rw-r--r--meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb43
2 files changed, 0 insertions, 124 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 6dd33f351..000000000
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch
+++ /dev/null
@@ -1,81 +0,0 @@
1From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
2From: William Jon McCann <jmccann@redhat.com>
3Date: Mon, 11 Oct 2010 23:35:45 -0400
4Subject: [PATCH] Require libnotify 0.6.0
5
6Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
7
8Upstream-Status: Backport
9
10---
11 configure.ac | 2 +-
12 plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | 8 ++------
13 plugins/xrandr/gsd-xrandr-manager.c | 13 +++----------
14 3 files changed, 6 insertions(+), 17 deletions(-)
15
16diff --git a/configure.ac b/configure.ac
17index 8a90053..8624b2a 100644
18--- a/configure.ac
19+++ b/configure.ac
20@@ -54,7 +54,7 @@ GTK_REQUIRED_VERSION=2.91.0
21 GCONF_REQUIRED_VERSION=2.6.1
22 GIO_REQUIRED_VERSION=2.17.3
23 GNOME_DESKTOP_REQUIRED_VERSION=2.29.92
24-LIBNOTIFY_REQUIRED_VERSION=0.4.3
25+LIBNOTIFY_REQUIRED_VERSION=0.6.1
26
27 EXTRA_COMPILE_WARNINGS(yes)
28
29diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
30index 9ca820a..f5964b9 100644
31--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
32+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
33@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
34 gsd_a11y_keyboard_manager_ensure_status_icon (manager);
35 manager->priv->notification = notify_notification_new (title,
36 message,
37- "preferences-desktop-accessibility",
38- NULL);
39- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
40+ "preferences-desktop-accessibility");
41 notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
42
43 notify_notification_add_action (manager->priv->notification,
44@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
45 gsd_a11y_keyboard_manager_ensure_status_icon (manager);
46 manager->priv->notification = notify_notification_new (title,
47 message,
48- "preferences-desktop-accessibility",
49- NULL);
50- notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
51+ "preferences-desktop-accessibility");
52 notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
53
54 notify_notification_add_action (manager->priv->notification,
55diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
56index 02536a3..ef57d5b 100644
57--- a/plugins/xrandr/gsd-xrandr-manager.c
58+++ b/plugins/xrandr/gsd-xrandr-manager.c
59@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
60
61 g_assert (error_to_display == NULL || secondary_text == NULL);
62
63- if (priv->status_icon)
64- notification = notify_notification_new_with_status_icon (primary_text,
65- error_to_display ? error_to_display->message : secondary_text,
66- GSD_XRANDR_ICON_NAME,
67- priv->status_icon);
68- else
69- notification = notify_notification_new (primary_text,
70- error_to_display ? error_to_display->message : secondary_text,
71- GSD_XRANDR_ICON_NAME,
72- NULL);
73+ notification = notify_notification_new (primary_text,
74+ error_to_display ? error_to_display->message : secondary_text,
75+ GSD_XRANDR_ICON_NAME);
76
77 notify_notification_show (notification, NULL); /* NULL-GError */
78 #else
79--
802.1.0
81
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 9a1897240..000000000
--- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb
+++ /dev/null
@@ -1,43 +0,0 @@
1SUMMARY = "GNOME settings daemon"
2LICENSE = "GPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
4
5PR = "r7"
6
7DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop"
8
9inherit gnome
10
11SRC_URI = " \
12 git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32 \
13 file://0001-Require-libnotify-0.6.0.patch \
14"
15SRCREV = "0160f6725cfb872e017f3958f108792c3b882872"
16
17S = "${WORKDIR}/git"
18
19PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}"
20PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra"
21PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss"
22
23EXTRA_OECONF = " \
24 --x-includes=${STAGING_INCDIR} \
25 --x-libraries=${STAGING_LIBDIR} \
26 --enable-polkit \
27"
28
29do_configure_prepend() {
30 sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac
31}
32
33FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \
34 ${datadir}/dbus-1/ \
35 ${datadir}/icon* \
36 ${datadir}/gnome-control-center \
37 ${datadir}/xsession*"
38
39FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug"
40FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la"
41FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a"
42
43PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed"