From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0E36713832E for ; Mon, 25 Jul 2016 15:23:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EC91FE084D; Mon, 25 Jul 2016 15:23:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86056E084D for ; Mon, 25 Jul 2016 15:23:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D59CB340A6A for ; Mon, 25 Jul 2016 15:23:53 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88A4C7CF for ; Mon, 25 Jul 2016 15:23:45 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <1469460205.a04f61b7bbfe1e82cf00e9354fc5d6f3b389f719.xmw@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/paps/, app-text/paps/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/paps/files/paps-0.6.8-fix-empty-file.patch app-text/paps/paps-0.6.8-r2.ebuild X-VCS-Directories: app-text/paps/files/ app-text/paps/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: a04f61b7bbfe1e82cf00e9354fc5d6f3b389f719 X-VCS-Branch: master Date: Mon, 25 Jul 2016 15:23:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 88854829-4e66-42d8-9a8c-e90918b5ba0f X-Archives-Hash: 51f30c4657b0fbbf39cae76e9cf12744 commit: a04f61b7bbfe1e82cf00e9354fc5d6f3b389f719 Author: Michael Weber gentoo org> AuthorDate: Mon Jul 25 15:23:10 2016 +0000 Commit: Michael Weber gentoo 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 +}