Bug#528539: gvfs: FTBFS on GNU/kFreeBSD

[Aurelien Jarno]

Package: gvfs
Version: 1.2.2-2+kbsd
Severity: important
Tags: patch
User: glibc-bsd-devel at lists.alioth.debian.org
Usertags: kfreebsd

gvfs FTBFS on GNU/kFreeBSD, as the gphoto2 backend is disabled by the
configure script, due to missing non-Linux support, while the packaging
considers it enabled.

The patch below fixes the problem by adding the missing support for 
FreeBSD. It also reenables fuse and cdda support that have been disabled
by the previous upload, while they are available on GNU/kFreeBSD (but 
not on Hurd).

diff -u gvfs-1.2.2/debian/rules gvfs-1.2.2/debian/rules
--- gvfs-1.2.2/debian/rules
+++ gvfs-1.2.2/debian/rules
@@ -20 +20 @@
-	sed -i 's/@LINUX@/$(LINUX_ARCHES)/' debian/control
+	sed -i 's/@LINUX@/$(LINUX_ARCHES) kfreebsd-amd64 kfreebsd-i386/' debian/control
diff -u gvfs-1.2.2/debian/control.in gvfs-1.2.2/debian/control.in
--- gvfs-1.2.2/debian/control.in
+++ gvfs-1.2.2/debian/control.in
@@ -18,10 +18,10 @@
                libxml2-dev,
                libavahi-glib-dev (>= 0.6),
                libavahi-client-dev (>= 0.6),
-               libfuse-dev | not+linux-gnu,
+               libfuse-dev | hurd,
                libgconf2-dev,
                libhal-dev (>= 0.5.10),
-               libcdio-paranoia-dev (>= 0.78.2) | not+linux-gnu,
+               libcdio-paranoia-dev (>= 0.78.2) | hurd,
 #               libbluetooth-dev (>= 4.0) | not+linux-gnu,
 #               libdbus-glib-1-dev,
 #               libexpat1-dev,
diff -u gvfs-1.2.2/debian/patches/90_relibtoolize.patch gvfs-1.2.2/debian/patches/90_relibtoolize.patch
--- gvfs-1.2.2/debian/patches/90_relibtoolize.patch
+++ gvfs-1.2.2/debian/patches/90_relibtoolize.patch
@@ -46274,7 +46274,7 @@
 -  if test "x$msg_hal" = "xyes"; then
 +  # Need OS tweaks in hal volume monitor backend
 +  case "$host" in
-+    *-linux*)
++    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
 +      use_gphoto2=yes
 +      ;;
 +    *)
only in patch2:
unchanged:
--- gvfs-1.2.2.orig/debian/patches/10_kfreebsd.patch
+++ gvfs-1.2.2/debian/patches/10_kfreebsd.patch
@@ -0,0 +1,27 @@
+--- a/monitor/gphoto2/ggphoto2volumemonitor.c
++++ b/monitor/gphoto2/ggphoto2volumemonitor.c
+@@ -560,7 +560,13 @@
+         continue;
+ 
+       usb_bus_num = hal_device_get_property_int (d, "usb.bus_number");
++#if defined(__linux__)
+       usb_device_num = hal_device_get_property_int (d, "usb.linux.device_number");
++#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
++      usb_device_num = hal_device_get_property_int (d, "freebsd.unit");
++#else
++# error "Need OS specific tweaks"
++#endif
+ 
+       store_heads = get_stores_for_camera (usb_bus_num, usb_device_num);
+       num_store_heads = g_list_length (store_heads);
+--- a/configure.ac	2009-04-03 09:30:54 +0200
++++ b/configure.ac	2009-05-13 11:16:24 +0200
+@@ -299,7 +299,7 @@
+ 
+   # Need OS tweaks in hal volume monitor backend
+   case "$host" in
+-    *-linux*)
++    *-linux* | *-freebsd* | *-kfreebsd*-gnu)
+       use_gphoto2=yes
+       ;;
+     *)

-- System Information:
Debian Release: squeeze/sid
Architecture: kfreebsd-amd64 (x86_64)

Kernel: kFreeBSD 7.1-1-amd64
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages gvfs depends on:
ii  libc0.1 2.9-12                           GNU C Library: Shared libraries
ii  libdbus 1.2.14-2                         simple interprocess messaging syst
ii  libgcon 2.26.0-1                         GNOME configuration database syste
ii  libglib 2.20.1-2                         The GLib library of C routines
ii  libhal1 0.5.12~git20090406.46dc48-2+kbsd Hardware Abstraction Layer - share

Versions of packages gvfs recommends:
ii  dbus    1.2.14-2                         simple interprocess messaging syst
ii  hal     0.5.12~git20090406.46dc48-2+kbsd Hardware Abstraction Layer

Versions of packages gvfs suggests:
pn  gvfs-backends                 <none>     (no description available)

-- no debconf information