Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/t1utils/files/, app-text/t1utils/
Date: Sun, 07 Jan 2018 05:41:08
Message-Id: 1515303619.dd4f80ff24cc83d1aeabb699c973bf1879d29b81.aballier@gentoo
1 commit: dd4f80ff24cc83d1aeabb699c973bf1879d29b81
2 Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com>
3 AuthorDate: Sun Dec 31 15:30:18 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Sun Jan 7 05:40:19 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4f80ff
7
8 app-text/t1utils: apply memmem patch from upstream
9
10 Closes: https://bugs.gentoo.org/630710
11 Closes: https://bugs.gentoo.org/642586
12 Package-Manager: Portage-2.3.19, Repoman-2.3.6
13
14 app-text/t1utils/files/t1utils-1.41-memmem.patch | 27 +++++++++++++++++++++++
15 app-text/t1utils/t1utils-1.41-r2.ebuild | 28 ++++++++++++++++++++++++
16 2 files changed, 55 insertions(+)
17
18 diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch
19 new file mode 100644
20 index 00000000000..db6f19549e5
21 --- /dev/null
22 +++ b/app-text/t1utils/files/t1utils-1.41-memmem.patch
23 @@ -0,0 +1,27 @@
24 +commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8
25 +Author: Eddie Kohler <ekohler@×××××.com>
26 +Date: Wed Aug 16 12:37:34 2017 -0400
27 +
28 + Check for memmem declaration; sometimes it is not declared by default.
29 +
30 +diff --git a/configure.ac b/configure.ac
31 +index 5b4e3ff..b4dc4fb 100644
32 +--- a/configure.ac
33 ++++ b/configure.ac
34 +@@ -19,6 +19,7 @@ dnl strerror()?
35 + dnl
36 +
37 + AC_REPLACE_FUNCS([strerror memmem])
38 ++AC_CHECK_DECLS([memmem])
39 +
40 +
41 + dnl
42 +@@ -88,7 +89,7 @@ char* strerror(int errno);
43 + #endif
44 +
45 + /* Prototype memmem if we don't have it. */
46 +-#if !HAVE_MEMMEM
47 ++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM
48 + void* memmem(const void* haystack, size_t haystack_len,
49 + const void* needle, size_t needle_len);
50 + #endif
51
52 diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
53 new file mode 100644
54 index 00000000000..8148e274d98
55 --- /dev/null
56 +++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
57 @@ -0,0 +1,28 @@
58 +# Copyright 1999-2017 Gentoo Foundation
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=6
62 +
63 +inherit autotools
64 +
65 +DESCRIPTION="Type 1 Font utilities"
66 +SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
67 +HOMEPAGE="http://www.lcdf.org/type/#t1utils"
68 +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
69 +SLOT="0"
70 +LICENSE="BSD"
71 +IUSE=""
72 +
73 +DEPEND=""
74 +RDEPEND="${DEPEND}
75 + !<media-libs/freetype-1.4_pre20080316"
76 +
77 +PATCHES=(
78 + "${FILESDIR}"/${P}-memmem.patch
79 +)
80 +DOCS=( NEWS.md README.md )
81 +
82 +src_prepare() {
83 + default
84 + eautoreconf
85 +}