diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:56:41 +0100 |
| commit | d87262dd706fec50cd150aab3e93883b6337466d (patch) | |
| tree | 246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch | |
| parent | 71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch')
| -rw-r--r-- | app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch b/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch deleted file mode 100644 index faf632128ff7..000000000000 --- a/app-text/poppler/files/poppler-0.57.0-disable-internal-jpx.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix security issue [internal unmaintained JPX decoder] that is caused -by building without system-jpeg libs. Fedora does not care because they -always build with system-jpeg, however in Gentoo we allow the user to -disable both options and poppler's buildsystem is making us believe -there would be no JPX decoder built in that case, when in reality -JPXStream.cc is built (even if it may not be used by the code). - - ---- a/CMakeLists.txt 2017-11-24 23:12:41.953450442 +0100 -+++ b/CMakeLists.txt 2017-11-24 23:16:09.441030669 +0100 -@@ -506,9 +508,11 @@ - add_definitions(-DUSE_OPENJPEG2) - set(poppler_LIBS ${poppler_LIBS} ${LIBOPENJPEG2_LIBRARIES}) - else () -- set(poppler_SRCS ${poppler_SRCS} -- poppler/JPXStream.cc -- ) -+ if(NOT WITH_OPENJPEG AND HAVE_JPX_DECODER) -+ set(poppler_SRCS ${poppler_SRCS} -+ poppler/JPXStream.cc -+ ) -+ endif() - endif() - if(USE_CMS) - if(LCMS_FOUND) |