Hello community,
here is the log from the commit of package xmlgraphics-fop for openSUSE:Factory
checked in at 2020-06-08 23:43:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xmlgraphics-fop (Old)
and /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlgraphics-fop"
Mon Jun 8 23:43:53 2020 rev:45 rq:811270 version:2.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/xmlgraphics-fop/xmlgraphics-fop.changes
2020-05-20 18:36:54.104160216 +0200
+++
/work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.3606/xmlgraphics-fop.changes
2020-06-08 23:44:00.141358980 +0200
@@ -1,0 +2,22 @@
+Thu Jun 4 05:13:44 UTC 2020 - Fridrich Strba <[email protected]>
+
+- version 2.5
+ * Does not need avalon-framework to build or run
+ * Adapt the command-line scripts by removing avalon-framework
+ from classpath
+ * Build against fontbox from apache-pdfbox >= 2
+ * Use the included pom file instead of downloading the same
+ file from maven central
+- Removed patch:
+ * fop-2.1-batik-xmlconstants.patch
+ + Included directly in this version. Requires batik >= 1.11
+- Modified patches:
+ * fop-2.1-QDox-2.0.patch -> fop-2.5-QDox-2.0.patch
+ * fix-javadoc-java8.patch
+ * hyphenation-more-stack.patch
+ * java8-compatibility.patch
+ * reproducible-build-manifest.patch
+ * xmlgraphics-fop-cli.patch
+ + Port to fop 2.5
+
+-------------------------------------------------------------------
Old:
----
fop-2.1-QDox-2.0.patch
fop-2.1-batik-xmlconstants.patch
fop-2.1-src.tar.gz
fop-2.1.pom
New:
----
fop-2.5-QDox-2.0.patch
fop-2.5-src.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xmlgraphics-fop.spec ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.869364310 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.873364323 +0200
@@ -19,19 +19,18 @@
%define bname fop
Name: xmlgraphics-fop
-Version: 2.1
+Version: 2.5
Release: 0
Summary: Formatter for Printing XSLT Processed XML Files
License: Apache-2.0
Group: Productivity/Publishing/XML
URL: https://xmlgraphics.apache.org/fop/
Source0:
https://ftp.halifax.rwth-aachen.de/apache/xmlgraphics/fop/source/fop-%{version}-src.tar.gz
-Source1:
https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/fop/%{version}/fop-%{version}.pom
+Source1:
https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
#FIX-OPENSUSE: add xmlgraphics-commons to classpath
Source2: %{name}.script
Source3: %{name}-fontmetrics.script
Source4: %{name}-fontlist.script
-Source5:
https://download.sourceforge.net/project/offo/offo-hyphenation/2.2/offo-hyphenation.zip
# Manpage(s)
Source10: %{name}.xml
Source11: %{name}-fontmetrics.xml
@@ -42,33 +41,36 @@
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
+Patch6: fop-2.5-QDox-2.0.patch
+BuildRequires: ant >= 1.8.4
+BuildRequires: apache-pdfbox >= 2.0
BuildRequires: commons-io >= 2.4
BuildRequires: commons-logging
BuildRequires: docbook-xsl-stylesheets
-# Needed for maven conversions
BuildRequires: glassfish-servlet-api
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: libxslt
BuildRequires: qdox >= 2.0
BuildRequires: unzip
-BuildRequires: xml-commons-apis >= 1.3
-BuildRequires: xmlgraphics-batik >= 1.8
+BuildRequires: xml-commons-apis
+BuildRequires: xmlgraphics-batik >= 1.11
BuildRequires: xmlgraphics-commons >= 2.1
#!BuildIgnore: saxon
-Requires: apache-pdfbox
-Requires: avalon-framework >= 4.3
-Requires: commons-io >= 2.4
-Requires: commons-logging
Requires: java >= 1.8
-Requires: xml-commons-apis >= 1.3
-Requires: xmlgraphics-commons >= 2.1
-%requires_ge xmlgraphics-batik
+Requires: xml-commons-apis
+Requires: mvn(com.thoughtworks.qdox:qdox) >= 2.0
+Requires: mvn(commons-io:commons-io)
+Requires: mvn(commons-logging:commons-logging)
+Requires: mvn(javax.servlet:servlet-api)
+Requires: mvn(org.apache.pdfbox:fontbox) >= 2.0
+Requires: mvn(org.apache.xmlgraphics:batik-anim) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:batik-awt-util) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:batik-bridge) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:batik-extension) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:batik-gvt) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:batik-transcoder) >= 1.11
+Requires: mvn(org.apache.xmlgraphics:xmlgraphics-commons)
Provides: %{bname} = %{version}-%{release}
Obsoletes: %{bname} < %{version}-%{release}
Provides: fo-formatter = %{version}-%{release}
@@ -82,44 +84,61 @@
representation), Print, AWT, MIF, and TXT.
%prep
-%setup -q -n %{bname}-%{version} -a5
-ln -thyph offo-hyphenation/hyph/*.xml
+%setup -q -n %{bname}-%{version} -a1
+ln -t fop/hyph offo-hyphenation/hyph/*.xml
find -name "*.jar" | xargs -t rm
-# Remove this file. It needs jai and we don't compile it.
-# Just javadoc chokes on it.
-rm src/java/org/apache/fop/util/bitmap/JAIMonochromeBitmapConverter.java
%patch1 -p1 -b .cli
%patch2 -p1
%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
# Replace keyword "VERSION" in XML files with the real one:
for x in %{SOURCE10} %{SOURCE11} %{SOURCE12}; do
sed -i "s=@VERSION@=%{version}=" $x
done
+# Building with ant, so the parent is pointless
+%pom_remove_parent fop
+%pom_xpath_inject pom:project "<version>%{version}</version>" fop
+
+# When building with ant, the fop.jar is an all-in jar,
+# so adapt the dependencies accordingly
+
+# Remove dependencies on fop modules included in the jar
+%pom_remove_dep :fop-events fop
+%pom_remove_dep :fop-util fop
+%pom_remove_dep :fop-core fop
+
+# Add dependencies of fop modules included in the jar
+%pom_add_dep com.thoughtworks.qdox:qdox:2 fop
+%pom_add_dep commons-io:commons-io:1.3.1 fop
+%pom_add_dep commons-logging:commons-logging:1.0.4 fop
+%pom_add_dep javax.servlet:servlet-api:2.2 fop
+%pom_add_dep org.apache.pdfbox:fontbox:2.0.16 fop
+%pom_add_dep org.apache.xmlgraphics:batik-anim:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:batik-awt-util:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:batik-bridge:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:batik-extension:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:batik-gvt:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:batik-transcoder:1.13 fop
+%pom_add_dep org.apache.xmlgraphics:xmlgraphics-commons:2.4 fop
+
%build
-build-jar-repository -s lib \
- avalon-framework-api \
- avalon-framework-impl \
+build-jar-repository -s fop/lib \
commons-io \
commons-logging \
fontbox \
glassfish-servlet-api \
+ batik-all \
xml-commons-apis \
xml-commons-apis-ext \
- batik-all \
xmlgraphics-commons \
qdox
export CLASSPATH= LANG=en_US.UTF-8
-%{ant} \
+%{ant} -f fop/build.xml \
-Djavac.source=1.8 -Djavac.target=1.8 \
package
@@ -135,13 +154,13 @@
%install
# jars
mkdir -p %{buildroot}%{_javadir}
-install -m 644 build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
-install -m 644 build/%{bname}-hyph.jar %{buildroot}%{_javadir}/%{name}-hyph.jar
-install -m 644 build/%{bname}-sandbox.jar
%{buildroot}%{_javadir}/%{name}-sandbox.jar
+install -m 644 fop/build/%{bname}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 fop/build/%{bname}-hyph.jar
%{buildroot}%{_javadir}/%{name}-hyph.jar
+install -m 644 fop/build/%{bname}-sandbox.jar
%{buildroot}%{_javadir}/%{name}-sandbox.jar
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 fop/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
%add_maven_depmap
# script
@@ -155,7 +174,7 @@
ln -s %{name}-fontlist %{buildroot}%{_bindir}/%{bname}-fontlist
# data
-install -D -m 644 conf/fop.xconf %{buildroot}%{_sysconfdir}/fop.xconf
+install -D -m 644 fop/conf/fop.xconf %{buildroot}%{_sysconfdir}/fop.xconf
# Manpages
mkdir -p %{buildroot}%{_mandir}/man1
@@ -175,7 +194,7 @@
%{_javadir}/%{name}-hyph.jar
%{_javadir}/%{name}-sandbox.jar
%license LICENSE
-%doc NOTICE README known-issues.xml
+%doc NOTICE README fop/known-issues.xml
%doc *.html
%attr(0755,root,root) %{_bindir}/%{name}
%{_bindir}/%{bname}
++++++ fix-javadoc-java8.patch ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.905364422 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.905364422 +0200
@@ -1,11 +1,9 @@
-Index: fop-2.1/build.xml
-===================================================================
---- fop-2.1.orig/build.xml
-+++ fop-2.1/build.xml
-@@ -963,6 +963,7 @@ NOTE:
+--- fop-2.5/fop/build.xml
++++ fop-2.5/fop/build.xml
+@@ -904,6 +904,7 @@ NOTE:
doctitle="Apache Formatting Objects Processor (FOP)"
bottom="Copyright ${year} The Apache Software Foundation. All Rights
Reserved."
- overview="${src.dir}/java/org/apache/fop/overview.html"
+ overview="${src.java.dir}/org/apache/fop/overview.html"
+ additionalparam="--allow-script-in-comments"
maxmemory="256M">
<header><![CDATA[${name} ${version}]]></header>
++++++ fop-2.1-QDox-2.0.patch -> fop-2.5-QDox-2.0.patch ++++++
--- /work/SRC/openSUSE:Factory/xmlgraphics-fop/fop-2.1-QDox-2.0.patch
2019-01-15 09:10:20.266570955 +0100
+++ /work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.3606/fop-2.5-QDox-2.0.patch
2020-06-08 23:43:57.637351255 +0200
@@ -1,6 +1,5 @@
-diff -urEbwB
fop-2.1/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
fop-2.1.new/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
---- fop-2.1/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
2016-01-07 15:13:29.000000000 +0100
-+++
fop-2.1.new/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java
2019-01-01 19:11:50.659094055 +0100
+---
fop-2.5/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
2020-05-05 11:42:05.000000000 +0200
++++
fop-2.5/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
2020-06-03 10:49:58.195555295 +0200
@@ -21,6 +21,7 @@
import java.io.File;
@@ -48,7 +47,7 @@
}
/**
-@@ -89,12 +77,11 @@
+@@ -89,9 +77,9 @@
*/
public boolean scanFile(File src)
throws IOException, EventConventionException,
ClassNotFoundException {
@@ -58,39 +57,27 @@
- JavaClass[] classes = builder.getClasses();
+ Collection<JavaClass> classes = builder.getClasses();
boolean eventProducerFound = false;
-- for (int i = 0, c = classes.length; i < c; i++) {
-- JavaClass clazz = classes[i];
-+ for (JavaClass clazz : classes) {
+ for (JavaClass clazz : classes) {
if (clazz.isInterface() && implementsInterface(clazz,
CLASSNAME_EVENT_PRODUCER)) {
- processEventProducerInterface(clazz);
- eventProducerFound = true;
-@@ -104,9 +91,9 @@
+@@ -103,7 +91,7 @@
}
private boolean implementsInterface(JavaClass clazz, String intf) {
- JavaClass[] classes = clazz.getImplementedInterfaces();
-- for (int i = 0, c = classes.length; i < c; i++) {
-- JavaClass cl = classes[i];
+ List<JavaClass> classes = clazz.getInterfaces();
-+ for (int i = 0, c = classes.size(); i < c; i++) {
-+ JavaClass cl = classes.get(i);
+ for (JavaClass cl : classes) {
if (cl.getFullyQualifiedName().equals(intf)) {
return true;
- }
-@@ -123,9 +110,9 @@
+@@ -121,7 +109,7 @@
protected void processEventProducerInterface(JavaClass clazz)
throws EventConventionException, ClassNotFoundException {
EventProducerModel prodMeta = new
EventProducerModel(clazz.getFullyQualifiedName());
- JavaMethod[] methods = clazz.getMethods(true);
-- for (int i = 0, c = methods.length; i < c; i++) {
-- JavaMethod method = methods[i];
+ List<JavaMethod> methods = clazz.getMethods(true);
-+ for (int i = 0, c = methods.size(); i < c; i++) {
-+ JavaMethod method = methods.get(i);
+ for (JavaMethod method : methods) {
EventMethodModel methodMeta = createMethodModel(method);
prodMeta.addMethod(methodMeta);
- }
-@@ -136,20 +123,20 @@
+@@ -133,20 +121,20 @@
private EventMethodModel createMethodModel(JavaMethod method)
throws EventConventionException, ClassNotFoundException {
@@ -117,7 +104,7 @@
throw new EventConventionException("The first parameter of the
method " + methodSig
+ " must be: 'Object source'!");
}
-@@ -164,12 +151,12 @@
+@@ -161,12 +149,12 @@
}
EventMethodModel methodMeta = new EventMethodModel(
method.getName(), severity);
@@ -135,7 +122,7 @@
type = PRIMITIVE_MAP.get(pClass.getName());
if (type == null) {
throw new UnsupportedOperationException(
-@@ -182,10 +169,10 @@
+@@ -179,10 +167,10 @@
methodMeta.addParameter(type, p.getName());
}
}
++++++ fop-2.1-src.tar.gz -> fop-2.5-src.tar.gz ++++++
/work/SRC/openSUSE:Factory/xmlgraphics-fop/fop-2.1-src.tar.gz
/work/SRC/openSUSE:Factory/.xmlgraphics-fop.new.3606/fop-2.5-src.tar.gz differ:
char 12, line 1
++++++ hyphenation-more-stack.patch ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.953364569 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.953364569 +0200
@@ -1,17 +1,12 @@
----
- build.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: fop-2.1/build.xml
-===================================================================
---- fop-2.1.orig/build.xml
-+++ fop-2.1/build.xml
-@@ -181,7 +181,7 @@ list of possible build targets.
+diff -urEbwB fop-2.5/fop/build.xml fop-2.5/fop/build.xml
+--- fop-2.5/fop/build.xml 2020-05-05 11:42:05.000000000 +0200
++++ fop-2.5/fop/build.xml 2020-06-03 11:09:17.026418161 +0200
+@@ -207,7 +207,7 @@
<property name="lib.dir" value="${basedir}/lib"/>
<property name="user.hyph.dir" value="${basedir}/hyph"/>
<property name="unidata.dir" value="${basedir}/UNIDATA"/>
- <property name="hyph.stacksize" value="512k"/>
+ <property name="hyph.stacksize" value="1M"/>
<property name="test.dir" value="${basedir}/test"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="build.gensrc.dir" value="${build.dir}/gensrc"/>
+ <property name="test.java.dir" value="${src.dir}/test/java"/>
+ <property name="test.resources.dir" value="${src.dir}/test/resources"/>
++++++ java8-compatibility.patch ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.961364594 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.961364594 +0200
@@ -1,5 +1,5 @@
---- fop-2.1/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
2016-01-07 15:13:29.000000000 +0100
-+++ fop-2.1/src/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
2018-12-06 23:18:14.815791853 +0100
+---
fop-2.5/fop-core/src/main/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
2020-05-05 11:42:04.000000000 +0200
++++
fop-2.5/fop-core/src/main/java/org/apache/fop/afp/fonts/CharactersetEncoder.java
2020-06-03 11:18:04.577537190 +0200
@@ -21,6 +21,7 @@
import java.io.IOException;
@@ -17,8 +17,8 @@
byte[] bytes = new byte[bb.remaining()];
bb.get(bytes);
return getEncodedChars(bytes, bytes.length);
---- fop-2.1/src/java/org/apache/fop/area/AreaTreeParser.java 2016-01-07
15:13:29.000000000 +0100
-+++ fop-2.1/src/java/org/apache/fop/area/AreaTreeParser.java 2018-12-06
23:18:14.815791853 +0100
+--- fop-2.5/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
2020-05-05 11:42:04.000000000 +0200
++++ fop-2.5/fop-core/src/main/java/org/apache/fop/area/AreaTreeParser.java
2020-06-03 11:18:04.581537214 +0200
@@ -24,6 +24,7 @@
import java.awt.geom.Rectangle2D;
import java.io.FileNotFoundException;
@@ -27,7 +27,7 @@
import java.nio.CharBuffer;
import java.util.List;
import java.util.Map;
-@@ -322,7 +323,7 @@
+@@ -326,7 +327,7 @@
throws SAXException {
lastAttributes = new AttributesImpl(attributes);
Maker maker = makers.get(localName);
@@ -36,7 +36,7 @@
ignoreCharacters = true;
if (maker != null) {
ignoreCharacters = maker.ignoreCharacters();
-@@ -353,7 +354,7 @@
+@@ -357,7 +358,7 @@
Maker maker = makers.get(localName);
if (maker != null) {
maker.endElement();
@@ -45,7 +45,7 @@
}
ignoreCharacters = true;
} else {
-@@ -798,7 +799,7 @@
+@@ -845,7 +846,7 @@
boolean reversed =
XMLUtil.getAttributeAsBoolean(lastAttributes, "reversed", false);
int[][] gposAdjustments
=
XMLUtil.getAttributeAsPositionAdjustments(lastAttributes, "position-adjust");
@@ -54,7 +54,7 @@
WordArea word = new WordArea(
offset, level, content.toString().trim(), letterAdjust,
null, gposAdjustments, reversed);
-@@ -818,7 +819,7 @@
+@@ -865,7 +866,7 @@
int offset = XMLUtil.getAttributeAsInt(lastAttributes,
"offset", 0);
//TODO the isAdjustable parameter is currently not
used/implemented
if (content.position() > 0) {
@@ -63,7 +63,7 @@
boolean adjustable =
XMLUtil.getAttributeAsBoolean(lastAttributes, "adj", true);
int level = XMLUtil.getAttributeAsInt(lastAttributes,
"level", -1);
SpaceArea space = new SpaceArea(offset, level,
content.charAt(0), adjustable);
-@@ -1207,17 +1208,17 @@
+@@ -1254,17 +1255,17 @@
// allocate a larger buffer and transfer content
CharBuffer newContent
= CharBuffer.allocate(this.content.position() +
length);
@@ -84,8 +84,8 @@
}
}
}
---- fop-2.1/src/java/org/apache/fop/fo/FOText.java 2016-01-07
15:13:29.000000000 +0100
-+++ fop-2.1/src/java/org/apache/fop/fo/FOText.java 2018-12-06
23:21:33.412845154 +0100
+--- fop-2.5/fop-core/src/main/java/org/apache/fop/fo/FOText.java
2020-05-05 11:42:04.000000000 +0200
++++ fop-2.5/fop-core/src/main/java/org/apache/fop/fo/FOText.java
2020-06-03 11:18:04.581537214 +0200
@@ -20,6 +20,7 @@
package org.apache.fop.fo;
@@ -94,7 +94,7 @@
import java.nio.CharBuffer;
import java.text.CharacterIterator;
import java.text.StringCharacterIterator;
-@@ -128,17 +129,17 @@
+@@ -134,17 +135,17 @@
newCapacity = requires;
}
CharBuffer newBuffer = CharBuffer.allocate(newCapacity);
@@ -115,7 +115,7 @@
}
/**
-@@ -150,7 +151,7 @@
+@@ -156,7 +157,7 @@
if (this.charBuffer == null) {
return null;
}
@@ -124,7 +124,7 @@
return this.charBuffer.asReadOnlyBuffer().subSequence(0,
this.charBuffer.limit());
}
-@@ -163,9 +164,9 @@
+@@ -169,9 +170,9 @@
// pointed to is really a different one
if (charBuffer != null) {
ft.charBuffer = CharBuffer.allocate(charBuffer.limit());
@@ -136,7 +136,7 @@
}
}
ft.prevFOTextThisBlock = null;
-@@ -197,7 +198,7 @@
+@@ -203,7 +204,7 @@
/** {@inheritDoc} */
public void endOfNode() throws FOPException {
if (charBuffer != null) {
@@ -145,7 +145,7 @@
}
super.endOfNode();
getFOEventHandler().characters(this);
-@@ -224,7 +225,7 @@
+@@ -230,7 +231,7 @@
}
char ch;
@@ -154,7 +154,7 @@
while (charBuffer.hasRemaining()) {
ch = charBuffer.get();
if (!((ch == CharUtilities.SPACE)
-@@ -232,7 +233,7 @@
+@@ -238,7 +239,7 @@
|| (ch == CharUtilities.CARRIAGE_RETURN)
|| (ch == CharUtilities.TAB))) {
// not whitespace
@@ -163,7 +163,7 @@
return true;
}
}
-@@ -275,7 +276,7 @@
+@@ -281,7 +282,7 @@
return;
}
@@ -172,7 +172,7 @@
CharBuffer tmp = charBuffer.slice();
char c;
int lim = charBuffer.limit();
-@@ -542,19 +543,19 @@
+@@ -548,19 +549,19 @@
public void remove() {
if (this.canRemove) {
@@ -197,7 +197,7 @@
// Make sure following calls fail, unless nextChar() was
called
this.canRemove = false;
} else {
-@@ -737,7 +738,7 @@
+@@ -743,7 +744,7 @@
*/
public void resetBuffer() {
if (charBuffer != null) {
@@ -206,8 +206,8 @@
}
}
---- fop-2.1/src/java/org/apache/fop/fonts/MultiByteFont.java 2016-01-07
15:13:29.000000000 +0100
-+++ fop-2.1/src/java/org/apache/fop/fonts/MultiByteFont.java 2018-12-06
23:18:14.815791853 +0100
+--- fop-2.5/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java
2020-05-05 11:42:05.000000000 +0200
++++ fop-2.5/fop-core/src/main/java/org/apache/fop/fonts/MultiByteFont.java
2020-06-03 11:19:29.182037444 +0200
@@ -21,6 +21,7 @@
import java.awt.Rectangle;
@@ -215,11 +215,11 @@
+import java.nio.Buffer;
import java.nio.CharBuffer;
import java.nio.IntBuffer;
- import java.util.BitSet;
-@@ -686,7 +687,7 @@
- cb.put((char) cc);
- }
+ import java.util.ArrayList;
+@@ -731,7 +732,7 @@
+ cb.put(c);
}
+
- cb.flip();
+ ((Buffer)cb).flip();
return cb;
++++++ reproducible-build-manifest.patch ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.985364668 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.985364668 +0200
@@ -1,15 +1,6 @@
-Remove custom "Build-Id" field from manifest. It contains:
-* Timestamp: Makes the build unreproducible.
-* Architecture: Makes the build arch-dependent whereas we want it as
- noarch.:
-* OS and Java version: Too detailed information, triggers too many
- publication for no real advantage.
-
---
-diff -up fop-2.1/build.xml.orig fop-2.1/build.xml
---- fop-2.1/build.xml.orig 2018-10-29 07:26:58.205413821 +0100
-+++ fop-2.1/build.xml 2018-10-29 07:55:33.117484917 +0100
-@@ -460,7 +460,6 @@ list of possible build targets.
+--- fop-2.5/fop/build.xml 2020-05-05 11:42:05.000000000 +0200
++++ fop-2.5/fop/build.xml 2020-06-03 11:24:41.859886083 +0200
+@@ -500,7 +500,6 @@
<attribute name="Implementation-Title" value="${Name}"/>
<attribute name="Implementation-Version" value="${version}"/>
<attribute name="Implementation-Vendor" value="The Apache Software
Foundation (http://xmlgraphics.apache.org/fop/)"/>
@@ -17,15 +8,15 @@
</manifest>
</jar>
</target>
-@@ -482,7 +481,6 @@ list of possible build targets.
- <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}">
+@@ -522,7 +521,6 @@
+ <jar jarfile="${build.dir}/fop.jar">
<manifest>
<attribute name="Main-Class" value="org.apache.fop.cli.Main"/>
- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java
${javac.target}])"/>
<section name="org/apache/fop/">
<attribute name="Specification-Title" value="XSL-FO - Extensible
Stylesheet Language"/>
<attribute name="Specification-Version" value="1.1"/>
-@@ -506,9 +504,7 @@ list of possible build targets.
+@@ -550,9 +548,7 @@
<format property="ts" pattern="yyyyMMdd-HHmmss-z"/>
</tstamp>
<jar jarfile="${build.dir}/fop-sandbox.jar"
basedir="${build.sandbox-classes.dir}">
@@ -33,26 +24,10 @@
- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java
${javac.target}])"/>
- </manifest>
+ <manifest/>
- <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
</target>
-@@ -637,7 +633,6 @@ list of possible build targets.
- <attribute name="Implementation-Title"
value="${fop-transcoder.name}"/>
- <attribute name="Implementation-Version"
value="${fop-transcoder.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software
Foundation (http://xmlgraphics.apache.org/fop/)"/>
-- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java
${javac.target}])"/>
- </manifest>
- <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
- </jar>
-@@ -672,7 +667,6 @@ list of possible build targets.
- <attribute name="Implementation-Title"
value="${fop-transcoder.name}"/>
- <attribute name="Implementation-Version"
value="${fop-transcoder.version}"/>
- <attribute name="Implementation-Vendor" value="The Apache Software
Foundation (http://xmlgraphics.apache.org/fop/)"/>
-- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java
${javac.target}])"/>
- </manifest>
- <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
- </jar>
-@@ -1042,9 +1036,7 @@ NOTE:
+@@ -983,9 +979,7 @@
</target>
<target name="jar-javadocs" depends="javadocs" description="Generates a jar
file containing the Javadocs">
<jar jarfile="${build.dir}/${name}-${version}-javadoc.jar">
@@ -61,22 +36,10 @@
- </manifest>
+ <manifest/>
<fileset dir="${build.javadocs.dir}"/>
- <metainf dir="${basedir}" includes="LICENSE,NOTICE"/>
+ <metainf dir="${basedir}/.." includes="LICENSE,NOTICE"/>
</jar>
-@@ -1346,9 +1338,7 @@ NOTE:
- <param name="pwd" value="${pwd}"/>
- </antcall>
- <jar jarfile="${build.dir}/${name}-${version}-bundle.jar">
-- <manifest>
-- <attribute name="Build-Id" value="${ts} (${user.name} [${os.name}
${os.version} ${os.arch}, Java ${java.runtime.version}])"/>
-- </manifest>
-+ <manifest/>
- <fileset dir="${build.dir}">
- <patternset>
- <include name="${name}-${version}.jar*"/>
-diff -up fop-2.1/examples/plan/build.xml.orig fop-2.1/examples/plan/build.xml
---- fop-2.1/examples/plan/build.xml.orig 2018-10-29 07:48:15.749466784
+0100
-+++ fop-2.1/examples/plan/build.xml 2018-10-29 07:48:22.709467073 +0100
+--- fop-2.5/fop/examples/plan/build.xml 2020-05-05 11:42:05.000000000
+0200
++++ fop-2.5/fop/examples/plan/build.xml 2020-06-03 11:50:35.613163539
+0200
@@ -133,7 +133,6 @@
<attribute name="Implementation-Title" value="${Name}"/>
<attribute name="Implementation-Version" value="${version}"/>
++++++ xmlgraphics-fop-cli.patch ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:01.997364705 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:01.997364705 +0200
@@ -1,8 +1,6 @@
-Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
-===================================================================
---- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java 2010-07-12
21:34:44.000000000 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java 2010-11-03
15:33:27.174637237 +0100
-@@ -201,11 +201,7 @@
+--- fop-2.5/fop-core/src/main/java/org/apache/fop/cli/Main.java
++++ fop-2.5/fop-core/src/main/java/org/apache/fop/cli/Main.java
+@@ -210,11 +210,7 @@
* @param args the command line parameters
*/
public static void main(String[] args) {
++++++ xmlgraphics-fop-fontlist.script ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:02.009364742 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:02.009364742 +0200
@@ -29,7 +29,7 @@
# Rest of the configuration
MAIN_CLASS=org.apache.fop.tools.fontlist.FontListMain
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all avalon-framework-impl
avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer commons-logging
commons-io"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons batik-all xerces-j2 xalan-j2
xalan-j2-serializer commons-logging commons-io"
# Set parameters
set_jvm
++++++ xmlgraphics-fop-fontmetrics.script ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:02.033364816 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:02.033364816 +0200
@@ -41,7 +41,7 @@
MAIN_CLASS=${MAIN_CLASS_TTF}
fi
-BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging
avalon-framework-impl avalon-framework-api xml-commons-apis xerces-j2 xalan-j2
xalan-j2-serializer"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons commons-io commons-logging
xml-commons-apis xerces-j2 xalan-j2 xalan-j2-serializer"
# Set parameters
set_jvm
++++++ xmlgraphics-fop.script ++++++
--- /var/tmp/diff_new_pack.9t7ujQ/_old 2020-06-08 23:44:02.057364890 +0200
+++ /var/tmp/diff_new_pack.9t7ujQ/_new 2020-06-08 23:44:02.061364902 +0200
@@ -33,7 +33,7 @@
# Rest of the configuration
MAIN_CLASS=org.apache.fop.cli.Main
-BASE_JARS="xmlgraphics-fop xmlgraphics-fop-hyph xmlgraphics-commons
commons-logging commons-io avalon-framework-api avalon-framework-impl batik-all
fontbox xml-commons-apis xml-commons-apis-ext"
+BASE_JARS="xmlgraphics-fop xmlgraphics-fop-hyph xmlgraphics-commons
commons-logging commons-io batik-all fontbox xml-commons-apis
xml-commons-apis-ext"
# Set parameters
set_jvm
