diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2009-03-03 03:56:55 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2009-03-03 03:56:55 +0000 |
| commit | 09656810754d318310b85dde682e4898762bcb23 (patch) | |
| tree | 8b93e095ecac01ef937cac1c7595345a1be2ff86 /games-puzzle | |
| parent | amd64 stable, bug 259136 (diff) | |
| download | gentoo-2-09656810754d318310b85dde682e4898762bcb23.tar.gz gentoo-2-09656810754d318310b85dde682e4898762bcb23.tar.bz2 gentoo-2-09656810754d318310b85dde682e4898762bcb23.zip | |
patch from Andrea Grazioli to work with newer and older versions of fribidi (bug #258969)
(Portage version: 2.1.6.7/cvs/Linux i686)
Diffstat (limited to 'games-puzzle')
| -rw-r--r-- | games-puzzle/fish-fillets/ChangeLog | 7 | ||||
| -rw-r--r-- | games-puzzle/fish-fillets/files/fish-fillets-0.8.1-fribidi.patch | 21 | ||||
| -rw-r--r-- | games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild | 6 |
3 files changed, 31 insertions, 3 deletions
diff --git a/games-puzzle/fish-fillets/ChangeLog b/games-puzzle/fish-fillets/ChangeLog index 238f357f6a6d..198380143664 100644 --- a/games-puzzle/fish-fillets/ChangeLog +++ b/games-puzzle/fish-fillets/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for games-puzzle/fish-fillets # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.35 2009/02/14 17:49:06 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/ChangeLog,v 1.36 2009/03/03 03:56:54 mr_bones_ Exp $ + + 03 Mar 2009; Michael Sterrett <mr_bones_@gentoo.org> + +files/fish-fillets-0.8.1-fribidi.patch, fish-fillets-0.8.1.ebuild: + patch from Andrea Grazioli to work with newer and older versions of fribidi + (bug #258969) 14 Feb 2009; Michael Sterrett <mr_bones_@gentoo.org> fish-fillets-0.8.1.ebuild: diff --git a/games-puzzle/fish-fillets/files/fish-fillets-0.8.1-fribidi.patch b/games-puzzle/fish-fillets/files/fish-fillets-0.8.1-fribidi.patch new file mode 100644 index 000000000000..2e490ebe0014 --- /dev/null +++ b/games-puzzle/fish-fillets/files/fish-fillets-0.8.1-fribidi.patch @@ -0,0 +1,21 @@ +diff -ru fillets-ng-0.8.1.orig/src/effect/Font.cpp fillets-ng-0.8.1/src/effect/Font.cpp +--- fillets-ng-0.8.1.orig/src/effect/Font.cpp 2006-01-05 23:31:18.000000000 +0100 ++++ fillets-ng-0.8.1/src/effect/Font.cpp 2009-03-02 21:20:23.000000000 +0100 +@@ -26,7 +26,7 @@ + FriBidiChar *logicalString = new FriBidiChar[text.length() + 1]; + FriBidiChar *visualString = new FriBidiChar[text.length() + 1]; + +- int ucsLength = fribidi_utf8_to_unicode(const_cast<char*>(text.c_str()), ++ int ucsLength = fribidi_charset_to_unicode(FRIBIDI_CHAR_SET_UTF8, const_cast<char*>(text.c_str()), + text.length(), logicalString); + fribidi_boolean ok = fribidi_log2vis(logicalString, ucsLength, &base, + visualString, NULL, NULL, NULL); +@@ -37,7 +37,7 @@ + } + + char *buffer = new char[text.length() + 1]; +- int length = fribidi_unicode_to_utf8(visualString, ucsLength, buffer); ++ int length = fribidi_unicode_to_charset(FRIBIDI_CHAR_SET_UTF8, visualString, ucsLength, buffer); + std::string result = std::string(buffer, length); + delete[] buffer; + delete[] visualString; diff --git a/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild b/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild index 97357020a0f0..ed0ed207e3b5 100644 --- a/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild +++ b/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild,v 1.2 2009/02/14 17:49:06 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-puzzle/fish-fillets/fish-fillets-0.8.1.ebuild,v 1.3 2009/03/03 03:56:55 mr_bones_ Exp $ EAPI=2 inherit autotools eutils games @@ -29,7 +29,9 @@ DEPEND="${RDEPEND} S=${WORKDIR}/fillets-ng-${PV} src_prepare() { - epatch "${FILESDIR}/${P}-gcc43.patch" + epatch \ + "${FILESDIR}/${P}-gcc43.patch" \ + "${FILESDIR}/${P}-fribidi.patch" #.mod was renamed to .fmod in lua 5.1.3 - bug #223271 sed -i \ |