Date: Tue, 7 Aug 2012 05:41:43 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302223 - in head/editors/openoffice-3: . files Message-ID: <201208070541.q775fhnv026056@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Tue Aug 7 05:41:43 2012 New Revision: 302223 URL: http://svn.freebsd.org/changeset/ports/302223 Log: Added a keyword so that openoffice and libreoffice can co-exist. Submitted by: Jan Henrik Sylvester <me@janh.de> Added: head/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent (contents, props changed) Modified: head/editors/openoffice-3/Makefile Modified: head/editors/openoffice-3/Makefile ============================================================================== --- head/editors/openoffice-3/Makefile Tue Aug 7 04:31:22 2012 (r302222) +++ head/editors/openoffice-3/Makefile Tue Aug 7 05:41:43 2012 (r302223) @@ -119,9 +119,19 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphic hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \ poppler-glib.8:${PORTSDIR}/graphics/poppler-glib \ rdf.0:${PORTSDIR}/textproc/redland \ - textcat.0:${PORTSDIR}/textproc/libtextcat \ freetype.9:${PORTSDIR}/print/freetype2 +.if exists(${LOCALBASE}/include/libexttextcat/textcat.h) +.if exists(${LOCALBASE}/include/textcat.h) +LIB_DEPENDS+= exttextcat-1.0.0:${PORTSDIR}/textproc/libexttextcat +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libexttextcat-lingucomponent +.else +IGNORE= textproc/libexttextcat needs COMPAT_TEXTCAT enabled +.endif +.else +LIB_DEPENDS+= textcat.0:${PORTSDIR}/textproc/libtextcat +.endif + BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \ gpatch:${PORTSDIR}/devel/patch \ Added: head/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/openoffice-3/files/extra-patch-libexttextcat-lingucomponent Tue Aug 7 05:41:43 2012 (r302223) @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- lingucomponent/source/languageguessing/simpleguesser.cxx.orig 2012-01-10 19:42:30.000000000 +0900 ++++ lingucomponent/source/languageguessing/simpleguesser.cxx 2012-08-07 11:14:45.000000000 +0900 +@@ -114,7 +114,7 @@ + if(!h){return guesses;} + + //calculate le number of unicode charcters (symbols) +- int len = utfstrlen(text); ++ int len = strlen(text); + + if( len > MAX_STRING_LENGTH_TO_ANALYSE ){len = MAX_STRING_LENGTH_TO_ANALYSE ;} +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208070541.q775fhnv026056>