From 207150b44fec55bf2b8c5e74badde93880e277fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 3 Oct 2014 16:37:29 +0200 Subject: RPM Packaging: update and cleanup tdelibs --- .../kdelibs-3.5.13-add_inotify_support.patch | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch (limited to 'redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch') diff --git a/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch b/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch deleted file mode 100644 index 97afbc7a7..000000000 --- a/redhat/tdelibs/kdelibs-3.5.13-add_inotify_support.patch +++ /dev/null @@ -1,67 +0,0 @@ -commit 24f144faf98249012e7b1657a5dfe93750f0dfde -Author: Timothy Pearson -Date: 1326095653 -0600 - - Add inotify CMake support to tdelibs - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e26c252..ede0a3a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -76,6 +76,7 @@ - OPTION( WITH_UTEMPTER "Use utempter for utmp management" OFF ) - OPTION( WITH_AVAHI "Enable AVAHI support" OFF ) - OPTION( WITH_PCRE "Enable pcre regex support for kjs" ON ) -+OPTION( WITH_INOTIFY "Enable inotify support for kio" ON ) - - OPTION( WITH_ASPELL "Enable aspell support" OFF ) - OPTION( WITH_HSPELL "Enable hspell support" OFF ) -@@ -726,6 +727,26 @@ if( WITH_GCC_VISIBILITY ) - set( HAVE_PCREPOSIX 1 ) - endif( ) - -+##### check for inotify ########################### -+ -+if( WITH_INOTIFY ) -+ check_include_file( "inotify.h" INOTIFY_FOUND ) -+ check_include_file( "sys/inotify.h" INOTIFY_SYS_FOUND ) -+ if( NOT INOTIFY_FOUND ) -+ if( NOT INOTIFY_SYS_FOUND ) -+ message(FATAL_ERROR "\ninotify support was requested, but inotify was not found on your system" ) -+ endif( NOT INOTIFY_SYS_FOUND ) -+ endif( NOT INOTIFY_FOUND ) -+ if( INOTIFY_FOUND ) -+ set( HAVE_INOTIFY 1 ) -+ endif( INOTIFY_FOUND ) -+ if( INOTIFY_SYS_FOUND ) -+ set( HAVE_INOTIFY 1 ) -+ set( HAVE_SYS_INOTIFY 1 ) -+ endif( INOTIFY_SYS_FOUND ) -+endif( ) -+ -+ - ##### check for aspell ########################## - # we need ASPELL_DATADIR too - -diff --git a/config.h.cmake b/config.h.cmake -index 1893270..d9b0ef5 100644 ---- a/config.h.cmake -+++ b/config.h.cmake -@@ -234,7 +234,7 @@ - #cmakedefine HAVE_INITGROUPS_PROTO 1 - - /* Define if your system has Linux Inode Notification */ --#undef HAVE_INOTIFY -+#cmakedefine HAVE_INOTIFY 1 - - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_INTTYPES_H 1 -@@ -555,7 +555,7 @@ - #cmakedefine HAVE_SYS_FILIO_H 1 - - /* Define if your system has glibc support for inotify */ --#undef HAVE_SYS_INOTIFY -+#cmakedefine HAVE_SYS_INOTIFY 1 - - /* Define to 1 if you have the header file. */ - #cmakedefine HAVE_SYS_MMAN_H 1 -- cgit v1.2.1