commit: dd4f80ff24cc83d1aeabb699c973bf1879d29b81 Author: Karl Linden <karl.j.linden <AT> gmail <DOT> com> AuthorDate: Sun Dec 31 15:30:18 2017 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Sun Jan 7 05:40:19 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4f80ff
app-text/t1utils: apply memmem patch from upstream Closes: https://bugs.gentoo.org/630710 Closes: https://bugs.gentoo.org/642586 Package-Manager: Portage-2.3.19, Repoman-2.3.6 app-text/t1utils/files/t1utils-1.41-memmem.patch | 27 +++++++++++++++++++++++ app-text/t1utils/t1utils-1.41-r2.ebuild | 28 ++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/app-text/t1utils/files/t1utils-1.41-memmem.patch b/app-text/t1utils/files/t1utils-1.41-memmem.patch new file mode 100644 index 00000000000..db6f19549e5 --- /dev/null +++ b/app-text/t1utils/files/t1utils-1.41-memmem.patch @@ -0,0 +1,27 @@ +commit 3f1ddda424353f0f926dd28efa47b0ac61556ce8 +Author: Eddie Kohler <ekoh...@gmail.com> +Date: Wed Aug 16 12:37:34 2017 -0400 + + Check for memmem declaration; sometimes it is not declared by default. + +diff --git a/configure.ac b/configure.ac +index 5b4e3ff..b4dc4fb 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -19,6 +19,7 @@ dnl strerror()? + dnl + + AC_REPLACE_FUNCS([strerror memmem]) ++AC_CHECK_DECLS([memmem]) + + + dnl +@@ -88,7 +89,7 @@ char* strerror(int errno); + #endif + + /* Prototype memmem if we don't have it. */ +-#if !HAVE_MEMMEM ++#if !HAVE_MEMMEM || !HAVE_DECL_MEMMEM + void* memmem(const void* haystack, size_t haystack_len, + const void* needle, size_t needle_len); + #endif diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild new file mode 100644 index 00000000000..8148e274d98 --- /dev/null +++ b/app-text/t1utils/t1utils-1.41-r2.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Type 1 Font utilities" +SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"; +HOMEPAGE="http://www.lcdf.org/type/#t1utils"; +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" +SLOT="0" +LICENSE="BSD" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} + !<media-libs/freetype-1.4_pre20080316" + +PATCHES=( + "${FILESDIR}"/${P}-memmem.patch +) +DOCS=( NEWS.md README.md ) + +src_prepare() { + default + eautoreconf +}
