Remove dependency on xalan-j2
This commit is contained in:
Mikolaj Izdebski
commit
c7413ccdfb
84
getContentDocument.patch
Normal file
84
getContentDocument.patch
Normal file
@ -0,0 +1,84 @@
|
||||
From: Markus Koschany <apo@debian.org>
|
||||
Date: Sat, 12 May 2018 22:12:44 +0200
|
||||
Subject: getContentDocument
|
||||
|
||||
Fix FTBFS with Java10 due to missing method getContentDocument.
|
||||
|
||||
Forwarded: no
|
||||
---
|
||||
src/org/apache/html/dom/HTMLFrameElementImpl.java | 7 +++++++
|
||||
src/org/apache/html/dom/HTMLIFrameElementImpl.java | 5 +++++
|
||||
src/org/apache/html/dom/HTMLObjectElementImpl.java | 5 +++++
|
||||
3 files changed, 17 insertions(+)
|
||||
|
||||
diff --git a/src/org/apache/html/dom/HTMLFrameElementImpl.java b/src/org/apache/html/dom/HTMLFrameElementImpl.java
|
||||
index 18ab953..e90a592 100644
|
||||
--- a/src/org/apache/html/dom/HTMLFrameElementImpl.java
|
||||
+++ b/src/org/apache/html/dom/HTMLFrameElementImpl.java
|
||||
@@ -17,6 +17,8 @@
|
||||
package org.apache.html.dom;
|
||||
|
||||
import org.w3c.dom.html.HTMLFrameElement;
|
||||
+import org.w3c.dom.Document;
|
||||
+
|
||||
|
||||
/**
|
||||
* @xerces.internal
|
||||
@@ -127,6 +129,11 @@ public class HTMLFrameElementImpl
|
||||
setAttribute( "src", src );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
|
||||
/**
|
||||
* Constructor requires owner document.
|
||||
diff --git a/src/org/apache/html/dom/HTMLIFrameElementImpl.java b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
|
||||
index c326557..287ba9e 100644
|
||||
--- a/src/org/apache/html/dom/HTMLIFrameElementImpl.java
|
||||
+++ b/src/org/apache/html/dom/HTMLIFrameElementImpl.java
|
||||
@@ -17,6 +17,7 @@
|
||||
package org.apache.html.dom;
|
||||
|
||||
import org.w3c.dom.html.HTMLIFrameElement;
|
||||
+import org.w3c.dom.Document;
|
||||
|
||||
/**
|
||||
* @xerces.internal
|
||||
@@ -150,6 +151,10 @@ public class HTMLIFrameElementImpl
|
||||
setAttribute( "width", width );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
|
||||
/**
|
||||
* Constructor requires owner document.
|
||||
diff --git a/src/org/apache/html/dom/HTMLObjectElementImpl.java b/src/org/apache/html/dom/HTMLObjectElementImpl.java
|
||||
index b065e69..cd27fc8 100644
|
||||
--- a/src/org/apache/html/dom/HTMLObjectElementImpl.java
|
||||
+++ b/src/org/apache/html/dom/HTMLObjectElementImpl.java
|
||||
@@ -17,6 +17,7 @@
|
||||
package org.apache.html.dom;
|
||||
|
||||
import org.w3c.dom.html.HTMLObjectElement;
|
||||
+import org.w3c.dom.Document;
|
||||
|
||||
/**
|
||||
* @xerces.internal
|
||||
@@ -239,6 +240,10 @@ public class HTMLObjectElementImpl
|
||||
setAttribute( "width", width );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
|
||||
|
||||
/**
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: xerces-j2
|
||||
Version: 2.12.1
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: Java XML parser
|
||||
# Most of the source is ASL 2.0
|
||||
# W3C licensed files:
|
||||
@ -14,8 +14,6 @@ URL: http://xerces.apache.org/xerces2-j/
|
||||
%global cvs_version %(tr . _ <<< %{version})
|
||||
|
||||
Source0: http://mirror.ox.ac.uk/sites/rsync.apache.org/xerces/j/source/Xerces-J-src.%{version}.tar.gz
|
||||
Source1: http://www.apache.org/dist/xerces/j/source/Xerces-J-src.%{version}.tar.gz.asc
|
||||
Source2: http://www.apache.org/dist/xerces/j/binaries/KEYS
|
||||
Source11: %{name}-version.1
|
||||
Source12: %{name}-constants.1
|
||||
|
||||
@ -38,13 +36,10 @@ BuildArch: noarch
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: ant
|
||||
BuildRequires: apache-parent
|
||||
BuildRequires: xalan-j2 >= 2.7.1
|
||||
BuildRequires: xml-commons-apis >= 1.4.01
|
||||
BuildRequires: xml-commons-resolver >= 1.2
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: gnupg2
|
||||
|
||||
Requires: xalan-j2 >= 2.7.1
|
||||
Requires: xml-commons-apis >= 1.4.01
|
||||
Requires: xml-commons-resolver >= 1.2
|
||||
# Explicit javapackages-tools requires since scripts use
|
||||
@ -109,10 +104,10 @@ Requires: %{name} = %{version}-%{release}
|
||||
%{summary}.
|
||||
|
||||
%prep
|
||||
# Verify the source file
|
||||
%{gpgverify} --data=%{SOURCE0} --signature=%{SOURCE1} --keyring=%{SOURCE2}
|
||||
|
||||
%autosetup -p0 -n xerces-%{cvs_version}
|
||||
%setup -n xerces-%{cvs_version}
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p0
|
||||
|
||||
# Copy the custom ant task into place
|
||||
mkdir -p tools/org/apache/xerces/util
|
||||
@ -138,10 +133,9 @@ pushd tools
|
||||
javac -classpath $(build-classpath ant) org/apache/xerces/util/XJavac.java
|
||||
jar cf bin/xjavac.jar org/apache/xerces/util/XJavac.class
|
||||
|
||||
ln -sf $(build-classpath xalan-j2-serializer) serializer.jar
|
||||
jar cmf /dev/null serializer.jar
|
||||
ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
|
||||
ln -sf $(build-classpath xml-commons-resolver) resolver.jar
|
||||
ln -sf $(build-classpath xerces-j2) x.jar
|
||||
popd
|
||||
|
||||
# Build everything
|
||||
@ -198,6 +192,9 @@ ln -sf %{name}.jar %{_javadir}/jaxp_parser_impl.jar
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.12.1-4
|
||||
- Remove dependency on xalan-j2
|
||||
|
||||
* Fri Mar 12 2021 Mat Booth <mat.booth@redhat.com> - 2.12.1-3
|
||||
- Update OSGi metadata, use import-package instead of require-bundle
|
||||
in order to avoid some tricky OSGi breakage on Java 11
|
||||
|
||||
Loading…
Reference in New Issue
Block a user