diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-30 07:09:38 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2013-07-30 07:09:38 +0000 |
| commit | 4719410111596b039dce0957d5c7bae296e9a7d5 (patch) | |
| tree | b0fac909f2954ce4306248741fd1ac695a107d12 /app-text | |
| parent | alternate fix to Bug #472976 by patch by Andreas Kinzler wrt to Bug #472976 b... (diff) | |
| download | gentoo-2-4719410111596b039dce0957d5c7bae296e9a7d5.tar.gz gentoo-2-4719410111596b039dce0957d5c7bae296e9a7d5.tar.bz2 gentoo-2-4719410111596b039dce0957d5c7bae296e9a7d5.zip | |
Fix liblangtag build on older gccs wrt bug#475494. Thanks to Fabio Rossi for finding the patch.
(Portage version: 2.2.0_alpha190/cvs/Linux x86_64, signed Manifest commit with key 8EEE3BE8)
Diffstat (limited to 'app-text')
| -rw-r--r-- | app-text/liblangtag/ChangeLog | 7 | ||||
| -rw-r--r-- | app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch | 30 | ||||
| -rw-r--r-- | app-text/liblangtag/liblangtag-0.5.1.ebuild | 6 |
3 files changed, 41 insertions, 2 deletions
diff --git a/app-text/liblangtag/ChangeLog b/app-text/liblangtag/ChangeLog index 7ea80d716c7d..8e363a6eb356 100644 --- a/app-text/liblangtag/ChangeLog +++ b/app-text/liblangtag/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-text/liblangtag # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/ChangeLog,v 1.19 2013/06/25 12:49:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/ChangeLog,v 1.20 2013/07/30 07:09:38 scarabeus Exp $ + + 30 Jul 2013; Tomáš Chvátal <scarabeus@gentoo.org> + +files/liblangtag-0.5.1-gcc45.patch, liblangtag-0.5.1.ebuild: + Fix liblangtag build on older gccs wrt bug#475494. Thanks to Fabio Rossi for + finding the patch. 25 Jun 2013; Agostino Sarubbo <ago@gentoo.org> liblangtag-0.5.1.ebuild: Stable for amd64, wrt bug #474156 diff --git a/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch new file mode 100644 index 000000000000..61bd1d041f7c --- /dev/null +++ b/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch @@ -0,0 +1,30 @@ +From 4a5ec00d229d9ccf293dc21ce64eb42de7e8118c Mon Sep 17 00:00:00 2001 +From: Jung-uk Kim <jkim@FreeBSD.org> +Date: Thu, 9 May 2013 15:59:35 -0400 +Subject: [PATCH] Fix duplicate typedef introduced in 57c47aa. + +--- + liblangtag/lt-trie.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c +index d2162c9..301a6da 100644 +--- a/liblangtag/lt-trie.c ++++ b/liblangtag/lt-trie.c +@@ -33,11 +33,11 @@ struct _lt_trie_t { + lt_iter_tmpl_t parent; + lt_trie_node_t *root; + }; +-typedef struct _lt_trie_iter_t { ++struct _lt_trie_iter_t { + lt_iter_t parent; + lt_list_t *stack; + lt_string_t *pos_str; +-} lt_trie_iter_t; ++}; + + /*< private >*/ + static lt_trie_node_t * +-- +1.8.2.3 + diff --git a/app-text/liblangtag/liblangtag-0.5.1.ebuild b/app-text/liblangtag/liblangtag-0.5.1.ebuild index 5081de49a262..e4e6d60c4318 100644 --- a/app-text/liblangtag/liblangtag-0.5.1.ebuild +++ b/app-text/liblangtag/liblangtag-0.5.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.4 2013/06/25 12:49:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.5 2013/07/30 07:09:38 scarabeus Exp $ EAPI=5 @@ -27,6 +27,10 @@ DEPEND="${RDEPEND} # Upstream expect liblangtag to be installed when one runs tests... RESTRICT="test" +PATCHES=( + "${FILESDIR}/${P}-gcc45.patch" +) + src_configure() { local myeconfargs=( $(use_enable introspection) |