diff options
| author | tnn <tnn@pkgsrc.org> | 2009-10-23 07:46:08 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2009-10-23 07:46:08 +0000 |
| commit | 57099ff696d99fa11f5125bd3dc443842013c4fd (patch) | |
| tree | ef87cbf94943e1733979086e695a545b5882e343 | |
| parent | 16ec936b24535a608b09693256f5aa658a47a850 (diff) | |
| download | pkgsrc-57099ff696d99fa11f5125bd3dc443842013c4fd.tar.gz | |
Add kludge to let it build on debian squeeze, where it failed with:
/usr/include/asm-generic/fcntl.h:117: error: redefinition of 'struct flock'
/usr/include/bits/fcntl.h:159: error: previous definition of 'struct flock'
(this is due to kdelibs including kernel headers for inotify)
Fingers crossed that this won't introduce regressions on $otherLinux.
| -rw-r--r-- | x11/kdelibs3/distinfo | 3 | ||||
| -rw-r--r-- | x11/kdelibs3/patches/patch-af | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index 7a740a5edfa..d29509d263e 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.96 2009/08/31 20:54:26 wiz Exp $ +$NetBSD: distinfo,v 1.97 2009/10/23 07:46:08 tnn Exp $ SHA1 (kdelibs-3.5.10.tar.bz2) = c930a25f4419134def55b8466c3a6f737227fb82 RMD160 (kdelibs-3.5.10.tar.bz2) = 4c960664283c83ebc8e68932ca9044336fcff223 @@ -11,6 +11,7 @@ SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1 SHA1 (patch-ac) = 205f99e8749c32bf445e23f6076dd642c10c8186 SHA1 (patch-ad) = d8ddcea1a281474b7694979b14744c5e06b56b65 SHA1 (patch-ae) = b609ee21da08885fd359b9a163d428cbb3955e74 +SHA1 (patch-af) = c77e57b564719c45c24ce737a4c0d4154df8563b SHA1 (patch-aj) = 2ec8d33ce6684da7c60759cf395b78fa4ac2eaec SHA1 (patch-an) = d34a3cc0ac0b92921bcaeb9b05c5b7a99ee3566c SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308 diff --git a/x11/kdelibs3/patches/patch-af b/x11/kdelibs3/patches/patch-af new file mode 100644 index 00000000000..9eae44f3fa4 --- /dev/null +++ b/x11/kdelibs3/patches/patch-af @@ -0,0 +1,12 @@ +$NetBSD: patch-af,v 1.12 2009/10/23 07:46:08 tnn Exp $ + +--- kio/kio/kdirwatch.cpp.orig 2006-07-22 10:16:37.000000000 +0200 ++++ kio/kio/kdirwatch.cpp +@@ -71,6 +71,7 @@ + #include <linux/types.h> + // Linux kernel headers are documented to not compile + #define _S390_BITOPS_H ++#define _ASM_GENERIC_FCNTL_H + #include <linux/inotify.h> + + static inline int inotify_init (void) |