Attachment #401750 for bug #546890

Line 0 Link Here

(-)a/app-text/liblangtag/Manifest (+5 lines)
	1	AUX liblangtag-0.5.1-gcc45.patch 737 SHA256 a4f5606eb811ef617ce042a505658d460d748809429bf43f6d8e85975b639ede SHA512 1f5c86c02c1223ac1dc0adee6e33564a75cc7ec261288bc6ab39c2ba5ce24c9e4c86b1b3b15cc04d204b31f195b126062b386a449aeba843256d3f54a72ad53f WHIRLPOOL 707724f8ca4a054b4784a35d15c5d5d5bcecc88e7cd1856a6110b9135cb9993f9622f6e4d9e15e6c99cedf1ee3266ff89c3dd80bb90c606d338bc7320584ee73
	2	AUX liblangtag-musl.patch 619 SHA256 e793b20f4c344043a7396f2c382d29ecb358d004d7b53ca5c441b056dc902c9b SHA512 19f97b18864b9f3919f2f7f0c85a6d7e70ea0a72ecb336e3ea1b20597c63d2e277b4e5de8043025057250398d8860109f1a8f7ab02e30536ae739b268b61e3a9 WHIRLPOOL 46e9599e3944a5c292435d53ede97e835f55f00b9632b5e6acc5ddf3d8478555fcab5bb0bdec4d02bbd0c47dbb6c8a27aabf5f77c2ea2bbd104793e89867aa54
	3	DIST liblangtag-0.5.1.tar.bz2 651785 SHA256 c3dd456762cd0b5fd1687f066c4bdf253d70b14729851b9cd05936a1cb46923b SHA512 006ed5b8621bfc4330589eeba8581dd2214a29c985f782b0c123012105ac6ea447f1d7593daec86b0126daf7929e6845208c633c63df67beca2d6201a6961bbf WHIRLPOOL 80f48834b00ba7732f07a7e88ae092a3f0f0168c3de176ad0544e130b8e0c3991a169ed4d502cdc9aff0af1fe3df43ac961d4c8517b9240b9934ea901c0626e5
	4	EBUILD liblangtag-0.5.1-r99.ebuild 1138 SHA256 3205b033b02a8a0fee9ffa47ad8860cad5ccb1ba2cc1f3a8179b30a3fc908bb4 SHA512 2be6ba16fc4af65534fb7f053228e927bb95af708fc86d332f4e41ed10b4292d64d9993bded346a5004d12057de84cb83cac82027fd8a6a43872b11aad993416 WHIRLPOOL feeb8683f648fbf07e34ea849a701e03f29047e9a4191a59084450f37cbaa47e96dc33ddc72acd43c55cad2c1f834cca255122f8866f6771073927698e9cca8d
	5	MISC metadata.xml 284 SHA256 e937a46d00fe6cbe1cf553eeaf44f3308e413fca5fe652a4e74c35fe336d0610 SHA512 6b883e0602ff9b5dd1a0055adfd0b9a9a5d74f32b0961e733d32cae582ff45e6e0ee00121cc455ce0b4402c8c44e152bb1708a183b69cd6c893d078bc50b8420 WHIRLPOOL 1402cf934cc79c53a85edca224eb2268f2b2e0fca5dbb273822510eaa22b6a26da722b16cc6a575e9184fd49ae776deef32cbddaebbb0d6bc2a331000bb56d7b




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


From 6ebf5709810983dca570d9f8873293b01b4a49bc Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 20 Apr 2015 10:28:29 +0900
Subject: [PATCH] add missing sys/types.h in lt-string.h required to build musl
 libc to satisfy ssize_t. (fixes issue#12)

---
 liblangtag/lt-string.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/liblangtag/lt-string.h b/liblangtag/lt-string.h
index 15724fc..c784430 100644
--- a/liblangtag/lt-string.h
+++ b/liblangtag/lt-string.h
@@ -18,6 +18,7 @@
 #define __LT_STRING_H__

 #include <liblangtag/lt-macros.h>
+#include <sys/types.h>

 LT_BEGIN_DECLS

-- 
2.0.5




# 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.5 2013/07/30 07:09:38 scarabeus Exp $

EAPI=5

inherit autotools-utils

DESCRIPTION="An interface library to access tags for identifying languages"
HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"

LICENSE="|| ( LGPL-3 MPL-1.1 )"
SLOT="0"
KEYWORDS="amd64 ~arm ppc x86"
IUSE="introspection static-libs test"

RDEPEND="
	dev-libs/glib
	dev-libs/libxml2
	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
DEPEND="${RDEPEND}
	dev-libs/gobject-introspection-common
	sys-devel/gettext
	test? ( dev-libs/check )"

# Upstream expect liblangtag to be installed when one runs tests...
RESTRICT="test"

PATCHES=(
	"${FILESDIR}/${P}-gcc45.patch"
	"${FILESDIR}/${PN}-musl.patch"
)

src_configure() {
	local myeconfargs=(
		$(use_enable introspection)
		$(use_enable test)
	)
	autotools-utils_src_configure
}

src_install() {
	autotools-utils_src_install
	prune_libtool_files --all
}

Line 0 Link Here

(-)a/app-text/liblangtag/metadata.xml (-1 / +8 lines)
0	-	1	<?xml version="1.0" encoding="UTF-8"?>
		2	<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
		3	<pkgmetadata>
		4	<herd>openoffice</herd>
		5	<use>
		6	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
		7	</use>
		8	</pkgmetadata>

Return to bug 546890

Line 0 Link Here

(-)a/app-text/liblangtag/files/liblangtag-0.5.1-gcc45.patch (+30 lines)
	1	From 4a5ec00d229d9ccf293dc21ce64eb42de7e8118c Mon Sep 17 00:00:00 2001
	2	From: Jung-uk Kim <jkim@FreeBSD.org>
	3	Date: Thu, 9 May 2013 15:59:35 -0400
	4	Subject: [PATCH] Fix duplicate typedef introduced in 57c47aa.
	5
	6	---
	7	liblangtag/lt-trie.c \| 4 ++--
	8	1 file changed, 2 insertions(+), 2 deletions(-)
	9
	10	diff --git a/liblangtag/lt-trie.c b/liblangtag/lt-trie.c
	11	index d2162c9..301a6da 100644
	12	--- a/liblangtag/lt-trie.c
	13	+++ b/liblangtag/lt-trie.c
	14	@@ -33,11 +33,11 @@ struct _lt_trie_t {
	15	lt_iter_tmpl_t parent;
	16	lt_trie_node_t *root;
	17	};
	18	-typedef struct _lt_trie_iter_t {
	19	+struct _lt_trie_iter_t {
	20	lt_iter_t parent;
	21	lt_list_t *stack;
	22	lt_string_t *pos_str;
	23	-} lt_trie_iter_t;
	24	+};
	25
	26	/< private >/
	27	static lt_trie_node_t *
	28	--
	29	1.8.2.3
	30

Line 0 Link Here

(-)a/app-text/liblangtag/files/liblangtag-musl.patch (+25 lines)
	1	From 6ebf5709810983dca570d9f8873293b01b4a49bc Mon Sep 17 00:00:00 2001
	2	From: Akira TAGOH <akira@tagoh.org>
	3	Date: Mon, 20 Apr 2015 10:28:29 +0900
	4	Subject: [PATCH] add missing sys/types.h in lt-string.h required to build musl
	5	libc to satisfy ssize_t. (fixes issue#12)
	6
	7	---
	8	liblangtag/lt-string.h \| 1 +
	9	1 file changed, 1 insertion(+)
	10
	11	diff --git a/liblangtag/lt-string.h b/liblangtag/lt-string.h
	12	index 15724fc..c784430 100644
	13	--- a/liblangtag/lt-string.h
	14	+++ b/liblangtag/lt-string.h
	15	@@ -18,6 +18,7 @@
	16	#define __LT_STRING_H__
	17
	18	#include <liblangtag/lt-macros.h>
	19	+#include <sys/types.h>
	20
	21	LT_BEGIN_DECLS
	22
	23	--
	24	2.0.5
	25

Line 0 Link Here

(-)a/app-text/liblangtag/liblangtag-0.5.1-r99.ebuild (+46 lines)
	1	# Copyright 1999-2013 Gentoo Foundation
	2	# Distributed under the terms of the GNU General Public License v2
	3	# $Header: /var/cvsroot/gentoo-x86/app-text/liblangtag/liblangtag-0.5.1.ebuild,v 1.5 2013/07/30 07:09:38 scarabeus Exp $
	4
	5	EAPI=5
	6
	7	inherit autotools-utils
	8
	9	DESCRIPTION="An interface library to access tags for identifying languages"
	10	HOMEPAGE="http://tagoh.bitbucket.org/liblangtag/"
	11	SRC_URI="https://bitbucket.org/tagoh/${PN}/downloads/${P}.tar.bz2"
	12
	13	LICENSE="\|\| ( LGPL-3 MPL-1.1 )"
	14	SLOT="0"
	15	KEYWORDS="amd64 ~arm ppc x86"
	16	IUSE="introspection static-libs test"
	17
	18	RDEPEND="
	19	dev-libs/glib
	20	dev-libs/libxml2
	21	introspection? ( >=dev-libs/gobject-introspection-0.10.8 )"
	22	DEPEND="${RDEPEND}
	23	dev-libs/gobject-introspection-common
	24	sys-devel/gettext
	25	test? ( dev-libs/check )"
	26
	27	# Upstream expect liblangtag to be installed when one runs tests...
	28	RESTRICT="test"
	29
	30	PATCHES=(
	31	"${FILESDIR}/${P}-gcc45.patch"
	32	"${FILESDIR}/${PN}-musl.patch"
	33	)
	34
	35	src_configure() {
	36	local myeconfargs=(
	37	$(use_enable introspection)
	38	$(use_enable test)
	39	)
	40	autotools-utils_src_configure
	41	}
	42
	43	src_install() {
	44	autotools-utils_src_install
	45	prune_libtool_files --all
	46	}