mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00
Code Issues Releases Activity

- Work around KDE bug 128757.

Browse Source 
- Finally support GNOME/XFCE icons/menus by default by depending on
  kde-xdg-env.
This commit is contained in:
Michael Nottebrock 2006-06-07 15:05:22 +00:00
parent dd7088c434
commit 7c6729fa08
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=164724
16 changed files with 260 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
misc/kde-xdg-env/Makefile
View File

@ -6,7 +6,8 @@
#
PORTNAME= xdg
PORTVERSION= ${KDE_VERSION}
PORTVERSION= 1.0
PORTEPOCH= 1
CATEGORIES= misc kde
MASTER_SITES= # none
PKGNAMEPREFIX= kde-
@ -17,8 +18,9 @@ EXTRACT_SUFX= # none
MAINTAINER= kde@FreeBSD.org
COMMENT= Script which hooks into startkde and helps KDE pick up XDG apps/menus
USE_KDEBASE_VER=3
.if defined(KDE_PREFIX)
PREFIX= ${KDE_PREFIX}
.endif
NO_BUILD= yes

6
misc/kde4-xdg-env/Makefile
View File

@ -6,7 +6,8 @@
#
PORTNAME= xdg
PORTVERSION= ${KDE_VERSION}
PORTVERSION= 1.0
PORTEPOCH= 1
CATEGORIES= misc kde
MASTER_SITES= # none
PKGNAMEPREFIX= kde-
@ -17,8 +18,9 @@ EXTRACT_SUFX= # none
MAINTAINER= kde@FreeBSD.org
COMMENT= Script which hooks into startkde and helps KDE pick up XDG apps/menus
USE_KDEBASE_VER=3
.if defined(KDE_PREFIX)
PREFIX= ${KDE_PREFIX}
.endif
NO_BUILD= yes

2
x11/kde4-baseapps/Makefile
View File

@ -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 \

34
x11/kde4-baseapps/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kde4-runtime/Makefile
View File

@ -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 \

34
x11/kde4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kde4-workspace/Makefile
View File

@ -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 \

34
x11/kde4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kdebase3/Makefile
View File

@ -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 \

34
x11/kdebase3/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kdebase4-runtime/Makefile
View File

@ -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 \

34
x11/kdebase4-runtime/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kdebase4-workspace/Makefile
View File

@ -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 \

34
x11/kdebase4-workspace/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)

2
x11/kdebase4/Makefile
View File

@ -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 \

34
x11/kdebase4/files/patch-kioslave_media_mediamanager-fstabbackend.cpp Normal file
View File

@ -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)