From 6b693cacc379c7cfdb9c77928c2a2b12bd9d1c9a Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Aug 07 2015 11:05:25 +0000 Subject: Add fix for FOP-2461 (rhbz#1251173) --- diff --git a/0001-Main.patch b/0001-Main.patch index bf09bc7..767cef9 100644 --- a/0001-Main.patch +++ b/0001-Main.patch @@ -1,7 +1,7 @@ From 040c088781b565273ccc085b597bab2e7b99c782 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:54:43 +0200 -Subject: [PATCH 1/4] Main +Subject: [PATCH 1/5] Main --- src/java/org/apache/fop/cli/Main.java | 6 +----- diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch index 18ab448..21082a8 100644 --- a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -1,7 +1,7 @@ From bddb924b5390c98dc012e0bc15fa6bddb53a64aa Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 14 Jul 2015 16:56:49 +0200 -Subject: [PATCH 2/4] Use sRGB.icc color profile from colord package +Subject: [PATCH 2/5] Use sRGB.icc color profile from colord package It's a replacement for non-free color profile shipped with fop --- diff --git a/0003-Disable-javadoc-doclint.patch b/0003-Disable-javadoc-doclint.patch index 9a9b2ed..496b426 100644 --- a/0003-Disable-javadoc-doclint.patch +++ b/0003-Disable-javadoc-doclint.patch @@ -1,7 +1,7 @@ From 1af3481114fda16bc6104618ac19b98577b69460 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 14 May 2015 06:26:09 +0200 -Subject: [PATCH 3/4] Disable javadoc doclint +Subject: [PATCH 3/5] Disable javadoc doclint --- build.xml | 1 + diff --git a/0004-Port-to-QDox-2.0.patch b/0004-Port-to-QDox-2.0.patch index ba6d04c..93c1527 100644 --- a/0004-Port-to-QDox-2.0.patch +++ b/0004-Port-to-QDox-2.0.patch @@ -1,7 +1,7 @@ From 3edb7de2cdd7dab48947882ae3340b0c3a0a9f87 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Tue, 17 Mar 2015 10:59:41 +0100 -Subject: [PATCH 4/4] Port to QDox 2.0 +Subject: [PATCH 4/5] Port to QDox 2.0 --- .../apache/fop/tools/EventProducerCollector.java | 59 ++++++++-------------- diff --git a/0005-NPE-FOP-2461.patch b/0005-NPE-FOP-2461.patch new file mode 100644 index 0000000..ef464cb --- /dev/null +++ b/0005-NPE-FOP-2461.patch @@ -0,0 +1,36 @@ +From 616945aa41c7ef4885d29481df072f760b18ddb5 Mon Sep 17 00:00:00 2001 +From: Michael Simacek +Date: Fri, 7 Aug 2015 13:03:32 +0200 +Subject: [PATCH 5/5] NPE-FOP-2461 + +--- + src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +index 9ba1bce..b42c635 100644 +--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java ++++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +@@ -393,7 +393,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage + 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 +403,8 @@ public class ListItemLayoutManager extends SpacedBorderedPaddedBlockLayoutManage + ((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()); +-- +2.1.0 + diff --git a/fop.spec b/fop.spec index ace14fa..0ae0156 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.0 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in src/java/org/apache/fop/render/awt/viewer/resources/ # rest is ASL 2.0 @@ -17,6 +17,8 @@ Patch0: 0001-Main.patch Patch1: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch2: 0003-Disable-javadoc-doclint.patch Patch3: 0004-Port-to-QDox-2.0.patch +# https://issues.apache.org/jira/browse/FOP-2461 +Patch4: 0005-NPE-FOP-2461.patch BuildArch: noarch @@ -65,6 +67,7 @@ Javadoc for %{name}. %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 cp %{SOURCE4} LICENSE-1.1 @@ -120,6 +123,9 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %changelog +* Fri Aug 07 2015 Michael Simacek - 2.0-2 +- Add fix for FOP-2461 (rhbz#1251173) + * Tue Jul 14 2015 Michael Simacek - 2.0-1 - Update to upstream version 2.0