- Drop unused patches:
* xerces-build.patch * xerces-j2-gcj-switch-constants-bug.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/xerces-j2?expand=0&rev=35
This commit is contained in:
parent
94e27dea61
commit
9d95a94d92
@ -1,18 +0,0 @@
|
|||||||
Index: build.xml
|
|
||||||
===================================================================
|
|
||||||
--- build.xml
|
|
||||||
+++ build.xml
|
|
||||||
@@ -28,11 +28,13 @@ Copyright:
|
|
||||||
<property name="tools.dir" value="./tools"/>
|
|
||||||
|
|
||||||
<!-- enable compilation under JDK 1.4 and above -->
|
|
||||||
+ <!-- commented out by SUSE packager
|
|
||||||
<taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
|
|
||||||
<classpath>
|
|
||||||
<pathelement location="${tools.dir}/bin/xjavac.jar"/>
|
|
||||||
</classpath>
|
|
||||||
</taskdef>
|
|
||||||
+ -->
|
|
||||||
|
|
||||||
<!-- Allow properties following these statements to be overridden -->
|
|
||||||
<!-- Note that all of these don't have to exist. They've just been defined
|
|
@ -1,79 +0,0 @@
|
|||||||
Index: src/org/apache/xerces/xpointer/ElementSchemePointer.java
|
|
||||||
===================================================================
|
|
||||||
--- src/org/apache/xerces/xpointer/ElementSchemePointer.java
|
|
||||||
+++ src/org/apache/xerces/xpointer/ElementSchemePointer.java
|
|
||||||
@@ -162,8 +162,7 @@ class ElementSchemePointer implements XP
|
|
||||||
while (tokens.hasMore()) {
|
|
||||||
int token = tokens.nextToken();
|
|
||||||
|
|
||||||
- switch (token) {
|
|
||||||
- case Tokens.XPTRTOKEN_ELEM_NCNAME: {
|
|
||||||
+ if( token == Tokens.XPTRTOKEN_ELEM_NCNAME) {
|
|
||||||
// Note: Only a single ShortHand pointer can be present
|
|
||||||
|
|
||||||
// The shortHand name
|
|
||||||
@@ -175,14 +174,12 @@ class ElementSchemePointer implements XP
|
|
||||||
fShortHandPointer.setSchemeName(fShortHandPointerName);
|
|
||||||
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
- case Tokens.XPTRTOKEN_ELEM_CHILD: {
|
|
||||||
+ } else if( token == Tokens.XPTRTOKEN_ELEM_CHILD) {
|
|
||||||
tmpChildSequence[i] = tokens.nextToken();
|
|
||||||
i++;
|
|
||||||
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
- default:
|
|
||||||
+ } else {
|
|
||||||
reportError("InvalidElementSchemeXPointer",
|
|
||||||
new Object[] { xpointer });
|
|
||||||
}
|
|
||||||
@@ -871,4 +868,4 @@ class ElementSchemePointer implements XP
|
|
||||||
|
|
||||||
} // class Scanner
|
|
||||||
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
||||||
Index: src/org/apache/xerces/xpointer/XPointerHandler.java
|
|
||||||
===================================================================
|
|
||||||
--- src/org/apache/xerces/xpointer/XPointerHandler.java
|
|
||||||
+++ src/org/apache/xerces/xpointer/XPointerHandler.java
|
|
||||||
@@ -165,8 +165,7 @@ public final class XPointerHandler exten
|
|
||||||
while (tokens.hasMore()) {
|
|
||||||
int token = tokens.nextToken();
|
|
||||||
|
|
||||||
- switch (token) {
|
|
||||||
- case Tokens.XPTRTOKEN_SHORTHAND: {
|
|
||||||
+ if(token == Tokens.XPTRTOKEN_SHORTHAND) {
|
|
||||||
|
|
||||||
// The shortHand name
|
|
||||||
token = tokens.nextToken();
|
|
||||||
@@ -182,8 +181,7 @@ public final class XPointerHandler exten
|
|
||||||
shortHandPointer.setSchemeName(shortHandPointerName);
|
|
||||||
fXPointerParts.add(shortHandPointer);
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
- case Tokens.XPTRTOKEN_SCHEMENAME: {
|
|
||||||
+ } else if(token == Tokens.XPTRTOKEN_SCHEMENAME) {
|
|
||||||
|
|
||||||
// Retreive the local name and prefix to form the scheme name
|
|
||||||
token = tokens.nextToken();
|
|
||||||
@@ -273,8 +271,7 @@ public final class XPointerHandler exten
|
|
||||||
}
|
|
||||||
|
|
||||||
break;
|
|
||||||
- }
|
|
||||||
- default:
|
|
||||||
+ } else {
|
|
||||||
reportError("InvalidXPointerExpression",
|
|
||||||
new Object[] { xpointer });
|
|
||||||
}
|
|
||||||
@@ -1248,4 +1245,4 @@ public final class XPointerHandler exten
|
|
||||||
super.setProperty(propertyId, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
-}
|
|
||||||
\ No newline at end of file
|
|
||||||
+}
|
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 11 13:06:12 UTC 2014 - tchvatal@suse.com
|
||||||
|
|
||||||
|
- Drop unused patches:
|
||||||
|
* xerces-build.patch
|
||||||
|
* xerces-j2-gcj-switch-constants-bug.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com
|
Mon Sep 9 11:06:27 UTC 2013 - tchvatal@suse.com
|
||||||
|
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package xerces-j2
|
# spec file for package xerces-j2
|
||||||
#
|
#
|
||||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
Loading…
x
Reference in New Issue
Block a user