commit: a04f61b7bbfe1e82cf00e9354fc5d6f3b389f719 Author: Michael Weber <xmw <AT> gentoo <DOT> org> AuthorDate: Mon Jul 25 15:23:10 2016 +0000 Commit: Michael Weber <xmw <AT> gentoo <DOT> org> CommitDate: Mon Jul 25 15:23:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a04f61b7
app-text/paps: Fix bad handling of empty files (bug 566050). Package-Manager: portage-2.2.28 .../paps/files/paps-0.6.8-fix-empty-file.patch | 23 +++++++++++++ app-text/paps/paps-0.6.8-r2.ebuild | 38 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch new file mode 100644 index 0000000..ae334d1 --- /dev/null +++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/show_bug.cgi?id=566050#c2 + +--- paps-0.6.8/src/paps.c ++++ paps-0.6.8/src/paps.c +@@ -569,11 +569,14 @@ + + fclose (file); + +- /* Add a trailing new line if it is missing */ +- if (inbuf->str[inbuf->len-1] != '\n') +- g_string_append(inbuf, "\n"); ++ if (inbuf->len) { ++ /* Add a trailing new line if it is missing */ ++ if (inbuf->str[inbuf->len-1] != '\n') ++ g_string_append(inbuf, "\n"); + +- text = inbuf->str; ++ text = inbuf->str; ++ } else ++ text = g_strdup("\n"); + g_string_free (inbuf, FALSE); + + return text; diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild new file mode 100644 index 0000000..12152b0 --- /dev/null +++ b/app-text/paps/paps-0.6.8-r2.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Unicode-aware text to PostScript converter" +HOMEPAGE="http://paps.sourceforge.net/"; +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="x11-libs/pango" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-fix-as-needed-build.patch \ + "${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \ + "${FILESDIR}"/${P}-fix-freetype-include.patch \ + "${FILESDIR}"/${P}-fix-empty-file.patch + + mv configure.in configure.ac || die + + eautoreconf +} + +src_install() { + dobin src/paps + doman src/paps.1 + dodoc AUTHORS ChangeLog NEWS README TODO +}
