app-text/poppler: Remove 0.46.0 (r1)

Package-Manager: Portage-2.3.3, Repoman-2.3.1

2 files changed, 0 insertions, 77 deletions

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 6d2352bd17f4..000000000000
--- 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 <aacid@kde.org>
-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 <bradh@frogmouth.net>
--// Copyright (C) 2005, 2007-2009, 2011-2015 Albert Astals Cid <aacid@kde.org>
-+// Copyright (C) 2005, 2007-2009, 2011-2016 Albert Astals Cid <aacid@kde.org>
- // Copyright (C) 2008 Julien Rebetez <julienr@svn.gnome.org>
- // Copyright (C) 2008, 2010 Pino Toscano <pino@kde.org>
- // Copyright (C) 2008, 2010, 2011 Carlos Garcia Campos <carlosgc@gnome.org>
-@@ -646,7 +646,7 @@ void PDFDoc::setDocInfoStringEntry(const char *key, GooString *value)
- GooString *PDFDoc::getDocInfoStringEntry(const char *key) {
-   Object infoObj;
-   getDocInfo(&infoObj);
--  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 3c2aa0af1730..000000000000
--- a/app-text/poppler/files/poppler-0.46.0-crashfix-2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3f5c84e17acfa71dfd44514384398f5a4c449630 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sat, 30 Jul 2016 17:50:42 +0200
-Subject: [PATCH 2/2] Check for XRefEntry existing before using it
-
-Bug #97005
----
- poppler/Hints.cc | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/poppler/Hints.cc b/poppler/Hints.cc
-index bdd0d32..6c2fc25 100644
---- a/poppler/Hints.cc
-+++ b/poppler/Hints.cc
-@@ -5,7 +5,7 @@
- // This file is licensed under the GPLv2 or later
- //
- // Copyright 2010, 2012 Hib Eris <hib@hiberis.nl>
--// Copyright 2010, 2011, 2013, 2014 Albert Astals Cid <aacid@kde.org>
-+// Copyright 2010, 2011, 2013, 2014, 2016 Albert Astals Cid <aacid@kde.org>
- // Copyright 2010, 2013 Pino Toscano <pino@kde.org>
- // Copyright 2013 Adrian Johnson <ajohnson@redneon.com>
- // Copyright 2014 Fabio D'Urso <fabiodurso@hotmail.it>
-@@ -43,7 +43,13 @@ Hints::Hints(BaseStream *str, Linearization *linearization, XRef *xref, Security
-       pageObjectFirst);
-     pageObjectFirst = 0;
-   }
--  pageOffsetFirst = xref->getEntry(pageObjectFirst)->offset;
-+  XRefEntry *pageObjectFirstXRefEntry = xref->getEntry(pageObjectFirst);
-+  if (!pageObjectFirstXRefEntry) {
-+      error(errSyntaxWarning, -1, "No XRef entry for first page object");
-+      pageOffsetFirst = 0;
-+  } else {
-+      pageOffsetFirst = pageObjectFirstXRefEntry->offset;
-+  }
- 
-   if (nPages >= INT_MAX / (int)sizeof(Guint)) {
-      error(errSyntaxWarning, -1, "Invalid number of pages ({0:d}) for hints table", nPages);
--- 
-2.9.1
-