[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2019-09-01 Thread Andreas Sturmlechner
commit: f00b7a4185b939068bba108bb889ddba42b65053
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep  1 20:04:11 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep  1 20:43:09 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f00b7a41

app-text/poppler: Drop 0.77.0

Package-Manager: Portage-2.3.74, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 app-text/poppler/Manifest  |   1 -
 .../files/poppler-0.71.0-respect-cflags.patch  |  31 -
 app-text/poppler/poppler-0.77.0.ebuild | 127 -
 3 files changed, 159 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index abdff69112a..a7ddc5c03ca 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,2 @@
-DIST poppler-0.77.0.tar.xz 1533068 BLAKE2B 
9ce7db05bd9d0131f643096b84058e67ba416b34497af5e97c9b6f404131fc72c29ac05e60b77477d16e586df73b306e4a01c113be7ede0cf3956240db889a7f
 SHA512 
7c82cf584541fcbfa7cecdb06be9c4ba6d03479fc248377b874afeab561eac24015915eee566edc35fafe785b9f381f492c1789c070e67a2c1b344879c156040
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B 
b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec
 SHA512 
f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
 DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 
09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86
 SHA512 
0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f

diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch 
b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
deleted file mode 100644
index e54f7c6390a..000
--- a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
 a/cmake/modules/PopplerMacros.cmake2018-10-21 18:47:56.0 
+0200
-+++ b/cmake/modules/PopplerMacros.cmake2018-11-01 10:43:10.898347039 
+0100
-@@ -147,28 +147,6 @@
-   endif(GCC_HAS_AS_NEEDED)
- endif (CMAKE_COMPILER_IS_GNUCXX)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  set(_warn "${_warn} -Wundef")
--  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
--
--  # set extra warnings
--  set(_warnx "${_warnx} -Wconversion")
--  set(_warnx "${_warnx} -Wshadow")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--endif()
--
- if(CMAKE_C_COMPILER MATCHES "icc")
-   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
-   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")

diff --git a/app-text/poppler/poppler-0.77.0.ebuild 
b/app-text/poppler/poppler-0.77.0.ebuild
deleted file mode 100644
index 4052e96324c..000
--- a/app-text/poppler/poppler-0.77.0.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git;
-   SLOT="0/"
-else
-   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
-   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"
-   SLOT="0/88"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/;
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png 
qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-   dev-util/glib-utils
-   virtual/pkgconfig
-"
-DEPEND="
-   media-libs/fontconfig
-   media-libs/freetype
-   sys-libs/zlib
-   cairo? (
-   dev-libs/glib:2
-   x11-libs/cairo
-   introspection? ( dev-libs/gobject-introspection:= )
-   )
-   curl? ( net-misc/curl )
-   jpeg? ( virtual/jpeg:0 )
-   jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-   lcms? ( 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2018-11-03 Thread Andreas Sturmlechner
commit: ae5512fe38ddc0dc9ea3571e4a11ce5e92c2e4bb
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov  3 21:40:42 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Nov  3 21:45:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5512fe

app-text/poppler: 0.71.0 version bump

Closes: https://bugs.gentoo.org/667150
Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 app-text/poppler/Manifest  |  1 +
 .../files/poppler-0.71.0-respect-cflags.patch  | 31 ++
 .../{poppler-.ebuild => poppler-0.71.0.ebuild} | 18 ++---
 app-text/poppler/poppler-.ebuild   | 18 ++---
 4 files changed, 50 insertions(+), 18 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 121cb6807d8..33966583e41 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,4 @@
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 
01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac
 SHA512 
91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706
 DIST poppler-0.67.0.tar.xz 1459412 BLAKE2B 
1c24908839fc9e3b3b2a1e0c014f7b6a1c6cc622157e161437ece91a86a20db0d5ae67b35783a5a4b712ab4ba0e43f141ca516fde10b5a549b9d36a98c5de25b
 SHA512 
36584c62970ae0ae7807687f9c0523560ae92ac323949be8916a0e8dc6e691633e55cdd76c6026253c337aed8a4b43a7759a3de74c9ec606654f65379fb0f206
 DIST poppler-0.68.0.tar.xz 1461052 BLAKE2B 
e95aa872230ff88f2caf9b8fef7da369b3115b1aabef2d57ebba3a13123ffe1cf1e200c6583a6da9e52bdb7708bec30e26f68e582bf99289abd572e42f712a5e
 SHA512 
98449ab96db1d17901ec44b1a71b0375ac83d0f13e059b83afb452939a3ae6375c4667ae029fa333fad3eed2d8315e5f1208f34d3548c5530f0ecc7a5841c27a
+DIST poppler-0.71.0.tar.xz 1480852 BLAKE2B 
be23100e44f73cd024d50727a632b749629b6e36ef41d2aee94f1998a8362dd0fa11e64bfb0f0f04f87265029abec32088ef2dad3b5aeb2733c7aaeb6817
 SHA512 
8e0ce95e7b58c37761c36a20f1282e63373a9557bf9f746ce2936562f12648506043d9559cf816944aa238814fc1b3f3a3c0a6cb002fd214b067e399bcc6ab1e

diff --git a/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch 
b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
new file mode 100644
index 000..e54f7c6390a
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.71.0-respect-cflags.patch
@@ -0,0 +1,31 @@
+--- a/cmake/modules/PopplerMacros.cmake2018-10-21 18:47:56.0 
+0200
 b/cmake/modules/PopplerMacros.cmake2018-11-01 10:43:10.898347039 
+0100
+@@ -147,28 +147,6 @@
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+-# set the default compile warnings
+-  set(_warn "-Wall -Wextra -Wpedantic")
+-  set(_warn "${_warn} -Wno-unused-parameter")
+-  set(_warn "${_warn} -Wcast-align")
+-  set(_warn "${_warn} -Wformat-security")
+-  set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wmissing-format-attribute")
+-  set(_warn "${_warn} -Wnon-virtual-dtor")
+-  set(_warn "${_warn} -Woverloaded-virtual")
+-  set(_warn "${_warn} -Wmissing-declarations")
+-  set(_warn "${_warn} -Wundef")
+-  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
+-
+-  # set extra warnings
+-  set(_warnx "${_warnx} -Wconversion")
+-  set(_warnx "${_warnx} -Wshadow")
+-
+-  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+-  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+-endif()
+-
+ if(CMAKE_C_COMPILER MATCHES "icc")
+   set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")

diff --git a/app-text/poppler/poppler-.ebuild 
b/app-text/poppler/poppler-0.71.0.ebuild
similarity index 89%
copy from app-text/poppler/poppler-.ebuild
copy to app-text/poppler/poppler-0.71.0.ebuild
index c2f019ea696..a8ae481329a 100644
--- a/app-text/poppler/poppler-.ebuild
+++ b/app-text/poppler/poppler-0.71.0.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "" ]] ; then
 else
SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
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"
-   SLOT="0/80"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
+   SLOT="0/82"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -25,17 +25,17 @@ IUSE="cairo cjk curl cxx debug doc +introspection +jpeg 
+jpeg2k +lcms nss png qt
 RESTRICT="test"
 
 COMMON_DEPEND="
-   >=media-libs/fontconfig-2.6.0
-   >=media-libs/freetype-2.3.9
+   media-libs/fontconfig
+   media-libs/freetype

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2018-01-09 Thread Andreas Sturmlechner
commit: c145c4b7287e9dd9e80724030be17b7ee1944afc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan  9 10:13:18 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan  9 10:15:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c145c4b7

app-text/poppler: Fix build (missing include)

Closes: https://bugs.gentoo.org/643858
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/poppler/files/poppler-0.62.0-glibc.patch | 34 +++
 app-text/poppler/poppler-0.62.0-r1.ebuild |  1 +
 2 files changed, 35 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.62.0-glibc.patch 
b/app-text/poppler/files/poppler-0.62.0-glibc.patch
new file mode 100644
index 000..6808e91601d
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.62.0-glibc.patch
@@ -0,0 +1,34 @@
+From 7b434a7ad9333a3b2250d636a517c58d9a12bca2 Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela 
+Date: Fri, 15 Dec 2017 16:56:20 +0200
+Subject: Honor configuration for building glibc copy of strtok_r
+
+config.h didn't get included and HAVE_STRTOK_R was never defined.
+Now getting via glibc.h.
+---
+ goo/glibc_strtok_r.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/goo/glibc_strtok_r.cc b/goo/glibc_strtok_r.cc
+index e779bf5..e323bc2 100644
+--- a/goo/glibc_strtok_r.cc
 b/goo/glibc_strtok_r.cc
+@@ -50,12 +50,15 @@
+ // Copyright (C) 2012 Alexey Pavlov 
+ // Copyright (C) 2012 Albert Astals Cid 
+ // Copyright (C) 2017 Adrian Johnson 
++// Copyright (C) 2017 Pekka Vuorela 
+ //
+ // To see a description of the changes please see the Changelog file that
+ // came with your tarball or type make ChangeLog if you are building from git
+ //
+ //
+ 
++#include "glibc.h"
++
+ #ifndef HAVE_STRTOK_R
+ 
+ #include 
+-- 
+cgit v1.1
+

diff --git a/app-text/poppler/poppler-0.62.0-r1.ebuild 
b/app-text/poppler/poppler-0.62.0-r1.ebuild
index b582e20f1f7..9b19e865af5 100644
--- a/app-text/poppler/poppler-0.62.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.62.0-r1.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.62.0-openjpeg2.patch"
"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+   "${FILESDIR}/${P}-glibc.patch" # bug 643858
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-12-27 Thread Andreas Sturmlechner
commit: f1d727da0a38e402231939e6dd004f5e75f7cf53
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 27 21:45:26 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 27 23:25:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1d727da

app-text/poppler: Drop obsolete and vulnerable versions

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-text/poppler/Manifest  |   3 -
 .../files/poppler-0.59.0-qt5-dependencies.patch|  31 -
 .../files/poppler-0.59.0-respect-cflags.patch  |  50 ---
 .../files/poppler-0.60.1-respect-cflags.patch  |  53 
 app-text/poppler/poppler-0.58.0.ebuild | 146 -
 app-text/poppler/poppler-0.59.0.ebuild | 146 -
 app-text/poppler/poppler-0.60.1.ebuild | 146 -
 7 files changed, 575 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4cf1f0b9a9d..9b6a491ce47 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,3 @@
 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B 
e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c
 SHA512 
197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
-DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B 
ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e
 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
-DIST poppler-0.59.0.tar.xz 1712004 BLAKE2B 
ddffe0361097b54dccb3eb7df7cb2e879c90258ffed9d07fa8ad77fa41a5b9b0943b6a3d1da455074137d7b1b4166bf76f284c98130ec29a9b9ba8823f165ef6
 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
-DIST poppler-0.60.1.tar.xz 1432712 BLAKE2B 
9c4e8645a5e5a3848ef9f65268e3cb757478c8e0fb46b0071e318e2afc35a05a0d1628d66af8f8815d1ff324a16c70ec8fa2c02cbe36621cb0252331594342b0
 SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 
6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa
 SHA512 
780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 
01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac
 SHA512 
91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706

diff --git a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch 
b/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
deleted file mode 100644
index 2bef6945716..000
--- a/app-text/poppler/files/poppler-0.59.0-qt5-dependencies.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 2f7ca474ec49f805257c75cefb364e08ebd9e4d1 Mon Sep 17 00:00:00 2001
-From: Johannes Huber 
-Date: Tue, 5 Sep 2017 22:58:44 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-

- CMakeLists.txt | 6 ++
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5b0a5be..787bd0d6 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -133,12 +133,10 @@ macro_optional_find_package(Qt4)
- find_package(Qt5Core)
- find_package(Qt5Gui)
- find_package(Qt5Xml)
--find_package(Qt5Widgets)
--find_package(Qt5Test)
--if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND 
Qt5Test_FOUND)
-+if (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND)
-   set(QT5_FOUND true)
- else ()
--  message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test 
not found")
-+  message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
-   set(QT5_FOUND false)
- endif()
- 
--- 
-2.14.1
-

diff --git a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch 
b/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
deleted file mode 100644
index ada6ddfc7d7..000
--- a/app-text/poppler/files/poppler-0.59.0-respect-cflags.patch
+++ /dev/null
@@ -1,50 +0,0 @@
 poppler-0.59.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.59.0/cmake/modules/PopplerMacros.cmake
-@@ -98,45 +98,14 @@
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
-if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
-endif()
- 
--  # set the default 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-12-04 Thread Lars Wendler
commit: d6734e9a0a0db3d7b28deffc35b876695643b14d
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec  4 14:26:56 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec  4 14:26:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6734e9a

app-text/poppler: Bump to version 0.62.0

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-text/poppler/Manifest  |   3 +-
 .../poppler/files/poppler-0.62.0-openjpeg2.patch   |  14 +++
 app-text/poppler/poppler-0.62.0.ebuild | 139 +
 3 files changed, 155 insertions(+), 1 deletion(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 15244e7da33..87dea90af9d 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,4 +2,5 @@ DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B 
e4126dff2e0ee140fa4c5c30d5a57da5aff38
 DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B 
ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e
 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 WHIRLPOOL 
82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 
19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 WHIRLPOOL 
fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
-DIST poppler-0.61.1.tar.xz 1433696 SHA256 
1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 
780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 WHIRLPOOL 
9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df
+DIST poppler-0.61.1.tar.xz 1433696 BLAKE2B 
6749466223d3bb0e891c6b26c7f1faa5c774dd47ac94c22474efe4a52af228aeb2abbb8ab268667acaa83fb41293246266124a111740df764eeedbe229fa70aa
 SHA512 
780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
+DIST poppler-0.62.0.tar.xz 1423372 BLAKE2B 
01c8745d0c1fa5b412ec92295a8784f5c1deff8b9fa709d09a3236d630f78fecc6af23fe3302964478d6356562712726db422ef51fe59a8b42e13e08370a77ac
 SHA512 
91f7eae7b05965ae97a34e658bed2a676be8a6e4d34f82148ece6eb58932632dcf9a34d50c66412f93f560ce575abf5c608ed6b1e5184604b96024801886c706

diff --git a/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch 
b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
new file mode 100644
index 000..789090cc9b2
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.62.0-openjpeg2.patch
@@ -0,0 +1,14 @@
+Sadly the CMake side of openjpeg slotting in Gentoo is broken.
+To reliably find openjpeg:2 we need to use pkg-config.
+
+--- poppler-0.62.0/CMakeLists.txt
 poppler-0.62.0/CMakeLists.txt
+@@ -193,7 +193,7 @@
+ endif()
+ set(WITH_OPENJPEG FALSE)
+ if(ENABLE_LIBOPENJPEG STREQUAL "openjpeg2")
+-  find_package(LIBOPENJPEG2)
++  pkg_check_modules(LIBOPENJPEG2 libopenjp2)
+   set(WITH_OPENJPEG ${LIBOPENJPEG2_FOUND})
+   if(NOT LIBOPENJPEG2_FOUND)
+ 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.")

diff --git a/app-text/poppler/poppler-0.62.0.ebuild 
b/app-text/poppler/poppler-0.62.0.ebuild
new file mode 100644
index 000..317b923ddd9
--- /dev/null
+++ b/app-text/poppler/poppler-0.62.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+   SLOT="0/"
+else
+   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/;
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-24 Thread Andreas Sturmlechner
commit: 2822a0cd48e39c110535322754120681a3cfe8f1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 24 21:12:10 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 24 23:06:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2822a0cd

app-text/poppler: Fix CVE-2017-14517

Bug: https://bugs.gentoo.org/631290
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../files/poppler-0.57.0-CVE-2017-14517.patch  |  27 
 app-text/poppler/poppler-0.57.0-r1.ebuild  | 148 +
 2 files changed, 175 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch 
b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch
new file mode 100644
index 000..6a0812cdbe8
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14517.patch
@@ -0,0 +1,27 @@
+From b524efeffa8d192c2597f4612ca961adc30286f6 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Wed, 13 Sep 2017 22:58:14 +0200
+Subject: [PATCH 1/4] XRef::parseEntry: Fix crash in broken file
+
+Bug #102687
+---
+ poppler/XRef.cc | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/poppler/XRef.cc b/poppler/XRef.cc
+index 6ea0fbb6..c74f2f60 100644
+--- a/poppler/XRef.cc
 b/poppler/XRef.cc
+@@ -1603,6 +1603,9 @@ GBool XRef::parseEntry(Goffset offset, XRefEntry *entry)
+ {
+   GBool r;
+ 
++  if (unlikely(entry == nullptr))
++return gFalse;
++
+   Object obj;
+   obj.initNull();
+   Parser parser = Parser(NULL, new Lexer(NULL,
+-- 
+2.14.1
+

diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild 
b/app-text/poppler/poppler-0.57.0-r1.ebuild
new file mode 100644
index 000..7cf2072c3af
--- /dev/null
+++ b/app-text/poppler/poppler-0.57.0-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+   SLOT="0/"
+else
+   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   SLOT="0/68"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/;
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png 
qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=media-libs/fontconfig-2.6.0
+   >=media-libs/freetype-2.3.9
+   sys-libs/zlib
+   cairo? (
+   dev-libs/glib:2
+   >=x11-libs/cairo-1.10.0
+   introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+   )
+   curl? ( net-misc/curl )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lcms? ( media-libs/lcms:2 )
+   nss? ( >=dev-libs/nss-3.19:0 )
+   png? ( media-libs/libpng:0= )
+   qt4? (
+   dev-qt/qtcore:4
+   dev-qt/qtgui:4
+   )
+   qt5? (
+   dev-qt/qtcore:5
+   dev-qt/qtgui:5
+   dev-qt/qtxml:5
+   )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+   cjk? ( >=app-text/poppler-data-0.4.7 )
+"
+
+DOCS=(AUTHORS NEWS README README-XPDF TODO)
+
+PATCHES=(
+   "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch"
+   "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+   "${FILESDIR}/${PN}-0.53.0-respect-cflags.patch"
+   "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
+   "${FILESDIR}/${PN}-0.40-FindQt4.patch"
+   # Fedora backports from upstream
+   "${FILESDIR}/${P}-CVE-2017-14517.patch"
+)
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # Clang doesn't grok this flag, the configure nicely tests that, but
+   # cmake just uses it, so remove it if we use clang
+   if [[ ${CC} == clang ]] ; then
+   sed -i -e 's/-fno-check-new//' 
cmake/modules/PopplerMacros.cmake || die
+   fi
+
+   if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+   sed '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+   -i CMakeLists.txt || die
+   else
+   einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+   fi
+
+   if tc-is-clang && [[ ${CHOST} == *-darwin* ]] ; then
+   # we need to up the C++ version, bug #622526
+   export CXX="$(tc-getCXX) -std=c++11"
+   fi
+}
+
+src_configure() {
+   

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-24 Thread Andreas Sturmlechner
commit: ccd22f376de6de2c8160d808451f320dc658565b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 24 21:31:04 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 24 23:06:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd22f37

app-text/poppler: Fix CVE-2017-14617

Bug: https://bugs.gentoo.org/631596
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 .../files/poppler-0.57.0-CVE-2017-14617.patch  | 31 ++
 app-text/poppler/poppler-0.57.0-r1.ebuild  |  1 +
 2 files changed, 32 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch 
b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch
new file mode 100644
index 000..27947953612
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14617.patch
@@ -0,0 +1,31 @@
+From 939465c40902d72e0c05d4f3a27ee67e4a007ed7 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Tue, 19 Sep 2017 21:19:03 +0200
+Subject: [PATCH] Fix crash in broken files
+
+Bug #102854
+---
+ poppler/Stream.cc | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/Stream.cc b/poppler/Stream.cc
+index f4eda85b..0ad602c7 100644
+--- a/poppler/Stream.cc
 b/poppler/Stream.cc
+@@ -454,11 +454,10 @@ ImageStream::ImageStream(Stream *strA, int widthA, int 
nCompsA, int nBitsA) {
+ } else {
+   imgLineSize = nVals;
+ }
+-if (width > INT_MAX / nComps) {
+-  // force a call to gmallocn(-1,...), which will throw an exception
++if (nComps <= 0 || width > INT_MAX / nComps) {
+   imgLineSize = -1;
+ }
+-imgLine = (Guchar *)gmallocn(imgLineSize, sizeof(Guchar));
++imgLine = (Guchar *)gmallocn_checkoverflow(imgLineSize, sizeof(Guchar));
+   }
+   imgIdx = nVals;
+ }
+-- 
+2.14.1
+

diff --git a/app-text/poppler/poppler-0.57.0-r1.ebuild 
b/app-text/poppler/poppler-0.57.0-r1.ebuild
index a19b815e595..b7a421f73e2 100644
--- a/app-text/poppler/poppler-0.57.0-r1.ebuild
+++ b/app-text/poppler/poppler-0.57.0-r1.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
"${FILESDIR}/${P}-CVE-2017-14518.patch"
"${FILESDIR}/${P}-CVE-2017-14519.patch"
"${FILESDIR}/${P}-CVE-2017-14520.patch"
+   "${FILESDIR}/${P}-CVE-2017-14617.patch"
"${FILESDIR}/${P}-CVE-2017-14926.patch"
"${FILESDIR}/${P}-CVE-2017-14927.patch"
"${FILESDIR}/${P}-CVE-2017-14928.patch"



[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-24 Thread Andreas Sturmlechner
commit: 21121c39ac5e0a8fc7481a0223e05c95fa30ee0d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 24 21:23:34 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 24 23:06:21 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21121c39

app-text/poppler: Fix CVE-2017-1792{6,7,8,9}, CVE-2017-15565

Bug: https://bugs.gentoo.org/635364
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-text/poppler/Manifest  |   2 +-
 .../files/poppler-0.57.0-CVE-2017-14926.patch  |  36 +++
 .../files/poppler-0.57.0-CVE-2017-14927.patch  |  32 +++
 .../files/poppler-0.57.0-CVE-2017-14928.patch  |  69 ++
 .../files/poppler-0.57.0-CVE-2017-14929.patch  | 252 +
 .../files/poppler-0.57.0-CVE-2017-15565.patch  |  28 +++
 app-text/poppler/poppler-0.57.0-r1.ebuild  |   5 +
 7 files changed, 423 insertions(+), 1 deletion(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 4fb1a1ebb5b..15244e7da33 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,5 @@
 DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B 
e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c
 SHA512 
197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
-DIST poppler-0.58.0.tar.xz 1710412 SHA256 
0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 WHIRLPOOL 
658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
+DIST poppler-0.58.0.tar.xz 1710412 BLAKE2B 
ac2558503f86e8f0729d9ee5e4bc6c59dc9a4abca2e94b4e94b27b139dcb237b608af70b011b6f042a06d18ce83e32593f5b3d28876ee2606d7e63bc9230e51e
 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 WHIRLPOOL 
82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 
19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 WHIRLPOOL 
fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
 DIST poppler-0.61.1.tar.xz 1433696 SHA256 
1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 
780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 WHIRLPOOL 
9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df

diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch 
b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch
new file mode 100644
index 000..882cf0e2b8b
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14926.patch
@@ -0,0 +1,36 @@
+From 170fe21144d469d3f865eda6e298df440b784499 Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Fri, 8 Sep 2017 18:28:15 +0200
+Subject: [PATCH 2/3] Annot: Fix crash on broken files
+
+Bug #102601
+
+(cherry picked from commit 2532df6060092e9fab7f041ae9598aff9cdd94bb)
+---
+ poppler/Annot.cc | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/poppler/Annot.cc b/poppler/Annot.cc
+index 27b698db..643ff12c 100644
+--- a/poppler/Annot.cc
 b/poppler/Annot.cc
+@@ -6865,13 +6865,13 @@ AnnotRichMedia::Content::Content(Dict *dict) {
+   assets = (Asset **)gmallocn(nAssets, sizeof(Asset *));
+ 
+   int counter = 0;
+-  for (int i = 0; i < obj2.arrayGetLength(); i += 2) {
++  for (int i = 0; i < nAssets; ++i) {
+ Object objKey;
+ 
+ assets[counter] = new AnnotRichMedia::Asset;
+ 
+-obj2.arrayGet(i, );
+-obj2.arrayGet(i + 1, [counter]->fileSpec);
++obj2.arrayGet(i * 2, );
++obj2.arrayGet(i * 2 + 1, [counter]->fileSpec);
+ 
+ assets[counter]->name = new GooString( objKey.getString() );
+ ++counter;
+-- 
+2.14.1
+

diff --git a/app-text/poppler/files/poppler-0.57.0-CVE-2017-14927.patch 
b/app-text/poppler/files/poppler-0.57.0-CVE-2017-14927.patch
new file mode 100644
index 000..3595345800f
--- /dev/null
+++ 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/files/cairo-qt-experimental/, ...

2017-11-23 Thread Andreas Sturmlechner
commit: fe12fcb87e86364127969ec37a308d0731d58084
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov 23 16:53:41 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov 23 21:12:13 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe12fcb8

app-text/poppler: Security cleanup

Bug: https://bugs.gentoo.org/627392
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 app-text/poppler/Manifest  |   3 +-
 .../0001-Cairo-backend-added-to-Qt4-wrapper.patch  | 199 -
 ...0002-Setting-default-Qt4-backend-to-Cairo.patch |  25 ---
 ...rcing-subpixel-rendering-in-Cairo-backend.patch |  30 
 ...-Enabling-slight-hinting-in-Cairo-Backend.patch |  45 -
 .../files/poppler-0.28.1-respect-cflags.patch  |  48 -
 app-text/poppler/metadata.xml  |   1 -
 app-text/poppler/poppler-0.45.0.ebuild | 142 ---
 8 files changed, 1 insertion(+), 492 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 62a15b03bbd..4fb1a1ebb5b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,5 +1,4 @@
-DIST poppler-0.45.0.tar.xz 1674464 SHA256 
96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 
b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b
 WHIRLPOOL 
687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
-DIST poppler-0.57.0.tar.xz 1703300 SHA256 
0ea37de71b7db78212ebc79df59f99b66409a29c2eac4d882dae9f2397fe44d8 SHA512 
197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
 WHIRLPOOL 
fb0c15e4834f23b2956014748f92557de9996b8a2a37cf4a7ba62ca22f01866455a933bcf0412775a8d5a8f6ba1ba463f2fd63e27fa406b5fb5bf1fd25d32000
+DIST poppler-0.57.0.tar.xz 1703300 BLAKE2B 
e4126dff2e0ee140fa4c5c30d5a57da5aff38d4c1f566e4ace22d3fe625949db3a662a8513881702cd5c5c302845998dd462048b5158abaf1d119650c997c84c
 SHA512 
197a0bf51e7fd607db83144d771904e48f266ab9e1252c688f9e7700a5bdd239670cf0363e9d77137bafa9c08fb6ddb9d066cc78a74dac7dfd717662b25cac5f
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 
0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 WHIRLPOOL 
658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 WHIRLPOOL 
82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 
19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 WHIRLPOOL 
fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7

diff --git 
a/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
 
b/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
deleted file mode 100644
index 2246b29b134..000
--- 
a/app-text/poppler/files/cairo-qt-experimental/0001-Cairo-backend-added-to-Qt4-wrapper.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From e8fcbaca23878f0edd2015440eec55aaba0e8f9f Mon Sep 17 00:00:00 2001
-From: Paul Gideon Dann 
-Date: Wed, 20 May 2009 11:42:28 +0100
-Subject: [PATCH 1/4] Cairo backend added to Qt4 wrapper
-

- qt4/src/CMakeLists.txt  | 15 ++
- qt4/src/poppler-document.cc |  3 ++
- qt4/src/poppler-page.cc | 70 +
- qt4/src/poppler-qt4.h   |  3 +-
- qt4/tests/CMakeLists.txt|  5 
- 5 files changed, 95 insertions(+), 1 deletion(-)
-
-diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
-index 189eca2..5338b55 100644
 a/qt4/src/CMakeLists.txt
-+++ b/qt4/src/CMakeLists.txt
-@@ -6,6 +6,11 @@ include_directories(
-   ${CMAKE_CURRENT_BINARY_DIR}
- )
- 
-+if (HAVE_CAIRO)
-+  include_directories(${CAIRO_INCLUDE_DIRS})
-+  add_definitions(${CAIRO_CFLAGS})
-+endif (HAVE_CAIRO)
-+
- set(poppler_qt4_SRCS
-   poppler-annotation.cc
-   poppler-document.cc
-@@ -28,10 +33,20 @@ set(poppler_qt4_SRCS
-   poppler-media.cc
-   ArthurOutputDev.cc
- )
-+if (HAVE_CAIRO)
-+  set(poppler_qt4_SRCS ${poppler_qt4_SRCS}
-+${CMAKE_SOURCE_DIR}/poppler/CairoOutputDev.cc
-+

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-13 Thread Lars Wendler
commit: 131df8329e9b993921e5a1dd91988d41e4149d01
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov 13 10:22:55 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov 13 10:23:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=131df832

app-text/poppler: Removed old.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/poppler/Manifest  |   1 -
 .../files/poppler-0.61.0-qt5_pc_in_typo.patch  |  24 
 app-text/poppler/poppler-0.61.0-r1.ebuild  | 151 -
 3 files changed, 176 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a4eae7e106a..62a15b03bbd 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,5 +3,4 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 
0ea37de71b7db78212ebc79df59f99b66409a2
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 
0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 WHIRLPOOL 
658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 WHIRLPOOL 
82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 
19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 WHIRLPOOL 
fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
-DIST poppler-0.61.0.tar.xz 1432952 SHA256 
53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 
d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5
 WHIRLPOOL 
56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f
 DIST poppler-0.61.1.tar.xz 1433696 SHA256 
1266096343f5163c1a585124e9a6d44474e1345de5cdfe55dc7b47357bcfcda9 SHA512 
780ebf07ad757635f3f71c7b1f61ad0849526f99f0dc514c3290c4e8db7000a68dfe50c17253d4c086aec5c5390055102478eba96699088179822f3be5ce278d
 WHIRLPOOL 
9d41a9c2ae551f71a82cdae763a4d9c032977c1140fb89f619b912169f9c48c6b310bba38b0138de16c5af04cb46f0f58c57c60a15a648fefcd92cee8c8583df

diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch 
b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
deleted file mode 100644
index 906989aa8ba..000
--- a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001
-From: Lars Wendler 
-Date: Tue, 7 Nov 2017 15:41:30 +0100
-Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry.
-
-Signed-off-by: Lars Wendler 

- poppler-qt5.pc.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
-index aaa1aa77..7e8c5c8f 100644
 a/poppler-qt5.pc.cmake
-+++ b/poppler-qt5.pc.cmake
-@@ -1,5 +1,5 @@
- prefix=@CMAKE_INSTALL_PREFIX@
--libdir=CMAKE_INSTALL_LIBDIR@
-+libdir=@CMAKE_INSTALL_LIBDIR@
- includedir=@CMAKE_INSTALL_INCLUDEDIR@
- 
- Name: poppler-qt5
--- 
-2.15.0
-

diff --git a/app-text/poppler/poppler-0.61.0-r1.ebuild 
b/app-text/poppler/poppler-0.61.0-r1.ebuild
deleted file mode 100644
index e1fa049c01c..000
--- a/app-text/poppler/poppler-0.61.0-r1.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils toolchain-funcs xdg-utils
-
-if [[ "${PV}" == "" ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
-   SLOT="0/"
-else
-   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
-   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
-   SLOT="0/72"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/;
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png 
qt4 qt5 tiff 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-07 Thread Lars Wendler
commit: e54cf75538fa0428cfe4989105bdb60116d8945c
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Nov  7 15:05:38 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Nov  7 15:07:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54cf755

app-text/poppler: Revbump to fix broken pkgconfig files.

Bug: https://bugs.gentoo.org/636708
Package-Manager: Portage-2.3.13, Repoman-2.3.4

 .../files/poppler-0.61.0-qt5_pc_in_typo.patch  | 24 ++
 ...pler-0.61.0.ebuild => poppler-0.61.0-r1.ebuild} |  5 +
 2 files changed, 29 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch 
b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
new file mode 100644
index 000..906989aa8ba
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-qt5_pc_in_typo.patch
@@ -0,0 +1,24 @@
+From 950d19a00a454098831ca42ffbe0b61d323f0f89 Mon Sep 17 00:00:00 2001
+From: Lars Wendler 
+Date: Tue, 7 Nov 2017 15:41:30 +0100
+Subject: [PATCH] poppler-qt5.pc.cmake: Fixed typo in libdir entry.
+
+Signed-off-by: Lars Wendler 
+---
+ poppler-qt5.pc.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/poppler-qt5.pc.cmake b/poppler-qt5.pc.cmake
+index aaa1aa77..7e8c5c8f 100644
+--- a/poppler-qt5.pc.cmake
 b/poppler-qt5.pc.cmake
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=CMAKE_INSTALL_LIBDIR@
++libdir=@CMAKE_INSTALL_LIBDIR@
+ includedir=@CMAKE_INSTALL_INCLUDEDIR@
+ 
+ Name: poppler-qt5
+-- 
+2.15.0
+

diff --git a/app-text/poppler/poppler-0.61.0.ebuild 
b/app-text/poppler/poppler-0.61.0-r1.ebuild
similarity index 94%
rename from app-text/poppler/poppler-0.61.0.ebuild
rename to app-text/poppler/poppler-0.61.0-r1.ebuild
index 2cfa1ed7abe..e1fa049c01c 100644
--- a/app-text/poppler/poppler-0.61.0.ebuild
+++ b/app-text/poppler/poppler-0.61.0-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
"${FILESDIR}/${PN}-0.33.0-openjpeg2.patch"
"${FILESDIR}/${PN}-0.40-FindQt4.patch"
+   "${FILESDIR}/${PN}-0.61.0-qt5_pc_in_typo.patch"
 )
 
 src_prepare() {
@@ -96,6 +97,10 @@ src_configure() {
-DBUILD_QT4_TESTS=OFF
-DBUILD_QT5_TESTS=OFF
-DBUILD_CPP_TESTS=OFF
+   -DCMAKE_INSTALL_DATADIR="/usr/share"
+   -DCMAKE_INSTALL_INCLUDEDIR="/usr/include"
+   -DCMAKE_INSTALL_LIBDIR="/usr/$(get_libdir)"
+   -DCMAKE_INSTALL_MANDIR="/usr/share/man"
-DENABLE_SPLASH=ON
-DENABLE_ZLIB=ON
-DENABLE_ZLIB_UNCOMPRESS=OFF



[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-11-06 Thread Lars Wendler
commit: afcaa4c7bf59fb9e3b89b88fd03cbb98c1465a42
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Nov  6 15:05:23 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Nov  6 15:29:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afcaa4c7

app-text/poppler: Bump to version 0.61.0

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 app-text/poppler/Manifest  |   1 +
 .../files/poppler-0.61.0-respect-cflags.patch  |  55 
 app-text/poppler/poppler-0.61.0.ebuild | 146 +
 3 files changed, 202 insertions(+)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a12dbceeb42..bd59768ed12 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -3,3 +3,4 @@ DIST poppler-0.57.0.tar.xz 1703300 SHA256 
0ea37de71b7db78212ebc79df59f99b66409a2
 DIST poppler-0.58.0.tar.xz 1710412 SHA256 
0e42e46419ae54b02d9f2b527c6475b6011d15816918b9057dfa3aae211af832 SHA512 
0675846fc99578925840cbb17083463da6ea54f7de348b946ae7d4480d9d87bd4b5069392b23a8b9bbafe0aafafaf5a200134be52d0832558104cb4aa2497aee
 WHIRLPOOL 
658f7dfbb786c2e09558f7e89ef0832db4ff32eaef08b7360fbf468236db01b44e33374424df6b64c17f018d7b10f61e151c08026652628d387958143a5a3837
 DIST poppler-0.59.0.tar.xz 1712004 SHA256 
a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641 SHA512 
23777922dc95feee2a4459281081b37e124a39fc25cd00c2c3fc206f5484c13eb9ac5317f674fbbcb51e384f9a53e38b4cacbf1426c68d2bae21a7cefbc48a0e
 WHIRLPOOL 
82ec203c17e2b2544cc0ac12d0b22bb051abf776114d17e1548f47d5e38ff289dee2e9c4b27dc16e3953b6f5b5ff0e0eeecfba73561dbc396ee0db7c5a4847e2
 DIST poppler-0.60.1.tar.xz 1432712 SHA256 
19f185e05c3b59b4a1de2cec8ef39f5446035493d17bbed41d02fb9a77c8a93c SHA512 
db73524b7413dddee38d5a049f3926338ee123b8fc4893d80ee9cf5aaae47c8c7b75b112293b156cd375894e548ec68e5fbf4af305e77b43bc3868ad1c966cdc
 WHIRLPOOL 
fe1fe7a3f0c0bac57c7503ad183fe2e8e2f0378c4dedc0dadbc6dcfaeaf8044bf387256742a970af5ed9e2704e42c35e996957e765eeff1aca4bedcc427ae6a7
+DIST poppler-0.61.0.tar.xz 1432952 SHA256 
53cde17a2afa3b73eb8b209d24e4369b52bfac444065dbb0a8cbcc7356582b7f SHA512 
d65a7ed87c8b87ee9a6b15ace90114c1538af29669a0bd6688895876f1fb726d38ddc4f686efdf5a33fc2a950cab10ca032dcd8f42ef5941b3b089239c6b11f5
 WHIRLPOOL 
56848f1248f42066c3fa76b617c9f24411209376fa088b39ee3a630ffb7a6368fa188050118f17b09af77a4ab6495e310edefc6c4f9dfd2082ef4d57eb902c0f

diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch 
b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
new file mode 100644
index 000..a75b84b482f
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
@@ -0,0 +1,55 @@
+--- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
 poppler-0.61.0/cmake/modules/PopplerMacros.cmake
+@@ -98,8 +98,6 @@
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+-  # set the default compile warnings
+   set(_warn "-Wall -Wextra -Wpedantic")
+   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
+   set(_warn "${_warn} -Wcast-align")
+@@ -124,39 +122,6 @@
+   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
+   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
+ 
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS"-fno-exceptions -fno-check-new 
-fno-common -D_DEFAULT_SOURCE")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_RELEASE"-O2 -DNDEBUG ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUG  "-g -O2 -fno-reorder-blocks 
-fno-schedule-insns -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL  "-g3 -fno-inline ${_save_cxxflags}")
+-  set(CMAKE_CXX_FLAGS_PROFILE"-g3 -fno-inline -ftest-coverage 
-fprofile-arcs ${_save_cxxflags}")
+-  set(_save_cflags "${CMAKE_C_FLAGS}")
+-  set(CMAKE_C_FLAGS  "-std=c99 -D_DEFAULT_SOURCE")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_RELEASE  "-O2 -DNDEBUG ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUG"-g -O2 -fno-reorder-blocks 
-fno-schedule-insns -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_DEBUGFULL"-g3 -fno-inline ${_save_cflags}")
+-  set(CMAKE_C_FLAGS_PROFILE  "-g3 -fno-inline -ftest-coverage 
-fprofile-arcs ${_save_cflags}")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-Wl,--as-needed")
+-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} 
-Wl,--as-needed")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  endif(GCC_HAS_AS_NEEDED)
+-endif (CMAKE_COMPILER_IS_GNUCXX)
+-
+-if(CMAKE_C_COMPILER MATCHES "icc")
+-  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g 

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-05-30 Thread Andreas Hüttel
commit: 6376e44deab97a83ce365b4b71b1a5db468f52a6
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue May 30 19:47:26 2017 +
Commit: Andreas Hüttel  gentoo  org>
CommitDate: Tue May 30 19:47:38 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6376e44d

app-text/poppler: Revision bump for bug 620198

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../files/poppler-0.55.0-CVE-2017-7511.patch   |  57 +
 app-text/poppler/poppler-0.55.0-r1.ebuild  | 137 +
 2 files changed, 194 insertions(+)

diff --git a/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch 
b/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch
new file mode 100644
index 000..64df1cfde43
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.55.0-CVE-2017-7511.patch
@@ -0,0 +1,57 @@
+From 5c9b08a875b07853be6c44e43ff5f7f059df666a Mon Sep 17 00:00:00 2001
+From: Albert Astals Cid 
+Date: Sat, 27 May 2017 00:09:17 +0200
+Subject: pdfunite: Fix crash with broken documents
+
+Sometimes we can't parse pages so check before accessing them
+
+Thanks to Jiaqi Peng for the report
+
+Fixes bugs #101153 and #101149
+
+diff --git a/utils/pdfunite.cc b/utils/pdfunite.cc
+index dfe48bf..c32e201 100644
+--- a/utils/pdfunite.cc
 b/utils/pdfunite.cc
+@@ -7,7 +7,7 @@
+ // Copyright (C) 2011-2015, 2017 Thomas Freitag 
+ // Copyright (C) 2012 Arseny Solokha 
+ // Copyright (C) 2012 Fabio D'Urso 
+-// Copyright (C) 2012, 2014 Albert Astals Cid 
++// Copyright (C) 2012, 2014, 2017 Albert Astals Cid 
+ // Copyright (C) 2013 Adrian Johnson 
+ // Copyright (C) 2013 Hib Eris 
+ // Copyright (C) 2015 Arthur Stavisky 
+@@ -268,15 +268,15 @@ int main (int argc, char *argv[])
+ catDict->lookup("OutputIntents", );
+ catDict->lookupNF("AcroForm", );
+ Ref *refPage = docs[0]->getCatalog()->getPageRef(1);
+-if (!afObj.isNull()) {
++if (!afObj.isNull() && refPage) {
+   docs[0]->markAcroForm(, yRef, countRef, 0, refPage->num, 
refPage->num);
+ }
+ catDict->lookupNF("OCProperties", );
+-if (!ocObj.isNull() && ocObj.isDict()) {
++if (!ocObj.isNull() && ocObj.isDict() && refPage) {
+   docs[0]->markPageObjects(ocObj.getDict(), yRef, countRef, 0, 
refPage->num, refPage->num);
+ }
+ catDict->lookup("Names", );
+-if (!names.isNull() && names.isDict()) {
++if (!names.isNull() && names.isDict() && refPage) {
+   docs[0]->markPageObjects(names.getDict(), yRef, countRef, 0, 
refPage->num, refPage->num);
+ }
+ if (intents.isArray() && intents.arrayGetLength() > 0) {
+@@ -353,6 +353,10 @@ int main (int argc, char *argv[])
+ 
+   for (i = 0; i < (int) docs.size(); i++) {
+ for (j = 1; j <= docs[i]->getNumPages(); j++) {
++  if (!docs[i]->getCatalog()->getPage(j)) {
++continue;
++  }
++
+   PDFRectangle *cropBox = NULL;
+   if (docs[i]->getCatalog()->getPage(j)->isCropped())
+ cropBox = docs[i]->getCatalog()->getPage(j)->getCropBox();
+-- 
+cgit v0.10.2
+

diff --git a/app-text/poppler/poppler-0.55.0-r1.ebuild 
b/app-text/poppler/poppler-0.55.0-r1.ebuild
new file mode 100644
index 000..df90008fc25
--- /dev/null
+++ b/app-text/poppler/poppler-0.55.0-r1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs xdg-utils
+
+if [[ "${PV}" == "" ]] ; then
+   inherit git-r3
+   EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}"
+   SLOT="0/"
+else
+   SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz;
+   KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris 
~x86-solaris"
+   SLOT="0/67"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so 
SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/;
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png 
qt4 qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+COMMON_DEPEND="
+   >=media-libs/fontconfig-2.6.0
+   >=media-libs/freetype-2.3.9
+   sys-libs/zlib
+   cairo? (
+   dev-libs/glib:2
+   >=x11-libs/cairo-1.10.0
+   introspection? ( >=dev-libs/gobject-introspection-1.32.1:= )
+   )
+   curl? ( net-misc/curl )
+   jpeg? ( virtual/jpeg:0 )
+   jpeg2k? ( media-libs/openjpeg:2= )
+   lcms? ( media-libs/lcms:2 )
+   nss? ( >=dev-libs/nss-3.19:0 )
+   png? ( media-libs/libpng:0= )
+   qt4? (
+   

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2017-05-10 Thread Lars Wendler
commit: 38ff9414211e0b8aaa7fad6780284821d15c120d
Author: Lars Wendler  gentoo  org>
AuthorDate: Wed May 10 15:10:58 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Wed May 10 15:11:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ff9414

app-text/poppler: Bump to version 0.54.0

Adjusted live ebuild accordingly.
Permission kindly granted by mrueg.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 app-text/poppler/Manifest  |  1 +
 .../files/poppler-0.53.0-respect-cflags.patch  | 52 ++
 .../{poppler-.ebuild => poppler-0.54.0.ebuild} | 15 ---
 app-text/poppler/poppler-.ebuild   | 11 -
 4 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 97ab4a06bb0..635441aa528 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,3 +1,4 @@
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 
96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 
b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b
 WHIRLPOOL 
687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
 DIST poppler-0.51.0.tar.xz 1691504 SHA256 
e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f SHA512 
f2e49cc8587396e38ac9125fa662bcb472eb0b9c9e0ce57135d72ad1792d55db858c7d00b8322b52ac3fe0cd97eacd2d570d3e579367c4acf2f04051f723c5c5
 WHIRLPOOL 
5e625db67411d1a3b9da4fbd78c82cfef03b78dd03854f3d1ab394b2bc0f6afe3f27983ee03d67ab03d28b29f94375332ef03d6c2263750125579f99428fd819
 DIST poppler-0.52.0.tar.xz 1692144 SHA256 
528b661738839f9a25f6e580fcd2d5db007e0a1948580c6489f0062798ca1992 SHA512 
8047af6cb6b1daff12f26463addbaaf532ef1f5c5185bc37eba6bc110438bc88687115bfec2802d738612fbc0c51ca5f7a5182989a23e30a05e9dab7ae4f5a52
 WHIRLPOOL 
024ae2ce4a68bbf77a6147fd73488cef3363f8a2d87eb11feb6148d2d22b2e04bac315e6b4ecfa8583c4e027f1f599343b1f93dce3efef80d4d8fecb200ae35f
+DIST poppler-0.54.0.tar.xz 1698392 SHA256 
10cca9a67cc2e6f4f9024192b1067c444218bf94430891f43dc819d78536ca31 SHA512 
1967cebdcc24c6a4ffc2ebea6940fafe315040afe5c8d797521897fe6ba851704af0e90122d3213d10d1dede7594b14198e6592c0666f4091e866c10cd104b43
 WHIRLPOOL 
d33a7b315b4fe9c5b9c4746277ff2234269080e23fdd61f1fc7d7a3960beecfa30900fa8874890b5442ecefc105314b46f1f8bb0da661ad7770b5ce2b082a31a

diff --git a/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch 
b/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch
new file mode 100644
index 000..3fdd9c20382
--- /dev/null
+++ b/app-text/poppler/files/poppler-0.53.0-respect-cflags.patch
@@ -0,0 +1,52 @@
+diff --git a/cmake/modules/PopplerMacros.cmake 
b/cmake/modules/PopplerMacros.cmake
+index 8e3ef399..5c20bf63 100644
+--- a/cmake/modules/PopplerMacros.cmake
 b/cmake/modules/PopplerMacros.cmake
+@@ -98,45 +98,14 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+   set(CMAKE_BUILD_TYPE RelWithDebInfo)
+ endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+ 
+-if(CMAKE_COMPILER_IS_GNUCXX)
+if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0.0")
+   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsuggest-override" )
+endif()
+ 
+-  # set the default compile warnings
+   set(DEFAULT_COMPILE_WARNINGS_NO)
+   set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wcast-align -fno-exceptions 
-fno-check-new -fno-common")
+   set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef 
-D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wall -W 
-Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute 
-fno-exceptions -fno-check-new -fno-common")
+ 
+-  set(CMAKE_CXX_FLAGS"-Wnon-virtual-dtor -Woverloaded-virtual 
${CMAKE_CXX_FLAGS}")
+-  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
+-  set(CMAKE_CXX_FLAGS_RELEASE"-O2 -DNDEBUG")
+-  set(CMAKE_CXX_FLAGS_DEBUG  "-g -O2 -fno-reorder-blocks 
-fno-schedule-insns -fno-inline")
+-  set(CMAKE_CXX_FLAGS_DEBUGFULL  "-g3 -fno-inline")
+-  set(CMAKE_CXX_FLAGS_PROFILE"-g3 -fno-inline -ftest-coverage 
-fprofile-arcs")
+-  set(CMAKE_C_FLAGS  "-std=c99")
+-  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g")
+-  set(CMAKE_C_FLAGS_RELEASE  "-O2 -DNDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG"-g -O2 -fno-reorder-blocks 
-fno-schedule-insns -fno-inline")
+-  set(CMAKE_C_FLAGS_DEBUGFULL"-g3 -fno-inline")
+-  set(CMAKE_C_FLAGS_PROFILE  "-g3 -fno-inline -ftest-coverage 
-fprofile-arcs")
+-
+-  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+-  if(GCC_HAS_AS_NEEDED)
+-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} 
-Wl,--as-needed")
+-set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} 
-Wl,--as-needed")
+-set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
+-  

[gentoo-commits] repo/gentoo:master commit in: app-text/poppler/files/, app-text/poppler/

2016-12-21 Thread Johannes Huber
commit: 72284d38f787b80f769fc63484ee8a9c70bd47d6
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed Dec 21 17:06:58 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed Dec 21 17:09:48 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72284d38

app-text/poppler: Remove 0.46.0 (r1)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-text/poppler/Manifest  |   1 -
 .../poppler/files/poppler-0.46.0-crashfix-1.patch  |  36 -
 .../poppler/files/poppler-0.46.0-crashfix-2.patch  |  41 --
 app-text/poppler/poppler-0.46.0-r1.ebuild  | 145 -
 4 files changed, 223 deletions(-)

diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index d7a0818..00bc13a 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,6 +1,5 @@
 DIST poppler-0.42.0.tar.xz 1674024 SHA256 
9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 
ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19
 WHIRLPOOL 
095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736
 DIST poppler-0.45.0.tar.xz 1674464 SHA256 
96dd1a6024bcdaa4530a3b49687db3d5c24ddfd072ccb37c6de0e42599728798 SHA512 
b703bed35da3572801834740bf61d59b6a3ee3b88bc1b3181bde3472264be4f6b89ceacb56179d7093329946abd6ba2501acfaf209d4f543352ff9fd38c47f1b
 WHIRLPOOL 
687b1ba816dbff1b0a69cb05914dd7fb161bfd8c0fa4e26b77bb0ad26e27f7d7d94085a1022716a8d7a7563145f0acead9fccbbd332959d0216b81b27f3632e8
-DIST poppler-0.46.0.tar.xz 1680940 SHA256 
967d35d13d61dee2fee656b80efef9e388a9e752bc79b7123f15b49c7769e487 SHA512 
c303875ae8082e8cd0332ecff82e52678393d0015d092aee6fec3cc191218f155aca049ce43996c255122f550aae53ed019bb7855291d117d0b9e25ab83e9caf
 WHIRLPOOL 
332aa78ba5a905a1c1b1fa62b20e730c7e7cde91f0a6f3c0291f85ea35188d65e496db8145c4eca8b382e8be6061bf16201603a3654c83f8c9f40e142fef0e74
 DIST poppler-0.47.0.tar.xz 1682184 SHA256 
b872e7228fc34a71ce4b47a5aea2a57ae67528818fa846e1e0eda089319bd242 SHA512 
44b5b1546f66f1b95e1359f4fdf79458d902604dababbcc0ecb0d45ed90451680bb1f3b5e163bd17e16fda1b8656bec6c9072964f9d8f276cb38a7be95db63a5
 WHIRLPOOL 
1d7c0ad5e81fdbccc7e55f58ee94fd5ee9f905d94e8dfdde3ebb350e085d709e409aa6f981e0f0f12c73b9a6d94120250ba2be12a80adf7216e1fc11ec9e7ca8
 DIST poppler-0.48.0.tar.xz 1684164 SHA256 
85a003968074c85d8e13bf320ec47cef647b496b56dcff4c790b34e5482fef93 SHA512 
20db22ab071479ba46f1a59b5bb5b2b5ba65da7d81037241b9aeb11234eaca007900b0368ffeb7a3b983807b1c39735ffabe9719f5856075d3a286461830a0d5
 WHIRLPOOL 
a902a8340a33fd5cbe17846cfda5817771f8a04e01d8b872f3650013d05d17e81f395f2dd15865495b1f552f70a2e9f65a6f027b5d87a3ba5a5ce1c31dfddc68
 DIST poppler-0.49.0.tar.xz 1685860 SHA256 
14485f0e1e43dcddf49cfc02c2ccb92910ba3e0e91e06f4bd2642ec00cb3a79f SHA512 
f840c28688318693efdf5af70608c72cdfc80399c33dc6f929918775b43b0c36695d8accc50fdce5d7c6bd0503206488d9658291613393e6ead0174bcb29dd79
 WHIRLPOOL 
a3f9b13add6e103b491456abc7571dcdf66a3a1285c4dfe21289468d13b384adc1d99fb9ed8de4cc9150683914cc513666df6d0e218531e01acbd0884979cc9d

diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch 
b/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch
deleted file mode 100644
index 6d2352b..
--- a/app-text/poppler/files/poppler-0.46.0-crashfix-1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 7d3aea760a14a73962e429059f73d97391660367 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Sat, 30 Jul 2016 17:32:59 +0200
-Subject: [PATCH 1/2] Fix abort on documents where the docinfo obj is not a
- dict
-
-Bug #97134

- poppler/PDFDoc.cc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
-index c91d6e4..a51d8b6 100644
 a/poppler/PDFDoc.cc
-+++ b/poppler/PDFDoc.cc
-@@ -14,7 +14,7 @@
- // under GPL version 2 or later
- //
- // Copyright (C) 2005, 2006, 2008 Brad Hards 
--// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid 
-+// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid 
- // Copyright (C) 2008 Julien Rebetez 
- // Copyright (C) 2008, 2010 Pino Toscano 
- // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos 
-@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const char *key, 
GooString *value)
- GooString *PDFDoc::getDocInfoStringEntry(const char *key) {
-   Object infoObj;
-   getDocInfo();
--  if (infoObj.isNull()) {
-+  if (!infoObj.isDict()) {
-   return NULL;
-   }
- 
--- 
-2.9.1
-

diff --git a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch 
b/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch
deleted file mode 100644
index 3c2aa0a..
--- a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From