Accepting request 530905 from Java:packages
Fix build with openjdk OBS-URL: https://build.opensuse.org/request/show/530905 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xerces-j2?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
f5d29de521
65
xerces-2_11_0-jdk7.patch
Normal file
65
xerces-2_11_0-jdk7.patch
Normal file
@ -0,0 +1,65 @@
|
||||
--- xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java 2010-11-26 21:42:02.000000000 +0100
|
||||
+++ xerces-2_11_0/src/org/apache/html/dom/HTMLFrameElementImpl.java 2017-10-03 17:28:29.096819783 +0200
|
||||
@@ -17,6 +17,7 @@
|
||||
package org.apache.html.dom;
|
||||
|
||||
import org.w3c.dom.html.HTMLFrameElement;
|
||||
+import org.w3c.dom.Document;
|
||||
|
||||
/**
|
||||
* @xerces.internal
|
||||
@@ -127,6 +128,11 @@
|
||||
setAttribute( "src", src );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
|
||||
/**
|
||||
* Constructor requires owner document.
|
||||
--- xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java 2010-11-26 21:42:08.000000000 +0100
|
||||
+++ xerces-2_11_0/src/org/apache/html/dom/HTMLIFrameElementImpl.java 2017-10-03 17:28:12.576819720 +0200
|
||||
@@ -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,11 @@
|
||||
setAttribute( "width", width );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
+
|
||||
|
||||
/**
|
||||
* Constructor requires owner document.
|
||||
--- xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java 2010-11-26 21:42:05.000000000 +0100
|
||||
+++ xerces-2_11_0/src/org/apache/html/dom/HTMLObjectElementImpl.java 2017-10-03 17:27:57.048819662 +0200
|
||||
@@ -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 @@
|
||||
setAttribute( "width", width );
|
||||
}
|
||||
|
||||
+ public Document getContentDocument()
|
||||
+ {
|
||||
+ return null;
|
||||
+ }
|
||||
|
||||
|
||||
/**
|
||||
@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 3 15:33:36 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Added patch:
|
||||
* xerces-2_11_0-jdk7.patch
|
||||
+ Dummy implementation of the getContentDocument() in common
|
||||
DOM API, in order to be able to build with jdk >= 1.6
|
||||
- Specify java source and target level 1.6 and don't depend on gcj
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri May 19 16:31:01 UTC 2017 - tchvatal@suse.com
|
||||
|
||||
|
||||
@ -33,22 +33,14 @@ Source5: %{name}-constants.1
|
||||
# PATCH-FIX-UPSTREAM bnc#814241 XERCESJ-1616
|
||||
Patch0: arrays-doubling.patch
|
||||
Patch1: scan-pseudo-attribute.patch
|
||||
Patch2: xerces-2_11_0-jdk7.patch
|
||||
BuildRequires: dos2unix
|
||||
# some build requirements removed to enable jpackage bootstrap. this is
|
||||
# the first package built, and we use the libraries in the tools subdir
|
||||
# for it.
|
||||
#!BuildIgnore: java-9-openjdk java-9-openjdk-devel
|
||||
#!BuildIgnore: java-1_8_0-openjdk java-1_8_0-openjdk-devel
|
||||
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
|
||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
||||
#!BuildIgnore: antlr antlr-java
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
BuildRequires: java-devel >= 1.6
|
||||
BuildRequires: javapackages-tools
|
||||
BuildRequires: unzip
|
||||
Requires(post): update-alternatives
|
||||
Requires(pre): update-alternatives
|
||||
Provides: jaxp_parser_impl
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
@ -167,9 +159,10 @@ This package contains the APIs subproject of xml-commons.
|
||||
find -type f -print |xargs -i dos2unix {}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
echo 'javac.target=1.5' > build.properties
|
||||
echo 'javac.source=1.5' >> build.properties
|
||||
echo 'javac.target=1.6' > build.properties
|
||||
echo 'javac.source=1.6' >> build.properties
|
||||
|
||||
sed -i 's/\r//' LICENSE README NOTICE build.sh
|
||||
|
||||
@ -177,9 +170,8 @@ sed -i 's/\r//' LICENSE README NOTICE build.sh
|
||||
## this uses the ant.jar provided by the xerces packages. Tough luck,
|
||||
# jpackage bootstrap has to start somewhere. It is not installed,
|
||||
# though.
|
||||
export JAVA_HOME=%{_libdir}/jvm/java-1.5.0-gcj
|
||||
export GC_MAXIMUM_HEAP_SIZE="134217728"
|
||||
export CLASSPATH=$CLASSPATH:`build-classpath antlr-bootstrap`
|
||||
export CLASSPATH=$CLASSPATH:$(build-classpath antlr-bootstrap)
|
||||
sh build.sh jars
|
||||
#ant tests test
|
||||
|
||||
@ -238,7 +230,6 @@ if [ $1 = 0 ] ; then
|
||||
fi
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc LICENSE README
|
||||
%{_javadir}/%{name}-%{version}.jar
|
||||
%{_javadir}/%{name}.jar
|
||||
@ -246,25 +237,21 @@ fi
|
||||
%ghost %{_sysconfdir}/alternatives/jaxp_parser_impl.jar
|
||||
|
||||
%files xml-apis
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}-%{version}-xml-apis.jar
|
||||
%{_javadir}/%{name}-xml-apis.jar
|
||||
%{_javadir}/xml-commons-apis.jar
|
||||
%ghost %{_sysconfdir}/alternatives/xml-commons-apis.jar
|
||||
|
||||
%files xml-resolver
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadir}/%{name}-%{version}-xml-resolver.jar
|
||||
%{_javadir}/%{name}-xml-resolver.jar
|
||||
%{_javadir}/xml-commons-resolver.jar
|
||||
%ghost %{_sysconfdir}/alternatives/xml-commons-resolver.jar
|
||||
|
||||
%files demo
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%files scripts
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/*
|
||||
%{_mandir}/man1/*
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user