summaryrefslogtreecommitdiff
path: root/x11/kdelibs2/files/patch-global.cpp
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2001-02-26 19:24:49 +0000
committerWill Andrews <will@FreeBSD.org>2001-02-26 19:24:49 +0000
commit26121d15aefe3055f4b11633dcaca64da67c0913 (patch)
tree6ef2924bd6e9cb5e5a689c5d3a30612f8ec5dc50 /x11/kdelibs2/files/patch-global.cpp
parentRemove '-lc' from LDLIBS so threaded apps can link against libslang (diff)
Lo and behold, welcome KDE 2.1 to our ports tree. As a direct result of
the KDE team's excellent work, I am initiating burn sequence for KDE 1.x. All base KDE1 ports are hereby nuked. I am also reluctantly reassuming maintainership of the KDE2 ports. Official KDE 2.1 packages built for FreeBSD 4.2-STABLE w/ XFree86 4.0.2 are available on KDE's official ftp mirrors now. Enjoy! Note: It seems that the KDE people rerolled their kdelibs and kdebase packages, and a quick examination of diffs reveal minor changes, but the port should still work. I'll fix the packaging problems that bento runs into. Approved by: kevlo
Notes
Notes: svn path=/head/; revision=38810
Diffstat (limited to 'x11/kdelibs2/files/patch-global.cpp')
-rw-r--r--x11/kdelibs2/files/patch-global.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/x11/kdelibs2/files/patch-global.cpp b/x11/kdelibs2/files/patch-global.cpp
index 13636e36b43a..9f423c75cbf1 100644
--- a/x11/kdelibs2/files/patch-global.cpp
+++ b/x11/kdelibs2/files/patch-global.cpp
@@ -1,6 +1,6 @@
---- kio/global.cpp.orig Thu Dec 7 14:52:15 2000
-+++ kio/global.cpp Thu Dec 7 14:52:29 2000
-@@ -28,6 +28,12 @@
+--- kio/global.cpp Sun Feb 18 10:27:06 2001
++++ kio/global.cpp.new Thu Feb 22 23:47:34 2001
+@@ -30,6 +30,12 @@
#include <string.h>
#include <unistd.h>
@@ -10,10 +10,10 @@
+#include <sys/mount.h>
+#endif
+
- #ifdef HAVE_FSTAB_H
- #include <fstab.h>
- #endif
-@@ -423,6 +429,30 @@
+ #include "kio/global.h"
+ #include "kio/job.h"
+
+@@ -567,6 +573,30 @@
/* Get the list of mounted file systems */
@@ -44,9 +44,9 @@
if ((mtab = SETMNTENT(MNTTAB, "r")) == 0) {
perror("setmntent");
return QString::null;
-@@ -467,6 +497,7 @@
+@@ -612,6 +642,7 @@
+ #endif /* GET_MNTINFO */
- ENDMNTENT(mtab);
//kdDebug( 7007 ) << "Returning result " << result << endl;
+#endif
return result;