diff options
| -rw-r--r-- | redhat/kdelibs/kdelibs-3.5.13-enable_pcre.patch | 67 | ||||
| -rw-r--r-- | redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz | bin | 0 -> 195241 bytes | |||
| -rwxr-xr-x | redhat/kdelibs/trinity-kdelibs-3.5.13.spec | 26 |
3 files changed, 85 insertions, 8 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 diff --git a/redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz b/redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz Binary files differnew file mode 100644 index 000000000..523bdfbfd --- /dev/null +++ b/redhat/kdelibs/kdelibs-3.5.13-kate_syntax.patch.gz diff --git a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec index 827a2523d..b9698c448 100755 --- a/redhat/kdelibs/trinity-kdelibs-3.5.13.spec +++ b/redhat/kdelibs/trinity-kdelibs-3.5.13.spec @@ -37,7 +37,13 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: kdelibs-%{version}.tar.gz -Patch0: kdelibs-3.5.13-maxlinelength.patch + +## [kdelibs/kio] Disable 'max line length' detection [Bug #656] +Patch10: kdelibs-3.5.13-maxlinelength.patch +## [kdelibs/kjs] Enable pcre support in kdelibs [Bug #569] +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 BuildRequires: libtool BuildRequires: tqtinterface-devel @@ -66,8 +72,8 @@ Requires: qt%{?_qt_suffix} Requires: avahi-qt3 -#Provides: kdelibs%{?_qt_suffix} = %{version} %if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix} = %{version} Obsoletes: kdelibs%{?_qt_suffix} <= 3.5.10 %endif @@ -83,8 +89,8 @@ kimgio (image manipulation). Summary: %{name} - Development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Provides: kdelibs%{?_qt_suffix}-devel = %{version} %if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-devel = %{version} Obsoletes: kdelibs%{?_qt_suffix}-devel <= 3.5.10 %endif @@ -96,8 +102,8 @@ applications for TDE. Group: Development/Libraries Summary: %{name} - API documentation Requires: %{name} = %{version}-%{release} -Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} %if "%{?_prefix}" == "/usr" +Provides: kdelibs%{?_qt_suffix}-apidocs = %{version} Obsoletes: kdelibs%{?_qt_suffix}-apidocs <= 3.5.10 %endif @@ -108,8 +114,9 @@ format for easy browsing %prep %setup -q -n kdelibs -%patch0 -p1 - +%patch10 -p1 +%patch11 -p0 +%patch12 -p1 %build @@ -136,6 +143,7 @@ cd build -DWITH_AVAHI=ON \ -DWITH_ASPELL=OFF \ -DWITH_HSPELL=OFF \ + -DWITH_PCRE=ON \ .. %__make %{?_smp_mflags} @@ -307,9 +315,11 @@ EOF %changelog -* Sun Nov 20 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +* Sat Dec 31 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Enable pcre support in kdelibs [Bug #569] +- Updated Kate syntax highlighting files [Bug #764] +- Disable 'max line length' detection [Bug #656] - Add 'Provides: kdelibs3' to avoid installing distro-provided KDE3 libraries -- Disable 'max line length' detection * Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Moves XDG files in TDE prefix to avoid conflict with distro-provided KDE |