svn commit: r529740 - in head/graphics: poppler poppler-glib poppler-qt5 poppler-utils poppler/files

[Ashish SHUKLA]

Author: ashish
Date: Sat Mar 28 15:57:26 2020
New Revision: 529740
URL: https://svnweb.freebsd.org/changeset/ports/529740

Log:
  - Add patches from upstream to fix segmentation fault with PDF files
    which include links
  
  PR:		245093
  Approved by:	tcberner (from desktop@)

Added:
  head/graphics/poppler/files/
  head/graphics/poppler/files/patch-glib_poppler-action.cc   (contents, props changed)
  head/graphics/poppler/files/patch-utils_HtmlOutputDev.cc   (contents, props changed)
Modified:
  head/graphics/poppler-glib/Makefile
  head/graphics/poppler-qt5/Makefile
  head/graphics/poppler-utils/Makefile
  head/graphics/poppler/Makefile

Modified: head/graphics/poppler-glib/Makefile
==============================================================================
--- head/graphics/poppler-glib/Makefile	Sat Mar 28 15:30:50 2020	(r529739)
+++ head/graphics/poppler-glib/Makefile	Sat Mar 28 15:57:26 2020	(r529740)
@@ -1,7 +1,7 @@
 # Created by: Michael Johnson <ahze at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
+PORTREVISION=	2
 
 COMMENT=	GLib bindings to poppler
 

Modified: head/graphics/poppler-qt5/Makefile
==============================================================================
--- head/graphics/poppler-qt5/Makefile	Sat Mar 28 15:30:50 2020	(r529739)
+++ head/graphics/poppler-qt5/Makefile	Sat Mar 28 15:57:26 2020	(r529740)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 PKGNAMESUFFIX=	-qt5
 
 COMMENT=	Qt 5 bindings to poppler

Modified: head/graphics/poppler-utils/Makefile
==============================================================================
--- head/graphics/poppler-utils/Makefile	Sat Mar 28 15:30:50 2020	(r529739)
+++ head/graphics/poppler-utils/Makefile	Sat Mar 28 15:57:26 2020	(r529740)
@@ -1,7 +1,7 @@
 # Created by: Michael Nottebrock <lofi at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Poppler's xpdf-workalike command line utilities # '
 

Modified: head/graphics/poppler/Makefile
==============================================================================
--- head/graphics/poppler/Makefile	Sat Mar 28 15:30:50 2020	(r529739)
+++ head/graphics/poppler/Makefile	Sat Mar 28 15:57:26 2020	(r529740)
@@ -3,6 +3,7 @@
 
 PORTNAME=	poppler
 DISTVERSION=	0.86.1
+PORTREVISION?=	1
 CATEGORIES=	graphics print
 MASTER_SITES=	https://poppler.freedesktop.org/
 

Added: head/graphics/poppler/files/patch-glib_poppler-action.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/poppler/files/patch-glib_poppler-action.cc	Sat Mar 28 15:57:26 2020	(r529740)
@@ -0,0 +1,51 @@
+--- glib/poppler-action.cc.orig	2020-03-01 19:52:52 UTC
++++ glib/poppler-action.cc
+@@ -627,39 +627,39 @@ _poppler_action_new (PopplerDocument *document,
+ 	switch (link->getKind ()) {
+ 	case actionGoTo:
+ 		action->type = POPPLER_ACTION_GOTO_DEST;
+-		build_goto_dest (document, action, dynamic_cast <const LinkGoTo *> (link));
++		build_goto_dest (document, action, static_cast <const LinkGoTo *> (link));
+ 		break;
+ 	case actionGoToR:
+ 		action->type = POPPLER_ACTION_GOTO_REMOTE;
+-		build_goto_remote (action, dynamic_cast <const LinkGoToR *> (link));
++		build_goto_remote (action, static_cast <const LinkGoToR *> (link));
+ 		break;
+ 	case actionLaunch:
+ 		action->type = POPPLER_ACTION_LAUNCH;
+-		build_launch (action, dynamic_cast <const LinkLaunch *> (link));
++		build_launch (action, static_cast <const LinkLaunch *> (link));
+ 		break;
+ 	case actionURI:
+ 		action->type = POPPLER_ACTION_URI;
+-		build_uri (action, dynamic_cast <const LinkURI *> (link));
++		build_uri (action, static_cast <const LinkURI *> (link));
+ 		break;
+ 	case actionNamed:
+ 		action->type = POPPLER_ACTION_NAMED;
+-		build_named (action, dynamic_cast <const LinkNamed *> (link));
++		build_named (action, static_cast <const LinkNamed *> (link));
+ 		break;
+ 	case actionMovie:
+ 		action->type = POPPLER_ACTION_MOVIE;
+-		build_movie (document, action, dynamic_cast<const LinkMovie*> (link));
++		build_movie (document, action, static_cast<const LinkMovie*> (link));
+ 		break;
+ 	case actionRendition:
+ 		action->type = POPPLER_ACTION_RENDITION;
+-		build_rendition (action, dynamic_cast<const LinkRendition*> (link));
++		build_rendition (action, static_cast<const LinkRendition*> (link));
+ 		break;
+ 	case actionOCGState:
+ 		action->type = POPPLER_ACTION_OCG_STATE;
+-		build_ocg_state (document, action, dynamic_cast<const LinkOCGState*> (link));
++		build_ocg_state (document, action, static_cast<const LinkOCGState*> (link));
+ 		break;
+ 	case actionJavaScript:
+ 		action->type = POPPLER_ACTION_JAVASCRIPT;
+-		build_javascript (action, dynamic_cast<const LinkJavaScript*> (link));
++		build_javascript (action, static_cast<const LinkJavaScript*> (link));
+ 		break;
+ 	case actionUnknown:
+ 	default:

Added: head/graphics/poppler/files/patch-utils_HtmlOutputDev.cc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/poppler/files/patch-utils_HtmlOutputDev.cc	Sat Mar 28 15:57:26 2020	(r529740)
@@ -0,0 +1,11 @@
+--- utils/HtmlOutputDev.cc.orig	2020-03-01 19:52:52 UTC
++++ utils/HtmlOutputDev.cc
+@@ -1838,7 +1838,7 @@ int HtmlOutputDev::getOutlinePageNum(OutlineItem *item
+     if (!action || action->getKind() != actionGoTo)
+         return pagenum;
+ 
+-    link = dynamic_cast<const LinkGoTo*>(action);
++    link = static_cast<const LinkGoTo*>(action);
+ 
+     if (!link || !link->isOk())
+         return pagenum;