| 1 |
--- kde.orig/configure.in.in 2005-05-23 14:17:19.000000000 +0200
|
| 2 |
+++ kde.patched/configure.in.in 2005-08-27 23:48:59.000000000 +0200
|
| 3 |
@@ -48,7 +48,7 @@
|
| 4 |
KDE_CHECK_STL
|
| 5 |
AC_HEADER_DIRENT
|
| 6 |
AC_HEADER_STDC
|
| 7 |
-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)
|
| 8 |
+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)
|
| 9 |
|
| 10 |
AC_ARG_WITH(acl,
|
| 11 |
[AC_HELP_STRING(--with-acl,
|
| 12 |
@@ -164,7 +164,7 @@
|
| 13 |
AC_CHECK_MKSTEMPS
|
| 14 |
AC_CHECK_MKSTEMP
|
| 15 |
AC_CHECK_MKDTEMP
|
| 16 |
-AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority)
|
| 17 |
+AC_CHECK_FUNCS(strtoll socket seteuid setegid strfmon stpcpy gettimeofday readdir_r setpriority tcgetattr tcsetattr)
|
| 18 |
|
| 19 |
AH_BOTTOM([
|
| 20 |
/* provide a definition for a 32 bit entity, usable as a typedef, possibly
|
| 21 |
--- kde.orig/kdecore/kpty.cpp 2005-05-23 14:16:21.000000000 +0200
|
| 22 |
+++ kde.patched/kdecore/kpty.cpp 2005-08-27 15:15:37.000000000 +0200
|
| 23 |
@@ -95,24 +95,24 @@
|
| 24 |
# endif
|
| 25 |
#endif
|
| 26 |
|
| 27 |
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
|
| 28 |
+#if defined(HAVE_TCGETATTR)
|
| 29 |
+# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
|
| 30 |
+#elif defined(TIOCGETA)
|
| 31 |
# define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
|
| 32 |
+#elif defined(TCGETS)
|
| 33 |
+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
|
| 34 |
#else
|
| 35 |
-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
|
| 36 |
-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
|
| 37 |
-# else
|
| 38 |
-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
|
| 39 |
-# endif
|
| 40 |
+# error
|
| 41 |
#endif
|
| 42 |
|
| 43 |
-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__)
|
| 44 |
+#if defined(HAVE_TCSETATTR) && defined(TCSANOW)
|
| 45 |
+# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
|
| 46 |
+#elif defined(TIOCSETA)
|
| 47 |
# define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
|
| 48 |
+#elif defined(TCSETS)
|
| 49 |
+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
|
| 50 |
#else
|
| 51 |
-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
|
| 52 |
-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
|
| 53 |
-# else
|
| 54 |
-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
|
| 55 |
-# endif
|
| 56 |
+# error
|
| 57 |
#endif
|
| 58 |
|
| 59 |
#if defined (_HPUX_SOURCE)
|
| 60 |
--- kde.orig/kinit/kinit.cpp 2005-07-20 11:19:21.000000000 +0200
|
| 61 |
+++ kde.patched/kinit/kinit.cpp 2005-08-27 15:15:37.000000000 +0200
|
| 62 |
@@ -59,7 +59,7 @@
|
| 63 |
#include <kapplication.h>
|
| 64 |
#include <klocale.h>
|
| 65 |
|
| 66 |
-#ifdef Q_OS_LINUX
|
| 67 |
+#ifdef HAVE_SYS_PRCTL_H
|
| 68 |
#include <sys/prctl.h>
|
| 69 |
#ifndef PR_SET_NAME
|
| 70 |
#define PR_SET_NAME 15
|
| 71 |
@@ -535,7 +535,7 @@
|
| 72 |
d.argv[argc] = 0;
|
| 73 |
|
| 74 |
/** Give the process a new name **/
|
| 75 |
-#ifdef Q_OS_LINUX
|
| 76 |
+#ifdef HAVE_SYS_PRCTL_H
|
| 77 |
/* set the process name, so that killall works like intended */
|
| 78 |
r = prctl(PR_SET_NAME, (unsigned long) name.data(), 0, 0, 0);
|
| 79 |
if ( r == 0 )
|
Parent Directory
| 
Revision Log