* Fix the kdelibs 3.5 build on the current Linux kernel headers (where

linux/inotify.h shouldn't be used anymore).

svn path=/nixpkgs/branches/stdenv-updates/; revision=14822
This commit is contained in:
Eelco Dolstra 2009-04-01 11:33:00 +00:00
parent 151bd1c17f
commit 3d6086c7a7
2 changed files with 36 additions and 0 deletions

View File

@ -13,6 +13,12 @@ stdenv.mkDerivation {
sha256 = "0wjw51r96h6rngbsrzndw890xggzvrakydsbaldlrvbh3jq9qzk1";
};
patches = [
# We're not supposed to use linux/inotify.h, use sys/inotify.h instead.
# Adapted from Gentoo.
./inotify.patch
];
passthru = {inherit openssl libjpeg qt; inherit (xlibs) libX11;};
buildInputs = [

View File

@ -0,0 +1,30 @@
diff -rc kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp kdelibs-3.5.10/kio/kio/kdirwatch.cpp
*** kdelibs-3.5.10-orig/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
--- kdelibs-3.5.10/kio/kio/kdirwatch.cpp 2009-04-01 13:26:48.000000000 +0200
***************
*** 64,74 ****
// debug
#include <sys/ioctl.h>
! #ifdef HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
- #include <linux/types.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>
--- 64,76 ----
// debug
#include <sys/ioctl.h>
! #if 1
! #include <sys/inotify.h>
! #include <fcntl.h>
! #elif HAVE_INOTIFY
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
// Linux kernel headers are documented to not compile
#define _S390_BITOPS_H
#include <linux/inotify.h>