diff options
| author | bapt <bapt@FreeBSD.org> | 2012-12-19 07:09:07 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-12-19 07:09:07 +0800 |
| commit | 79e1a83e414e54f2b087c20cd4925a0fab93e0bc (patch) | |
| tree | ad7c39da51b49efe798d391589a3e0dbdee5aa47 /editors/libreoffice | |
| parent | e239e0d9a0a9c0259b3a19b1d2c30586f4c14854 (diff) | |
| download | freebsd-ports-gnome-79e1a83e414e54f2b087c20cd4925a0fab93e0bc.tar.gz freebsd-ports-gnome-79e1a83e414e54f2b087c20cd4925a0fab93e0bc.tar.zst freebsd-ports-gnome-79e1a83e414e54f2b087c20cd4925a0fab93e0bc.zip | |
Chase icu, graphite2 and libexttextcat bump
Diffstat (limited to 'editors/libreoffice')
| -rw-r--r-- | editors/libreoffice/Makefile | 8 | ||||
| -rw-r--r-- | editors/libreoffice/files/patch-ICU50 | 49 |
2 files changed, 53 insertions, 4 deletions
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile index 9c72a92753fd..9aa1e87fadd8 100644 --- a/editors/libreoffice/Makefile +++ b/editors/libreoffice/Makefile @@ -2,7 +2,7 @@ .include "${.CURDIR}/Makefile.common" -PORTREVISION= 0 +PORTREVISION= 1 MASTER_SITE_SUBDIR= src/${PORTVERSION}/ MASTER_SITES+= http://dev-www.libreoffice.org/src/:ext \ @@ -27,7 +27,7 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ xml2.5:${PORTSDIR}/textproc/libxml2 \ xslt.2:${PORTSDIR}/textproc/libxslt \ expat.6:${PORTSDIR}/textproc/expat2 \ - icutu.48:${PORTSDIR}/devel/icu \ + icutu:${PORTSDIR}/devel/icu \ jpeg.11:${PORTSDIR}/graphics/jpeg \ curl.6:${PORTSDIR}/ftp/curl \ hunspell-1.3.0:${PORTSDIR}/textproc/hunspell \ @@ -38,11 +38,11 @@ LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ wpg-0.2.2:${PORTSDIR}/graphics/libwpg \ wps-0.2.2:${PORTSDIR}/textproc/libwps \ rdf.0:${PORTSDIR}/textproc/redland \ - exttextcat-1.0.0:${PORTSDIR}/textproc/libexttextcat \ + exttextcat-2.0.0:${PORTSDIR}/textproc/libexttextcat \ lpsolve55:${PORTSDIR}/math/lp_solve \ cups.2:${PORTSDIR}/print/cups-client \ visio-0.0.0:${PORTSDIR}/textproc/libvisio \ - graphite2.2:${PORTSDIR}/graphics/graphite2 \ + graphite2:${PORTSDIR}/graphics/graphite2 \ nss3.1:${PORTSDIR}/security/nss \ SampleICC.2:${PORTSDIR}/graphics/sampleicc \ png15:${PORTSDIR}/graphics/png \ diff --git a/editors/libreoffice/files/patch-ICU50 b/editors/libreoffice/files/patch-ICU50 new file mode 100644 index 000000000000..58c91267e825 --- /dev/null +++ b/editors/libreoffice/files/patch-ICU50 @@ -0,0 +1,49 @@ +From 0c08a84c04b166ab6479716e2c33cd444d7e3dbe Mon Sep 17 00:00:00 2001 +From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> +Date: Mon, 02 Apr 2012 16:46:32 +0000 +Subject: Make ICU build with icu-49 by removing no-longer used variables. + +Signed-off-by: Tomas Chvatal <tchvatal@suse.cz> +--- +diff --git a/i18npool/source/breakiterator/data/char.txt b/i18npool/source/breakiterator/data/char.txt +index 8e49a56..acb932e 100644 +--- i18npool/source/breakiterator/data/char.txt ++++ i18npool/source/breakiterator/data/char.txt +@@ -16,7 +16,6 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + # True Indic wants to move by syllables. Break up SpacingMark. This based on Unicode 6.0 data +diff --git a/i18npool/source/breakiterator/data/char_in.txt b/i18npool/source/breakiterator/data/char_in.txt +index 5e1ed67..5ad12a7 100644 +--- i18npool/source/breakiterator/data/char_in.txt ++++ i18npool/source/breakiterator/data/char_in.txt +@@ -15,7 +15,6 @@ + $CR = [\p{Grapheme_Cluster_Break = CR}]; + $LF = [\p{Grapheme_Cluster_Break = LF}]; + $Control = [\p{Grapheme_Cluster_Break = Control}]; +-$Prepend = [\p{Grapheme_Cluster_Break = Prepend}]; + $Extend = [\p{Grapheme_Cluster_Break = Extend}]; + $SpacingMark = [\p{Grapheme_Cluster_Break = SpacingMark}]; + $BengaliLetter = [\u0985-\u09B9 \u09CE \u09DC-\u09E1 \u09F0-\u09F1]; +@@ -72,7 +71,6 @@ $L ($L | $V | $LV | $LVT); + [^$Control $CR $LF] $Extend; + + [^$Control $CR $LF] $SpacingMark; +-$Prepend [^$Control $CR $LF]; + + + ## ------------------------------------------------- +@@ -94,7 +92,6 @@ $T ($LVT | $T); + + $Extend [^$Control $CR $LF]; + $SpacingMark [^$Control $CR $LF]; +-[^$Control $CR $LF] $Prepend; + + + ## ------------------------------------------------- +-- +cgit v0.9.0.2-2-gbebe |