------------------------------------------------------------
revno: 107
tags: 1.6.2+dfsg-5
fixes bug: http://bugs.debian.org/676097
committer: Dmitrijs Ledkovs <[email protected]>
branch nick: sword
timestamp: Thu 2012-06-07 10:04:56 +0100
message:
Fix FTBFS due to icu changes (Closes: #676097).
added:
.pc/fix-ftbfs-icu.patch/
.pc/fix-ftbfs-icu.patch/cmake/
.pc/fix-ftbfs-icu.patch/cmake/FindICU.cmake
debian/patches/fix-ftbfs-icu.patch
modified:
.pc/applied-patches
cmake/FindICU.cmake
debian/changelog
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-04-17 21:57:10 +0000
+++ .pc/applied-patches 2012-06-07 09:04:56 +0000
@@ -5,3 +5,4 @@
cmake_backport.patch
icu_in_soname.patch
fix-ftbfs-gcc4.7.diff
+fix-ftbfs-icu.patch
=== added directory '.pc/fix-ftbfs-icu.patch'
=== added directory '.pc/fix-ftbfs-icu.patch/cmake'
=== added file '.pc/fix-ftbfs-icu.patch/cmake/FindICU.cmake'
--- .pc/fix-ftbfs-icu.patch/cmake/FindICU.cmake 1970-01-01 00:00:00 +0000
+++ .pc/fix-ftbfs-icu.patch/cmake/FindICU.cmake 2012-06-07 09:04:56 +0000
@@ -0,0 +1,102 @@
+# Finds the International Components for Unicode (ICU) Library
+#
+# ICU_FOUND - True if ICU found.
+# ICU_I18N_FOUND - True if ICU's internationalization library found.
+# 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)
+
+# Our first goal is to find the icu-config script, if possible
+find_program(
+ ICU_CONFIG_BIN
+ icu-config
+ HINTS "${ICU_CONFIG_BIN_PATH}"
+)
+find_program(
+ ICU_GENRB
+ genrb
+)
+
+if(ICU_CONFIG_BIN)
+ 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}" ${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})
+
+ # 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}" ${ICU_CONFIG_OPTS} "--ldflags-icuio"
+ OUTPUT_VARIABLE ICU_LIBRARY_IO_RAW
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+
+ string(REGEX REPLACE "^[ ]+" "" ICU_LIBRARY ${ICU_LIBRARY_RAW})
+ string(REGEX REPLACE "^[ ]+" "" ICU_LIBRARY_IO ${ICU_LIBRARY_IO_RAW})
+ # Combine them
+ set(ICU_LIBRARY "${ICU_LIBRARY} ${ICU_LIBRARY_IO_RAW}")
+
+ # Get the version
+ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--version"
+ OUTPUT_VARIABLE ICU_VERSION
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
+else(ICU_CONFIG_BIN)
+
+ # Look for the header file.
+ find_path(
+ ICU_INCLUDE_DIR
+ NAMES unicode/utypes.h
+ DOC "Include directory for the ICU library")
+ mark_as_advanced(ICU_INCLUDE_DIR)
+
+ # Look for the library.
+ find_library(
+ ICU_LIBRARY
+ NAMES icuuc cygicuuc cygicuuc32
+ DOC "Libraries to link against for the common parts of ICU")
+ mark_as_advanced(ICU_LIBRARY)
+endif(ICU_CONFIG_BIN)
+
+# Copy the results to the output variables.
+if(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+ set(ICU_FOUND 1)
+ set(ICU_LIBRARIES ${ICU_LIBRARY})
+ set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+
+ # Look for the ICU internationalization libraries
+ find_library(
+ ICU_I18N_LIBRARY
+ NAMES icuin icui18n cygicuin cygicuin32
+ DOC "Libraries to link against for ICU internationalization")
+ mark_as_advanced(ICU_I18N_LIBRARY)
+ if (ICU_I18N_LIBRARY)
+ set(ICU_I18N_FOUND 1)
+ set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
+ else (ICU_I18N_LIBRARY)
+ set(ICU_I18N_FOUND 0)
+ set(ICU_I18N_LIBRARIES)
+ endif (ICU_I18N_LIBRARY)
+else(ICU_INCLUDE_DIR AND ICU_LIBRARY)
+ set(ICU_FOUND 0)
+ set(ICU_I18N_FOUND 0)
+ set(ICU_LIBRARIES)
+ set(ICU_I18N_LIBRARIES)
+ set(ICU_INCLUDE_DIRS)
+ MESSAGE(STATUS "ICU: No")
+endif(ICU_INCLUDE_DIR AND ICU_LIBRARY)
=== modified file 'cmake/FindICU.cmake'
--- cmake/FindICU.cmake 2012-03-25 22:06:07 +0000
+++ cmake/FindICU.cmake 2012-06-07 09:04:56 +0000
@@ -36,7 +36,7 @@
string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
# Try to get the Libraries we need
- execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags"
+ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-libsonly"
OUTPUT_VARIABLE ICU_LIBRARY_RAW
OUTPUT_STRIP_TRAILING_WHITESPACE
)
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-17 21:57:10 +0000
+++ debian/changelog 2012-06-07 09:04:56 +0000
@@ -1,3 +1,9 @@
+sword (1.6.2+dfsg-5) unstable; urgency=low
+
+ * Fix FTBFS due to icu changes (Closes: #676097).
+
+ -- Dmitrijs Ledkovs <[email protected]> Thu, 07 Jun 2012 07:49:56 +0100
+
sword (1.6.2+dfsg-4) unstable; urgency=low
[ Matthias Klose ]
=== added file 'debian/patches/fix-ftbfs-icu.patch'
--- debian/patches/fix-ftbfs-icu.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/fix-ftbfs-icu.patch 2012-06-07 09:04:56 +0000
@@ -0,0 +1,17 @@
+Description: Fix FTBFS by requesting libraries only from icu-config
+Author: Dmitrijs Ledkovs <[email protected]>, Daniel Glassey <[email protected]>
+Bug-Debian: http://bugs.debian.org/676097
+
+Index: b/cmake/FindICU.cmake
+===================================================================
+--- a/cmake/FindICU.cmake
++++ b/cmake/FindICU.cmake
+@@ -36,7 +36,7 @@
+ string(REPLACE "-I" "" ICU_INCLUDE_DIR ${ICU_INCLUDE_DIR})
+
+ # Try to get the Libraries we need
+- execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags"
++ execute_process(COMMAND "${ICU_CONFIG_BIN}" ${ICU_CONFIG_OPTS} "--ldflags-libsonly"
+ OUTPUT_VARIABLE ICU_LIBRARY_RAW
+ OUTPUT_STRIP_TRAILING_WHITESPACE
+ )
=== modified file 'debian/patches/series'
--- debian/patches/series 2012-04-17 21:57:10 +0000
+++ debian/patches/series 2012-06-07 09:04:56 +0000
@@ -5,3 +5,4 @@
cmake_backport.patch
icu_in_soname.patch
fix-ftbfs-gcc4.7.diff
+fix-ftbfs-icu.patch
_______________________________________________
Pkg-crosswire-devel mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-crosswire-devel
