svn commit: r390702 - in head/textproc/fop: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Jun 27 13:33:41 2015
New Revision: 390702
URL: https://svnweb.freebsd.org/changeset/ports/390702

Log:
  - Add workaround patch to fix misc/freebsd-doc-* building
  
  See https://issues.apache.org/jira/browse/FOP-2461
  
  PR:		201007
  Submitted by:	geoff at sea-incorporated.com (maintainer)

Added:
  head/textproc/fop/files/
  head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java   (contents, props changed)
Modified:
  head/textproc/fop/Makefile

Modified: head/textproc/fop/Makefile
==============================================================================
--- head/textproc/fop/Makefile	Sat Jun 27 13:27:09 2015	(r390701)
+++ head/textproc/fop/Makefile	Sat Jun 27 13:33:41 2015	(r390702)
@@ -3,6 +3,7 @@
 
 PORTNAME=	fop
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	textproc java
 MASTER_SITES=	APACHE/xmlgraphics/fop/source/:fop \
 		SF/offo/offo-hyphenation/2.1:hyph

Added: head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java	Sat Jun 27 13:33:41 2015	(r390702)
@@ -0,0 +1,20 @@
+--- src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java.orig	2015-05-26 08:03:48 UTC
++++ src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+@@ -393,7 +393,7 @@ public class ListItemLayoutManager exten
+             int breakClass = EN_AUTO;
+             KnuthElement endEl = elementLists[0].size() > 0 ? (KnuthElement) elementLists[0].get(end[0])
+                     : null;
+-            Position originalLabelPosition = endEl != null ? endEl.getPosition().getPosition() : null;
++            Position originalLabelPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
+             if (endEl instanceof KnuthPenalty) {
+                 additionalPenaltyHeight = endEl.getWidth();
+                 stepPenalty = endEl.getPenalty() == -KnuthElement.INFINITE ? -KnuthElement.INFINITE : Math
+@@ -402,7 +402,7 @@ public class ListItemLayoutManager exten
+                         ((KnuthPenalty) endEl).getBreakClass());
+             }
+             endEl = elementLists[1].size() > 0 ? (KnuthElement) elementLists[1].get(end[1]) : null;
+-            Position originalBodyPosition = endEl != null ? endEl.getPosition().getPosition() : null;
++            Position originalBodyPosition = (endEl != null && endEl.getPosition() != null) ? endEl.getPosition().getPosition() : null;
+             if (endEl instanceof KnuthPenalty) {
+                 additionalPenaltyHeight = Math.max(
+                         additionalPenaltyHeight, endEl.getWidth());