diff options
| author | Alberto Villa <avilla@FreeBSD.org> | 2011-07-17 21:23:48 +0000 |
|---|---|---|
| committer | Alberto Villa <avilla@FreeBSD.org> | 2011-07-17 21:23:48 +0000 |
| commit | 59c3c3fce963477ce3d729bc518957a89e926bdc (patch) | |
| tree | 3b8efab2dabc7aa295841d3e7da030b74c807ce9 /editors/calligra/files | |
| parent | Bring this port back from the dead and assume maintainership of it. (diff) | |
- Depend on the embedded wv2 instead of the one from ports.
- Correctly link to iconv in the wv2 tests. [1]
- Add conflict with the yet-to-come calligra port.
- Bump PORTREVISION.
This fix finally enables the build of the msword-odf filter.
Reported by: Axel Gonzalez <loox@e-shell.net> [1]
Submitted by: Raphael Kubo da Costa <kubito@gmail.com> via area51
Notes
Notes:
svn path=/head/; revision=277870
Diffstat (limited to 'editors/calligra/files')
| -rw-r--r-- | editors/calligra/files/patch-filters-kword-CMakeLists.txt | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/editors/calligra/files/patch-filters-kword-CMakeLists.txt b/editors/calligra/files/patch-filters-kword-CMakeLists.txt new file mode 100644 index 000000000000..5e139efd9f19 --- /dev/null +++ b/editors/calligra/files/patch-filters-kword-CMakeLists.txt @@ -0,0 +1,16 @@ +--- filters/kword/CMakeLists.txt ++++ filters/kword/CMakeLists.txt +@@ -42,7 +42,12 @@ IF( HAVE_SYS_ICONV_H ) + SET( ICONV_COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} "-DHAVE_SYS_ICONV_H" ) + ENDIF( HAVE_SYS_ICONV_H ) + +-TRY_RUN( MODERN_ICONV_RUN MODERN_ICONV_COMPILE ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp ${CMAKE_SOURCE_DIR}/cmake/TestModernIconv.c COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} ) ++TRY_RUN( MODERN_ICONV_RUN MODERN_ICONV_COMPILE ++ ${CMAKE_CURRENT_BINARY_DIR}/CMakeTmp ++ ${CMAKE_SOURCE_DIR}/cmake/TestModernIconv.c ++ CMAKE_FLAGS "-DLINK_LIBRARIES:STRING=${ICONV_LIBRARIES}" ++ "-DINCLUDE_DIRECTORIES:STRING=${ICONV_INCLUDE_DIR}" ++ COMPILE_DEFINITIONS ${ICONV_COMPILE_DEFINITIONS} ) + + IF( MODERN_ICONV_RUN GREATER 0 OR NOT MODERN_ICONV_COMPILE ) + MESSAGE( STATUS "wv2 depends on a modern iconv installation, supporting UNICODELITTLE and" ) |