92e0f09493
* Tue Aug 26 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.10-1 - kde-3.5.10 * Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-18 - fix build against Rawhide kernel headers (fix flock and flock64 redefinition) * Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17 - fix logic error in OnlyShowIn=KDE3 patch * Wed Jul 02 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-16 - f9+: use drkonqi from KDE 4 kdebase-runtime in KCrash (#453243) * Wed Jun 04 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-15 - set include_crystalsvg to 1 everywhere - use Epoch 1 for crystalsvg-icon-theme, add Obsoletes * Tue Jun 03 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-14 - revert kdeui symlink hack (there be dragons) - unbreak -apidocs, add %%check so this never ever happens again * Sat May 24 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-13 - f9+: include kdeui symlink here + scriptlets to help rpm handle it * Fri May 23 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-12 - f9+: omit %%{_datadir}/apps/kdeui, use version from kdelibs-common (rh#447965, kde#157850) * Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-11 - (Only|Not)ShowIn=KDE3 patch (helps #446466) * Thu May 15 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-10 - fix kresources.desktop: NoDisplay=true * Mon Apr 14 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-8 - omit Requires: kdndsd-avahi (#441222) * Wed Apr 02 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-7 - more qt->qt3 fixes * Tue Mar 25 2008 Rex Dieter <rdieter@fedoraproject.org> 3.5.9-6 - s/qt-devel/qt3-devel/
16 lines
563 B
Diff
16 lines
563 B
Diff
diff -ur kdelibs-3.5.9/kio/kio/kdirwatch.cpp kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp
|
|
--- kdelibs-3.5.9/kio/kio/kdirwatch.cpp 2006-07-22 10:16:37.000000000 +0200
|
|
+++ kdelibs-3.5.9-fix-flock-redefinition/kio/kio/kdirwatch.cpp 2008-08-23 00:59:17.000000000 +0200
|
|
@@ -71,7 +71,11 @@
|
|
#include <linux/types.h>
|
|
// Linux kernel headers are documented to not compile
|
|
#define _S390_BITOPS_H
|
|
+#define flock linux_flock
|
|
+#define flock64 linux_flock64
|
|
#include <linux/inotify.h>
|
|
+#undef flock
|
|
+#undef flock64
|
|
|
|
static inline int inotify_init (void)
|
|
{
|