[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Fix some issues with media:/ on NetBSD. ...

[markd <markd%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d52c9c31e7bb
branches:  trunk
changeset: 538092:d52c9c31e7bb
user:      markd <markd%pkgsrc.org@localhost>
date:      Mon Jan 28 19:33:01 2008 +0000

description:
Fix some issues with media:/ on NetBSD.  From Sergey Svishchev in
KDE bug 143112.  Bump PKGREVISION.

diffstat:

 x11/kdebase3/Makefile         |   4 ++--
 x11/kdebase3/distinfo         |   4 +++-
 x11/kdebase3/patches/patch-at |  33 +++++++++++++++++++++++++++++++++
 x11/kdebase3/patches/patch-au |  24 ++++++++++++++++++++++++
 4 files changed, 62 insertions(+), 3 deletions(-)

diffs (96 lines):

diff -r a64ef3d86813 -r d52c9c31e7bb x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile     Mon Jan 28 12:08:49 2008 +0000
+++ b/x11/kdebase3/Makefile     Mon Jan 28 19:33:01 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.141 2008/01/18 05:10:05 tnn Exp $
+# $NetBSD: Makefile,v 1.142 2008/01/28 19:33:01 markd Exp $
 
 DISTNAME=      kdebase-${_KDE_VERSION}
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    x11
 COMMENT=       Base modules for the KDE 3 integrated X11 desktop
 
diff -r a64ef3d86813 -r d52c9c31e7bb x11/kdebase3/distinfo
--- a/x11/kdebase3/distinfo     Mon Jan 28 12:08:49 2008 +0000
+++ b/x11/kdebase3/distinfo     Mon Jan 28 19:33:01 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.103 2008/01/05 09:03:10 abs Exp $
+$NetBSD: distinfo,v 1.104 2008/01/28 19:33:01 markd Exp $
 
 SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
 RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -27,6 +27,8 @@
 SHA1 (patch-aq) = 8cdc56fb3ca1646983790b6bb20b62ac04e41aa2
 SHA1 (patch-ar) = 0584037f39827a4b0e9859e39546295f2d7d8f5e
 SHA1 (patch-as) = 277a8f927c343cc0b194a77b0fbb45118f8a5287
+SHA1 (patch-at) = 55aa213937c858984785500a56bad655196eeaec
+SHA1 (patch-au) = 49fcdbef0409bc657d5fc20c4f391924df72cf4b
 SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
 SHA1 (patch-bc) = 63983ae5110a8fa85621f39848aff2113207d02c
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff -r a64ef3d86813 -r d52c9c31e7bb x11/kdebase3/patches/patch-at
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-at     Mon Jan 28 19:33:01 2008 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-at,v 1.6 2008/01/28 19:33:01 markd Exp $
+
+KDE bug 143112
+
+--- kioslave/media/mediamanager/fstabbackend.cpp.orig  2006-10-02 06:31:54.000000000 +1300
++++ kioslave/media/mediamanager/fstabbackend.cpp
+@@ -69,7 +69,7 @@ FstabBackend::FstabBackend(MediaList &li
+ 
+       KDirWatch::self()->startScan();
+ 
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+       connect( &m_mtabTimer, SIGNAL( timeout() ),
+                this, SLOT( handleMtabChange() ) );
+       m_mtabTimer.start(250);
+@@ -170,7 +170,7 @@ bool inExclusionPattern(KMountPoint *mou
+ void FstabBackend::handleMtabChange(bool allowNotification)
+ {
+       QStringList new_mtabIds;
+-      KMountPoint::List mtab = KMountPoint::currentMountPoints();
++      KMountPoint::List mtab = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName);
+ 
+       KMountPoint::List::iterator it = mtab.begin();
+       KMountPoint::List::iterator end = mtab.end();
+@@ -409,6 +409,8 @@ void FstabBackend::guess(const QString &
+              || devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1
+              // FREEBSD SPECIFIC
+              || devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1
++             // NETBSD SPECIFIC
++             || devNode.find("/cd")!=-1 || devNode.find("/mcd")!=-1
+               )
+       {
+               mimeType = "media/cdrom";
diff -r a64ef3d86813 -r d52c9c31e7bb x11/kdebase3/patches/patch-au
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/kdebase3/patches/patch-au     Mon Jan 28 19:33:01 2008 +0000
@@ -0,0 +1,24 @@
+$NetBSD: patch-au,v 1.5 2008/01/28 19:33:01 markd Exp $
+
+KDE bug 143112
+
+--- kioslave/media/mediamanager/fstabbackend.h.orig    2008-01-21 23:06:41.000000000 +1300
++++ kioslave/media/mediamanager/fstabbackend.h
+@@ -25,7 +25,7 @@
+ #include <qstringlist.h>
+ #include <qmap.h>
+ 
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+ #include <qtimer.h>
+ #endif
+ 
+@@ -60,7 +60,7 @@ private:
+       QStringList m_mtabIds;
+         QMap<QString, QString> m_mtabEntries;
+       QStringList m_fstabIds;
+-#ifdef Q_OS_FREEBSD
++#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)
+       QTimer m_mtabTimer;
+ #endif
+ };