diff options
| author | markd <markd> | 2008-01-28 19:33:01 +0000 |
|---|---|---|
| committer | markd <markd> | 2008-01-28 19:33:01 +0000 |
| commit | fdc682f0be62c0f4e06b3bfcd20ff518c126a16d (patch) | |
| tree | 99f06d6f672a45d9106f382c5bd53e7ea01ac6f1 /x11/kdebase3/patches | |
| parent | 8904f631621e63d9901551373481fef640e40bc2 (diff) | |
| download | pkgsrc-fdc682f0be62c0f4e06b3bfcd20ff518c126a16d.tar.gz | |
Fix some issues with media:/ on NetBSD. From Sergey Svishchev in
KDE bug 143112. Bump PKGREVISION.
Diffstat (limited to 'x11/kdebase3/patches')
| -rw-r--r-- | x11/kdebase3/patches/patch-at | 33 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-au | 24 |
2 files changed, 57 insertions, 0 deletions
diff --git a/x11/kdebase3/patches/patch-at b/x11/kdebase3/patches/patch-at new file mode 100644 index 00000000000..f7ac39aec7b --- /dev/null +++ b/x11/kdebase3/patches/patch-at @@ -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 --git a/x11/kdebase3/patches/patch-au b/x11/kdebase3/patches/patch-au new file mode 100644 index 00000000000..748677139b2 --- /dev/null +++ b/x11/kdebase3/patches/patch-au @@ -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 + }; |