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/, app-text/poppler/files/
Date: Wed, 30 Jan 2019 22:31:52
Message-Id: 1548887365.4090dfd2d2c2be4cd3eccf155db2a3ddf1dd4091.asturm@gentoo
1 commit: 4090dfd2d2c2be4cd3eccf155db2a3ddf1dd4091
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 30 22:27:45 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 30 22:29:25 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4090dfd2
7
8 app-text/poppler: Security cleanup
9
10 Bug: https://bugs.gentoo.org/659828
11 Package-Manager: Portage-2.3.59, Repoman-2.3.12
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13
14 app-text/poppler/Manifest | 1 -
15 app-text/poppler/files/poppler-0.62.0-glibc.patch | 34 ------
16 .../poppler/files/poppler-0.62.0-openjpeg2.patch | 14 ---
17 app-text/poppler/poppler-0.62.0-r1.ebuild | 127 ---------------------
18 4 files changed, 176 deletions(-)
19
20 diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
21 index 7091647900a..5b781522168 100644
22 --- a/app-text/poppler/Manifest
23 +++ b/app-text/poppler/Manifest
24 @@ -1,4 +1,3 @@
25 -DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac SHA512 91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
26 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e SHA512 98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
27 DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c44447aaeb6817 SHA512 8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e
28 DIST poppler-0.72.0.tar.xz 1492912 BLAKE2B 6582b418031c52e5e9031e9f25b80841ba471c1308030bef2cdb13cd607ddd0ca51639d93c09f33e42d5f9378ee44b5ebe4dbac29254f952f7c2ec147799bc5e SHA512 57dc98ff3e433cb8c7e3c31016c080e09586410622d70fb2fe1aa36c2a55017508dd5b5b253cfe987b86f9197bdd34345e038c89f542003cf021900c86614145
29
30 diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch b/app-text/poppler/files/poppler-0.62.0-glibc.patch
31 deleted file mode 100644
32 index 6808e91601d..00000000000
33 --- a/app-text/poppler/files/poppler-0.62.0-glibc.patch
34 +++ /dev/null
35 @@ -1,34 +0,0 @@
36 -From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
37 -From: Pekka Vuorela <pekka.vuorela@×××××××××××.com>
38 -Date: Fri, 15 Dec 2017 16:56:20 +0200
39 -Subject: Honor configuration for building glibc copy of strtok_r
40 -
41 -config.h didn't get included and HAVE_STRTOK_R was never defined.
42 -Now getting via glibc.h.
43 ----
44 - goo/glibc_strtok_r.cc | 3 +++
45 - 1 file changed, 3 insertions(+)
46 -
47 -diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
48 -index e779bf5..e323bc2 100644
49 ---- a/goo/glibc_strtok_r.cc
50 -+++ b/goo/glibc_strtok_r.cc
51 -@@ -50,12 +50,15 @@
52 - // Copyright (C) 2012 Alexey Pavlov <alexpux@×××××.com>
53 - // Copyright (C) 2012 Albert Astals Cid <aacid@×××.org>
54 - // Copyright (C) 2017 Adrian Johnson <ajohnson@×××××××.com>
55 -+// Copyright (C) 2017 Pekka Vuorela <pekka.vuorela@×××××××××××.com>
56 - //
57 - // To see a description of the changes please see the Changelog file that
58 - // came with your tarball or type make ChangeLog if you are building from git
59 - //
60 - //========================================================================
61 -
62 -+#include "glibc.h"
63 -+
64 - #ifndef HAVE_STRTOK_R
65 -
66 - #include <string.h>
67 ---
68 -cgit v1.1
69 -
70
71 diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
72 deleted file mode 100644
73 index 789090cc9b2..00000000000
74 --- a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
75 +++ /dev/null
76 @@ -1,14 +0,0 @@
77 -Sadly the CMake side of openjpeg slotting in Gentoo is broken.
78 -To reliably find openjpeg:2 we need to use pkg-config.
79 -
80 ---- poppler-0.62.0/CMakeLists.txt
81 -+++ poppler-0.62.0/CMakeLists.txt
82 -@@ -193,7 +193,7 @@
83 - endif()
84 - set(WITH_OPENJPEG FALSE)
85 - if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
86 -- find_package(LIBOPENJPEG2)
87 -+ pkg_check_modules(LIBOPENJPEG2 libopenjp2)
88 - set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
89 - if(NOT LIBOPENJPEG2_FOUND)
90 - message(FATAL_ERROR "Install libopenjpeg2 before trying to build poppler. You can also decide to use the internal unmaintained JPX decoder or none at all.")
91
92 diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild b/app-text/poppler/poppler-0.62.0-r1.ebuild
93 deleted file mode 100644
94 index 568a800956b..00000000000
95 --- a/app-text/poppler/poppler-0.62.0-r1.ebuild
96 +++ /dev/null
97 @@ -1,127 +0,0 @@
98 -# Copyright 1999-2018 Gentoo Foundation
99 -# Distributed under the terms of the GNU General Public License v2
100 -
101 -EAPI=6
102 -
103 -inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
104 -
105 -if [[ "${PV}" == "9999" ]] ; then
106 - inherit git-r3
107 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
108 - SLOT="0/9999"
109 -else
110 - SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
111 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
112 - SLOT="0/73" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
113 -fi
114 -
115 -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
116 -HOMEPAGE="https://poppler.freedesktop.org/"
117 -
118 -LICENSE="GPL-2"
119 -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
120 -
121 -# No test data provided
122 -RESTRICT="test"
123 -
124 -COMMON_DEPEND="
125 - >=media-libs/fontconfig-2.6.0
126 - >=media-libs/freetype-2.3.9
127 - sys-libs/zlib
128 - cairo? (
129 - dev-libs/glib:2
130 - >=x11-libs/cairo-1.10.0
131 - introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
132 - )
133 - curl? ( net-misc/curl )
134 - jpeg? ( virtual/jpeg:0 )
135 - jpeg2k? ( media-libs/openjpeg:2= )
136 - lcms? ( media-libs/lcms:2 )
137 - nss? ( >=dev-libs/nss-3.19:0 )
138 - png? ( media-libs/libpng:0= )
139 - qt5? (
140 - dev-qt/qtcore:5
141 - dev-qt/qtgui:5
142 - dev-qt/qtxml:5
143 - )
144 - tiff? ( media-libs/tiff:0 )
145 -"
146 -DEPEND="${COMMON_DEPEND}
147 - virtual/pkgconfig
148 -"
149 -RDEPEND="${COMMON_DEPEND}
150 - cjk? ( >=app-text/poppler-data-0.4.7 )
151 -"
152 -
153 -DOCS=(AUTHORS NEWS README README-XPDF)
154 -
155 -PATCHES=(
156 - "${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
157 - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
158 - "${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
159 - "${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
160 - "${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
161 - "${FILESDIR}/${P}-glibc.patch" # bug 643858
162 -)
163 -
164 -src_prepare() {
165 - cmake-utils_src_prepare
166 -
167 - # Clang doesn't grok this flag, the configure nicely tests that, but
168 - # cmake just uses it, so remove it if we use clang
169 - if [[ ${CC} == clang ]] ; then
170 - sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die
171 - fi
172 -
173 - if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
174 - sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
175 - -i CMakeLists.txt || die
176 - else
177 - einfo "policy(SET CMP0002 OLD) - workaround can be removed"
178 - fi
179 -
180 - # we need to up the C++ version, bug #622526, #643278
181 - append-cxxflags -std=c++11
182 -}
183 -
184 -src_configure() {
185 - xdg_environment_reset
186 - local mycmakeargs=(
187 - -DBUILD_GTK_TESTS=OFF
188 - -DBUILD_QT5_TESTS=OFF
189 - -DBUILD_CPP_TESTS=OFF
190 - -DENABLE_SPLASH=ON
191 - -DENABLE_ZLIB=ON
192 - -DENABLE_ZLIB_UNCOMPRESS=OFF
193 - -DENABLE_XPDF_HEADERS=ON
194 - -DSPLASH_CMYK=OFF
195 - -DUSE_FIXEDPOINT=OFF
196 - -DUSE_FLOAT=OFF
197 - -DWITH_Cairo=$(usex cairo)
198 - -DENABLE_LIBCURL=$(usex curl)
199 - -DENABLE_CPP=$(usex cxx)
200 - -DWITH_GObjectIntrospection=$(usex introspection)
201 - -DWITH_JPEG=$(usex jpeg)
202 - -DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
203 - -DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
204 - -DENABLE_CMS=$(usex lcms lcms2 none)
205 - -DWITH_NSS3=$(usex nss)
206 - -DWITH_PNG=$(usex png)
207 - $(cmake-utils_use_find_package qt5 Qt5Core)
208 - -DWITH_TIFF=$(usex tiff)
209 - -DENABLE_UTILS=$(usex utils)
210 - )
211 -
212 - cmake-utils_src_configure
213 -}
214 -
215 -src_install() {
216 - cmake-utils_src_install
217 -
218 - # live version doesn't provide html documentation
219 - if use cairo && use doc && [[ ${PV} != 9999 ]]; then
220 - # For now install gtk-doc there
221 - insinto /usr/share/gtk-doc/html/poppler
222 - doins -r "${S}"/glib/reference/html/*
223 - fi
224 -}