kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Add workaround patch to fix misc/freebsd-doc-* building

Browse source 
See https://issues.apache.org/jira/browse/FOP-2461

PR:		201007
Submitted by:	geoff@sea-incorporated.com (maintainer)
This commit is contained in:
Dmitry Marakasov 2015-06-27 13:33:41 +00:00
parent 87ea2e59d3
commit 37bebf8445
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=390702
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
textproc/fop/Makefile
View file

@ -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

20
textproc/fop/files/patch-src_java_org_apache_fop_layoutmgr_list_ListItemLayoutManager.java Normal file
View file

@ -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());