aboutsummaryrefslogtreecommitdiff
path: root/textproc/fop/files
diff options
context:
space:
mode:
authorDmitry Marakasov <amdmi3@FreeBSD.org>2015-06-27 13:33:41 +0000
committerDmitry Marakasov <amdmi3@FreeBSD.org>2015-06-27 13:33:41 +0000
commit37bebf844533c7f8d7ef0e15cf08419f492f14af (patch)
tree22df56a24df416702acd0116316676150a78d1bd /textproc/fop/files
parent87ea2e59d31518b4bdd06f33f86512813e667c1e (diff)
downloadports-37bebf844533c7f8d7ef0e15cf08419f492f14af.tar.gz
ports-37bebf844533c7f8d7ef0e15cf08419f492f14af.zip
- Add workaround patch to fix misc/freebsd-doc-* building
See https://issues.apache.org/jira/browse/FOP-2461 PR: 201007 Submitted by: geoff@sea-incorporated.com (maintainer)
Notes
Notes: svn path=/head/; revision=390702
Diffstat (limited to 'textproc/fop/files')
-rw-r--r--textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java20
1 files changed, 20 insertions, 0 deletions
diff --git a/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java b/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java
new file mode 100644
index 000000000000..519a05d5dd7c
--- /dev/null
+++ b/textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java
@@ -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());