------------------------------------------------------------ revno: 109 committer: Dmitrijs Ledkovs <[email protected]> branch nick: sword timestamp: Wed 2012-11-21 02:40:09 +0000 message: add multiarch clucene patch added: .pc/multiarch-clucene.patch/ .pc/multiarch-clucene.patch/cmake/ .pc/multiarch-clucene.patch/cmake/FindCLucene.cmake debian/patches/multiarch-clucene.patch modified: .pc/applied-patches cmake/FindCLucene.cmake debian/patches/series
-- lp:sword/debian https://code.launchpad.net/~pkgcrosswire/sword/main Your team CrossWire Packaging Team is subscribed to branch lp:sword/debian. To unsubscribe from this branch go to https://code.launchpad.net/~pkgcrosswire/sword/main/+edit-subscription
=== modified file '.pc/applied-patches' --- .pc/applied-patches 2012-11-21 02:01:01 +0000 +++ .pc/applied-patches 2012-11-21 02:40:09 +0000 @@ -10,3 +10,4 @@ 2662.patch 2666.patch 2670.patch +multiarch-clucene.patch === added directory '.pc/multiarch-clucene.patch' === added directory '.pc/multiarch-clucene.patch/cmake' === added file '.pc/multiarch-clucene.patch/cmake/FindCLucene.cmake' --- .pc/multiarch-clucene.patch/cmake/FindCLucene.cmake 1970-01-01 00:00:00 +0000 +++ .pc/multiarch-clucene.patch/cmake/FindCLucene.cmake 2012-11-21 02:40:09 +0000 @@ -0,0 +1,129 @@ +# +# SOURCE: http://websvn.kde.org/trunk/kdesupport/strigi/cmake/FindCLucene.cmake?view=log +# +# ONE FIX: /usr/lib64 added to work on Fedora +# + + +# +# This module looks for clucene (http://clucene.sf.net) support +# It will define the following values +# +# CLUCENE_INCLUDE_DIR = where CLucene/StdHeader.h can be found +# CLUCENE_LIBRARY_DIR = where CLucene/clucene-config.h can be found +# CLUCENE_LIBRARY = the library to link against CLucene +# CLUCENE_VERSION = The CLucene version string +# CLucene_FOUND = set to 1 if clucene is found +# + +INCLUDE(CheckSymbolExists) +INCLUDE(FindLibraryWithDebug) + +if(NOT CLUCENE_MIN_VERSION) + set(CLUCENE_MIN_VERSION "0.9.19") +endif(NOT CLUCENE_MIN_VERSION) + +IF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake) + INCLUDE(${PROJECT_CMAKE}/CLuceneConfig.cmake) +ENDIF(EXISTS ${PROJECT_CMAKE}/CLuceneConfig.cmake) + +IF(MSVC) + IF(CMAKE_BUILD_TYPE STREQUAL "Release") + SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/Release) + ELSE(CMAKE_BUILD_TYPE STREQUAL "Release") + SET(WIN_CLUCENE_SEARCH_PATH ../clucene-core/src/CLucene/debug) + ENDIF(CMAKE_BUILD_TYPE STREQUAL "Release") + SET(WIN_CLUCENE_INCLUDE_PATH ../clucene-core/src) +ELSE(MSVC) + SET(WIN_CLUCENE_SEARCH_PATH "") + SET(WIN_CLUCENE_INCLUDE_PATH "") +ENDIF(MSVC) + +SET(TRIAL_LIBRARY_PATHS + $ENV{CLUCENE_HOME}/lib${LIB_SUFFIX} + ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} + /usr/local/lib${LIB_SUFFIX} + /opt/local/lib${LIB_SUFFIX} + /usr/lib${LIB_SUFFIX} + /usr/lib64 + /sw/lib${LIB_SUFFIX} + /usr/pkg/lib${LIB_SUFFIX} + ${WIN_CLUCENE_SEARCH_PATH} + ) +SET(TRIAL_INCLUDE_PATHS + $ENV{CLUCENE_HOME}/include + ${CMAKE_INSTALL_PREFIX}/include + /usr/local/include + /usr/include + /sw/include + /usr/pkg/include + ${WIN_CLUCENE_INCLUDE_PATH} + ) +FIND_LIBRARY_WITH_DEBUG(CLUCENE_LIBRARY + NAMES clucene clucene-core + PATHS ${TRIAL_LIBRARY_PATHS}) +IF (CLUCENE_LIBRARY) + #MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") +ENDIF (CLUCENE_LIBRARY) +FIND_PATH(CLUCENE_INCLUDE_DIR + NAMES CLucene.h + PATHS ${TRIAL_INCLUDE_PATHS} + ONLY_CMAKE_FIND_ROOT_PATH) + +IF (CLUCENE_INCLUDE_DIR) + #MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") +ENDIF (CLUCENE_INCLUDE_DIR) + +IF(WIN32) + SET(TRIAL_LIBRARY_PATHS ${CLUCENE_INCLUDE_DIR}) +ENDIF(WIN32) + +SET(CLUCENE_GOOD_VERSION TRUE) + +FIND_PATH(CLUCENE_LIBRARY_DIR + NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) +IF (CLUCENE_LIBRARY_DIR) + SET(CLUCENE_INCLUDE_DIR ${CLUCENE_INCLUDE_DIR} ${CLUCENE_LIBRARY_DIR}) + #MESSAGE(STATUS "Found CLucene library dir: ${CLUCENE_LIBRARY_DIR}") + FILE(READ ${CLUCENE_LIBRARY_DIR}/CLucene/clucene-config.h CLCONTENT) + STRING(REGEX MATCH "_CL_VERSION +\".*\"" CLMATCH ${CLCONTENT}) + IF (CLMATCH) + STRING(REGEX REPLACE "_CL_VERSION +\"(.*)\"" "\\1" CLUCENE_VERSION ${CLMATCH}) + IF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") + SET(CLUCENE_GOOD_VERSION FALSE) + ENDIF (CLUCENE_VERSION VERSION_LESS "${CLUCENE_MIN_VERSION}") + IF (CLUCENE_VERSION STREQUAL "0.9.17") + MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") + SET(CLUCENE_GOOD_VERSION FALSE) + ENDIF (CLUCENE_VERSION STREQUAL "0.9.17") + IF (CLUCENE_VERSION VERSION_GREATER "2.0") + MESSAGE (STATUS "Found CLucene 2, enabling compatibility mode") + SET(CLUCENE2 TRUE) + ELSE (CLUCENE_VERSION VERSION_GREATER "2.0") + SET(CLUCENE2 FALSE) + ENDIF (CLUCENE_VERSION VERSION_GREATER "2.0") + ENDIF (CLMATCH) +ELSE (CLUCENE_LIBRARY_DIR) + #MESSAGE(STATUS "CLucene library dir not found.") +ENDIF (CLUCENE_LIBRARY_DIR) + +IF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) + SET(CLucene_FOUND TRUE) +ENDIF(CLUCENE_INCLUDE_DIR AND CLUCENE_LIBRARY AND CLUCENE_LIBRARY_DIR AND CLUCENE_GOOD_VERSION) + +IF(CLucene_FOUND) + IF(NOT CLucene_FIND_QUIETLY) + MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}") + ENDIF(NOT CLucene_FIND_QUIETLY) +ELSE(CLucene_FOUND) + IF(CLucene_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "CLucene: No") + ENDIF(CLucene_FIND_REQUIRED) +ENDIF(CLucene_FOUND) + +MARK_AS_ADVANCED( + CLUCENE_INCLUDE_DIR + CLUCENE_LIBRARY_DIR + CLUCENE_LIBRARY + ) === modified file 'cmake/FindCLucene.cmake' --- cmake/FindCLucene.cmake 2012-03-25 22:06:07 +0000 +++ cmake/FindCLucene.cmake 2012-11-21 02:40:09 +0000 @@ -46,6 +46,7 @@ /opt/local/lib${LIB_SUFFIX} /usr/lib${LIB_SUFFIX} /usr/lib64 + /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} /sw/lib${LIB_SUFFIX} /usr/pkg/lib${LIB_SUFFIX} ${WIN_CLUCENE_SEARCH_PATH} === added file 'debian/patches/multiarch-clucene.patch' --- debian/patches/multiarch-clucene.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/multiarch-clucene.patch 2012-11-21 02:40:09 +0000 @@ -0,0 +1,13 @@ +Description: add multiarch location +Author: Dmitrijs Ledkovs <[email protected]> + +--- sword-1.6.2+dfsg.orig/cmake/FindCLucene.cmake ++++ sword-1.6.2+dfsg/cmake/FindCLucene.cmake +@@ -46,6 +46,7 @@ SET(TRIAL_LIBRARY_PATHS + /opt/local/lib${LIB_SUFFIX} + /usr/lib${LIB_SUFFIX} + /usr/lib64 ++ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /sw/lib${LIB_SUFFIX} + /usr/pkg/lib${LIB_SUFFIX} + ${WIN_CLUCENE_SEARCH_PATH} === modified file 'debian/patches/series' --- debian/patches/series 2012-11-21 02:01:01 +0000 +++ debian/patches/series 2012-11-21 02:40:09 +0000 @@ -10,3 +10,4 @@ 2662.patch 2666.patch 2670.patch +multiarch-clucene.patch
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
