diff --git a/0001-Main.patch b/0001-Main.patch new file mode 100644 index 0000000..1d83354 --- /dev/null +++ b/0001-Main.patch @@ -0,0 +1,22 @@ +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:54:43 +0200 +Subject: [PATCH] Main + + +diff --git a/fop-core/src/main/java/org/apache/fop/cli/Main.java b/fop-core/src/main/java/org/apache/fop/cli/Main.java +index b8ba68df9..b14bc831e 100644 +--- a/fop-core/src/main/java/org/apache/fop/cli/Main.java ++++ b/fop-core/src/main/java/org/apache/fop/cli/Main.java +@@ -210,11 +210,7 @@ public final class Main { + * @param args the command line parameters + */ + public static void main(String[] args) { +- if (checkDependencies()) { +- startFOP(args); +- } else { +- startFOPWithDynamicClasspath(args); +- } ++ startFOP(args); + } + + } diff --git a/0002-Use-sRGB.icc-color-profile-from-colord-package.patch b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch new file mode 100644 index 0000000..fa3157b --- /dev/null +++ b/0002-Use-sRGB.icc-color-profile-from-colord-package.patch @@ -0,0 +1,33 @@ +From: Michael Simacek +Date: Tue, 14 Jul 2015 16:56:49 +0200 +Subject: [PATCH] Use sRGB.icc color profile from colord package + + +diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +index 704898def..1ce14cb4e 100644 +--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java ++++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +@@ -22,7 +22,9 @@ package org.apache.fop.pdf; + import java.awt.color.ColorSpace; + import java.awt.color.ICC_Profile; + import java.io.IOException; ++import java.io.FileNotFoundException; + import java.io.InputStream; ++import java.io.FileInputStream; + import java.util.Set; + + import org.apache.commons.io.IOUtils; +@@ -138,7 +140,12 @@ public class PDFICCBasedColorSpace extends PDFObject implements PDFColorSpace { + public static PDFICCStream setupsRGBColorProfile(PDFDocument pdfDoc) { + ICC_Profile profile; + PDFICCStream sRGBProfile = pdfDoc.getFactory().makePDFICCStream(); +- InputStream in = PDFDocument.class.getResourceAsStream("sRGB.icc"); ++ InputStream in; ++ try { ++ in = new FileInputStream("/usr/share/color/icc/colord/sRGB.icc"); ++ } catch (FileNotFoundException e) { ++ in = null; ++ } + if (in != null) { + try { + profile = ColorProfileUtil.getICC_Profile(in); diff --git a/fop.spec b/fop.spec index 55ec177..f9f06b0 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Name: fop Summary: XSL-driven print formatter Version: 2.6 -Release: 1%{?dist} +Release: 2%{?dist} # ASL 1.1: # several files in fop-core/src/main/resources/org/apache/fop/render/awt/viewer/resources # rest is ASL 2.0 @@ -12,6 +12,8 @@ Source1: %{name}.script Source2: batik-pdf-MANIFEST.MF Source4: https://www.apache.org/licenses/LICENSE-1.1.txt #Patch0: fop-xmlunit.patch +Patch1: 0001-Main.patch +Patch2: 0002-Use-sRGB.icc-color-profile-from-colord-package.patch Patch4: 0004-Port-to-QDox-2.0.patch BuildArch: noarch @@ -117,6 +119,9 @@ cp -rp target/xmvn-apidocs/* %{buildroot}%{_javadocdir}/%{name} %changelog +* Thu Aug 26 2021 Peter Lemenkov - 2.6-2 +- Restore two patches + * Wed Aug 25 2021 Orion Poplawski - 2.6-1 - Update to 2.6, build with maven