Hi!
I'm attaching a new, up-to-date patch for building kdelibs on GNU/kFreeBSD.
Please could you forward/commit the relevant part to upstream?
--
Robert Millan
diff -ur kdelibs-3.4.2.old/configure.in.in kdelibs-3.4.2/configure.in.in
--- kdelibs-3.4.2.old/configure.in.in 2005-05-23 14:17:19.000000000 +0200
+++ kdelibs-3.4.2/configure.in.in 2005-08-27 23:48:59.000000000 +0200
@@ -47,7 +47,7 @@
KDE_CHECK_STL
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h
sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h
termios.h)
+AC_CHECK_HEADERS(sys/param.h sys/mman.h sys/time.h sysent.h strings.h
sys/stat.h sys/select.h paths.h malloc.h limits.h sys/soundcard.h dlfcn.h
termios.h sys/prctl.h)
DCOPIDL2CPP="compiled"
DCOPIDL="compiled"
@@ -118,7 +118,7 @@
AC_CHECK_MKSTEMPS
AC_CHECK_MKSTEMP
AC_CHECK_MKDTEMP
-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday)
+AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday
tcgetattr tcsetattr)
AH_BOTTOM([
/* provide a definition for a 32 bit entity, usable as a typedef, possibly
diff -ur kdelibs-3.4.2.old/debian/control kdelibs-3.4.2/debian/control
--- kdelibs-3.4.2.old/debian/control 2005-08-27 13:06:22.000000000 +0200
+++ kdelibs-3.4.2/debian/control 2005-08-27 15:16:22.000000000 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Isaac Clerencia <[EMAIL PROTECTED]>, Pierre Habouzit <[EMAIL
PROTECTED]>, Christopher Martin <[EMAIL PROTECTED]>, Adeodato Sim?? <[EMAIL
PROTECTED]>, Riku Voipio <[EMAIL PROTECTED]>
-Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev,
binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>=
2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev,
libcupsys2-dev, libfam-dev (>= 2.7.0-7.2), libidn11-dev, libjasper-1.701-dev,
libkrb5-dev, libldap2-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>=
3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev, sharutils, texinfo
+Build-Depends: cdbs (>= 0.4.27), debhelper (>= 4.2.30), autotools-dev,
binutils (>= 2.14.90.0.7), docbook-to-man, gawk, gettext, libart-2.0-dev (>=
2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev [!kfreebsd-i386 !hurd-i386],
libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.2),
libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libldap2-dev, libopenexr-dev
(>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev,
libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils,
libxslt1-dev, sharutils, texinfo
Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11
Standards-Version: 3.6.2
diff -ur kdelibs-3.4.2.old/kdecore/kmountpoint.cpp
kdelibs-3.4.2/kdecore/kmountpoint.cpp
--- kdelibs-3.4.2.old/kdecore/kmountpoint.cpp 2005-05-23 14:16:21.000000000
+0200
+++ kdelibs-3.4.2/kdecore/kmountpoint.cpp 2005-08-27 16:26:09.000000000
+0200
@@ -224,7 +224,7 @@
{
KMountPoint::List result;
-#ifdef HAVE_GETMNTINFO
+#if defined(HAVE_GETMNTINFO) && defined(MNT_NOWAIT)
struct statfs *mounted;
diff -ur kdelibs-3.4.2.old/kdecore/kpty.cpp kdelibs-3.4.2/kdecore/kpty.cpp
--- kdelibs-3.4.2.old/kdecore/kpty.cpp 2005-05-23 14:16:21.000000000 +0200
+++ kdelibs-3.4.2/kdecore/kpty.cpp 2005-08-27 15:15:37.000000000 +0200
@@ -95,24 +95,24 @@
# endif
#endif
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) ||
defined (__bsdi__) || defined(__APPLE__)
+#if defined(HAVE_TCGETATTR)
+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
+#elif defined(TIOCGETA)
# define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
+#elif defined(TCGETS)
+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
#else
-# if defined(_HPUX_SOURCE) || defined(__Lynx__)
-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-# else
-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
-# endif
+# error
#endif
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) ||
defined (__bsdi__) || defined(__APPLE__)
+#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
+#elif defined(TIOCSETA)
# define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
+#elif defined(TCSETS)
+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
#else
-# ifdef _HPUX_SOURCE
-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-# else
-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
-# endif
+# error
#endif
#if defined (_HPUX_SOURCE)
diff -ur kdelibs-3.4.2.old/kinit/kinit.cpp kdelibs-3.4.2/kinit/kinit.cpp
--- kdelibs-3.4.2.old/kinit/kinit.cpp 2005-07-20 11:19:21.000000000 +0200
+++ kdelibs-3.4.2/kinit/kinit.cpp 2005-08-27 15:15:37.000000000 +0200
@@ -59,7 +59,7 @@
#include <kapplication.h>
#include <klocale.h>
-#ifdef Q_OS_LINUX
+#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#ifndef PR_SET_NAME
#define PR_SET_NAME 15
@@ -524,7 +524,7 @@
d.argv[argc] = 0;
/** Give the process a new name **/
-#ifdef Q_OS_LINUX
+#ifdef HAVE_SYS_PRCTL_H
/* set the process name, so that killall works like intended */
r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
if ( r == 0 )
diff -ur kdelibs-3.4.2.old/kio/kio/global.cpp kdelibs-3.4.2/kio/kio/global.cpp
--- kdelibs-3.4.2.old/kio/kio/global.cpp 2005-07-20 11:19:22.000000000
+0200
+++ kdelibs-3.4.2/kio/kio/global.cpp 2005-08-27 19:34:15.000000000 +0200
@@ -1291,7 +1291,7 @@
*
***************************************************************/
-#ifndef HAVE_GETMNTINFO
+#if !defined(HAVE_GETMNTINFO) || !defined(MNT_NOWAIT)
#ifdef _PATH_MOUNTED
// On some Linux, MNTTAB points to /etc/fstab !
@@ -1419,7 +1419,7 @@
//kdDebug(7007) << "findDeviceMountPoint realname=" << realname << endl;
-#ifdef HAVE_GETMNTINFO
+#if defined(HAVE_GETMNTINFO) && defined(MNT_NOWAIT)
struct statfs *mounted;
@@ -1685,7 +1685,7 @@
* How kinky can you get with a filesystem?
*/
-#ifdef HAVE_GETMNTINFO
+#if defined(HAVE_GETMNTINFO) && defined(MNT_NOWAIT)
struct statfs *mounted;
char realpath_buffer[MAXPATHLEN];
