RHEL/Fedora: add gam/gamin support to kdelibs

2 files changed, 89 insertions, 3 deletions

diff --git a/redhat/kdelibs/kdelibs-3.5.13-enable_fam_gamin.patch b/redhat/kdelibs/kdelibs-3.5.13-enable_fam_gamin.patch
new file mode 100644
index 000000000..42e1993d3
--- /dev/null
+++ b/redhat/kdelibs/kdelibs-3.5.13-enable_fam_gamin.patch
@@ -0,0 +1,79 @@
+commit 2b035349c31fe64c31d2c050892b117a3a807179
+Author: Timothy Pearson <[email protected]>
+Date:   1326668093 -0600
+
+    Add fam/gamin support to tdelibs CMake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5ce186b..a1a6429 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -77,6 +77,7 @@ OPTION( WITH_ELFICON "Enable ELF embedded icon support" ${WITH_ALL_OPTIONS} )
+ 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_GAMIN "Enable FAM/GAMIN support" OFF )
+ 
+ OPTION( WITH_ASPELL "Enable aspell support" OFF )
+ OPTION( WITH_HSPELL "Enable hspell support" OFF )
+@@ -786,6 +787,23 @@ if( WITH_INOTIFY )
+ endif( )
+ 
+ 
++##### check for FAM/GAMIN ##########################
++
++if( WITH_GAMIN )
++  check_include_file( "fam.h" HAVE_FAM_H )
++  if( HAVE_FAM_H )
++    pkg_search_module( GAMIN gamin )
++    if( GAMIN_FOUND )
++      set( HAVE_FAM 1 )
++    else( GAMIN_FOUND )
++      message(FATAL_ERROR "\nfam/gamin support was requested, but gamin was not found on your system" )
++    endif( GAMIN_FOUND )
++  else( HAVE_FAM_H )
++    message(FATAL_ERROR "\nfam/gamin support was requested, but fam was not found on your system" )
++  endif( HAVE_FAM_H )
++endif( WITH_GAMIN )
++
++
+ ##### check for aspell ##########################
+ # we need ASPELL_DATADIR too
+ 
+diff --git a/config.h.cmake b/config.h.cmake
+index d9b0ef5..4e4bd18 100644
+--- a/config.h.cmake
++++ b/config.h.cmake
+@@ -120,7 +120,7 @@
+ #undef HAVE_FADVISE
+ 
+ /* Define if your system has libfam */
+-#undef HAVE_FAM
++#cmakedefine HAVE_FAM 1
+ 
+ /* Define to 1 if you have the <float.h> header file. */
+ #cmakedefine HAVE_FLOAT_H 1
+diff --git a/kio/kio/CMakeLists.txt b/kio/kio/CMakeLists.txt
+index 9d8790f..25d4fad 100644
+--- a/kio/kio/CMakeLists.txt
++++ b/kio/kio/CMakeLists.txt
+@@ -25,8 +25,12 @@ include_directories(
+   ${CMAKE_SOURCE_DIR}/kio
+   ${CMAKE_SOURCE_DIR}/kio/kssl
+   ${CMAKE_SOURCE_DIR}/interfaces
++  ${GAMIN_INCLUDEDIR}
+ )
+ 
++link_directories(
++  ${GAMIN_LIBDIR}
++)
+ 
+ ##### headers ###################################
+ 
+@@ -112,4 +116,5 @@
+ 
+ tde_add_library( ${target} STATIC_PIC AUTOMOC
+   SOURCES ${${target}_SRCS}
++  LINK ${GAMIN_LIBRARIES}
+ )
+ 
diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
index ccafc358b..21e80ffd8 100755
--- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
+++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec
@@ -2,7 +2,7 @@
 %if "%{?version}" == ""
 %define version 3.5.13
 %endif
-%define release 5
+%define release 6
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -44,8 +44,10 @@ Patch10:	kdelibs-3.5.13-maxlinelength.patch
 Patch11:	kdelibs-3.5.13-enable_pcre.patch
 ## [kdelibs/kate] Updated syntax highlighting files [Bug #764]
 Patch12:	kdelibs-3.5.13-kate_syntax.patch.gz
-## [kdelibs] Adds Inotify support (backport from commit 24f144faf98249012e7b1657a5dfe93750f0dfde)
+## [kdelibs] Adds Inotify support (backport commit 24f144faf98249012e7b1657a5dfe93750f0dfde)
 Patch13:	kdelibs-3.5.13-add_inotify_support.patch
+## [kdelibs] Add fam/gamin support to tdelibs CMake (backport commit 2b035349c31fe64c31d2c050892b117a3a807179)
+Patch14:	kdelibs-3.5.13-enable_fam_gamin.patch
 
 BuildRequires:	libtool
 BuildRequires:	tqtinterface-devel
@@ -66,6 +68,7 @@ BuildRequires:	libtiff-devel
 BuildRequires:	OpenEXR-devel
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	glib2-devel
+BuildRequires:	gamin-devel
 
 Requires:		tqtinterface
 Requires:		trinity-arts
@@ -120,6 +123,7 @@ format for easy browsing
 %patch11 -p0
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 
 %build
@@ -148,7 +152,7 @@ cd build
   -DWITH_HSPELL=OFF \
   -DWITH_PCRE=ON \
   -DWITH_INOTIFY=ON \
-  -DWITH_XTEST=ON \
+  -DWITH_GAMIN=ON \
   ..
 
 %__make %{?_smp_mflags}
@@ -320,6 +324,9 @@ EOF
 
 
 %changelog
+* Mon Jan 16 2012 Francois Andriot <[email protected]> - 3.5.13-6
+- Adds 'fam' and 'gamin' support
+
 * Sat Jan 14 2012 Francois Andriot <[email protected]> - 3.5.13-5
 - Adds 'inotify' support