[gentoo-commits] proj/hardened-dev:musl commit in: app-office/liblangtag/files/, app-office/liblangtag/

[Anthony G. Basile]

commit:     083c471384085bd67a1fe0b7a288a2f887d0798a
Author:     tt_1 <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Sat May  2 23:50:23 2015 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May  2 23:50:23 2015 +0000
URL:        https://gitweb.gentoo.org/proj/hardened-dev.git/commit/?id=083c4713

app-office/liblangtag: bug #547368.

 .../liblangtag/files/liblangtag-0.5.1-gcc45.patch  | 30 ++++++++++++++
 .../liblangtag/files/liblangtag-0.5.1-musl.patch   | 11 ++++++
 app-office/liblangtag/liblangtag-0.5.1-r99.ebuild  | 46 ++++++++++++++++++++++
 app-office/liblangtag/metadata.xml                 |  8 ++++
 4 files changed, 95 insertions(+)

diff --git a/app-office/liblangtag/files/liblangtag-0.5.1-gcc45.patch b/app-office/liblangtag/files/liblangtag-0.5.1-gcc45.patch
new file mode 100644
index 0000000..61bd1d0
--- /dev/null
+++ b/app-office/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@×××××××.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-office/liblangtag/files/liblangtag-0.5.1-musl.patch b/app-office/liblangtag/files/liblangtag-0.5.1-musl.patch
new file mode 100644
index 0000000..5caba76
--- /dev/null
+++ b/app-office/liblangtag/files/liblangtag-0.5.1-musl.patch
@@ -0,0 +1,11 @@
+diff -ur a/liblangtag-0.5.1/liblangtag/lt-string.h b/liblangtag-0.5.1/liblangtag/lt-string.h
+--- a/liblangtag-0.5.1/liblangtag/lt-string.h	2012-12-13 10:59:17.000000000 -0200
++++ b/liblangtag-0.5.1/liblangtag/lt-string.h	2015-04-17 21:34:12.371262196 -0200
+@@ -18,6 +18,7 @@
+ #define __LT_STRING_H__
+ 
+ #include <liblangtag/lt-macros.h>
++#include <sys/types.h>
+ 
+ LT_BEGIN_DECLS
+ 

diff --git a/app-office/liblangtag/liblangtag-0.5.1-r99.ebuild b/app-office/liblangtag/liblangtag-0.5.1-r99.ebuild
new file mode 100644
index 0000000..fb10c99
--- /dev/null
+++ b/app-office/liblangtag/liblangtag-0.5.1-r99.ebuild
@@ -0,0 +1,46 @@
+# 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}/${P}-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
+}

diff --git a/app-office/liblangtag/metadata.xml b/app-office/liblangtag/metadata.xml
new file mode 100644
index 0000000..5aa863f
--- /dev/null
+++ b/app-office/liblangtag/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>openoffice</herd>
+  <use>
+    <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+  </use>
+</pkgmetadata>