- fix build against Rawhide kernel headers (fix flock and flock64
redefinition)
This commit is contained in:
parent
f6a0fe541f
commit
8da90eb8fe
11
kdelibs-3.5.9-fix-flock-redefinition.patch
Normal file
11
kdelibs-3.5.9-fix-flock-redefinition.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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:36:02.000000000 +0200
|
||||||
|
@@ -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)
|
@ -31,7 +31,7 @@
|
|||||||
|
|
||||||
Summary: K Desktop Environment 3 - Libraries
|
Summary: K Desktop Environment 3 - Libraries
|
||||||
Version: 3.5.9
|
Version: 3.5.9
|
||||||
Release: 17%{?dist}
|
Release: 18%{?dist}
|
||||||
|
|
||||||
%if 0%{?fedora} > 8
|
%if 0%{?fedora} > 8
|
||||||
Name: kdelibs3
|
Name: kdelibs3
|
||||||
@ -81,6 +81,8 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch
|
|||||||
Patch52: kdelibs-3.5.9-KDE3.patch
|
Patch52: kdelibs-3.5.9-KDE3.patch
|
||||||
# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
|
# use /usr/libexec/kde4/drkonqi in KCrash (#453243)
|
||||||
Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
|
Patch53: kdelibs-3.5.9-drkonqi-kde4.patch
|
||||||
|
# fix build against Rawhide kernel headers (fix flock and flock64 redefinition)
|
||||||
|
Patch54: kdelibs-3.5.9-fix-flock-redefinition.patch
|
||||||
|
|
||||||
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
# use /etc/kde in addition to /usr/share/config, borrowed from debian
|
||||||
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
Patch100: kdelibs-3.5.5-kstandarddirs.patch
|
||||||
@ -263,6 +265,7 @@ format for easy browsing
|
|||||||
%if "%{name}" != "kdelibs"
|
%if "%{name}" != "kdelibs"
|
||||||
%patch53 -p1 -b .drkonqi-kde4
|
%patch53 -p1 -b .drkonqi-kde4
|
||||||
%endif
|
%endif
|
||||||
|
%patch54 -p1 -b .flock-redefinition
|
||||||
|
|
||||||
%patch100 -p1 -b .kstandarddirs
|
%patch100 -p1 -b .kstandarddirs
|
||||||
%patch101 -p1 -b .libtool-shlibext
|
%patch101 -p1 -b .libtool-shlibext
|
||||||
@ -622,6 +625,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* Fri Aug 22 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 3.5.9-17
|
||||||
- fix logic error in OnlyShowIn=KDE3 patch
|
- fix logic error in OnlyShowIn=KDE3 patch
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user