diff options
| author | Dmitrijs Ledkovs <xnox@debian.org> | 2012-06-07 07:49:56 +0100 |
|---|---|---|
| committer | Roberto C. Sanchez <roberto@connexer.com> | 2014-03-29 10:54:08 -0400 |
| commit | 444809607c3a05c1b690a644cd147d1e9c51762a (patch) | |
| tree | e7012b60cd49e2d638f35f635320b39427950e73 /debian/patches | |
| parent | 9bdd21628118bca593af69cb4bb8555c0b9405b9 (diff) | |
Imported Debian patch 1.6.2+dfsg-5
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/fix-ftbfs-icu.patch | 17 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 18 insertions, 0 deletions
diff --git a/debian/patches/fix-ftbfs-icu.patch b/debian/patches/fix-ftbfs-icu.patch new file mode 100644 index 0000000..f4f1438 --- /dev/null +++ b/debian/patches/fix-ftbfs-icu.patch @@ -0,0 +1,17 @@ +Description: Fix FTBFS by requesting libraries only from icu-config +Author: Dmitrijs Ledkovs <xnox@debian.org>, Daniel Glassey <dglassey@gmail.com> +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 + ) diff --git a/debian/patches/series b/debian/patches/series index 55eb22f..a3afc62 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ cmake_backport.patch icu_in_soname.patch fix-ftbfs-gcc4.7.diff +fix-ftbfs-icu.patch |