summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/classpath/classpath-minimal_0.96.1.bb9
-rw-r--r--packages/classpath/classpath-minimal_0.97.bb9
-rw-r--r--packages/classpath/classpath-native_0.96.1.bb7
-rw-r--r--packages/classpath/classpath.inc9
-rw-r--r--packages/classpath/classpath_0.95.bb7
-rw-r--r--packages/classpath/classpath_0.96.1.bb9
-rw-r--r--packages/classpath/classpath_0.97.bb6
-rw-r--r--packages/classpath/files/xmlstream-fix.patch93
8 files changed, 136 insertions, 13 deletions
diff --git a/packages/classpath/classpath-minimal_0.96.1.bb b/packages/classpath/classpath-minimal_0.96.1.bb
index e71884dc2b..826c5a9479 100644
--- a/packages/classpath/classpath-minimal_0.96.1.bb
+++ b/packages/classpath/classpath-minimal_0.96.1.bb
@@ -1,8 +1,11 @@
require classpath.inc
-PR = "r5"
+PR = "r6"
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
PROVIDES = "${PN} classpath"
@@ -15,3 +18,5 @@ EXTRA_OECONF += "\
--disable-dssi \
--disable-examples \
"
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
diff --git a/packages/classpath/classpath-minimal_0.97.bb b/packages/classpath/classpath-minimal_0.97.bb
index 14495cedff..7a44226940 100644
--- a/packages/classpath/classpath-minimal_0.97.bb
+++ b/packages/classpath/classpath-minimal_0.97.bb
@@ -1,6 +1,10 @@
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+
+PR = "r1"
PROVIDES = "${PN} classpath"
@@ -13,3 +17,6 @@ EXTRA_OECONF += "\
--disable-dssi \
--disable-examples \
"
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
diff --git a/packages/classpath/classpath-native_0.96.1.bb b/packages/classpath/classpath-native_0.96.1.bb
index e7d1d07a81..b9c3b3a4f1 100644
--- a/packages/classpath/classpath-native_0.96.1.bb
+++ b/packages/classpath/classpath-native_0.96.1.bb
@@ -1,6 +1,9 @@
require classpath-native.inc
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
diff --git a/packages/classpath/classpath.inc b/packages/classpath/classpath.inc
index e5f5170b32..cfb9f1c089 100644
--- a/packages/classpath/classpath.inc
+++ b/packages/classpath/classpath.inc
@@ -44,9 +44,14 @@ do_install() {
mv ${D}${libdir}/security ${D}${libdir}/${PBN}
}
-PACKAGES =+ "${PBN}-common ${PN}-examples \
+# Defines the packages that this classpath recipe creates.
+# This allows the classpath-minimal variants to override this
+# again.
+CPPACKAGES = "${PBN}-common ${PN}-examples \
${PN}-tools ${PN}-tools-doc \
- ${PN}-gtk ${PN}-gconf "
+ ${PN}-gtk ${PN}-gconf"
+
+PACKAGES =+ "${CPPACKAGES}"
FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}"
diff --git a/packages/classpath/classpath_0.95.bb b/packages/classpath/classpath_0.95.bb
index 6b167a2d47..0b2090f72f 100644
--- a/packages/classpath/classpath_0.95.bb
+++ b/packages/classpath/classpath_0.95.bb
@@ -1,8 +1,11 @@
require classpath.inc
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
-PR = "r2"
+PR = "r3"
DEPENDS += "gtk+ gconf libxtst"
diff --git a/packages/classpath/classpath_0.96.1.bb b/packages/classpath/classpath_0.96.1.bb
index 799b0f31ac..9d347a0303 100644
--- a/packages/classpath/classpath_0.96.1.bb
+++ b/packages/classpath/classpath_0.96.1.bb
@@ -1,8 +1,11 @@
require classpath.inc
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \
- "
-PR = "r4"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+
+PR = "r5"
DEPENDS += "gtk+ gconf libxtst"
diff --git a/packages/classpath/classpath_0.97.bb b/packages/classpath/classpath_0.97.bb
index b8cd02084a..4e45dd4350 100644
--- a/packages/classpath/classpath_0.97.bb
+++ b/packages/classpath/classpath_0.97.bb
@@ -1,6 +1,10 @@
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+
+PR = "r1"
DEPENDS += "gtk+ gconf libxtst"
diff --git a/packages/classpath/files/xmlstream-fix.patch b/packages/classpath/files/xmlstream-fix.patch
new file mode 100644
index 0000000000..30b44178d7
--- /dev/null
+++ b/packages/classpath/files/xmlstream-fix.patch
@@ -0,0 +1,93 @@
+Index: gnu/xml/stream/AttributeImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/AttributeImpl.java,v
+retrieving revision 1.1
+diff -u -r1.1 AttributeImpl.java
+--- gnu/xml/stream/AttributeImpl.java 4 Sep 2005 09:52:10 -0000 1.1
++++ gnu/xml/stream/AttributeImpl.java 4 Mar 2008 16:02:43 -0000
+@@ -56,11 +56,11 @@
+
+ protected final QName name;
+ protected final String value;
+- protected final QName type;
++ protected final String type;
+ protected final boolean specified;
+
+ protected AttributeImpl(Location location,
+- QName name, String value, QName type,
++ QName name, String value, String type,
+ boolean specified)
+ {
+ super(location);
+@@ -85,7 +85,7 @@
+ return value;
+ }
+
+- public QName getDTDType()
++ public String getDTDType()
+ {
+ return type;
+ }
+Index: gnu/xml/stream/XMLEventAllocatorImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java,v
+retrieving revision 1.3
+diff -u -r1.3 XMLEventAllocatorImpl.java
+--- gnu/xml/stream/XMLEventAllocatorImpl.java 3 Mar 2006 12:30:59 -0000 1.3
++++ gnu/xml/stream/XMLEventAllocatorImpl.java 4 Mar 2008 16:02:44 -0000
+@@ -165,7 +165,7 @@
+ attributes.add(new AttributeImpl(location,
+ reader.getAttributeName(i),
+ reader.getAttributeValue(i),
+- QName.valueOf(reader.getAttributeType(i)),
++ reader.getAttributeType(i),
+ reader.isAttributeSpecified(i)));
+ return new StartElementImpl(location,
+ reader.getName(),
+Index: gnu/xml/stream/XMLEventFactoryImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 XMLEventFactoryImpl.java
+--- gnu/xml/stream/XMLEventFactoryImpl.java 3 Mar 2006 12:30:59 -0000 1.2
++++ gnu/xml/stream/XMLEventFactoryImpl.java 4 Mar 2008 16:02:44 -0000
+@@ -79,20 +79,20 @@
+ {
+ return new AttributeImpl(location,
+ new QName(namespaceURI, localName, prefix),
+- value, QName.valueOf("CDATA"), true);
++ value, "CDATA", true);
+ }
+
+ public Attribute createAttribute(String localName, String value)
+ {
+ return new AttributeImpl(location,
+ new QName(localName),
+- value, QName.valueOf("CDATA"), true);
++ value, "CDATA", true);
+ }
+
+ public Attribute createAttribute(QName name, String value)
+ {
+ return new AttributeImpl(location, name, value,
+- QName.valueOf("CDATA"), true);
++ "CDATA", true);
+ }
+
+ public Namespace createNamespace(String namespaceURI)
+Index: javax/xml/stream/events/Attribute.java
+===================================================================
+RCS file: /sources/classpath/classpath/javax/xml/stream/events/Attribute.java,v
+retrieving revision 1.2
+diff -u -r1.2 Attribute.java
+--- javax/xml/stream/events/Attribute.java 4 Sep 2005 09:44:30 -0000 1.2
++++ javax/xml/stream/events/Attribute.java 4 Mar 2008 16:02:48 -0000
+@@ -59,7 +59,7 @@
+ /**
+ * Returns the type of this attribute.
+ */
+- QName getDTDType();
++ String getDTDType();
+
+ /**
+ * Indicates whether this attribute was specified in the input source, or
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 07:30:10 +0000