Emmanuel Bourg pushed to branch master at Debian Java Maintainers / fop
Commits: 59fc1bff by Emmanuel Bourg at 2026-11-18T23:20:20+01:00 Fixed the compatibility with xmlgraphics-commons 2.12 (Closes: #1154384) - - - - - 4 changed files: - debian/changelog - debian/control - debian/patches/series - + debian/patches/xmlgraphics-commons-compatibility.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +fop (1:2.10+dfsg1-5) unstable; urgency=medium + + * Team upload. + * Fixed the compatibility with xmlgraphics-commons 2.12 (Closes: #1154384) + + -- Emmanuel Bourg <[email protected]> Wed, 18 Nov 2026 23:10:57 +0100 + fop (1:2.10+dfsg1-4) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -32,7 +32,7 @@ Build-Depends: libxerces2-java, libxml-commons-external-java, libxml-maven-plugin-java, - libxmlgraphics-commons-java (>= 2.10), + libxmlgraphics-commons-java (>= 2.12), libxmlunit-java, maven-debian-helper, maven-repo-helper, ===================================== debian/patches/series ===================================== @@ -13,3 +13,4 @@ FOP-3275-java25-event-model.patch FOP-3236-xmp-test-namespaces.patch skip-AdobeStandardEncodingTestCase.patch renewed-signing-keystore.patch +xmlgraphics-commons-compatibility.patch ===================================== debian/patches/xmlgraphics-commons-compatibility.patch ===================================== @@ -0,0 +1,79 @@ +Description: Fix the compatibility with xmlgraphics-commons 2.12 +Origin: backport, https://github.com/apache/xmlgraphics-fop/commit/0eb213c0f917fff926e2ea1706ea1410b7c859b5 + backport, https://github.com/apache/xmlgraphics-fop/commit/7c028337d3364a8dc0b0e2735878e7aeb4b9639b +Bug-Debian: https://bugs.debian.org/1154384 +--- a/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java ++++ b/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderCCITTFax.java +@@ -69,4 +69,8 @@ + + return dict.toString() + " /CCITTFaxDecode"; + } ++ ++ public String getAdditionalFilter() { ++ return ""; ++ } + } +--- a/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderJPEG.java ++++ b/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderJPEG.java +@@ -48,4 +48,8 @@ + public String getImplicitFilter() { + return "<< >> /DCTDecode"; + } ++ ++ public String getAdditionalFilter() { ++ return ""; ++ } + } +--- a/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderPNG.java ++++ b/fop-core/src/main/java/org/apache/fop/render/ps/ImageEncoderPNG.java +@@ -118,4 +118,8 @@ + filter += " /BitsPerComponent " + image.getBitDepth() + " >> /FlateDecode"; + return filter; + } ++ ++ public String getAdditionalFilter() { ++ return ""; ++ } + } +--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java ++++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerRenderedImage.java +@@ -77,7 +77,7 @@ + ri = convertedImg; + } + +- ImageEncoder encoder = ImageEncodingHelper.createRenderedImageEncoder(ri); ++ ImageEncoder encoder = ImageEncodingHelper.createRenderedImageEncoder(ri, gen.getJPEGCompressionRatio()); + Dimension imgDim = new Dimension(ri.getWidth(), ri.getHeight()); + String imgDescription = ri.getClass().getName(); + ImageEncodingHelper helper = new ImageEncodingHelper(ri); +@@ -99,7 +99,7 @@ + FormGenerator formGen = new ImageFormGenerator( + form.getName(), imageDescription, + info.getSize().getDimensionPt(), +- ri, false); ++ ri, false, gen); + formGen.generate(gen); + } + +--- a/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java ++++ b/fop-core/src/main/java/org/apache/fop/render/ps/PSImageHandlerSVG.java +@@ -94,7 +94,7 @@ + + MaskedImage mi = convertToRGB(ImageIO.read(is)); + BufferedImage ri = mi.getImage(); +- ImageEncoder encoder = ImageEncodingHelper.createRenderedImageEncoder(ri); ++ ImageEncoder encoder = ImageEncodingHelper.createRenderedImageEncoder(ri, gen.getJPEGCompressionRatio()); + Dimension imgDim = new Dimension(ri.getWidth(), ri.getHeight()); + String imgDescription = ri.getClass().getName(); + ImageEncodingHelper helper = new ImageEncodingHelper(ri); +--- a/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java ++++ b/fop-core/src/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java +@@ -161,7 +161,7 @@ + Metadata meta = PDFMetadata.createXMPFromPDFDocument(doc); + + XMPProperty schemas = meta.getProperty(XMPConstants.PDF_A_EXTENSION, "schemas"); +- assertProperties(schemas, XMPConstants.PDF_A_EXTENSION, "schemas", null, null); ++ assertProperties(schemas, XMPConstants.PDF_A_EXTENSION, "schemas", "pdfaExtension", null); + assertNotNull("When PDF/A and PDF/UA are both active, we need to add an " + + "extension element to avoid validation errors from PDF/A validators", schemas); + View it on GitLab: https://salsa.debian.org/java-team/fop/-/commit/59fc1bff62f70013432aef05ffaa3c2bd4cb184f -- View it on GitLab: https://salsa.debian.org/java-team/fop/-/commit/59fc1bff62f70013432aef05ffaa3c2bd4cb184f You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits

