openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File gcc4-fixes.diff of Package trang (Revision 9798d8342fa132d552f73666a411fb0e)

Currently displaying revision 9798d8342fa132d552f73666a411fb0e , Show latest

diff -Naur ../trang-20030619.orig/Makefile.in ./Makefile.in
--- ../trang-20030619.orig/Makefile.in	2003-06-19 16:18:46.000000000 +0200
+++ ./Makefile.in	2005-04-27 20:19:33.000000000 +0200
@@ -496,6 +496,7 @@
   $(srcdir)/src/javax/xml/parsers/SAXParserFactory.java \
   $(srcdir)/src/javax/xml/parsers/SAXParser.java \
   $(srcdir)/src/javax/xml/parsers/ParserConfigurationException.java
+CLASSES=$(SOURCES:.java=.class)
 RESOURCES=\
   src/META-INF/services/com.thaiopensource.datatype.xsd.regex.RegexEngine.o \
   src/META-INF/services/com.thaiopensource.validate.auto.SchemaReceiverFactory.o \
@@ -595,6 +596,10 @@
   src/org/apache/xerces/impl \
   src/org/apache/xerces/impl/xpath \
   src/org/apache/xerces/impl/xpath/regex
+
+# also find inner classes (like /name/of/package/Class$InnerClass.class)
+ALLCLASSES=$(CLASSES:.class=[.\$$]*class)
+
 all: $(PROG) test_$(PROG)
 
 $(PROG): $(PROG).o $(RESOURCES)
@@ -603,8 +608,11 @@
 test_$(PROG): $(PROG).o $(RESOURCES)
 	$(GCJ) $(GCJFLAGS) $(LDFLAGS) --main=$(TEST_MAIN) -o $@ $(PROG).o $(RESOURCES) $(LIBS)
 
-$(PROG).o: $(SOURCES)
-	$(GCJ) $(GCJFLAGS) -c -o $@ $(SOURCES)
+$(PROG).o: $(CLASSES)
+	$(GCJ) $(GCJFLAGS) -findirect-dispatch -c -o $@ $(ALLCLASSES)
+
+.java.class:
+	$(GCJ) $(GCJFLAGS) -classpath $(srcdir)/src -C $< 
 
 .resource.o:
 	$(GCJ) $(GCJFLAGS) -c -o $@ --resource=`echo $@ | sed -e 's;src/;;' -e 's/.o$$//'` $<
@@ -630,6 +638,8 @@
 
 clean:
 	-rm -f dirstamp $(PROG) $(PROG).o $(RESOURCES)
+	-rm $(CLASSES)
+	-rm $(subst $$,\$$,$(INNERCLASSES))
 	-rmdir `for d in $(DIRS); do echo $$d; done | sort -r`
 	cd test; $(MAKE) clean
 
@@ -645,5 +655,5 @@
 distclean: clean
 	-rm -f config.status config.cache config.log
 
-.SUFFIXES: .resource
+.SUFFIXES: .resource .class .java
 .PHONY: all check distclean clean install uninstall
diff -Naur ../trang-20030619.orig/src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java ./src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java
--- ../trang-20030619.orig/src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java	2003-02-22 03:35:46.000000000 +0100
+++ ./src/com/thaiopensource/relaxng/input/parse/SchemaBuilderImpl.java	2005-04-27 19:23:57.000000000 +0200
@@ -430,7 +430,7 @@
   }
 
   static class CommentListImpl implements CommentList {
-    private final List list = new Vector();
+    protected final List list = new Vector();
     public void addComment(String value, Location loc) throws BuildException {
       Comment comment = new Comment(value);
       comment.setSourceLocation((SourceLocation)loc);
diff -Naur ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/rnc/NamespaceManager.java ./src/com/thaiopensource/relaxng/output/rnc/NamespaceManager.java
--- ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/rnc/NamespaceManager.java	2003-01-06 08:15:18.000000000 +0100
+++ ./src/com/thaiopensource/relaxng/output/rnc/NamespaceManager.java	2005-04-27 19:23:57.000000000 +0200
@@ -68,8 +68,8 @@
 
 
   static class Binding {
-    private final String prefix;
-    private final String namespaceUri;
+    protected final String prefix;
+    protected final String namespaceUri;
     Binding(String prefix, String namespaceUri) {
       this.prefix = prefix;
       this.namespaceUri = namespaceUri;
diff -Naur ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/BasicOutput.java ./src/com/thaiopensource/relaxng/output/xsd/BasicOutput.java
--- ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/BasicOutput.java	2003-05-31 10:36:40.000000000 +0200
+++ ./src/com/thaiopensource/relaxng/output/xsd/BasicOutput.java	2005-04-27 19:23:57.000000000 +0200
@@ -258,7 +258,7 @@
 
   class ParticleOutput implements ParticleVisitor {
     private Occurs occ = Occurs.EXACTLY_ONE;
-    private int context = NORMAL_CONTEXT;
+    protected int context = NORMAL_CONTEXT;
 
     private boolean startWrapperForElement() {
       boolean needWrapper = context >= COMPLEX_TYPE_CONTEXT;
diff -Naur ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/ComplexTypeSelector.java ./src/com/thaiopensource/relaxng/output/xsd/ComplexTypeSelector.java
--- ../trang-20030619.orig/src/com/thaiopensource/relaxng/output/xsd/ComplexTypeSelector.java	2003-05-10 05:25:47.000000000 +0200
+++ ./src/com/thaiopensource/relaxng/output/xsd/ComplexTypeSelector.java	2005-04-27 19:23:57.000000000 +0200
@@ -42,7 +42,7 @@
   }
 
   static class NamedComplexType {
-    private final boolean mixed;
+    protected final boolean mixed;
 
     NamedComplexType(boolean mixed) {
       this.mixed = mixed;
diff -Naur ../trang-20030619.orig/src/com/thaiopensource/relaxng/translate/util/ParamProcessor.java ./src/com/thaiopensource/relaxng/translate/util/ParamProcessor.java
--- ../trang-20030619.orig/src/com/thaiopensource/relaxng/translate/util/ParamProcessor.java	2003-02-20 07:47:34.000000000 +0100
+++ ./src/com/thaiopensource/relaxng/translate/util/ParamProcessor.java	2005-04-27 19:23:57.000000000 +0200
@@ -18,7 +18,7 @@
   private static class BadParamException extends Exception { }
 
   static class LocalizedInvalidValueException extends InvalidParamValueException {
-    private final String key;
+    protected final String key;
 
     LocalizedInvalidValueException(String key) {
       this.key = key;

Places

File gcc4-fixes.diff of Package trang (Revision 9798d8342fa132d552f73666a411fb0e)

Places