From: "Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in app-text/poppler/files: poppler-0.20.1-lcms-automagic.patch poppler-0.20.0-lcms-automagic.patch
Date: Thu, 14 Jun 2012 11:46:29 +0000 (UTC) [thread overview]
Message-ID: <20120614114629.DFB7B2004C@flycatcher.gentoo.org> (raw)
scarabeus 12/06/14 11:46:29
Added: poppler-0.20.1-lcms-automagic.patch
Removed: poppler-0.20.0-lcms-automagic.patch
Log:
Bump to 0.20.1 wrt bug#420911.
(Portage version: 2.2.0_alpha110/cvs/Linux x86_64, RepoMan options: --force)
Revision Changes Path
1.1 app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/poppler/files/poppler-0.20.1-lcms-automagic.patch?rev=1.1&content-type=text/plain
Index: poppler-0.20.1-lcms-automagic.patch
===================================================================
diff -ruN poppler-0.20.0/CMakeLists.txt my/CMakeLists.txt
--- poppler-0.20.0/CMakeLists.txt 2012-05-10 21:08:51.000000000 +0200
+++ my/CMakeLists.txt 2012-05-18 01:14:34.103419581 +0200
@@ -29,6 +29,7 @@
option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
option(ENABLE_LCMS "Use liblcms for color management." ON)
+option(ENABLE_LCMS2 "Use liblcms2 for color management." ON)
option(ENABLE_LIBCURL "Build libcurl based HTTP support." OFF)
option(ENABLE_ZLIB "Build with zlib (not totally safe)." OFF)
option(USE_FIXEDPOINT "Use fixed point arithmetic in the Splash backend" OFF)
@@ -136,16 +137,14 @@
set(ENABLE_LIBOPENJPEG ${LIBOPENJPEG_FOUND})
set(HAVE_OPENJPEG_H ON)
endif(ENABLE_LIBOPENJPEG)
-if(ENABLE_LCMS)
+if(ENABLE_LCMS2)
find_package(LCMS2)
- if(LCMS2_FOUND)
- set(USE_CMS ${LCMS2_FOUND})
- else(LCMS2_FOUND)
- find_package(LCMS)
- set(USE_CMS ${LCMS_FOUND})
- set(USE_LCMS1 ${LCMS_FOUND})
- endif(LCMS2_FOUND)
-endif(ENABLE_LCMS)
+ set(USE_CMS ${LCMS2_FOUND})
+elseif(ENABLE_LCMS)
+ find_package(LCMS)
+ set(USE_CMS ${LCMS_FOUND})
+ set(USE_LCMS1 ${LCMS_FOUND})
+endif(ENABLE_LCMS2)
if(ENABLE_LIBCURL)
find_package(CURL)
include_directories(${CURL_INCLUDE_DIR})
reply other threads:[~2012-06-14 11:46 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120614114629.DFB7B2004C@flycatcher.gentoo.org \
--to=scarabeus@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox