summaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gnome-disk-utility
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-disk-utility
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-disk-utility')
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch74
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch49
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch27
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch34
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch37
-rw-r--r--meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb45
6 files changed, 0 insertions, 266 deletions
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch
deleted file mode 100644
index 805e937763..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch
+++ /dev/null
@@ -1,74 +0,0 @@
1From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001
2From: David Zeuthen <davidz@redhat.com>
3Date: Fri, 8 Jul 2011 11:03:52 -0400
4Subject: [PATCH] Add support for DeviceAutomountHint
5
6Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184
7
8Upstream-Status: Applied [1]
9
10[1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html
11
12Signed-off-by: David Zeuthen <davidz@redhat.com>
13---
14 src/gdu/gdu-device.c | 10 ++++++++++
15 src/gdu/gdu-device.h | 1 +
16 2 files changed, 11 insertions(+), 0 deletions(-)
17
18diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c
19index 6a5afad..4be39cf 100644
20--- a/src/gdu/gdu-device.c
21+++ b/src/gdu/gdu-device.c
22@@ -82,6 +82,7 @@ typedef struct
23 gboolean device_presentation_nopolicy;
24 char *device_presentation_name;
25 char *device_presentation_icon_name;
26+ char *device_automount_hint;
27 guint64 device_size;
28 guint64 device_block_size;
29
30@@ -279,6 +280,8 @@ collect_props (const char *key,
31 props->device_presentation_name = g_strdup (g_value_get_string (value));
32 else if (strcmp (key, "DevicePresentationIconName") == 0)
33 props->device_presentation_icon_name = g_strdup (g_value_get_string (value));
34+ else if (strcmp (key, "DeviceAutomountHint") == 0)
35+ props->device_automount_hint = g_strdup (g_value_get_string (value));
36 else if (strcmp (key, "DeviceSize") == 0)
37 props->device_size = g_value_get_uint64 (value);
38 else if (strcmp (key, "DeviceBlockSize") == 0)
39@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props)
40 g_strfreev (props->device_mount_paths);
41 g_free (props->device_presentation_name);
42 g_free (props->device_presentation_icon_name);
43+ g_free (props->device_automount_hint);
44 g_free (props->job_id);
45 g_free (props->id_usage);
46 g_free (props->id_type);
47@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device)
48 }
49
50 const char *
51+gdu_device_get_automount_hint (GduDevice *device)
52+{
53+ return device->priv->props->device_automount_hint;
54+}
55+
56+const char *
57 gdu_device_drive_get_media (GduDevice *device)
58 {
59 return device->priv->props->drive_media;
60diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h
61index 4c1302b..8cfd7a9 100644
62--- a/src/gdu/gdu-device.h
63+++ b/src/gdu/gdu-device.h
64@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device);
65 const char *gdu_device_drive_get_connection_interface (GduDevice *device);
66 guint64 gdu_device_drive_get_connection_speed (GduDevice *device);
67 char **gdu_device_drive_get_media_compatibility (GduDevice *device);
68+const gchar *gdu_device_get_automount_hint(GduDevice *device);
69 const char *gdu_device_drive_get_media (GduDevice *device);
70 gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device);
71 gboolean gdu_device_drive_get_requires_eject (GduDevice *device);
72--
731.7.6.5
74
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
deleted file mode 100644
index 0bc9707c26..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 Mon Sep 17 00:00:00 2001
2From: William Jon McCann <jmccann@redhat.com>
3Date: Tue, 12 Oct 2010 00:12:49 -0400
4Subject: [PATCH] Require libnotify 0.6.1
5
6https://bugzilla.gnome.org/show_bug.cgi?id=631940
7
8Upstream-Status: Backport [1]
9
10[1] https://git.gnome.org/browse/gnome-disk-utility/commit/?id=f8dea8dd411cba10a54ec083c3d5c9d641ec36c0
11
12Signed-off-by: David Zeuthen <davidz@redhat.com>
13---
14 configure.ac | 2 +-
15 src/notification/notification-main.c | 5 +----
16 2 files changed, 2 insertions(+), 5 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index c61212e..3790fcf 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -128,7 +128,7 @@ DBUS_GLIB_REQUIRED=0.74
23 GNOME_KEYRING_REQUIRED=2.22
24 GTK2_REQUIRED=2.20.0
25 UNIQUE_REQUIRED=1.0
26-LIBNOTIFY_REQUIRED=0.3.0
27+LIBNOTIFY_REQUIRED=0.6.1
28 NAUTILUS_REQUIRED=2.24.0
29 AVAHI_UI_REQUIRED=0.6.25
30
31diff --git a/src/notification/notification-main.c b/src/notification/notification-main.c
32index 18e9672..b6a713f 100644
33--- a/src/notification/notification-main.c
34+++ b/src/notification/notification-main.c
35@@ -535,10 +535,7 @@ update_status_icon (NotificationData *data)
36 _("A hard disk may be failing"),
37 /* Translators: This is used as the text of the notification*/
38 _("One or more hard disks report health problems. Click the icon to get more information."),
39- "gtk-dialog-warning",
40- NULL);
41- notify_notification_attach_to_status_icon (data->ata_smart_notification,
42- data->status_icon);
43+ "gtk-dialog-warning");
44 notify_notification_set_urgency (data->ata_smart_notification, NOTIFY_URGENCY_CRITICAL);
45 notify_notification_set_timeout (data->ata_smart_notification, NOTIFY_EXPIRES_NEVER);
46 show_notification (data);
47--
482.1.0
49
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
deleted file mode 100644
index f36942d194..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2Subject: Disable scrollkeeper-config not found message
3Upstream-Status: Not-Applicable
4
5If scrollkeeper-config isn't found, configure fails with an error.
6Fix that by commenting out the check.
7
8Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
9
10
11Index: gnome-disk-utility-2.32.0/configure.ac
12===================================================================
13--- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400
14+++ gnome-disk-utility-2.32.0/configure.ac 2011-08-20 01:29:48.000000000 +0400
15@@ -188,9 +188,9 @@
16 # *************
17
18 AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
19-if test x$SCROLLKEEPER_CONFIG = xno; then
20- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package)
21-fi
22+dnl if test x$SCROLLKEEPER_CONFIG = xno; then
23+dnl AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package])
24+dnl fi
25
26 # ********************
27 # Internationalization
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
deleted file mode 100644
index 6ba3979557..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am
2===================================================================
3--- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am 2011-08-20 01:59:16.000000000 +0400
4+++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am 2011-08-20 02:08:18.000000000 +0400
5@@ -14,20 +14,20 @@
6 gdu-marshal.c: gdu-marshal.list
7 echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@
8
9-udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am
10- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
11+udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am
12+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
13
14-udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am
15- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
16+udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am
17+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
18
19-udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am
20- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
21+udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am
22+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
23
24-udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am
25- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
26+udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am
27+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
28
29-udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am
30- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
31+udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am
32+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
33
34 lib_LTLIBRARIES=libgdu.la
diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch
deleted file mode 100644
index 48e63b1ea7..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1In cross environment we have to prepend the sysroot to the path found by
2pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
3it ends up using the files from host system. Now usually people have gnome installed
4so the build succeeds but if you dont have gnome installed on build host then
5it wont find the files on host system and packages using gnome-doc-utils wont
6compile.
7
8This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
9will be empty
10
11Upstream-Status: Pending
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Index: gnome-disk-utility-2.32.0/gnome-doc-utils.make
16===================================================================
17--- gnome-disk-utility-2.32.0.orig/gnome-doc-utils.make 2010-09-15 08:27:46.000000000 -0700
18+++ gnome-disk-utility-2.32.0/gnome-doc-utils.make 2011-09-25 16:04:30.693795591 -0700
19@@ -133,12 +133,12 @@
20 _xml2po ?= `which xml2po`
21 _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
22
23-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
24-_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
25-_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
26-_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
27-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
28-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
29+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
30+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
31+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
32+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
33+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
34+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
35
36 if ENABLE_SK
37 _ENABLE_SK = true
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
deleted file mode 100644
index 55a589c3f9..0000000000
--- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
+++ /dev/null
@@ -1,45 +0,0 @@
1SUMMARY = "GNOME disk utility"
2
3LICENSE = "GPLv2+"
4LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564"
5
6DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui \
7 virtual/libx11 libatasmart gnome-doc-utils intltool-native \
8 gnome-common-native libgnome-keyring dbus-glib-native \
9"
10
11PR = "r4"
12
13inherit gnomebase gtk-icon-cache distro_features_check
14
15REQUIRED_DISTRO_FEATURES = "x11"
16
17SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d"
18SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98"
19GNOME_COMPRESS_TYPE="bz2"
20
21SRC_URI += "\
22 file://disable-scrollkeeper.patch \
23 file://fix-dbus-interfaces.patch \
24 file://sysrooted-pkg-config.patch \
25 file://0001-Add-support-for-DeviceAutomountHint.patch \
26 file://0002-Require-libnotify-0.6.1.patch \
27"
28
29EXTRA_OECONF += "--disable-scrollkeeper"
30
31PACKAGECONFIG ??= ""
32PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus"
33
34do_configure_prepend() {
35 sed -i -e "s: help : :g" ${S}/Makefile.am
36}
37
38PACKAGES =+ "${PN}-nautilus-extension ${PN}-libs"
39FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so"
40FILES_${PN}-libs += "${libdir}/libgdu*.so.*"
41FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la"
42FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a"
43FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug"
44
45PNBLACKLIST[gnome-disk-utility] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/132824/ - the recipe will be removed on 2017-09-01 unless the issue is fixed"