From 71f68716bf2d16f508cb8a7ea979b4e2e7ab7d8d Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Sun, 3 Dec 2006 07:41:32 +0000
Subject: Fix gnome-mount on 64-bit platforms.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7968 df743ca5-7f9a-e211-a948-0013205c9059
---
 sysutils/gnome-mount/Makefile                       |  4 ++--
 .../files/patch-src_gnome-mount-properties-view.c   | 14 +++++++++++---
 .../files/patch-src_gnome-mount-properties.c        | 21 +++++++++++++++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c

(limited to 'sysutils')

diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 193976ed6..2e60a0e23 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.7 2006/11/19 21:36:27 marcus Exp $
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.8 2006/11/26 21:34:49 marcus Exp $
 #
 
 PORTNAME=	gnome-mount
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~david/dist/
 
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
index 9ac4d5569..481e82858 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
@@ -1,6 +1,14 @@
 --- src/gnome-mount-properties-view.c.orig	Mon Aug 14 00:17:22 2006
-+++ src/gnome-mount-properties-view.c	Thu Nov 16 02:10:17 2006
-@@ -59,6 +59,35 @@ struct _GnomeMountPropertiesViewClass {
++++ src/gnome-mount-properties-view.c	Sun Dec  3 02:38:08 2006
+@@ -34,6 +34,7 @@
+ #include <sys/time.h>
+ #include <string.h>
+ #include <gconf/gconf-client.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+ 
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+@@ -59,6 +60,35 @@ struct _GnomeMountPropertiesViewClass {
  	GtkVBoxClass base_class;
  };
  
@@ -36,7 +44,7 @@
  G_DEFINE_TYPE (GnomeMountPropertiesView, gm_properties_view, GTK_TYPE_VBOX)
  
  static void
-@@ -445,13 +474,29 @@ static gboolean
+@@ -445,13 +475,29 @@ static gboolean
  mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
  {
  #ifdef __FreeBSD__
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
new file mode 100644
index 000000000..1f36b1259
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
@@ -0,0 +1,21 @@
+--- src/gnome-mount-properties.c.orig	Sun Dec  3 02:38:14 2006
++++ src/gnome-mount-properties.c	Sun Dec  3 02:39:27 2006
+@@ -27,6 +27,8 @@
+ #include <libhal.h>
+ #include <libhal-storage.h>
+ 
++#include <gtk/gtk.h>
++
+ #include <libnautilus-extension/nautilus-extension-types.h>
+ #include <libnautilus-extension/nautilus-info-provider.h>
+ #include <libnautilus-extension/nautilus-property-page-provider.h>
+@@ -202,7 +204,8 @@ gnome_mount_properties_plugin_register_t
+ 		NULL,
+ 		sizeof (GObject),
+ 		0,
+-		(GInstanceInitFunc) NULL
++		(GInstanceInitFunc) NULL,
++		(const GTypeValueTable *) NULL
+ 	};
+ 
+ 	static const GInterfaceInfo property_page_provider_iface_info = {
-- 
cgit v1.2.3