Remove upstreamed patches

Julien LepillerSat Feb 10 19:17:55+0100 2018

97bfecc

Remove upstreamed patches

java-xerces-bootclasspath.patch unknown status 2

1-
Based on https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/03_bootclasspath.patch?revision=14509, adopted for guix
2-
3-
--- xerces-2_11_0/build.xml.orig	2010-11-26 21:42:11.000000000 +0100
4-
+++ xerces-2_11_0/build.xml	2017-03-28 14:04:41.946606996 +0200
5-
@@ -290,13 +290,14 @@
6-
            destdir="${build.dest}"
7-
            source="${javac.source}"
8-
            target="${javac.target}"
9-
-           classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
10-
+           classpath="${build.dir}/classes:${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"
11-
            debug="${debug}" nowarn="true"
12-
            debuglevel="${debuglevel}"
13-
            deprecation="${deprecation}"
14-
            optimize="${optimize}"
15-
            includeAntRuntime="false"
16-
-           includeJavaRuntime="false"
17-
+           includeJavaRuntime="true"
18-
+           bootclasspath="${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"
19-
            excludes="org/xml/sax/** 
20-
                 javax/xml/**
21-
                 org/w3c/dom/*
22-
@@ -1451,13 +1452,14 @@
23-
                destdir="${build.dest}"
24-
                source="${javac.source}"
25-
                target="${javac.target}"
26-
-               classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
27-
+               classpath="${build.dir}/classes:${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"
28-
                debug="${debug}"
29-
                debuglevel="${debuglevel}"
30-
                deprecation="${deprecation}"
31-
                optimize="${optimize}"
32-
                includeAntRuntime="false"
33-
-               includeJavaRuntime="false"
34-
+               includeJavaRuntime="true"
35-
+               bootclasspath="${jar.jaxp}:${jar.apis-ext}:${jar.resolver}"
36-
                excludes="org/xml/sax/** 
37-
                     javax/xml/**
38-
                     org/w3c/dom/*

java-xerces-build_dont_unzip.patch unknown status 2

1-
Don't unzip the sources which were bundled originally. Guix strips them from
2-
the source and uses pre-build packages.
3-
4-
Taken from https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/02_build_dont_unzip.patch?revision=14507
5-
6-
Index: b/build.xml
7-
===================================================================
8-
--- a/build.xml
9-
+++ b/build.xml
10-
@@ -247,7 +247,7 @@
11-
     <copy file="${src.dir}/org/apache/xerces/impl/xpath/regex/message.properties"
12-
       tofile="${build.src}/org/apache/xerces/impl/xpath/regex/message_en.properties"/>
13-
 
14-
-    <!-- now deal with API's:  -->
15-
+    <!-- not needed for Debian
16-
     <unzip src="${src.apis.zip}" dest="${build.src}">
17-
         <patternset
18-
             includes="org/xml/sax/** 
19-
@@ -270,6 +270,7 @@
20-
                 org/w3c/dom/xpath/**"
21-
         />
22-
     </unzip>
23-
+    -->
24-
     
25-
     <!-- substitute tokens as needed -->
26-
     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 
27-
@@ -1232,7 +1233,7 @@
28-
     <replace file="${build.dir}/src/org/apache/xerces/parsers/AbstractSAXParser.java"
29-
              token="return (fConfiguration instanceof XML11Configurable);" value="return false;"/>
30-
  
31-
-    <!-- now deal with API's:  -->
32-
+    <!-- not needed for Debian
33-
     <unzip src="${src.apis.zip}" dest="${build.src}">
34-
         <patternset
35-
             includes="org/xml/sax/** 
36-
@@ -1255,7 +1256,7 @@
37-
                 org/w3c/dom/xpath/**"
38-
         />
39-
     </unzip>
40-
-
41-
+    -->
42-
 
43-
     <!-- substitute tokens as needed -->
44-
     <replace file="${build.dir}/src/org/apache/xerces/impl/Version.java" 

java-xerces-manifest_classpath.patch unknown status 2

1-
Index: b/src/manifest.xerces
2-
===================================================================
3-
--- a/src/manifest.xerces
4-
+++ b/src/manifest.xerces
5-
@@ -1,5 +1,6 @@
6-
 Manifest-Version: 1.0
7-
 Created-By: @java.version@ (@java.vendor@)
8-
+Class-Path: xml-apis-ext.jar xml-resolver.jar jaxp-1.4.jar
9-
 
10-
 Name: org/apache/xerces/impl/Version.class
11-
 Comment: @impl.name@ 

java-xerces-xjavac_taskdef.patch unknown status 2

1-
This patch eliminates the need for providing "xjavac", which saves building a
2-
package for the unmaintained "xerces-tools".
3-
4-
Taken from https://anonscm.debian.org/viewvc/pkg-java/trunk/libxerces2-java/debian/patches/01_xjavac_taskdef.patch?revision=14507
5-
6-
Index: b/build.xml
7-
===================================================================
8-
--- a/build.xml
9-
+++ b/build.xml
10-
@@ -39,7 +39,7 @@
11-
   <property name="tools.dir" value="./tools"/>
12-
 
13-
   <!-- enable compilation under JDK 1.4 and above -->
14-
-  <taskdef name="xjavac" classname="org.apache.xerces.util.XJavac">
15-
+  <taskdef name="xjavac" classname="org.apache.tools.ant.taskdefs.Javac">
16-
     <classpath>
17-
       <pathelement location="${tools.dir}/bin/xjavac.jar"/>
18-
     </classpath>
19-
@@ -291,7 +291,7 @@
20-
            source="${javac.source}"
21-
            target="${javac.target}"
22-
            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"
23-
-           debug="${debug}"
24-
+           debug="${debug}" nowarn="true"
25-
            debuglevel="${debuglevel}"
26-
            deprecation="${deprecation}"
27-
            optimize="${optimize}"
28-
@@ -359,7 +359,7 @@
29-
            source="${javac.source}"
30-
            target="${javac.target}"
31-
            classpath="${build.dir}/classes:${tools.dir}/${jar.apis}"
32-
-           debug="${debug}"
33-
+           debug="${debug}" nowarn="true"
34-
            debuglevel="${debuglevel}"
35-
            includeAntRuntime="false"
36-
            includeJavaRuntime="true"/>
37-
@@ -379,7 +379,7 @@
38-
            source="${javac.source}"
39-
            target="${javac.target}"
40-
            classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar"
41-
-           debug="${debug}"
42-
+           debug="${debug}" nowarn="true"
43-
            debuglevel="${debuglevel}"
44-
            includeAntRuntime="false"
45-
            includeJavaRuntime="true"/>