diff options
| author | avilla <avilla@FreeBSD.org> | 2011-07-18 05:23:48 +0800 |
|---|---|---|
| committer | avilla <avilla@FreeBSD.org> | 2011-07-18 05:23:48 +0800 |
| commit | 04cd5b819ef68efc6264f1aec0a2c0925a07201e (patch) | |
| tree | 0fc1cebef7aa4669c468556d9992424d4bd8e6fd /editors/koffice-kde4 | |
| parent | cb5aa2ba371f612eb08f34292bc27b05ae498a6d (diff) | |
| download | freebsd-ports-gnome-04cd5b819ef68efc6264f1aec0a2c0925a07201e.tar.gz freebsd-ports-gnome-04cd5b819ef68efc6264f1aec0a2c0925a07201e.tar.zst freebsd-ports-gnome-04cd5b819ef68efc6264f1aec0a2c0925a07201e.zip | |
- 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
Diffstat (limited to 'editors/koffice-kde4')
| -rw-r--r-- | editors/koffice-kde4/Makefile | 9 | ||||
| -rw-r--r-- | editors/koffice-kde4/files/patch-filters-kword-CMakeLists.txt | 16 | ||||
| -rw-r--r-- | editors/koffice-kde4/pkg-plist | 5 |
3 files changed, 24 insertions, 6 deletions
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile index af0d570691fe..ed8733b6c347 100644 --- a/editors/koffice-kde4/Makefile +++ b/editors/koffice-kde4/Makefile @@ -7,7 +7,7 @@ PORTNAME= koffice PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KOFFICE2_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -33,7 +33,6 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \ tiff.4:${PORTSDIR}/graphics/tiff \ gsl.16:${PORTSDIR}/math/gsl \ - wv2.4:${PORTSDIR}/textproc/wv2 \ freetype.9:${PORTSDIR}/print/freetype2 \ qimageblitz.4:${PORTSDIR}/x11/qimageblitz \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ @@ -41,6 +40,8 @@ LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ dcmdata.3:${PORTSDIR}/devel/dcmtk RUN_DEPENDS= ${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx30 +CONFLICTS= calligra-[0-9]* + USE_BZIP2= yes USE_CMAKE= yes USE_ICONV= yes @@ -110,10 +111,6 @@ post-patch: ${PATCH_WRKSRC}/cmake/modules/FindImageMagick.cmake ${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \ ${PATCH_WRKSRC}/cmake/modules/FindWPD.cmake - ${REINPLACE_CMD} -e 's|-DHAVE_ICONV_H|-DHAVE_ICONV_H -L${LOCALBASE}/lib -liconv -Wl,-rpath -Wl,${LOCALBASE}/lib -liconv|' \ - ${PATCH_WRKSRC}/filters/kword/CMakeLists.txt - ${REINPLACE_CMD} -e '/add_subdirectory(wv2)/d' \ - ${PATCH_WRKSRC}/filters/kword/msword-odf/CMakeLists.txt post-install: @-update-mime-database ${PREFIX}/share/mime diff --git a/editors/koffice-kde4/files/patch-filters-kword-CMakeLists.txt b/editors/koffice-kde4/files/patch-filters-kword-CMakeLists.txt new file mode 100644 index 000000000000..5e139efd9f19 --- /dev/null +++ b/editors/koffice-kde4/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" ) diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist index d1862ababb1a..0facf58bdc5d 100644 --- a/editors/koffice-kde4/pkg-plist +++ b/editors/koffice-kde4/pkg-plist @@ -566,6 +566,7 @@ lib/kde4/kspreadtextmodule.so lib/kde4/kspreadtrigonometrymodule.so lib/kde4/kwordkword1dot3import.so lib/kde4/kwordpart.so +lib/kde4/mswordodf_import.so lib/kde4/musicshape.so lib/kde4/okularGenerator_odp.so lib/kde4/oowriterexport.so @@ -694,6 +695,9 @@ lib/libkowidgets.so.8.0.0 lib/libkowmf.so lib/libkowmf.so.8 lib/libkowmf.so.8.0.0 +lib/libkowv2.so +lib/libkowv2.so.4 +lib/libkowv2.so.4.0.1 lib/libkplatokernel.so lib/libkplatokernel.so.8 lib/libkplatokernel.so.8.0.0 @@ -2782,6 +2786,7 @@ share/kde4/services/kword_docx_import.desktop share/kde4/services/kword_hancomword_import.desktop share/kde4/services/kword_html_export.desktop share/kde4/services/kword_html_import.desktop +share/kde4/services/kword_msword-odf_import.desktop share/kde4/services/kword_oowriter_export.desktop share/kde4/services/kword_oowriter_import.desktop share/kde4/services/kword_palmdoc_export.desktop |