[xmlbeans] build fix for Java8
gil
gil at fedoraproject.org
Sun Feb 15 02:25:14 UTC 2015
commit 519fabab2b0a96b86a503ecaef816b9d6df2b850
Author: gil <puntogil at libero.it>
Date: Sun Feb 15 03:24:59 2015 +0100
build fix for Java8
xmlbeans-2.6.0-java8.patch | 10 ++++++++++
xmlbeans.spec | 7 +++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/xmlbeans-2.6.0-java8.patch b/xmlbeans-2.6.0-java8.patch
new file mode 100644
index 0000000..6772397
--- /dev/null
+++ b/xmlbeans-2.6.0-java8.patch
@@ -0,0 +1,10 @@
+--- build.xml 2015-02-15 03:12:23.105593326 +0100
++++ build.xml.java8 2015-02-15 03:16:59.857032487 +0100
+@@ -694,6 +694,7 @@
+ <pathelement location="build/classes/configschema"/>
+ <pathelement location="build/classes/toolschema"/>
+ <pathelement location="build/classes/xsdschema"/>
++ <pathelement location="build/classes/typestore"/>
+ </classpath>
+ </javac>
+ </target>
diff --git a/xmlbeans.spec b/xmlbeans.spec
index 926483c..bcf99cf 100644
--- a/xmlbeans.spec
+++ b/xmlbeans.spec
@@ -47,6 +47,9 @@ Patch1: 0001-Update-to-newer-saxon-API.patch
Patch2: xmlbeans-2.6.0-iso-8859-1-encoding.patch
Patch3: xmlbeans-2.6.0-jsr-bundle.patch
Patch4: xmlbeans-scripts-classpath.patch
+# error: cannot access TypeStoreUser
+Patch5: xmlbeans-2.6.0-java8.patch
+
License: ASL 2.0
%if %without bootstrap
@@ -111,7 +114,7 @@ Requires: %{name} = %{version}-%{release}
%patch2 -p1
%patch3 -p1
%patch4 -p1
-
+%patch5 -p0
%build
# Piccolo and jam are rebuilt from source and bundled with xbean
@@ -133,7 +136,7 @@ ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css docs/guide/tools.html
# Build
-ant -Djavac.source=1.5 -Djavac.target=1.5 default docs
+ant -Djavac.source=1.6 -Djavac.target=1.6 default docs
%install
# jar
More information about the scm-commits
mailing list