------------------------------------------------------------ revno: 98 committer: Dmitrijs Ledkovs <[email protected]> branch nick: sword timestamp: Sun 2012-03-25 22:09:15 +0100 message: * Fix linking against CLucene * Backport CMake changes removed: debian/patches/14_compiler_flags.diff debian/patches/15_move_icudatadir.diff added: debian/patches/cmake_backport.patch modified: debian/changelog debian/control debian/copyright 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 'debian/changelog' --- debian/changelog 2011-11-09 00:03:11 +0000 +++ debian/changelog 2012-03-25 21:09:15 +0000 @@ -1,3 +1,11 @@ +sword (1.6.2+dfsg-2) unstable; urgency=low + + [ Dmitrijs Ledkovs <[email protected]> ] + * Fix linking against CLucene + * Backport CMake changes + + -- Dmitrijs Ledkovs <[email protected]> Sun, 25 Mar 2012 20:17:12 +0100 + sword (1.6.2+dfsg-1) unstable; urgency=low [ Dmitrijs Ledkovs <[email protected]> ] === modified file 'debian/control' --- debian/control 2011-11-08 17:48:26 +0000 +++ debian/control 2012-03-25 21:09:15 +0000 @@ -18,7 +18,7 @@ Uploaders: Daniel Glassey <[email protected]>, Dmitrijs Ledkovs <[email protected]>, Jonathan Marsden <[email protected]> -Standards-Version: 3.9.1 +Standards-Version: 3.9.3 Homepage: http://www.crosswire.org/sword/ Package: libsword8 === modified file 'debian/copyright' --- debian/copyright 2011-11-08 18:45:51 +0000 +++ debian/copyright 2012-03-25 21:09:15 +0000 @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: The SWORD Project Upstream-Contact: Members of the SWORD Project team <[email protected]> The CrossWire Bible Society === removed file 'debian/patches/14_compiler_flags.diff' --- debian/patches/14_compiler_flags.diff 2010-12-08 14:12:18 +0000 +++ debian/patches/14_compiler_flags.diff 1970-01-01 00:00:00 +0000 @@ -1,19 +0,0 @@ -Make CMake honour environmental flags. ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -139,13 +139,13 @@ - - IF(BUILDING_SHARED) - SET_TARGET_PROPERTIES(sword -- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} -+ PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS} -fPIC" - ) - ENDIF(BUILDING_SHARED) - - IF(BUILDING_STATIC) - SET_TARGET_PROPERTIES(sword_static -- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} -+ PROPERTIES COMPILE_FLAGS "$ENV{CFLAGS}" - ) - ENDIF(BUILDING_STATIC) - === removed file 'debian/patches/15_move_icudatadir.diff' --- debian/patches/15_move_icudatadir.diff 2010-11-30 13:57:46 +0000 +++ debian/patches/15_move_icudatadir.diff 1970-01-01 00:00:00 +0000 @@ -1,23 +0,0 @@ -Move transliteration files into $(libdir)/sword sub-dir -=== modified file 'cmake/install.cmake' ---- a/cmake/install.cmake -+++ b/cmake/install.cmake -@@ -62,7 +62,7 @@ - - # Need to build/install the - IF(WITH_ICU AND ICU_GENRB) -- ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") -+ ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") - FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu") - FOREACH(translit ${translit_SOURCES}) - STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit}) -@@ -86,6 +86,6 @@ - ENDIF(BUILDING_SHARED) - - INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" -- DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") -+ DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") - ENDFOREACH(translit ${translit_SOURCES}) --ENDIF(WITH_ICU AND ICU_GENRB) -\ No newline at end of file -+ENDIF(WITH_ICU AND ICU_GENRB) === added file 'debian/patches/cmake_backport.patch' --- debian/patches/cmake_backport.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/cmake_backport.patch 2012-03-25 21:09:15 +0000 @@ -0,0 +1,508 @@ +Description: Backport of latest cmake +Origin: commit, revision id: [email protected] +Author: Dmitrijs Ledkovs <[email protected]> +Last-Update: 2012-03-22 +X-Bzr-Revision-Id: [email protected] + +=== modified file 'CMakeLists.txt' +Index: sword/CMakeLists.txt +=================================================================== +--- sword.orig/CMakeLists.txt 2012-03-23 00:14:16.541890418 +0000 ++++ sword/CMakeLists.txt 2012-03-23 00:32:45.377920112 +0000 +@@ -38,6 +38,7 @@ + # This will look for various libraries that libsword builds against. There is no REQUIRED + # attribute added here, since all of the libraries here are not, in actuality, required. + # ++MESSAGE(STATUS "\n-- SEARCHING FOR SYTEM PACKAGES") + # Find our packages + FIND_PACKAGE(ZLIB QUIET) + FIND_PACKAGE(ICU QUIET) +@@ -77,30 +78,18 @@ + IF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") + SET_TARGET_PROPERTIES(sword_static PROPERTIES + OUTPUT_NAME "sword") +- MESSAGE(STATUS "Building Static library with name sword") ++ #MESSAGE(STATUS "Building Static library with name sword") + ELSE(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") +- MESSAGE(STATUS "Building Static library with name +- sword_static") ++ #MESSAGE(STATUS "Building Static library with name ++ #sword_static") + ENDIF(NOT MSVC OR NOT LIBSWORD_LIBRARY_TYPE MATCHES ".*Shared.*") ++ MESSAGE(STATUS "Building Static library.") + ENDIF(LIBSWORD_LIBRARY_TYPE MATCHES ".*Static.*" OR NOT LIBSWORD_LIBRARY_TYPE) + + ################################################################################################ + # Some random user settings + # + +-IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") +- SET_TARGET_PROPERTIES(sword +- PROPERTIES COMPILE_FLAGS "-pg" +- ) +-ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") +- +-IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") +- SET_TARGET_PROPERTIES(sword +- PROPERTIES COMPILE_FLAGS "-g -finstrument-functions" +- ) +- TARGET_LINK_LIBRARIES(libsword fnccheck) +-ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") +- + IF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") + ADD_DEFINITIONS(-DGLOBCONFPATH="${SWORD_GLOBAL_CONF_DIR}/sword.conf") + ENDIF(NOT SWORD_GLOBAL_CONF_DIR STREQUAL "") +@@ -123,33 +112,41 @@ + ENDIF(BUILDING_SHARED) + + ############################################################################################### +-# Some options are only needed if we're going to be building a debug option into the library +-# These are generally only for developer building and testing ++# The buildflags depend on the CMAKE_BUILD_TYPE supplied at the command line. ++# For a full lists of different flags see http://cmake.org/Wiki/CMake_Useful_Variables ++# ++# Cmake has sane defaults for None aka '', DEBUG, RELEASE, RELWITHDEBINFO for known compilers. ++# ++# You can override these variables on the command-line or here. ++# We provide our own defaults below + # +-# Debug testing +-IF(CMAKE_BUILD_TYPE STREQUAL "Debug") +- SET(SWORD_CFLAGS "-g3 -Wall -Werror -O0") +-ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug") +- SET(SWORD_CFLAGS "-O3") +-ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug") ++# Note the below two initialisations done for us by cmake: ++# ++#SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}" or "$ENV{CFLAGS}" or "" ) ++#SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" or "$ENV{CXXFLAGS}" or "" ) + + IF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") +- SET(SWORD_CFLAGS "${SWORD_CFLAGS} -Werror") ++ SET(CMAKE_C_FLAGS "-Werror ${CMAKE_C_FLAGS}") ++ SET(CMAKE_CXX_FLAGS "-Werror ${CMAKE_CXX_FLAGS}") + ENDIF(SWORD_ENABLE_WARNINGS STREQUAL "Yes") + +-IF(BUILDING_SHARED) +- SET_TARGET_PROPERTIES(sword +- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} +- ) +-ENDIF(BUILDING_SHARED) ++IF(SWORD_ENABLE_PROFILE STREQUAL "Yes") ++ SET(CMAKE_C_FLAGS "-pg ${CMAKE_C_FLAGS}") ++ SET(CMAKE_CXX_FLAGS "-pg ${CMAKE_CXX_FLAGS}") ++ENDIF(SWORD_ENABLE_PROFILE STREQUAL "Yes") + +-IF(BUILDING_STATIC) +- SET_TARGET_PROPERTIES(sword_static +- PROPERTIES COMPILE_FLAGS ${SWORD_CFLAGS} +- ) +-ENDIF(BUILDING_STATIC) ++IF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") ++ SET(CMAKE_C_FLAGS "-g -finstrument-functions ${CMAKE_C_FLAGS}") ++ SET(CMAKE_CXX_FLAGS "-g -finstrument-functions ${CMAKE_CXX_FLAGS}") ++ TARGET_LINK_LIBRARIES(libsword fnccheck) ++ENDIF(SWORD_ENABLE_PROFILEFN STREQUAL "Yes") + +-MESSAGE(STATUS "Setting CFlags for compile to ${SWORD_CFLAGS}") ++SET(CMAKE_C_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_C_FLAGS}") ++SET(CMAKE_C_FLAGS_RELEASE "-O3 ${CMAKE_C_FLAGS}") ++SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_C_FLAGS}") ++SET(CMAKE_CXX_FLAGS_DEBUG "-g3 -Wall -O0 ${CMAKE_CXX_FLAGS}") ++SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS}") ++SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g ${CMAKE_CXX_FLAGS}") + + ############################################################################################## + # Setting libraries and includes +@@ -167,11 +164,19 @@ + INCLUDE_DIRECTORIES(${CLUCENE_INCLUDE_DIR}) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${CLUCENE_LIBRARY}) + LINK_DIRECTORIES(${CLUCENE_LIBRARY_DIR}) ++ ADD_DEFINITIONS(-DUSELUCENE) ++ IF(CLUCENE2) ++ ADD_DEFINITIONS(-DCLUCENE2) ++ ENDIF(CLUCENE2) + ENDIF(WITH_CLUCENE) + IF(WITH_ICU) + INCLUDE_DIRECTORIES(${ICU_INCLUDE_DIRS}) ++ ADD_DEFINITIONS(${ICU_DEFINITIONS}) + SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${ICU_LIBRARIES} ${ICU_I18N_LIBRARIES}) + ENDIF(WITH_ICU) ++IF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) ++ SET(SWORD_LINK_LIBRARIES ${SWORD_LINK_LIBRARIES} ${REGEX_LIBRARY}) ++ENDIF(REGEX_FOUND AND CROSS_COMPILE_MINGW32) + + IF(BUILDING_SHARED) + TARGET_LINK_LIBRARIES(sword ${SWORD_LINK_LIBRARIES}) +@@ -219,9 +224,9 @@ + # Bindings are good, right? + # + +-IF(NOT SWORD_BINDINGS STREQUAL "") ++IF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) + INCLUDE("${CMAKE_CURRENT_SOURCE_DIR}/cmake/bindings.cmake") +-ENDIF(NOT SWORD_BINDINGS STREQUAL "") ++ENDIF(NOT SWORD_BINDINGS STREQUAL "" AND SWORD_BINDINGS) + + ############################################################################################## + # Utilities are hawt +Index: sword/cmake/FindCLucene.cmake +=================================================================== +--- sword.orig/cmake/FindCLucene.cmake 2012-03-23 00:14:16.485890416 +0000 ++++ sword/cmake/FindCLucene.cmake 2012-03-23 00:32:45.381920113 +0000 +@@ -63,7 +63,7 @@ + NAMES clucene clucene-core + PATHS ${TRIAL_LIBRARY_PATHS}) + IF (CLUCENE_LIBRARY) +- MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") ++ #MESSAGE(STATUS "Found CLucene library: ${CLUCENE_LIBRARY}") + ENDIF (CLUCENE_LIBRARY) + FIND_PATH(CLUCENE_INCLUDE_DIR + NAMES CLucene.h +@@ -71,7 +71,7 @@ + ONLY_CMAKE_FIND_ROOT_PATH) + + IF (CLUCENE_INCLUDE_DIR) +- MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") ++ #MESSAGE(STATUS "Found CLucene include dir: ${CLUCENE_INCLUDE_DIR}") + ENDIF (CLUCENE_INCLUDE_DIR) + + IF(WIN32) +@@ -83,22 +83,29 @@ + FIND_PATH(CLUCENE_LIBRARY_DIR + NAMES CLucene/clucene-config.h PATHS ${TRIAL_LIBRARY_PATHS} ${TRIAL_INCLUDE_PATHS} NO_DEFAULT_PATH) + IF (CLUCENE_LIBRARY_DIR) +- MESSAGE(STATUS "Found CLucene library dir: ${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 STRLESS "${CLUCENE_MIN_VERSION}") +- MESSAGE(ERROR " CLucene version ${CLUCENE_VERSION} is less than the required minimum ${CLUCENE_MIN_VERSION}") ++ 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 STRLESS "${CLUCENE_MIN_VERSION}") +- IF (CLUCENE_VERSION STREQUAL "0.9.17") +- MESSAGE(ERROR "CLucene version 0.9.17 is not supported.") ++ 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") ++ 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.") ++ #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) +@@ -107,11 +114,11 @@ + + IF(CLucene_FOUND) + IF(NOT CLucene_FIND_QUIETLY) +- MESSAGE(STATUS "Found CLucene: ${CLUCENE_LIBRARY}") ++ MESSAGE(STATUS "CLucene: Yes ${CLUCENE_LIBRARY}") + ENDIF(NOT CLucene_FIND_QUIETLY) + ELSE(CLucene_FOUND) + IF(CLucene_FIND_REQUIRED) +- MESSAGE(FATAL_ERROR "Could not find CLucene.") ++ MESSAGE(FATAL_ERROR "CLucene: No") + ENDIF(CLucene_FIND_REQUIRED) + ENDIF(CLucene_FOUND) + +Index: sword/cmake/FindICU.cmake +=================================================================== +--- sword.orig/cmake/FindICU.cmake 2012-03-23 00:14:16.473890416 +0000 ++++ sword/cmake/FindICU.cmake 2012-03-23 00:32:45.381920113 +0000 +@@ -5,6 +5,7 @@ + # ICU_INCLUDE_DIRS - Directory to include to get ICU headers + # Note: always include ICU headers as, e.g., + # unicode/utypes.h ++# ICU_DEFINITIONS - Definitions + # ICU_LIBRARIES - Libraries to link against for the common ICU + # ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation + # (note: in addition to ICU_LIBRARIES) +@@ -13,6 +14,7 @@ + find_program( + ICU_CONFIG_BIN + icu-config ++ HINTS "${ICU_CONFIG_BIN_PATH}" + ) + find_program( + ICU_GENRB +@@ -20,25 +22,26 @@ + ) + + if(ICU_CONFIG_BIN) +- MESSAGE(STATUS "icu-config found at ${ICU_CONFIG_BIN}: Using that for configuration") +- MESSAGE(STATUS "genrb found at ${ICU_GENRB}: Using that for generating transliteration data") ++ MESSAGE(STATUS "[ICU] icu-config: Yes ${ICU_CONFIG_BIN}") ++ MESSAGE(STATUS "[ICU] genrb: Yes ${ICU_GENRB}") + + # Get include directories +- execute_process(COMMAND "${ICU_CONFIG_BIN}" "--cppflags" +- OUTPUT_VARIABLE ICU_INCLUDE_DIR ++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--cppflags" ++ OUTPUT_VARIABLE ICU_CPPFLAGS + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + # Sanitize output ++ string(REGEX MATCHALL "-I[^ ]*\ |-I[^ ]*$" ICU_INCLUDE_DIR ${ICU_CPPFLAGS}) ++ string(REGEX MATCHALL "-D[^ ]*\ |-D[^ ]*$" ICU_DEFINITIONS ${ICU_CPPFLAGS}) + string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) +- string(REGEX REPLACE "^[ ]+" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR}) + +- # Try to get the Libraries we need +- execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags" ++ # Try to get the Libraries we need ++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags" + OUTPUT_VARIABLE ICU_LIBRARY_RAW + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + +- execute_process(COMMAND "${ICU_CONFIG_BIN}" "--ldflags-icuio" ++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-icuio" + OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -49,7 +52,7 @@ + set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}") + + # Get the version +- execute_process(COMMAND "${ICU_CONFIG_BIN}" "--version" ++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--version" + OUTPUT_VARIABLE ICU_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE + ) +@@ -95,4 +98,5 @@ + set(ICU_LIBRARIES) + set(ICU_I18N_LIBRARIES) + set(ICU_INCLUDE_DIRS) ++ MESSAGE(STATUS "ICU: No") + endif(ICU_INCLUDE_DIR AND ICU_LIBRARY) +Index: sword/cmake/FindRegex.cmake +=================================================================== +--- sword.orig/cmake/FindRegex.cmake 2012-03-23 00:14:16.509890417 +0000 ++++ sword/cmake/FindRegex.cmake 2012-03-23 00:32:45.381920113 +0000 +@@ -27,8 +27,14 @@ + ) + ENDIF(NOT REGEX_INCLUDE_DIR) + ++FIND_LIBRARY(REGEX_LIBRARY ++ NAMES regex gnurx) ++ + IF(REGEX_INCLUDE_DIR) + SET(REGEX_FOUND 1) ++ MESSAGE(STATUS "System regex.h: Yes") ++ELSE(REGEX_INCLUDE_DIR) ++ MESSAGE(STATUS "System regex.h: No") + ENDIF(REGEX_INCLUDE_DIR) + + MARK_AS_ADVANCED( +Index: sword/cmake/bindings.cmake +=================================================================== +--- sword.orig/cmake/bindings.cmake 2012-03-23 00:14:16.497890418 +0000 ++++ sword/cmake/bindings.cmake 2012-03-23 00:32:45.381920113 +0000 +@@ -5,15 +5,16 @@ + # I will try to get them integrated into the system if I can. If there are bindings that you need + # other than the Python|Perl/Swig bindings, then you should probably speak up now. + ++MESSAGE(STATUS "\n-- CONFIGURING SWIG BINDINGS") + ##################################################################################################### + # SWIG + # We need to find the SWIG executable in order to be able to do this, right? + FIND_PACKAGE(SWIG) + + IF(NOT SWIG_FOUND) +- MESSAGE(FATAL_ERROR "Swig not found. Bindings will not be built.") ++ MESSAGE(FATAL_ERROR "Swig: no") + ELSE(NOT SWIG_FOUND) +- MESSAGE(STATUS "Swig found at ${SWIG_EXECUTABLE}") ++ MESSAGE(STATUS "Swig: yes") + + SET(SWORD_SWIG_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/bindings/swig") + SET(SWORD_SWIG_BINARY "${CMAKE_CURRENT_BINARY_DIR}/bindings/swig") +@@ -72,7 +73,7 @@ + VERBATIM + ) + +- MESSAGE(STATUS "Configured for building Python bindings.") ++ MESSAGE(STATUS "Python: yes") + ENDIF(SWORD_BINDINGS MATCHES ".*Python.*") + + IF(SWORD_BINDINGS MATCHES ".*Perl.*") +@@ -127,9 +128,9 @@ + VERBATIM + ) + +- MESSAGE(STATUS "Configured for building Perl bindings.") ++ MESSAGE(STATUS "Perl: yes") + ELSE(PERL_FOUND) +- MESSAGE(FATAL_ERROR "Perl not found. Can't create perl bindings without Perl to bind") ++ MESSAGE(FATAL_ERROR "Perl: not found") + ENDIF(PERL_FOUND) + ENDIF(SWORD_BINDINGS MATCHES ".*Perl.*") + ENDIF(NOT SWIG_FOUND) +Index: sword/cmake/install.cmake +=================================================================== +--- sword.orig/cmake/install.cmake 2012-03-23 00:14:16.461890416 +0000 ++++ sword/cmake/install.cmake 2012-03-23 00:32:45.381920113 +0000 +@@ -1,6 +1,7 @@ + ##################################################################### + # First, install the library itself + # ++MESSAGE(STATUS "\n-- CONFIGURING INSTALLATION DESTINATIONS") + IF(NOT CMAKE_INSTALL_PREFIX) + IF(APPLE) + SET(SWORD_INSTALL_DIR "/opt/local") +@@ -22,6 +23,9 @@ + INSTALL(TARGETS sword_static + DESTINATION ${SWORD_INSTALL_DIR}/lib) + ENDIF(BUILDING_STATIC) ++# Install the locales ++INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/locales.d ++ DESTINATION ${SWORD_INSTALL_DIR}/share/sword) + + # Install the headers + INSTALL(FILES ${SWORD_INSTALL_HEADERS} +@@ -32,7 +36,7 @@ + DESTINATION "${SWORD_INSTALL_DIR}/include/sword") + ENDIF(SWORD_INTERNAL_REGEX) + +-MESSAGE(STATUS "Installation destination: ${SWORD_INSTALL_DIR}") ++MESSAGE(STATUS "Destination: ${SWORD_INSTALL_DIR}") + + # Configuration files, of course + SET(prefix ${SWORD_INSTALL_DIR}) +@@ -62,7 +66,7 @@ + + # Need to build/install the + IF(WITH_ICU AND ICU_GENRB) +- ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") ++ ADD_DEFINITIONS(-DSWICU_DATA="${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") + FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/icu") + FOREACH(translit ${translit_SOURCES}) + STRING(REPLACE ".txt" ".res" translit_OUTPUT ${translit}) +@@ -86,6 +90,6 @@ + ENDIF(BUILDING_SHARED) + + INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/icu/${translit_OUTPUT}" +- DESTINATION "${libdir}/${SWORD_VERSION}_icu_${ICU_VERSION}") ++ DESTINATION "${libdir}/sword/${SWORD_VERSION}_icu_${ICU_VERSION}") + ENDFOREACH(translit ${translit_SOURCES}) +-ENDIF(WITH_ICU AND ICU_GENRB) +\ No newline at end of file ++ENDIF(WITH_ICU AND ICU_GENRB) +Index: sword/cmake/muxsources.cmake +=================================================================== +--- sword.orig/cmake/muxsources.cmake 2012-03-23 00:14:16.529890418 +0000 ++++ sword/cmake/muxsources.cmake 2012-03-23 00:32:45.385920113 +0000 +@@ -10,73 +10,74 @@ + # a ZLIB at all, and allowing a user to disable it does not bring about use + # of some internal fall-back but just leaves the ability to read ZLIB files + # out of the library altogether ++MESSAGE(STATUS "\n-- CONFIGURING SOURCE LIST") + IF(SWORD_NO_ZLIB STREQUAL "Yes") +- MESSAGE(STATUS "ZLib support excluded") ++ MESSAGE(STATUS "ZLib: excluded by use option") + ADD_DEFINITIONS(-DEXCLUDEZLIB) + SET(WITH_ZLIB 0) + ELSE(SWORD_NO_ZLIB STREQUAL "Yes") + SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_used_SOURCES}) + IF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") +- MESSAGE(STATUS "No system ZLib found or user forcing internal") ++ MESSAGE(STATUS "ZLib: internal") + SET(sword_SOURCES ${sword_SOURCES} ${sword_zlib_nofound_SOURCES}) + SET(WITH_INTERNAL_ZLIB 1) + ELSE(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") +- MESSAGE(STATUS "Using system ZLib: ${ZLIB_LIBRARY}") ++ MESSAGE(STATUS "ZLib: system ${ZLIB_LIBRARY}") + SET(WITH_ZLIB 1) + ENDIF(NOT ZLIB_FOUND OR SWORD_USE_INTERNAL_ZLIB STREQUAL "Yes") + ENDIF(SWORD_NO_ZLIB STREQUAL "Yes") + + # Check for if we've found ICU + IF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") +- MESSAGE(STATUS "cURL found , using ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") ++ MESSAGE(STATUS "cURL: system ${CURL_LIBRARY} and ${CURL_INCLUDE_DIRS}") + ADD_DEFINITIONS(-DCURLAVAILABLE) + SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_found_SOURCES}) + SET(WITH_CURL 1) + ELSE(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") +- MESSAGE(STATUS "cURL not found or being ignored") ++ MESSAGE(STATUS "cURL: no") + SET(sword_SOURCES ${sword_SOURCES} ${sword_curl_nofound_SOURCES}) + SET(WITH_CURL 0) + ENDIF(CURL_FOUND AND NOT SWORD_NO_CURL STREQUAL "Yes") + + # And for CLucene + IF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") +- MESSAGE(STATUS "CLucene found, using ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") ++ MESSAGE(STATUS "CLucene: yes ${CLUCENE_LIBRARY} in ${CLUCENE_LIBRARY_DIR} and ${CLUCENE_INCLUDE_DIR}") + SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_found_SOURCES}) + SET(WITH_CLUCENE 1) + ELSE(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") +- MESSAGE(STATUS "CLucene not found or being ignored") ++ MESSAGE(STATUS "CLucene: no") + SET(sword_SOURCES ${sword_SOURCES} ${sword_clucene_nofound_SOURCES}) + SET(WITH_CLUCENE 0) + ENDIF(CLucene_FOUND AND NOT SWORD_NO_CLUCENE STREQUAL "Yes") + + # Alert the user if PkgConfig is unavailalbe + IF(NOT PKG_CONFIG_FOUND) +- MESSAGE(STATUS "PkgConfig not found on the system. Proceeding without it.") ++ MESSAGE(STATUS "PkgConfig: no") + SET(WITH_PKG_CONFIG 1) + ELSE(NOT PKG_CONFIG_FOUND) +- MESSAGE(STATUS "PkgConfig found. Using.") ++ MESSAGE(STATUS "PkgConfig: yes") + SET(WITH_PKG_CONFIG 0) + ENDIF(NOT PKG_CONFIG_FOUND) + + # ICU needs some lovin' too + IF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") +- MESSAGE(STATUS "ICU Found, using ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") ++ MESSAGE(STATUS "ICU: yes ${ICU_LIBRARY} and ${ICU_INCLUDE_DIRS}") + ADD_DEFINITIONS(-D_ICU_) + SET(sword_SOURCES ${sword_SOURCES} ${sword_icu_found_SOURCES}) + SET(WITH_ICU 1) + ELSE(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") +- MESSAGE(STATUS "ICU not found or ignored.") ++ MESSAGE(STATUS "ICU: no") + SET(WITH_ICU 0) + ENDIF(ICU_FOUND AND NOT SWORD_NO_ICU STREQUAL "No") + + # Internal or external regex.h + IF(REGEX_FOUND) +- MESSAGE(STATUS "System Regex found: ${REGEX_INCLUDE_DIR}") ++ MESSAGE(STATUS "Regex.h: system ${REGEX_INCLUDE_DIR}") + INCLUDE_DIRECTORIES(${REGEX_INCLUDE_DIR}) + SET(sword_SOURCES ${sword_SOURCES} ${sword_external_regex_SOURCES}) + SET(WITH_REGEX 1) + ELSE(REGEX_FOUND) +- MESSAGE(STATUS "Using internal regex") ++ MESSAGE(STATUS "Regex.h: internal") + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include/internal/regex) + SET(sword_SOURCES ${sword_SOURCES} ${sword_internal_regex_SOURCES}) + SET(WITH_REGEX 0) +Index: sword/cmake/sources.cmake +=================================================================== +--- sword.orig/cmake/sources.cmake 2012-03-23 00:14:16.449890415 +0000 ++++ sword/cmake/sources.cmake 2012-03-23 00:33:05.417920649 +0000 +@@ -417,4 +417,4 @@ + translit_Latin_Gothic.txt + translit_Latin_Ugaritic.txt + translit_swordindex.txt +-) +\ No newline at end of file ++) === modified file 'debian/patches/series' --- debian/patches/series 2011-08-06 23:11:34 +0000 +++ debian/patches/series 2012-03-25 21:09:15 +0000 @@ -1,6 +1,5 @@ 12_fix_compiler_warnings.diff 13_curl.diff -14_compiler_flags.diff -15_move_icudatadir.diff 16_gcc4.6_sword.patch 2631_fix_curl.patch +cmake_backport.patch
_______________________________________________ Pkg-crosswire-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
