diff options
| author |   Andreas Müller <schnitzeltony@googlemail.com> | 2015-08-30 12:33:59 +0200 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-08 16:18:35 +0200 |
| commit | 13bc1b4b0fcf3a755df2041e2e8ce09ef6ca3fe1 (patch) | |
| tree | 4ac79ff8a8bf6d0d2102598dec12732350c25b35 /meta-gnome | |
| parent | a0b93d8c18ccc9ac30e55431bbdc8e860bb428b4 (diff) | |
| download | meta-openembedded-contrib-13bc1b4b0fcf3a755df2041e2e8ce09ef6ca3fe1.tar.gz | |
gnome-disk-utility: fix build for libnotify 0.7.x
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch | 49 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch new file mode 100644 index 0000000000..0bc9707c26 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch @@ -0,0 +1,49 @@ +From f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 Mon Sep 17 00:00:00 2001 +From: William Jon McCann <jmccann@redhat.com> +Date: Tue, 12 Oct 2010 00:12:49 -0400 +Subject: [PATCH] Require libnotify 0.6.1 + +https://bugzilla.gnome.org/show_bug.cgi?id=631940 + +Upstream-Status: Backport [1] + +[1] https://git.gnome.org/browse/gnome-disk-utility/commit/?id=f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 + +Signed-off-by: David Zeuthen <davidz@redhat.com> +--- + configure.ac | 2 +- + src/notification/notification-main.c | 5 +---- + 2 files changed, 2 insertions(+), 5 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c61212e..3790fcf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -128,7 +128,7 @@ DBUS_GLIB_REQUIRED=0.74 + GNOME_KEYRING_REQUIRED=2.22 + GTK2_REQUIRED=2.20.0 + UNIQUE_REQUIRED=1.0 +-LIBNOTIFY_REQUIRED=0.3.0 ++LIBNOTIFY_REQUIRED=0.6.1 + NAUTILUS_REQUIRED=2.24.0 + AVAHI_UI_REQUIRED=0.6.25 + +diff --git a/src/notification/notification-main.c b/src/notification/notification-main.c +index 18e9672..b6a713f 100644 +--- a/src/notification/notification-main.c ++++ b/src/notification/notification-main.c +@@ -535,10 +535,7 @@ update_status_icon (NotificationData *data) + _("A hard disk may be failing"), + /* Translators: This is used as the text of the notification*/ + _("One or more hard disks report health problems. Click the icon to get more information."), +- "gtk-dialog-warning", +- NULL); +- notify_notification_attach_to_status_icon (data->ata_smart_notification, +- data->status_icon); ++ "gtk-dialog-warning"); + notify_notification_set_urgency (data->ata_smart_notification, NOTIFY_URGENCY_CRITICAL); + notify_notification_set_timeout (data->ata_smart_notification, NOTIFY_EXPIRES_NEVER); + show_notification (data); +-- +2.1.0 + diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb index 4f95066ec5..2f427e7ef1 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb @@ -17,6 +17,7 @@ SRC_URI += "\ file://fix-dbus-interfaces.patch \ file://sysrooted-pkg-config.patch \ file://0001-Add-support-for-DeviceAutomountHint.patch \ + file://0002-Require-libnotify-0.6.1.patch \ " EXTRA_OECONF += "--disable-scrollkeeper" |