diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-30 10:49:39 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2012-05-30 10:49:39 +0000 |
| commit | c1295ac7d154ff1bec603bc4f6f5bb90bcfc2702 (patch) | |
| tree | 456aab521a1c9b315ff676c6f89a5041c05267a0 /app-office/libreoffice | |
| parent | Fix 2to3 patch (diff) | |
| download | gentoo-2-c1295ac7d154ff1bec603bc4f6f5bb90bcfc2702.tar.gz gentoo-2-c1295ac7d154ff1bec603bc4f6f5bb90bcfc2702.tar.bz2 gentoo-2-c1295ac7d154ff1bec603bc4f6f5bb90bcfc2702.zip | |
Fix build with latest libexttextcat. Resolves bug#418231.
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch | 23 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild | 4 |
3 files changed, 30 insertions, 3 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index bf244088066e..8521063af9db 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/libreoffice # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.321 2012/05/30 09:00:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.322 2012/05/30 10:49:39 scarabeus Exp $ + + 30 May 2012; Tomáš Chvátal <scarabeus@gentoo.org> + +files/libreoffice-3.5.4-libexttextcat.patch, libreoffice-3.5.4.2-r1.ebuild: + Fix build with latest libexttextcat. Resolves bug#418231. 30 May 2012; Agostino Sarubbo <ago@gentoo.org> libreoffice-3.5.4.2-r1.ebuild: stable for amd64, wrt to bug #416457 diff --git a/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch b/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch new file mode 100644 index 000000000000..905c6818afe1 --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-3.5.4-libexttextcat.patch @@ -0,0 +1,23 @@ +From 25a605f36544582bd454d4bc0e71e684749a0b80 Mon Sep 17 00:00:00 2001 +From: Caolán McNamara <caolanm@redhat.com> +Date: Fri, 25 May 2012 14:51:04 +0000 +Subject: this is supposed to just be the number of bytes + +Change-Id: Iecd376aba13f94c5c62fab2f3278c5f3efda20b4 +--- +diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx b/lingucomponent/source/languageguessing/simpleguesser.cxx +index 383ab3e..3346ef2 100644 +--- a/lingucomponent/source/languageguessing/simpleguesser.cxx ++++ b/lingucomponent/source/languageguessing/simpleguesser.cxx +@@ -117,8 +117,7 @@ vector<Guess> SimpleGuesser::GuessLanguage(const char* text) + 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; +-- +cgit v0.9.0.2-2-gbebe diff --git a/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild index d8b732c85ec6..a73ea9d3e50f 100644 --- a/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild +++ b/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v 1.3 2012/05/30 09:00:32 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.4.2-r1.ebuild,v 1.4 2012/05/30 10:49:39 scarabeus Exp $ EAPI=4 @@ -192,8 +192,8 @@ DEPEND="${COMMON_DEPEND} " PATCHES=( - # this can't be upstreamed :( "${FILESDIR}/${PN}-system-pyuno.patch" + "${FILESDIR}/${PN}-3.5.4-libexttextcat.patch" "${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch" "${FILESDIR}/${PN}-3.5-doublebuild.patch" "${FILESDIR}/${PN}-3.5-hebrew-icu49.patch" |