[oe-commits] org.oe.dev classpath:

[thebohemian commit]

classpath:
  - added patch to fix StAX API incompatibility
  - changed classpath-minimal recipes to generate less binary packages

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 1d06736abd89e6b42d2eaf5918fcd17ad518fcb3
ViewMTN: http://monotone.openembedded.org/revision/info/1d06736abd89e6b42d2eaf5918fcd17ad518fcb3
Files:
1
packages/classpath/files/xmlstream-fix.patch
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/classpath.inc
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/classpath_0.97.bb
Diffs:

#
# mt diff -rb2b754e5497fd05a98effd7ccd0e1f22435c99a1 -r1d06736abd89e6b42d2eaf5918fcd17ad518fcb3
#
# 
# 
# add_file "packages/classpath/files/xmlstream-fix.patch"
#  content [4bf1d735126a491acd71312c04fe6b42e481ef75]
# 
# patch "packages/classpath/classpath-minimal_0.96.1.bb"
#  from [dc3a72abbdd2e121e00c6ea3aeaf5434f164c02f]
#    to [02423279a40cc9c5bde83b965533ab39526ab11a]
# 
# patch "packages/classpath/classpath-minimal_0.97.bb"
#  from [1dbca8bbd4be527feefdde7d7fd2126af6490e7b]
#    to [7d2f5a5a665b8437435d4e674b51c8f2b442bd48]
# 
# patch "packages/classpath/classpath-native_0.96.1.bb"
#  from [8b956ee477f32cf28c75a7cd39e9e85373378164]
#    to [de2308a46658542392eb7d94031a5a997a9dd987]
# 
# patch "packages/classpath/classpath.inc"
#  from [b992c2ac2ea9164632c7cc97aadc93694ae7d6db]
#    to [38c3e19b11832c4ee048c930972f95afbc256c0c]
# 
# patch "packages/classpath/classpath_0.95.bb"
#  from [d2f820a6ce35613717c16b3612ca071f4d918e83]
#    to [e7719be862652c7d80851c9e91f373cdcca5b3fb]
# 
# patch "packages/classpath/classpath_0.96.1.bb"
#  from [214aa050c2a1948b4e32c88821cce2b89be5f74b]
#    to [33e806e4b65b649a2b4005bd15cb10f3d86c7df7]
# 
# patch "packages/classpath/classpath_0.97.bb"
#  from [db8b170f0f6f53145caf1d439efa49971f8c4475]
#    to [e43aa91f755d291041b31336edce4b31751bdff0]
# 
============================================================
--- packages/classpath/files/xmlstream-fix.patch	4bf1d735126a491acd71312c04fe6b42e481ef75
+++ packages/classpath/files/xmlstream-fix.patch	4bf1d735126a491acd71312c04fe6b42e481ef75
@@ -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
============================================================
--- packages/classpath/classpath-minimal_0.96.1.bb	dc3a72abbdd2e121e00c6ea3aeaf5434f164c02f
+++ packages/classpath/classpath-minimal_0.96.1.bb	02423279a40cc9c5bde83b965533ab39526ab11a
@@ -1,8 +1,11 @@ require classpath.inc
 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"
============================================================
--- packages/classpath/classpath-minimal_0.97.bb	1dbca8bbd4be527feefdde7d7fd2126af6490e7b
+++ packages/classpath/classpath-minimal_0.97.bb	7d2f5a5a665b8437435d4e674b51c8f2b442bd48
@@ -1,7 +1,11 @@ require classpath.inc
 require classpath.inc
 
-PR = "r0"
+SRC_URI += "\
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
 
+PR = "r1"
+
 PROVIDES = "${PN} classpath"
 
 EXTRA_OECONF += "\
@@ -13,3 +17,6 @@ EXTRA_OECONF += "\
                 --disable-dssi \
                 --disable-examples \
                "
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
============================================================
--- packages/classpath/classpath-native_0.96.1.bb	8b956ee477f32cf28c75a7cd39e9e85373378164
+++ packages/classpath/classpath-native_0.96.1.bb	de2308a46658542392eb7d94031a5a997a9dd987
@@ -1,6 +1,9 @@ require classpath-native.inc
 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 \
+  "
 
============================================================
--- packages/classpath/classpath.inc	b992c2ac2ea9164632c7cc97aadc93694ae7d6db
+++ packages/classpath/classpath.inc	38c3e19b11832c4ee048c930972f95afbc256c0c
@@ -44,10 +44,15 @@ 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}"
 
 FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security"
============================================================
--- packages/classpath/classpath_0.95.bb	d2f820a6ce35613717c16b3612ca071f4d918e83
+++ packages/classpath/classpath_0.95.bb	e7719be862652c7d80851c9e91f373cdcca5b3fb
@@ -1,8 +1,11 @@ require classpath.inc
 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"
 
============================================================
--- packages/classpath/classpath_0.96.1.bb	214aa050c2a1948b4e32c88821cce2b89be5f74b
+++ packages/classpath/classpath_0.96.1.bb	33e806e4b65b649a2b4005bd15cb10f3d86c7df7
@@ -1,9 +1,12 @@ require classpath.inc
 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"
 
 EXTRA_OECONF += "\
============================================================
--- packages/classpath/classpath_0.97.bb	db8b170f0f6f53145caf1d439efa49971f8c4475
+++ packages/classpath/classpath_0.97.bb	e43aa91f755d291041b31336edce4b31751bdff0
@@ -1,7 +1,11 @@ require classpath.inc
 require classpath.inc
 
-PR = "r0"
+SRC_URI += "\
+  file://xmlstream-fix.patch;patch=1;pnum=0 \
+  "
 
+PR = "r1"
+
 DEPENDS += "gtk+ gconf libxtst"
 
 EXTRA_OECONF += "\