Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/gtk-doc/
Date: Sun, 26 Aug 2018 06:56:18
Message-Id: 1535266559.b1f0c43e476dfad520cc03a117b55f77bb53fd45.zmedico@gentoo
1 commit: b1f0c43e476dfad520cc03a117b55f77bb53fd45
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 26 06:35:20 2018 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 26 06:55:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f0c43e
7
8 dev-util/gtk-doc: mkpdf: fix exitcode (bug 646850)
9
10 Fix gtk-doc exitcode. The problem can be demonstrated by building
11 gtk-doc with dblatex installed, and then building evince with
12 EXTRA_ECONF="--enable-gtk-doc --enable-gtk-doc-pdf".
13
14 Bug: https://bugs.gentoo.org/646850
15 See: https://github.com/GNOME/gtk-doc/commit/1baf9a63bdf3283832be06bce151835922909436
16 Package-Manager: Portage-2.3.48, Repoman-2.3.10
17
18 dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild | 4 ++++
19 1 file changed, 4 insertions(+)
20
21 diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
22 index 155f1f6a02f..f696a066e7f 100644
23 --- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
24 +++ b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
25 @@ -50,6 +50,10 @@ src_prepare() {
26 # Remove global Emacs keybindings, bug #184588
27 eapply "${FILESDIR}"/${PN}-1.8-emacs-keybindings.patch
28
29 + # Apply upstream commit 1baf9a6, bug #646850
30 + sed -e '1,/exit 1/s/exit 1/exit $1/' \
31 + -i gtkdoc-mkpdf.in || die
32 +
33 gnome2_src_prepare
34 }