diff options
| author | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 00:52:26 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2012-01-04 00:52:26 +0100 |
| commit | 5e8992d3e1997336d2590807bf99ef090352be70 (patch) | |
| tree | 73d96f4b396ef219eca19456875b3db3c665d8a5 /redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch | |
| parent | 415fcb269ea8489a5066fd0188f022775a5871cf (diff) | |
| parent | e565534290c19c9f69d0672be1a79bc51e661a19 (diff) | |
| download | tde-packaging-5e8992d3e1997336d2590807bf99ef090352be70.tar.gz tde-packaging-5e8992d3e1997336d2590807bf99ef090352be70.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch')
| -rw-r--r-- | redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch b/redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch new file mode 100644 index 000000000..089570a75 --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch @@ -0,0 +1,67 @@ +Index: kjs/CMakeLists.txt +=================================================================== +--- kjs/CMakeLists.txt (revision 1261450) ++++ kjs/CMakeLists.txt (working copy) +@@ -15,10 +15,12 @@ + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/kdecore ++ ${LIBPCRE_INCLUDEDIR} + ) + + link_directories( + ${TQT_LIBRARY_DIRS} ++ ${LIBPCRE_LIBDIR} + ) + + +@@ -59,6 +61,6 @@ + tde_add_library( ${target} SHARED + SOURCES ${${target}_SRCS} + VERSION 1.2.0 +- LINK kdecore-shared ++ LINK kdecore-shared ${LIBPCRE_LIBRARIES} + DESTINATION ${LIB_INSTALL_DIR} + ) +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 1261450) ++++ CMakeLists.txt (working copy) +@@ -75,6 +75,7 @@ + OPTION( WITH_OPENEXR "Enable openexr support" OFF ) + 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_ASPELL "Enable aspell support" OFF ) + OPTION( WITH_HSPELL "Enable hspell support" OFF ) +@@ -715,6 +716,16 @@ + endif( WITH_QT3 ) + endif( ) + ++##### check for pcre ########################### ++ ++if( WITH_PCRE ) ++ pkg_search_module( LIBPCRE libpcre ) ++ if( NOT LIBPCRE_FOUND ) ++ message(FATAL_ERROR "\npcre support are requested, but not found on your system" ) ++ endif( NOT LIBPCRE_FOUND ) ++ set( HAVE_PCREPOSIX 1 ) ++endif( ) ++ + ##### check for aspell ########################## + # we need ASPELL_DATADIR too + +Index: config.h.cmake +=================================================================== +--- config.h.cmake (revision 1261450) ++++ config.h.cmake (working copy) +@@ -366,7 +366,7 @@ + #cmakedefine HAVE_PATHS_H 1 + + /* Define if you have pcreposix libraries and header files. */ +-#undef HAVE_PCREPOSIX ++#cmakedefine HAVE_PCREPOSIX 1 + + /* Define to 1 if you have the `poll' function. */ + #cmakedefine HAVE_POLL 1 |