From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Feb 12 23:30:18 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 825DA16A41F for ; Mon, 12 Feb 2007 23:30:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 6140213C4B6 for ; Mon, 12 Feb 2007 23:30:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l1CNUI3H058429 for ; Mon, 12 Feb 2007 23:30:18 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l1CNUIoc058428; Mon, 12 Feb 2007 23:30:18 GMT (envelope-from gnats) Resent-Date: Mon, 12 Feb 2007 23:30:18 GMT Resent-Message-Id: <200702122330.l1CNUIoc058428@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Bartosz Fabianowski Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4128416A406 for ; 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 ; 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 ; 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 To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.0 Cc: Subject: ports/109111: [PATCH] audio/amarok: Fix detection of msdosfs/vfat X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Feb 2007 23:30:18 -0000 >Number: 109111 >Category: ports >Synopsis: [PATCH] audio/amarok: Fix detection of msdosfs/vfat >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Mon Feb 12 23:30:17 GMT 2007 >Closed-Date: >Last-Modified: >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: >Unformatted: