Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/poppler/
Date: Sat, 30 Jun 2018 20:48:03
Message-Id: 1530391652.df9add78592074a5cd727447cff7cbb7e57b4de1.asturm@gentoo
1 commit: df9add78592074a5cd727447cff7cbb7e57b4de1
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 30 20:22:57 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 30 20:47:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df9add78
7
8 app-text/poppler: Fix cmake warning
9
10 Closes: https://bugs.gentoo.org/659146
11 Package-Manager: Portage-2.3.41, Repoman-2.3.9
12
13 app-text/poppler/poppler-0.66.0.ebuild | 2 +-
14 app-text/poppler/poppler-9999.ebuild | 2 +-
15 2 files changed, 2 insertions(+), 2 deletions(-)
16
17 diff --git a/app-text/poppler/poppler-0.66.0.ebuild b/app-text/poppler/poppler-0.66.0.ebuild
18 index 5d2ce10f935..893cc9f7e68 100644
19 --- a/app-text/poppler/poppler-0.66.0.ebuild
20 +++ b/app-text/poppler/poppler-0.66.0.ebuild
21 @@ -99,7 +99,6 @@ src_configure() {
22 -DWITH_Cairo=$(usex cairo)
23 -DENABLE_LIBCURL=$(usex curl)
24 -DENABLE_CPP=$(usex cxx)
25 - -DWITH_GObjectIntrospection=$(usex introspection)
26 -DWITH_JPEG=$(usex jpeg)
27 -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
28 -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
29 @@ -110,6 +109,7 @@ src_configure() {
30 -DWITH_TIFF=$(usex tiff)
31 -DENABLE_UTILS=$(usex utils)
32 )
33 + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
34
35 cmake-utils_src_configure
36 }
37
38 diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
39 index 5d2ce10f935..893cc9f7e68 100644
40 --- a/app-text/poppler/poppler-9999.ebuild
41 +++ b/app-text/poppler/poppler-9999.ebuild
42 @@ -99,7 +99,6 @@ src_configure() {
43 -DWITH_Cairo=$(usex cairo)
44 -DENABLE_LIBCURL=$(usex curl)
45 -DENABLE_CPP=$(usex cxx)
46 - -DWITH_GObjectIntrospection=$(usex introspection)
47 -DWITH_JPEG=$(usex jpeg)
48 -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
49 -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
50 @@ -110,6 +109,7 @@ src_configure() {
51 -DWITH_TIFF=$(usex tiff)
52 -DENABLE_UTILS=$(usex utils)
53 )
54 + use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
55
56 cmake-utils_src_configure
57 }