From nobody@FreeBSD.org  Mon Feb 12 23:28:50 2007
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4128416A406
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Feb 2007 23:28:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.freebsd.org (Postfix) with ESMTP id 3233513C47E
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Feb 2007 23:28:50 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id l1CNSnsD012894
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 12 Feb 2007 23:28:49 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id l1CNSnw7012892;
	Mon, 12 Feb 2007 23:28:49 GMT
	(envelope-from nobody)
Message-Id: <200702122328.l1CNSnw7012892@www.freebsd.org>
Date: Mon, 12 Feb 2007 23:28:49 GMT
From: Bartosz Fabianowski<freebsd@chillt.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] audio/amarok: Fix detection of msdosfs/vfat
X-Send-Pr-Version: www-3.0

>Number:         109111
>Category:       ports
>Synopsis:       [PATCH] audio/amarok: Fix detection of msdosfs/vfat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mich
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 12 23:30:17 GMT 2007
>Closed-Date:    Wed Mar 07 16:17:56 GMT 2007
>Last-Modified:  Wed Mar  7 16:20:05 GMT 2007
>Originator:     Bartosz Fabianowski
>Release:        6-STABLE
>Organization:
>Environment:
FreeBSD takahe.local 6.2-STABLE FreeBSD 6.2-STABLE #0: Thu Feb  1 01:39:42 GMT 2007     root@takahe.local:/usr/obj/usr/src/sys/TAKAHE  i386

>Description:
The patch by Daniel O'Connor committed to audio/amarok on 18th January and included in Amarok's 1.4.5 release that was supposed to fix FAT file system detection on FreeBSD actually breaks it in some cases. When a FAT partition is mounted via fstab entry or mount_msdosfs, KMountPoint may report its type as "msdosfs". However, when mounting through HAL and media:/ (the officially supported method of mounting removable drives under KDE), the file system type KMountPoint is "vfat", even under FreeBSD. Thus, Daniel's patch fixes the detection of manually mounted FAT partitions but breaks the probably more common case of mounting through HAL. The attached patch fixes this behavior by flagging both "msdosfs" and "vfat" as FAT.

The upstream bug report is: http://bugs.kde.org/show_bug.cgi?id=141614
>How-To-Repeat:
* Mount a removable FAT partition (thumb drive, MP3 player) through media:/
* Attempt to transfer a fine named for example "test:file.mp3" to the drive using Amarok
>Fix:
Drop the following patch into /usr/ports/audio/amarok/files:


--- amarok/src/mediadevice/generic/genericmediadevice.cpp.orig	Mon Feb 12 23:01:20 2007
+++ amarok/src/mediadevice/generic/genericmediadevice.cpp	Mon Feb 12 23:01:29 2007
@@ -418,13 +418,7 @@
         if( m_medium.mountPoint() == (*mountiter)->mountPoint() )
             m_medium.setFsType( (*mountiter)->mountType() );
     }
-    m_actuallyVfat = m_medium.fsType() == 
-#ifdef __FreeBSD__
-        "msdosfs"
-#else
-        "vfat" 
-#endif
-        ? true : false;
+    m_actuallyVfat = (m_medium.fsType() == "vfat" || m_medium.fsType() == "msdosfs") ? true : false;
     m_connected = true;
     m_transferDir = m_medium.mountPoint();
     m_initialFile = new GenericMediaFile( 0, m_medium.mountPoint(), this );

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->mich 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Feb 12 23:30:30 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109111 
State-Changed-From-To: open->closed 
State-Changed-By: mich 
State-Changed-When: Wed Mar 7 16:17:38 UTC 2007 
State-Changed-Why:  
Committed, thanks ! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=109111 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/109111: commit references a PR
Date: Wed,  7 Mar 2007 16:17:36 +0000 (UTC)

 mich        2007-03-07 16:17:21 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/amarok         pkg-plist 
   Added files:
     audio/amarok/files   
                          patch-amarok_src_mediadevice_generic_genericmediadevice.cpp 
   Log:
   - fix PLIST after libmtp support is working again
   - Fix detection of msdosfs/vfat [1]
   
   PR:                     ports/109111 [1]
   Submitted by:           Bartosz Fabianowski <freebsd@chillt.de> [1]
   
   Revision  Changes    Path
   1.4       +18 -0     ports/audio/amarok/files/patch-amarok_src_mediadevice_generic_genericmediadevice.cpp (new)
   1.28      +4 -0      ports/audio/amarok/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
