Gentoo Archives: gentoo-commits

From: "Fabian Groffen (grobian)" <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/poppler: poppler-0.33.0-r1.ebuild ChangeLog
Date: Mon, 01 Jun 2015 19:54:37
Message-Id: 20150601195432.F3714A14@oystercatcher.gentoo.org
1 grobian 15/06/01 19:54:32
2
3 Modified: poppler-0.33.0-r1.ebuild ChangeLog
4 Log:
5 Fix compilation with Clang
6
7 (Portage version: 2.2.14-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)
8
9 Revision Changes Path
10 1.4 app-text/poppler/poppler-0.33.0-r1.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.4&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?rev=1.4&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild?r1=1.3&r2=1.4
15
16 Index: poppler-0.33.0-r1.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v
19 retrieving revision 1.3
20 retrieving revision 1.4
21 diff -u -r1.3 -r1.4
22 --- poppler-0.33.0-r1.ebuild 29 May 2015 13:00:45 -0000 1.3
23 +++ poppler-0.33.0-r1.ebuild 1 Jun 2015 19:54:32 -0000 1.4
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2015 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.3 2015/05/29 13:00:45 dilfridge Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.33.0-r1.ebuild,v 1.4 2015/06/01 19:54:32 grobian Exp $
29
30 EAPI=5
31
32 @@ -66,6 +66,16 @@
33 "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
34 )
35
36 +src_prepare() {
37 + cmake-utils_src_prepare
38 +
39 + # Clang doesn't grok this flag, the configure nicely tests that, but
40 + # cmake just uses it, so remove it if we use clang
41 + if [[ ${CC} == clang ]] ; then
42 + sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
43 + fi
44 +}
45 +
46 src_configure() {
47 local mycmakeargs=(
48 -DBUILD_GTK_TESTS=OFF
49
50
51
52 1.462 app-text/poppler/ChangeLog
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.462&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?rev=1.462&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/ChangeLog?r1=1.461&r2=1.462
57
58 Index: ChangeLog
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v
61 retrieving revision 1.461
62 retrieving revision 1.462
63 diff -u -r1.461 -r1.462
64 --- ChangeLog 29 May 2015 13:00:45 -0000 1.461
65 +++ ChangeLog 1 Jun 2015 19:54:32 -0000 1.462
66 @@ -1,6 +1,9 @@
67 # ChangeLog for app-text/poppler
68 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
69 -# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.461 2015/05/29 13:00:45 dilfridge Exp $
70 +# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.462 2015/06/01 19:54:32 grobian Exp $
71 +
72 + 01 Jun 2015; Fabian Groffen <grobian@g.o> poppler-0.33.0-r1.ebuild:
73 + Fix compilation with Clang
74
75 29 May 2015; Andreas K. Hüttel <dilfridge@g.o>
76 poppler-0.33.0-r1.ebuild, poppler-9999.ebuild: