diff options
Diffstat (limited to 'meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility')
5 files changed, 0 insertions, 221 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 @@ -From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 8 Jul 2011 11:03:52 -0400 -Subject: [PATCH] Add support for DeviceAutomountHint - -Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 - -Upstream-Status: Applied [1] - -[1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - src/gdu/gdu-device.c | 10 ++++++++++ - src/gdu/gdu-device.h | 1 + - 2 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c -index 6a5afad..4be39cf 100644 ---- a/src/gdu/gdu-device.c -+++ b/src/gdu/gdu-device.c -@@ -82,6 +82,7 @@ typedef struct - gboolean device_presentation_nopolicy; - char *device_presentation_name; - char *device_presentation_icon_name; -+ char *device_automount_hint; - guint64 device_size; - guint64 device_block_size; - -@@ -279,6 +280,8 @@ collect_props (const char *key, - props->device_presentation_name = g_strdup (g_value_get_string (value)); - else if (strcmp (key, "DevicePresentationIconName") == 0) - props->device_presentation_icon_name = g_strdup (g_value_get_string (value)); -+ else if (strcmp (key, "DeviceAutomountHint") == 0) -+ props->device_automount_hint = g_strdup (g_value_get_string (value)); - else if (strcmp (key, "DeviceSize") == 0) - props->device_size = g_value_get_uint64 (value); - else if (strcmp (key, "DeviceBlockSize") == 0) -@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props) - g_strfreev (props->device_mount_paths); - g_free (props->device_presentation_name); - g_free (props->device_presentation_icon_name); -+ g_free (props->device_automount_hint); - g_free (props->job_id); - g_free (props->id_usage); - g_free (props->id_type); -@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device) - } - - const char * -+gdu_device_get_automount_hint (GduDevice *device) -+{ -+ return device->priv->props->device_automount_hint; -+} -+ -+const char * - gdu_device_drive_get_media (GduDevice *device) - { - return device->priv->props->drive_media; -diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h -index 4c1302b..8cfd7a9 100644 ---- a/src/gdu/gdu-device.h -+++ b/src/gdu/gdu-device.h -@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device); - const char *gdu_device_drive_get_connection_interface (GduDevice *device); - guint64 gdu_device_drive_get_connection_speed (GduDevice *device); - char **gdu_device_drive_get_media_compatibility (GduDevice *device); -+const gchar *gdu_device_get_automount_hint(GduDevice *device); - const char *gdu_device_drive_get_media (GduDevice *device); - gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device); - gboolean gdu_device_drive_get_requires_eject (GduDevice *device); --- -1.7.6.5 - 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 @@ -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/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 @@ -From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> -Subject: Disable scrollkeeper-config not found message -Upstream-Status: Not-Applicable - -If scrollkeeper-config isn't found, configure fails with an error. -Fix that by commenting out the check. - -Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> - - -Index: gnome-disk-utility-2.32.0/configure.ac -=================================================================== ---- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400 -+++ gnome-disk-utility-2.32.0/configure.ac 2011-08-20 01:29:48.000000000 +0400 -@@ -188,9 +188,9 @@ - # ************* - - AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) --if test x$SCROLLKEEPER_CONFIG = xno; then -- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) --fi -+dnl if test x$SCROLLKEEPER_CONFIG = xno; then -+dnl AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package]) -+dnl fi - - # ******************** - # 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 @@ -Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am -=================================================================== ---- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am 2011-08-20 01:59:16.000000000 +0400 -+++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am 2011-08-20 02:08:18.000000000 +0400 -@@ -14,20 +14,20 @@ - gdu-marshal.c: gdu-marshal.list - echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@ - --udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml -+udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am -+ 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 - --udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am -- 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 -+udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am -+ 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 - --udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am -- 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 -+udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am -+ 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 - --udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am -- 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 -+udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am -+ 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 - --udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am -- 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 -+udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am -+ 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 - - 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 @@ -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gnome-disk-utility-2.32.0/gnome-doc-utils.make -=================================================================== ---- gnome-disk-utility-2.32.0.orig/gnome-doc-utils.make 2010-09-15 08:27:46.000000000 -0700 -+++ gnome-disk-utility-2.32.0/gnome-doc-utils.make 2011-09-25 16:04:30.693795591 -0700 -@@ -133,12 +133,12 @@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true |