Date: Wednesday, July 20, 2011 @ 08:08:11 Author: ibiru Revision: 132112
update to 3.0.2 Modified: gnome-disk-utility/trunk/PKGBUILD Deleted: gnome-disk-utility/trunk/add-support-for-DeviceAutomountHint.patch -------------------------------------------+ PKGBUILD | 15 ++---- add-support-for-DeviceAutomountHint.patch | 65 ---------------------------- 2 files changed, 6 insertions(+), 74 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-07-20 11:16:39 UTC (rev 132111) +++ PKGBUILD 2011-07-20 12:08:11 UTC (rev 132112) @@ -2,8 +2,8 @@ # Maintainer: Jan de Groot <[email protected]> pkgname=gnome-disk-utility -pkgver=3.0.0 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="GNOME libraries and applications for dealing with storage devices" arch=('i686' 'x86_64') license=('GPL') @@ -12,17 +12,14 @@ makedepends=('gtk-doc' 'intltool') options=('!libtool' '!emptydirs') install=gnome-disk-utility.install -source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 - fix-freeze.patch - add-support-for-DeviceAutomountHint.patch) -sha256sums=('94d31142a5f488d034cd2954df4ab1c26bd053fb0d46d230fba91b4f8b3663fb' - '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526' - '1e2f8d2d8ea121d21ff2b2a1e208c0fd4af603a4ed0d024ad326a991ebc7a613') +source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz + fix-freeze.patch) +sha256sums=('7983f12ba04e84f164d0cae54bb06ed9b3ebe6c0a1c606d63d067fc395aeb0a5' + '818b70360978968457d2c50738347c6726ed8d0c007eb57074881a7e33652526') build() { cd "${srcdir}/${pkgname}-${pkgver}" patch -Np1 -i "${srcdir}/fix-freeze.patch" - patch -Np1 -i "${srcdir}/add-support-for-DeviceAutomountHint.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ --libexecdir=/usr/lib/gnome-disk-utility \ --disable-scrollkeeper --disable-nautilus --disable-gtk-doc Deleted: add-support-for-DeviceAutomountHint.patch =================================================================== --- add-support-for-DeviceAutomountHint.patch 2011-07-20 11:16:39 UTC (rev 132111) +++ add-support-for-DeviceAutomountHint.patch 2011-07-20 12:08:11 UTC (rev 132112) @@ -1,65 +0,0 @@ -From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <[email protected]> -Date: Fri, 08 Jul 2011 15:03:52 +0000 -Subject: Add support for DeviceAutomountHint - -Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 - -Signed-off-by: David Zeuthen <[email protected]> ---- -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); --- -cgit v0.9
