From c330953a564c40f31dce62e43d966cd457c7bf41ad6a8287c9ff6ed779cafe5f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 3 Apr 2020 10:53:12 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=89 --- fop-2.1-batik-xmlconstants.patch | 11 ++++++++ xmlgraphics-fop.changes | 9 +++++++ xmlgraphics-fop.spec | 46 +++++++++++++++----------------- 3 files changed, 42 insertions(+), 24 deletions(-) create mode 100644 fop-2.1-batik-xmlconstants.patch diff --git a/fop-2.1-batik-xmlconstants.patch b/fop-2.1-batik-xmlconstants.patch new file mode 100644 index 0000000..9d46cf4 --- /dev/null +++ b/fop-2.1-batik-xmlconstants.patch @@ -0,0 +1,11 @@ +--- fop-2.1/src/java/org/apache/fop/svg/SVGUtilities.java 2016-01-07 15:13:29.000000000 +0100 ++++ fop-2.1/src/java/org/apache/fop/svg/SVGUtilities.java 2020-04-03 12:41:31.331947147 +0200 +@@ -29,7 +29,7 @@ + import org.w3c.dom.Element; + + import org.apache.batik.anim.dom.SVGDOMImplementation; +-import org.apache.batik.util.XMLConstants; ++import org.apache.batik.constants.XMLConstants; + + /** + * Some utilities for creating svg DOM documents and elements. diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index d1ea53d..fcff18e 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Apr 3 10:50:59 UTC 2020 - Fridrich Strba + +- Added patch: + * fop-2.1-batik-xmlconstants.patch + + apply when building with batik >= 1.11 + + batik 1.11 moved XMLConstants class from + org.apache.batik.util to org.apache.batik.constants + ------------------------------------------------------------------- Wed Aug 14 23:18:43 UTC 2019 - Frank H. Ellenberger diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec index db83922..36eaecf 100644 --- a/xmlgraphics-fop.spec +++ b/xmlgraphics-fop.spec @@ -1,7 +1,7 @@ # # spec file for package xmlgraphics-fop # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2000-2008, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -43,15 +43,16 @@ Patch4: java8-compatibility.patch # PATCH-FEATURE-OPENSUSE reproducible-build-manifest.patch -- boo#1110024 Patch5: reproducible-build-manifest.patch Patch6: fop-2.1-QDox-2.0.patch +Patch7: fop-2.1-batik-xmlconstants.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-pdfbox BuildRequires: avalon-framework >= 4.3 BuildRequires: commons-io >= 2.4 BuildRequires: commons-logging BuildRequires: docbook-xsl-stylesheets -BuildRequires: java-devel >= 1.8 # Needed for maven conversions BuildRequires: glassfish-servlet-api +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: libxslt BuildRequires: qdox >= 2.0 @@ -92,7 +93,11 @@ rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java %patch3 -p1 %patch4 -p1 %patch5 -p1 +# Batik 1.11 moved XMLConstants from org.apache.batik.util to org.apache.batik.constants %patch6 -p1 +%if %{?pkg_vcmp:%pkg_vcmp xmlgraphics-batik >= 1.11}%{!?pkg_vcmp:0} +%patch7 -p1 +%endif cp %{SOURCE2} %{SOURCE3} %{SOURCE4} . # Replace keyword "VERSION" in XML files with the real one: @@ -102,21 +107,21 @@ done sed -i "s=@version@=%{version}=" xmlgraphics-fop-pom-template.pom %build -pushd lib -ln -s $(build-classpath avalon-framework-api) -ln -s $(build-classpath avalon-framework-impl) -ln -s $(build-classpath commons-io) -ln -s $(build-classpath commons-logging) -ln -s $(build-classpath fontbox) -ln -s $(build-classpath glassfish-servlet-api) -ln -s $(build-classpath xml-commons-apis) -ln -s $(build-classpath xml-commons-apis-ext) -ln -s $(build-classpath batik-all) -ln -s $(build-classpath xmlgraphics-commons) -ln -s $(build-classpath qdox) -popd +build-jar-repository -s lib \ + avalon-framework-api \ + avalon-framework-impl \ + commons-io \ + commons-logging \ + fontbox \ + glassfish-servlet-api \ + xml-commons-apis \ + xml-commons-apis-ext \ + batik-all \ + xmlgraphics-commons \ + qdox + export CLASSPATH= LANG=en_US.UTF-8 -ant \ +%{ant} \ -Djavac.source=1.8 -Djavac.target=1.8 \ package @@ -169,7 +174,7 @@ for m in *.1.gz; do done popd -%files +%files -f .mfiles %license LICENSE %doc NOTICE README known-issues.xml %doc *.html @@ -180,14 +185,7 @@ popd %{_bindir}/%{bname}-fontmetrics %attr(0755,root,root) %{_bindir}/%{name}-fontlist %{_bindir}/%{bname}-fontlist -%{_javadir}/%{name}.jar %{_datadir}/%{name} -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %{_mandir}/man1/* %config(noreplace) %{_sysconfdir}/fop.xconf From 1c9391e1c36a97913044a3ddc149171f7fdfa3869ee8b62cb33393d3e3a5fa23 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 3 Apr 2020 10:55:13 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=90 --- xmlgraphics-fop.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmlgraphics-fop.changes b/xmlgraphics-fop.changes index fcff18e..072407e 100644 --- a/xmlgraphics-fop.changes +++ b/xmlgraphics-fop.changes @@ -4,7 +4,7 @@ Fri Apr 3 10:50:59 UTC 2020 - Fridrich Strba - Added patch: * fop-2.1-batik-xmlconstants.patch + apply when building with batik >= 1.11 - + batik 1.11 moved XMLConstants class from + + batik 1.11 moved XMLConstants class from org.apache.batik.util to org.apache.batik.constants ------------------------------------------------------------------- @@ -38,7 +38,7 @@ Thu Dec 6 21:54:53 UTC 2018 - Fridrich Strba - Modified patch: * java8-compatibility.patch + Fix fix ByteBuffer/CharBuffer incompatibilities with java8 - Cast all the java.nio.ByteBuffer and java.nio.CharBuffer + Cast all the java.nio.ByteBuffer and java.nio.CharBuffer instances to java.nio.Buffer before calling the clear(), flip(), limit(int), mark(), reset() and rewind() methods.