rpms/kdepim/F-9 kdepim-3.5.10-fix-flock-redefinition.patch, NONE, 1.1 kdepim.spec, 1.175, 1.176
Kevin Kofler
kkofler at fedoraproject.org
Mon Mar 16 02:21:26 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdepim/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27622/F-9
Modified Files:
kdepim.spec
Added Files:
kdepim-3.5.10-fix-flock-redefinition.patch
Log Message:
- backport build fix for current kernel headers (flock) from 3.5 branch
kdepim-3.5.10-fix-flock-redefinition.patch:
--- NEW FILE kdepim-3.5.10-fix-flock-redefinition.patch ---
Index: kmail/editorwatcher.cpp
===================================================================
--- kmail/editorwatcher.cpp (revision 858978)
+++ kmail/editorwatcher.cpp (revision 858979)
@@ -32,8 +32,12 @@
#include <cassert>
// inotify stuff taken from kdelibs/kio/kio/kdirwatch.cpp
-#ifdef HAVE_INOTIFY
+#ifdef HAVE_SYS_INOTIFY
#include <sys/ioctl.h>
+#include <sys/inotify.h>
+#include <fcntl.h>
+#elif HAVE_INOTIFY
+#include <sys/ioctl.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/syscall.h>
Index: kmail/configure.in.in
===================================================================
--- kmail/configure.in.in (revision 858978)
+++ kmail/configure.in.in (revision 858979)
@@ -57,8 +57,30 @@
AC_LANG_RESTORE
])
- if test "$kde_cv_have_inotify" = "yes" ; then
+ AC_CACHE_VAL(kde_cv_have_sys_inotify,
+ [
+ kde_cv_have_sys_inotify=no
+ AC_LANG_SAVE
+ AC_LANG_C
+
+ AC_TRY_COMPILE(
+ [
+#include <sys/inotify.h>
+ ],
+ [
+#ifndef IN_ALL_EVENTS
+#error no inotify notification
+#endif
+ ],kde_cv_have_sys_inotify=yes,kde_cv_have_sys_inotify=no)
+
+ AC_LANG_RESTORE
+ ])
+
+ if test "$kde_cv_have_inotify" = "yes" -o "$kde_cv_have_sys_inotify" = "yes"; then
AC_DEFINE_UNQUOTED(HAVE_INOTIFY, 1, [Define if your system has Linux Inode Notification])
+ if test "$kde_cv_have_sys_inotify" = "yes"; then
+ AC_DEFINE_UNQUOTED(HAVE_SYS_INOTIFY, 1, [Define if your system has glibc support for inotify])
+ fi
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
Index: kdepim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdepim/F-9/kdepim.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- kdepim.spec 16 Mar 2009 01:46:46 -0000 1.175
+++ kdepim.spec 16 Mar 2009 02:20:56 -0000 1.176
@@ -50,6 +50,9 @@
# backported from 4.2/4.3
# http://websvn.kde.org/?view=rev&revision=924024
Patch101: kdepim-3.5.10-#465211.patch
+# fix build with current kernel headers (flock redefinition)
+# http://websvn.kde.org/?view=rev&revision=858979
+Patch102: kdepim-3.5.10-fix-flock-redefinition.patch
Provides: kdepim3 = %{version}-%{release}
@@ -153,6 +156,7 @@
%patch7 -p1 -b .metakit_sparc64
%patch100 -p0 -b .kabcdistlistupdater
%patch101 -p1 -b .#465211
+%patch102 -p0 -b .flock-redefinition
%if 0%{?fedora} > 8
pushd kitchensync
@@ -285,6 +289,7 @@
%changelog
* Mon Mar 16 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-3
- backport fix for KOrganizer crash (#465211, kde#171651, kde#171787) from 4.2
+- backport build fix for current kernel headers (flock) from 3.5 branch
* Mon Sep 29 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 6:3.5.10-2
- add converter for old kabc distribution lists (#464622)
More information about the fedora-extras-commits
mailing list