[61185] trunk/dports/java/dom4j/files/patch-JDK-1.6.diff

[nox at macports.org]

Revision: 61185
          http://trac.macports.org/changeset/61185
Author:   nox at macports.org
Date:     2009-12-04 06:29:51 -0800 (Fri, 04 Dec 2009)
Log Message:
-----------
Fix dom4j patch for SL support committed earlier

Modified Paths:
--------------
    trunk/dports/java/dom4j/files/patch-JDK-1.6.diff

Modified: trunk/dports/java/dom4j/files/patch-JDK-1.6.diff
===================================================================
--- trunk/dports/java/dom4j/files/patch-JDK-1.6.diff	2009-12-04 08:54:05 UTC (rev 61184)
+++ trunk/dports/java/dom4j/files/patch-JDK-1.6.diff	2009-12-04 14:29:51 UTC (rev 61185)
@@ -1,6 +1,6 @@
---- src/java/org/dom4j/dom/DOMAttribute.java.orig	2009-11-28 15:03:09.000000000 +0100
-+++ src/java/org/dom4j/dom/DOMAttribute.java	2009-11-28 17:57:22.000000000 +0100
-@@ -15,6 +15,7 @@
+--- src/java/org/dom4j/dom/DOMAttribute.java.orig	2009-11-28 15:03:09.000000000 +0100
++++ src/java/org/dom4j/dom/DOMAttribute.java	2009-11-28 17:57:22.000000000 +0100
+@@ -15,6 +15,7 @@
  import org.w3c.dom.Document;
  import org.w3c.dom.NamedNodeMap;
  import org.w3c.dom.NodeList;
@@ -8,7 +8,7 @@
  
  /**
   * <p>
-@@ -179,6 +180,14 @@
+@@ -179,6 +180,14 @@
      public org.w3c.dom.Element getOwnerElement() {
          return DOMNodeHelper.asDOMElement(getParent());
      }
@@ -23,9 +23,9 @@
  }
  
  /*
---- src/java/org/dom4j/dom/DOMDocument.java.orig	2009-11-28 15:03:09.000000000 +0100
-+++ src/java/org/dom4j/dom/DOMDocument.java	2009-11-28 18:11:18.000000000 +0100
-@@ -15,10 +15,12 @@
+--- src/java/org/dom4j/dom/DOMDocument.java.orig	2009-11-28 15:03:09.000000000 +0100
++++ src/java/org/dom4j/dom/DOMDocument.java	2009-11-28 18:11:18.000000000 +0100
+@@ -15,10 +15,12 @@
  
  import org.w3c.dom.Attr;
  import org.w3c.dom.CDATASection;
@@ -38,7 +38,7 @@
  import org.w3c.dom.NodeList;
  import org.w3c.dom.ProcessingInstruction;
  
-@@ -301,6 +303,85 @@
+@@ -301,6 +303,85 @@
              return super.getDocumentFactory();
          }
      }
@@ -124,9 +124,9 @@
  }
  
  /*
---- src/java/org/dom4j/dom/DOMDocumentFactory.java.orig	2009-11-28 15:03:09.000000000 +0100
-+++ src/java/org/dom4j/dom/DOMDocumentFactory.java	2009-11-28 17:51:19.000000000 +0100
-@@ -174,6 +174,11 @@
+--- src/java/org/dom4j/dom/DOMDocumentFactory.java.orig	2009-11-28 15:03:09.000000000 +0100
++++ src/java/org/dom4j/dom/DOMDocumentFactory.java	2009-11-28 17:51:19.000000000 +0100
+@@ -174,6 +174,11 @@
                      docType.getPublicId(), docType.getSystemId());
          }
      }
@@ -138,9 +138,9 @@
  }
  
  
---- src/java/org/dom4j/dom/DOMElement.java.orig	2009-11-28 15:03:09.000000000 +0100
-+++ src/java/org/dom4j/dom/DOMElement.java	2009-11-28 17:39:51.000000000 +0100
-@@ -16,11 +16,13 @@
+--- src/java/org/dom4j/dom/DOMElement.java.orig	2009-11-28 15:03:09.000000000 +0100
++++ src/java/org/dom4j/dom/DOMElement.java	2009-11-28 17:39:51.000000000 +0100
+@@ -16,11 +16,13 @@
  import org.dom4j.QName;
  import org.dom4j.tree.DefaultElement;
  
@@ -154,7 +154,7 @@
  
  /**
   * <p>
-@@ -389,6 +391,25 @@
+@@ -389,6 +391,25 @@
  
          return getDocumentFactory().createQName(localName, prefix, namespace);
      }
@@ -181,8 +181,8 @@
  
  /*
 --- src/java/org/dom4j/tree/AbstractCharacterData.java.orig	2005-05-16 15:28:39.000000000 +0200
-+++ src/java/org/dom4j/tree/AbstractCharacterData.java	2009-11-28 17:55:18.000000000 +0100
-@@ -10,6 +10,8 @@
++++ src/java/org/dom4j/tree/AbstractCharacterData.java	2009-11-28 17:55:18.000000000 +0100
+@@ -10,6 +10,8 @@
  import org.dom4j.CharacterData;
  import org.dom4j.Element;
  
@@ -191,7 +191,7 @@
  /**
   * <p>
   * <code>AbstractCharacterData</code> is an abstract base class for tree
-@@ -41,6 +43,21 @@
+@@ -41,6 +43,21 @@
      public void appendText(String text) {
          setText(getText() + text);
      }
@@ -213,9 +213,9 @@
  }
  
  /*
---- src/java/org/dom4j/tree/AbstractNode.java.orig	2009-11-28 17:38:46.000000000 +0100
-+++ src/java/org/dom4j/tree/AbstractNode.java	2009-11-28 18:01:53.000000000 +0100
-@@ -20,6 +20,8 @@
+--- src/java/org/dom4j/tree/AbstractNode.java.orig	2009-11-28 17:38:46.000000000 +0100
++++ src/java/org/dom4j/tree/AbstractNode.java	2009-11-28 18:01:53.000000000 +0100
+@@ -20,6 +20,8 @@
  import org.dom4j.XPath;
  import org.dom4j.rule.Pattern;
  
@@ -224,7 +224,7 @@
  /**
   * <p>
   * <code>AbstractNode</code> is an abstract base class for tree implementors
-@@ -231,6 +233,66 @@
+@@ -231,6 +233,66 @@
          throw new RuntimeException("asXPathResult() not yet implemented fully "
                  + "for: " + this);
      }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091204/99a30bd4/attachment.html>