Update to KDE 3.5.0

6 files changed, 17 insertions, 147 deletions

diff --git a/x11/kde4-runtime/files/patch-kdm_backend-xdmcp.c b/x11/kde4-runtime/files/patch-kdm_backend-xdmcp.c
deleted file mode 100644
index 79e18a4ea648..000000000000
--- a/x11/kde4-runtime/files/patch-kdm_backend-xdmcp.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- kdm/backend/xdmcp.c	2005/05/04 06:07:06	409205
-+++ kdm/backend/xdmcp.c	2005/10/15 09:04:13	470797
-@@ -940,7 +940,12 @@
- 			}
- 			DisposeProtoDisplay( pdpy );
- 			Debug( "starting display %s,%s\n", d->name, d->class2 );
--			StartDisplay( d );
-+			if (LoadDisplayResources( d ) < 0) {
-+				LogError( "Unable to read configuration for display %s; "
-+				          "stopping it.\n", d->name );
-+				StopDisplay( d );
-+			} else
-+				StartDisplay( d );
- 			CloseGetter();
- 		}
- 	}
diff --git a/x11/kde4-runtime/files/patch-kioslave_ldap_Makefile.in b/x11/kde4-runtime/files/patch-kioslave_ldap_Makefile.in
deleted file mode 100644
index ee406052177e..000000000000
--- a/x11/kde4-runtime/files/patch-kioslave_ldap_Makefile.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- kioslave/ldap/Makefile.in	Tue Jul  5 19:14:25 2005
-+++ kioslave/ldap/Makefile.in	Tue Jul  5 19:13:47 2005
-@@ -567,6 +567,7 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- INCLUDES = $(all_includes) $(LDAP_INCS)
-+AM_CXXFLAGS = -DLDAP_DEPRECATED
- AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LDAP_RPATH)
- LDADD = $(LIB_KIO) $(LDAP_LIBS)
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp b/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp
deleted file mode 100644
index 4fe077c27135..000000000000
--- a/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
---- kioslave/media/kdedmodule/fstabbackend.cpp
-+++ kioslave/media/kdedmodule/fstabbackend.cpp
-@@ -47,6 +47,12 @@
- 	handleMtabChange();
- 
- 	KDirWatch::self()->startScan();
-+
-+#ifdef Q_OS_FREEBSD
-+	connect( &m_mtabTimer, SIGNAL( timeout() ),
-+	         this, SLOT( handleMtabChange() ) );
-+	m_mtabTimer.start(250);
-+#endif
- }
- 
- FstabBackend::~FstabBackend()
-@@ -86,7 +92,7 @@
- 	  || mount->mountType() == "tmpfs"
- 	  || mount->mountType() == "sysfs"
- 	  || mount->mountType() == "usbfs"
--	  || mount->mountType() == "proc"
-+	  || mount->mountType().contains( "proc" )
- 	  || mount->mountType() == "unknown"
- 	  || mount->mountType() == "none"
- 	  || mount->mountedFrom() == "none"
-@@ -136,7 +142,7 @@
- #if 0
- 		else if ( !m_mtabIds.contains(id) )
- 		{
--			QString name = generateName(dev);
-+			QString name = generateName(dev, fs);
- 
- 			Medium *m = new Medium(id, name);
- 
-@@ -205,7 +211,7 @@
- 
- 		if ( !m_fstabIds.contains(id) )
- 		{
--			QString name = generateName(dev);
-+			QString name = generateName(dev, fs);
- 
- 			Medium *m = new Medium(id, name);
- 
-@@ -247,9 +253,18 @@
- 	      +m.replace("/", "");
- }
- 
--QString FstabBackend::generateName(const QString &devNode)
-+QString FstabBackend::generateName(const QString &devNode, const QString &fsType)
- {
--	return KURL(devNode).fileName();
-+	KURL url( devNode );
-+
-+	if ( url.isValid() )
-+	{
-+		return url.fileName();
-+	}
-+	else // surely something nfs or samba based
-+	{
-+		return fsType;
-+	}
- }
- 
- void FstabBackend::guess(const QString &devNode, const QString &mountPoint,
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.h b/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.h
deleted file mode 100644
index e9ceadf8e9b7..000000000000
--- a/x11/kde4-runtime/files/patch-kioslave_media_kdedmodule_fstabbackend.h
+++ /dev/null
@@ -1,37 +0,0 @@
---- kioslave/media/kdedmodule/fstabbackend.h
-+++ kioslave/media/kdedmodule/fstabbackend.h
-@@ -24,6 +24,10 @@
- #include <qobject.h>
- #include <qstringlist.h>
- 
-+#ifdef Q_OS_FREEBSD
-+#include <qtimer.h>
-+#endif
-+
- class FstabBackend : public QObject, public BackendBase
- {
- Q_OBJECT
-@@ -38,17 +42,20 @@
- 	                  QString &label);
- private slots:
- 	void slotDirty(const QString &path);
--
--private:
- 	void handleFstabChange();
- 	void handleMtabChange();
- 
-+private:
- 	static QString generateId(const QString &devNode,
- 	                          const QString &mountPoint);
--	static QString generateName(const QString &devNode);
-+	static QString generateName(const QString &devNode,
-+	                            const QString &fsType);
- 
- 	QStringList m_mtabIds;
- 	QStringList m_fstabIds;
-+#ifdef Q_OS_FREEBSD
-+	QTimer m_mtabTimer;
-+#endif
- };
- 
- #endif
diff --git a/x11/kde4-runtime/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp b/x11/kde4-runtime/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp
deleted file mode 100644
index 4cb49827612d..000000000000
--- a/x11/kde4-runtime/files/patch-kioslave_media_mounthelper_kio_media_mounthelper.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- kioslave/media/mounthelper/kio_media_mounthelper.cpp.orig	Fri Aug  5 14:26:27 2005
-+++ kioslave/media/mounthelper/kio_media_mounthelper.cpp	Fri Aug  5 14:27:25 2005
-@@ -79,7 +79,7 @@
- 		connect( job, SIGNAL( result( KIO::Job * ) ),
- 		         this, SLOT( slotResult( KIO::Job * ) ) );
- 	}
--	else if (args->isSet("s"))
-+	else if (args->isSet("s") || args->isSet("e"))
- 	{
- 		if (medium.isMounted())
- 		{
-@@ -93,10 +93,6 @@
- 		{
- 			invokeEject(device, true);
- 		}
--	}
--	else if (args->isSet("e"))
--	{
--		invokeEject(device);
- 	}
- 	else
- 	{
diff --git a/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp b/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp
new file mode 100644
index 000000000000..4f51bfc6bab8
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-nsplugins_viewer-viewer.cpp
@@ -0,0 +1,17 @@
+--- nsplugins/viewer/viewer.cpp.orig	Mon Dec 19 00:30:44 2005
++++ nsplugins/viewer/viewer.cpp	Mon Dec 19 00:43:33 2005
+@@ -54,7 +54,14 @@
+ #include "qxteventloop.h"
+ #endif
+ 
++/**
++ *  Use RLIMIT_DATA on systems that don't define RLIMIT_AS,
++ *  such as FreeBSD 4.
++ */
+ 
++#ifndef RLIMIT_AS
++#define RLIMIT_AS RLIMIT_DATA
++#endif
+ 
+ /**
+  * The error handler catches all X errors, writes the error