fix some C-long vs. C#-long mismatches (on 32-bit systems) in

libgphoto glue code, makes photo import directly from the camera
work better for me

5 files changed, 110 insertions, 3 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index cb419624d28..9efcb828658 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/01/18 09:58:59 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/16 12:16:23 drochner Exp $
 #
 
 DISTNAME=	f-spot-0.6.1.5
-PKGREVISION=	3
+PKGREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -19,6 +19,13 @@ USE_TOOLS+=	gmake intltool pkg-config bash:run msgfmt
 
 MAKE_JOBS_SAFE=	no
 
+.include "../../mk/bsd.prefs.mk"
+.for platform in ${LP64PLATFORMS}
+.  if ${MACHINE_PLATFORM:M${platform}}
+CONFIGURE_ENV+=	EXTRACSDEFINES=-define:LONG_IS_64BITS
+.  endif
+.endfor
+
 PKGCONFIG_OVERRIDE+=	f-spot.pc.in
 
 REPLACE_BASH+=	icon-theme-installer
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index f0cb6caf7b0..f060e1bb4ef 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/11/13 17:35:29 drochner Exp $
+$NetBSD: distinfo,v 1.6 2010/02/16 12:16:23 drochner Exp $
 
 SHA1 (f-spot-0.6.1.5.tar.bz2) = 712aa5ce0a8844403a751456ae467117d1ab71da
 RMD160 (f-spot-0.6.1.5.tar.bz2) = f132d1b6d044521d0550f982e006f99ad8fc05ac
 Size (f-spot-0.6.1.5.tar.bz2) = 2902761 bytes
+SHA1 (patch-aa) = 7f2d5aaca2b0685c1460afaef3d9a34b230412c8
+SHA1 (patch-ab) = 2c4744ff8915c7e98ceb9a402447e168c2b972b5
+SHA1 (patch-ac) = a37283a80a0067b1486c2f49f5dd9894888b486b
diff --git a/graphics/f-spot/patches/patch-aa b/graphics/f-spot/patches/patch-aa
new file mode 100644
index 00000000000..6c0337e5827
--- /dev/null
+++ b/graphics/f-spot/patches/patch-aa
@@ -0,0 +1,44 @@
+$NetBSD: patch-aa,v 1.1 2010/02/16 12:16:23 drochner Exp $
+
+--- lib/libgphoto2-sharp/CameraFile.cs.orig	2009-11-04 19:34:32.000000000 +0000
++++ lib/libgphoto2-sharp/CameraFile.cs
+@@ -76,11 +76,19 @@ namespace LibGPhoto2
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
++#if LONG_IS_64BITS
+ 		internal static extern ErrorCode gp_file_append (HandleRef file, byte[] data, ulong size);
++#else
++		internal static extern ErrorCode gp_file_append (HandleRef file, byte[] data, uint size);
++#endif
+ 
+ 		public void Append (byte[] data)
+ 		{
++#if LONG_IS_64BITS
+ 			Error.CheckError (gp_file_append (this.Handle, data, (ulong)data.Length));
++#else
++			Error.CheckError (gp_file_append (this.Handle, data, (uint)data.Length));
++#endif
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
+@@ -223,11 +231,19 @@ namespace LibGPhoto2
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
++#if LONG_IS_64BITS
+ 		internal static extern ErrorCode gp_file_set_data_and_size (HandleRef file, byte[] data, ulong size);
++#else
++		internal static extern ErrorCode gp_file_set_data_and_size (HandleRef file, byte[] data, uint size);
++#endif
+ 
+ 		public void SetDataAndSize (byte[] data)
+ 		{
++#if LONG_IS_64BITS
+ 			Error.CheckError (gp_file_set_data_and_size (this.Handle, data, (ulong)data.Length));
++#else
++			Error.CheckError (gp_file_set_data_and_size (this.Handle, data, (uint)data.Length));
++#endif
+ 		}
+ 		
+ 		[DllImport ("libgphoto2.so")]
diff --git a/graphics/f-spot/patches/patch-ab b/graphics/f-spot/patches/patch-ab
new file mode 100644
index 00000000000..fb2caad5b12
--- /dev/null
+++ b/graphics/f-spot/patches/patch-ab
@@ -0,0 +1,40 @@
+$NetBSD: patch-ab,v 1.1 2010/02/16 12:16:23 drochner Exp $
+
+--- lib/libgphoto2-sharp/CameraFilesystem.cs.orig	2009-11-04 19:34:32.000000000 +0000
++++ lib/libgphoto2-sharp/CameraFilesystem.cs
+@@ -45,7 +45,11 @@ namespace LibGPhoto2
+ 	{
+ 		public CameraFileInfoFields fields;
+ 		public CameraFileStatus status;
++#if LONG_IS_64BITS
+ 		public ulong size;
++#else
++		public uint size;
++#endif
+ 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
+ 	}
+ 	
+@@ -54,7 +58,11 @@ namespace LibGPhoto2
+ 	{
+ 		public CameraFileInfoFields fields;
+ 		public CameraFileStatus status;
++#if LONG_IS_64BITS
+ 		public ulong size;
++#else
++		public uint size;
++#endif
+ 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
+ 		
+ 		public uint width, height;
+@@ -65,7 +73,11 @@ namespace LibGPhoto2
+ 	{
+ 		public CameraFileInfoFields fields;
+ 		public CameraFileStatus status;
++#if LONG_IS_64BITS
+ 		public ulong size;
++#else
++		public uint size;
++#endif
+ 		[MarshalAs(UnmanagedType.ByValTStr, SizeConst=64)] public char[] type;
+ 		
+ 		public uint width, height;
diff --git a/graphics/f-spot/patches/patch-ac b/graphics/f-spot/patches/patch-ac
new file mode 100644
index 00000000000..a77ee1e727e
--- /dev/null
+++ b/graphics/f-spot/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2010/02/16 12:16:23 drochner Exp $
+
+--- configure.orig	2009-11-04 19:35:17.000000000 +0000
++++ configure
+@@ -19761,7 +19761,7 @@ $as_echo "yes" >&6; }
+ fi
+ 
+ if pkg-config --atleast-version=2.4 libgphoto2; then
+-	CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4"
++	CSC_DEFINES="$CSC_DEFINES -d:GPHOTO2_2_4 $EXTRACSDEFINES"
+ fi
+ 
+