diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-07 15:05:22 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2006-06-07 15:05:22 +0000 |
| commit | 7c6729fa0885bc7c69a7bef93c48072385d58df2 (patch) | |
| tree | aa7121580dd2f5f40b78717e73ea741598ea02a7 /x11/kde4-workspace | |
| parent | dd7088c4345c3b9f29e134f0cb89af32af2ac583 (diff) | |
| download | ports-7c6729fa0885bc7c69a7bef93c48072385d58df2.tar.gz ports-7c6729fa0885bc7c69a7bef93c48072385d58df2.zip | |
- Work around KDE bug 128757.
- Finally support GNOME/XFCE icons/menus by default by depending on
kde-xdg-env.
Notes
Notes:
svn path=/head/; revision=164724
Diffstat (limited to 'x11/kde4-workspace')
| -rw-r--r-- | x11/kde4-workspace/Makefile | 2 | ||||
| -rw-r--r-- | x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp | 34 |
2 files changed, 36 insertions, 0 deletions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index f98901d8194d..f37bba3afaa2 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src @@ -16,6 +17,7 @@ DIST_SUBDIR= KDE MAINTAINER= kde@FreeBSD.org COMMENT= Basic applications for the KDE system +RUN_DEPENDS= ${LOCALBASE}/env/xdg-env.sh:${PORTSDIR}/misc/kde-xdg-env BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} \ xmkmf:${X_IMAKE_PORT} LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 \ diff --git a/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp new file mode 100644 index 000000000000..210698a0b31a --- /dev/null +++ b/x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp @@ -0,0 +1,34 @@ +--- kioslave/media/mediamanager/fstabbackend.cpp Mon May 22 20:12:42 2006 ++++ kioslave/media/mediamanager/fstabbackend.cpp Fri Mar 17 11:17:33 2006 +@@ -144,7 +144,7 @@ + + void FstabBackend::handleMtabChange(bool allowNotification) + { +- QStringList new_mtabIds, new_mtabEntries; ++ QStringList new_mtabIds; + KMountPoint::List mtab = KMountPoint::currentMountPoints(); + + KMountPoint::List::iterator it = mtab.begin(); +@@ -158,14 +158,6 @@ + + if ( ::inExclusionPattern(*it, m_networkSharesOnly) ) continue; + +- /* Did we know this already before ? If yes, then +- nothing has changed, do not stat the mount point. Avoids +- hang if network shares are stalling */ +- QString mtabEntry = dev + "*" + mp + "*" + fs; +- bool isOldEntry = m_mtabEntries.contains(mtabEntry); +- new_mtabEntries+=mtabEntry; +- if (isOldEntry) continue; +- + QString id = generateId(dev, mp); + new_mtabIds+=id; + +@@ -226,7 +218,6 @@ + } + + m_mtabIds = new_mtabIds; +- m_mtabEntries = new_mtabEntries; + } + + void FstabBackend::handleFstabChange(bool allowNotification)
\ No newline at end of file |