Incorporate jst's fixes into the correct patches, revert generate-automatic-patches.sh until it can be genericized, correct the series comments, and prepare to rebase
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 11 Jul 2008 15:01:44 -0400
changeset 150 1c04169f4d45
parent 149 13eaa3adde4b
child 151 02eb136bf089
push id30
push userbsmedberg@mozilla.com
push dateSun, 13 Jul 2008 14:45:31 +0000
Incorporate jst's fixes into the correct patches, revert generate-automatic-patches.sh until it can be genericized, correct the series comments, and prepare to rebase
generate-automatic-patches.sh
jst-build-fixes
nsRangeStore-okonstack2
nsURIHashKey-okonstack2
series
xpcom-request-context2
--- a/generate-automatic-patches.sh
+++ b/generate-automatic-patches.sh
@@ -4,43 +4,41 @@
 # (in the .hg/patches directory probably)
 
 set -e;
 
 this=$0
 thisreldir=`dirname $this`
 thisdir=`cd $thisreldir && pwd`
 rootdir=`cd "$thisdir/../../.." && pwd`
-export srcdir="$rootdir/mozilla"
+srcdir="$rootdir/src"
 porkobjdir="$rootdir/ff-pork"
 analysisobjdir="$rootdir/ff-gcobject-analysis"
-oinkdir=/home/jst/oink/oink-stack/oink
-porkbarrel=/home/jst//oink/pork-barrel/pork-barrel
-gccdehydra=home/dmandelin/gcc-dehydra/412-installed/bin/g++
-dehydra=/home/dmandelin/gcc-dehydra/dehydra-gcc/gcc_dehydra.so
+oinkdir=/builds/oink-stack/oink
+porkbarrel=/builds/pork-barrel/pork-barrel
+gccdehydra=/builds/gcc-dehydra/installed/bin/g++
+dehydra=/builds/gcc-dehydra/dehydra/gcc_dehydra.so
 
-if [ ! true ]
-then
 printf "Removing old automatic patches, if any\n"
 
 hg -R "$srcdir" qpop -a;
 hg -R "$srcdir" qrm empty-patch-before-automatic || true;
 hg -R "$srcdir" qrm automatic-gcobject || true;
 hg -R "$srcdir" qrm automatic-garburator || true;
 hg -R "$srcdir" qrm automatic-remove-addrefs || true;
 hg -R "$srcdir" qrm empty-patch-after-automatic || true;
 hg -R "$srcdir" qpush -a;
 (cd "$srcdir" && autoconf-2.13);
 
-printf "Building ff-pork in $porkobjdir\n"
+printf "Building ff-pork\n"
 
 rm -rf "$porkobjdir";
 mkdir -p "$porkobjdir/config";
 install "$thisdir/pork-rules.mk" "$porkobjdir/config/myrules.mk";
-(cd "$porkobjdir" && /home/jst/xpcomgc/configure-scripts/configure-pork-analysis && make -j4 WARNINGS_AS_ERRORS= >"$rootdir/pork-build.log" 2>&1 ) || exit 1;
+(cd "$porkobjdir" && /builds/configure-scripts/configure-pork-analysis && make -j8 WARNINGS_AS_ERRORS= >"$rootdir/pork-build.log" 2>&1 ) || exit 1;
 
 rm -f "$rootdir/iifiles.list";
 (cd "$porkobjdir" && make echo-iifiles IIFILES_LIST="$rootdir/iifiles.list") || exit 1;
 
 printf "Running garburator\n"
 
 (cd "$porkobjdir" && "$porkbarrel" 8 "$rootdir/iifiles.list" "$oinkdir/garburator") >"$rootdir/automatic-garburator.patch" 2>"$rootdir/automatic-garburator.errlog" || exit 1;
 
@@ -48,24 +46,22 @@ filterdiff -x "**nsCOMPtr.h" < "$rootdir
 
 printf "Applying automatic-garburator\n"
 
 hg -R "$srcdir" qnew empty-patch-before-automatic
 hg -R "$srcdir" qnew automatic-garburator
 (cd "$porkobjdir" && patch -p0 <"$rootdir/automatic-garburator-filtered.patch") || exit 1
 hg -R "$srcdir" qrefresh -m "Automatically generated patch: convert stack nsCOMPtrs to raw pointers"
 
-fi # jst
-
 printf "Building ff-gcobject-analysis\n"
 
 rm -rf "$analysisobjdir"
 mkdir -p "$analysisobjdir/config"
 install "$thisdir/gcobject-config.mk" "$analysisobjdir/config/myconfig.mk"
-(cd "$analysisobjdir" && /home/jst/xpcomgc/configure-scripts/configure-gcc-analysis && make -j4 WARNINGS_AS_ERRORS= >"$rootdir/analysis-build.log" 2>&1 ) || exit 1;
+(cd "$analysisobjdir" && /builds/configure-scripts/configure-gcc-analysis && make -j8 WARNINGS_AS_ERRORS= >"$rootdir/analysis-build.log" 2>&1 ) || exit 1;
 
 printf "Generating gcobject patch\n"
 
 python "$thisdir/add-gcobject-inheritance.py" "$analysisobjdir" >"$rootdir/automatic-gcobject.patch" 2>"$rootdir/automatic-gcobject.errlog"
 
 printf "Applying gcobject patch\n"
 
 hg -R "$srcdir" qnew automatic-gcobject
deleted file mode 100644
--- a/jst-build-fixes
+++ /dev/null
@@ -1,210 +0,0 @@
-diff -r 493840dd0c01 config/config.mk
---- a/config/config.mk	Wed Jul 02 13:42:20 2008 -0700
-+++ b/config/config.mk	Thu Jul 03 20:08:53 2008 -0700
-@@ -510,6 +510,8 @@
- JAVA_DIST_DIR = $(DEPTH)/$(JAVA_GEN_DIR)
- JAVA_IFACES_PKG_NAME = org/mozilla/interfaces
- 
-+REQUIRES += js
-+
- REQ_INCLUDES	= -I$(srcdir) -I. $(foreach d,$(REQUIRES),-I$(DIST)/include/$d) -I$(DIST)/include 
- ifdef LIBXUL_SDK
- REQ_INCLUDES_SDK = $(foreach d,$(REQUIRES),-I$(LIBXUL_SDK)/include/$d) -I$(LIBXUL_SDK)/include
-diff -r 493840dd0c01 editor/libeditor/base/nsSelectionState.cpp
---- a/editor/libeditor/base/nsSelectionState.cpp	Wed Jul 02 13:42:20 2008 -0700
-+++ b/editor/libeditor/base/nsSelectionState.cpp	Thu Jul 03 20:08:53 2008 -0700
-@@ -273,9 +273,9 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if ((item->startNode.get() == aParent) && (item->startOffset > aPosition))
-+    if ((item->startNode == aParent) && (item->startOffset > aPosition))
-       item->startOffset++;
--    if ((item->endNode.get() == aParent) && (item->endOffset > aPosition))
-+    if ((item->endNode == aParent) && (item->endOffset > aPosition))
-       item->endOffset++;
-   }
-   return NS_OK;
-@@ -309,9 +309,9 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if ((item->startNode.get() == parent) && (item->startOffset > offset))
-+    if ((item->startNode == parent) && (item->startOffset > offset))
-       item->startOffset--;
--    if ((item->endNode.get() == parent) && (item->endOffset > offset))
-+    if ((item->endNode == parent) && (item->endOffset > offset))
-       item->endOffset--;
-       
-     // check for range endpoints that are in aNode
-@@ -371,7 +371,7 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if (item->startNode.get() == aOldRightNode)
-+    if (item->startNode == aOldRightNode)
-     {
-       if (item->startOffset > aOffset)
-       {
-@@ -382,7 +382,7 @@
-         item->startNode = aNewLeftNode;
-       }
-     }
--    if (item->endNode.get() == aOldRightNode)
-+    if (item->endNode == aOldRightNode)
-     {
-       if (item->endOffset > aOffset)
-       {
-@@ -417,7 +417,7 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if (item->startNode.get() == aParent)
-+    if (item->startNode == aParent)
-     {
-       // adjust start point in aParent
-       if (item->startOffset > aOffset)
-@@ -431,18 +431,18 @@
-         item->startOffset = aOldLeftNodeLength;
-       }
-     }
--    else if (item->startNode.get() == aRightNode)
-+    else if (item->startNode == aRightNode)
-     {
-       // adjust start point in aRightNode
-       item->startOffset += aOldLeftNodeLength;
-     }
--    else if (item->startNode.get() == aLeftNode)
-+    else if (item->startNode == aLeftNode)
-     {
-       // adjust start point in aLeftNode
-       item->startNode = aRightNode;
-     }
- 
--    if (item->endNode.get() == aParent)
-+    if (item->endNode == aParent)
-     {
-       // adjust end point in aParent
-       if (item->endOffset > aOffset)
-@@ -456,12 +456,12 @@
-         item->endOffset = aOldLeftNodeLength;
-       }
-     }
--    else if (item->endNode.get() == aRightNode)
-+    else if (item->endNode == aRightNode)
-     {
-       // adjust end point in aRightNode
-        item->endOffset += aOldLeftNodeLength;
-     }
--    else if (item->endNode.get() == aLeftNode)
-+    else if (item->endNode == aLeftNode)
-     {
-       // adjust end point in aLeftNode
-       item->endNode = aRightNode;
-@@ -489,9 +489,9 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if ((item->startNode.get() == node) && (item->startOffset > aOffset))
-+    if ((item->startNode == node) && (item->startOffset > aOffset))
-       item->startOffset += len;
--    if ((item->endNode.get() == node) && (item->endOffset > aOffset))
-+    if ((item->endNode == node) && (item->endOffset > aOffset))
-       item->endOffset += len;
-   }
-   return NS_OK;
-@@ -514,12 +514,12 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if ((item->startNode.get() == node) && (item->startOffset > aOffset))
-+    if ((item->startNode == node) && (item->startOffset > aOffset))
-     {
-       item->startOffset -= aLength;
-       if (item->startOffset < 0) item->startOffset = 0;
-     }
--    if ((item->endNode.get() == node) && (item->endOffset > aOffset))
-+    if ((item->endNode == node) && (item->endOffset > aOffset))
-     {
-       item->endOffset -= aLength;
-       if (item->endOffset < 0) item->endOffset = 0;
-@@ -555,9 +555,9 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if (item->startNode.get() == aOriginalNode)
-+    if (item->startNode == aOriginalNode)
-       item->startNode = aNewNode;
--    if (item->endNode.get() == aOriginalNode)
-+    if (item->endNode == aOriginalNode)
-       item->endNode = aNewNode;
-   }
-   return NS_OK;
-@@ -590,20 +590,20 @@
-     item = (nsRangeStore*)mArray.ElementAt(i);
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
--    if (item->startNode.get() == aNode)
-+    if (item->startNode == aNode)
-     {
-       item->startNode = aParent;
-       item->startOffset += aOffset;
-     }
--    else if ((item->startNode.get() == aParent) && (item->startOffset > aOffset))
-+    else if ((item->startNode == aParent) && (item->startOffset > aOffset))
-       item->startOffset += (PRInt32)aNodeOrigLen-1;
-       
--    if (item->endNode.get() == aNode)
-+    if (item->endNode == aNode)
-     {
-       item->endNode = aParent;
-       item->endOffset += aOffset;
-     }
--    else if ((item->endNode.get() == aParent) && (item->endOffset > aOffset))
-+    else if ((item->endNode == aParent) && (item->endOffset > aOffset))
-       item->endOffset += (PRInt32)aNodeOrigLen-1;
-   }
-   return NS_OK;
-@@ -655,15 +655,15 @@
-     if (!item) return NS_ERROR_NULL_POINTER;
-     
-     // like a delete in aOldParent
--    if ((item->startNode.get() == aOldParent) && (item->startOffset > aOldOffset))
-+    if ((item->startNode == aOldParent) && (item->startOffset > aOldOffset))
-       item->startOffset--;
--    if ((item->endNode.get() == aOldParent) && (item->endOffset > aOldOffset))
-+    if ((item->endNode == aOldParent) && (item->endOffset > aOldOffset))
-       item->endOffset--;
-       
-     // and like an insert in aNewParent
--    if ((item->startNode.get() == aNewParent) && (item->startOffset > aNewOffset))
-+    if ((item->startNode == aNewParent) && (item->startOffset > aNewOffset))
-       item->startOffset++;
--    if ((item->endNode.get() == aNewParent) && (item->endOffset > aNewOffset))
-+    if ((item->endNode == aNewParent) && (item->endOffset > aNewOffset))
-       item->endOffset++;
-   }
-   return NS_OK;
-@@ -689,8 +689,8 @@
- nsresult nsRangeStore::StoreRange(nsIDOMRange *aRange)
- {
-   if (!aRange) return NS_ERROR_NULL_POINTER;
--  aRange->GetStartContainer(getter_AddRefs(startNode));
--  aRange->GetEndContainer(getter_AddRefs(endNode));
-+  aRange->GetStartContainer(&startNode);
-+  aRange->GetEndContainer(&endNode);
-   aRange->GetStartOffset(&startOffset);
-   aRange->GetEndOffset(&endOffset);
-   return NS_OK;
-diff -r 493840dd0c01 layout/style/nsCSSLoader.h
---- a/layout/style/nsCSSLoader.h	Wed Jul 02 13:42:20 2008 -0700
-+++ b/layout/style/nsCSSLoader.h	Thu Jul 03 20:08:53 2008 -0700
-@@ -239,7 +239,7 @@
-   {
-   }
-   nsURIAndPrincipalHashKey(const nsURIAndPrincipalHashKey& toCopy)
--    : nsURIHashKey(toCopy)
-+    : nsURIHashKey(toCopy), mPrincipal(toCopy.mPrincipal)
-   {
-     NS_NOTREACHED("This code doesn't work!");
-   }
new file mode 100644
--- /dev/null
+++ b/nsRangeStore-okonstack2
@@ -0,0 +1,186 @@
+diff --git a/editor/libeditor/base/nsSelectionState.cpp b/editor/libeditor/base/nsSelectionState.cpp
+--- a/editor/libeditor/base/nsSelectionState.cpp
++++ b/editor/libeditor/base/nsSelectionState.cpp
+@@ -273,9 +273,9 @@ nsRangeUpdater::SelAdjCreateNode(nsIDOMN
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if ((item->startNode.get() == aParent) && (item->startOffset > aPosition))
++    if ((item->startNode == aParent) && (item->startOffset > aPosition))
+       item->startOffset++;
+-    if ((item->endNode.get() == aParent) && (item->endOffset > aPosition))
++    if ((item->endNode == aParent) && (item->endOffset > aPosition))
+       item->endOffset++;
+   }
+   return NS_OK;
+@@ -309,9 +309,9 @@ nsRangeUpdater::SelAdjDeleteNode(nsIDOMN
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if ((item->startNode.get() == parent) && (item->startOffset > offset))
++    if ((item->startNode == parent) && (item->startOffset > offset))
+       item->startOffset--;
+-    if ((item->endNode.get() == parent) && (item->endOffset > offset))
++    if ((item->endNode == parent) && (item->endOffset > offset))
+       item->endOffset--;
+       
+     // check for range endpoints that are in aNode
+@@ -371,7 +371,7 @@ nsRangeUpdater::SelAdjSplitNode(nsIDOMNo
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if (item->startNode.get() == aOldRightNode)
++    if (item->startNode == aOldRightNode)
+     {
+       if (item->startOffset > aOffset)
+       {
+@@ -382,7 +382,7 @@ nsRangeUpdater::SelAdjSplitNode(nsIDOMNo
+         item->startNode = aNewLeftNode;
+       }
+     }
+-    if (item->endNode.get() == aOldRightNode)
++    if (item->endNode == aOldRightNode)
+     {
+       if (item->endOffset > aOffset)
+       {
+@@ -417,7 +417,7 @@ nsRangeUpdater::SelAdjJoinNodes(nsIDOMNo
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if (item->startNode.get() == aParent)
++    if (item->startNode == aParent)
+     {
+       // adjust start point in aParent
+       if (item->startOffset > aOffset)
+@@ -431,18 +431,18 @@ nsRangeUpdater::SelAdjJoinNodes(nsIDOMNo
+         item->startOffset = aOldLeftNodeLength;
+       }
+     }
+-    else if (item->startNode.get() == aRightNode)
++    else if (item->startNode == aRightNode)
+     {
+       // adjust start point in aRightNode
+       item->startOffset += aOldLeftNodeLength;
+     }
+-    else if (item->startNode.get() == aLeftNode)
++    else if (item->startNode == aLeftNode)
+     {
+       // adjust start point in aLeftNode
+       item->startNode = aRightNode;
+     }
+ 
+-    if (item->endNode.get() == aParent)
++    if (item->endNode == aParent)
+     {
+       // adjust end point in aParent
+       if (item->endOffset > aOffset)
+@@ -456,12 +456,12 @@ nsRangeUpdater::SelAdjJoinNodes(nsIDOMNo
+         item->endOffset = aOldLeftNodeLength;
+       }
+     }
+-    else if (item->endNode.get() == aRightNode)
++    else if (item->endNode == aRightNode)
+     {
+       // adjust end point in aRightNode
+        item->endOffset += aOldLeftNodeLength;
+     }
+-    else if (item->endNode.get() == aLeftNode)
++    else if (item->endNode == aLeftNode)
+     {
+       // adjust end point in aLeftNode
+       item->endNode = aRightNode;
+@@ -489,9 +489,9 @@ nsRangeUpdater::SelAdjInsertText(nsIDOMC
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if ((item->startNode.get() == node) && (item->startOffset > aOffset))
++    if ((item->startNode == node) && (item->startOffset > aOffset))
+       item->startOffset += len;
+-    if ((item->endNode.get() == node) && (item->endOffset > aOffset))
++    if ((item->endNode == node) && (item->endOffset > aOffset))
+       item->endOffset += len;
+   }
+   return NS_OK;
+@@ -514,12 +514,12 @@ nsRangeUpdater::SelAdjDeleteText(nsIDOMC
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if ((item->startNode.get() == node) && (item->startOffset > aOffset))
++    if ((item->startNode == node) && (item->startOffset > aOffset))
+     {
+       item->startOffset -= aLength;
+       if (item->startOffset < 0) item->startOffset = 0;
+     }
+-    if ((item->endNode.get() == node) && (item->endOffset > aOffset))
++    if ((item->endNode == node) && (item->endOffset > aOffset))
+     {
+       item->endOffset -= aLength;
+       if (item->endOffset < 0) item->endOffset = 0;
+@@ -555,9 +555,9 @@ nsRangeUpdater::DidReplaceContainer(nsID
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if (item->startNode.get() == aOriginalNode)
++    if (item->startNode == aOriginalNode)
+       item->startNode = aNewNode;
+-    if (item->endNode.get() == aOriginalNode)
++    if (item->endNode == aOriginalNode)
+       item->endNode = aNewNode;
+   }
+   return NS_OK;
+@@ -590,20 +590,20 @@ nsRangeUpdater::DidRemoveContainer(nsIDO
+     item = (nsRangeStore*)mArray.ElementAt(i);
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+-    if (item->startNode.get() == aNode)
++    if (item->startNode == aNode)
+     {
+       item->startNode = aParent;
+       item->startOffset += aOffset;
+     }
+-    else if ((item->startNode.get() == aParent) && (item->startOffset > aOffset))
++    else if ((item->startNode == aParent) && (item->startOffset > aOffset))
+       item->startOffset += (PRInt32)aNodeOrigLen-1;
+       
+-    if (item->endNode.get() == aNode)
++    if (item->endNode == aNode)
+     {
+       item->endNode = aParent;
+       item->endOffset += aOffset;
+     }
+-    else if ((item->endNode.get() == aParent) && (item->endOffset > aOffset))
++    else if ((item->endNode == aParent) && (item->endOffset > aOffset))
+       item->endOffset += (PRInt32)aNodeOrigLen-1;
+   }
+   return NS_OK;
+@@ -655,15 +655,15 @@ nsRangeUpdater::DidMoveNode(nsIDOMNode *
+     if (!item) return NS_ERROR_NULL_POINTER;
+     
+     // like a delete in aOldParent
+-    if ((item->startNode.get() == aOldParent) && (item->startOffset > aOldOffset))
++    if ((item->startNode == aOldParent) && (item->startOffset > aOldOffset))
+       item->startOffset--;
+-    if ((item->endNode.get() == aOldParent) && (item->endOffset > aOldOffset))
++    if ((item->endNode == aOldParent) && (item->endOffset > aOldOffset))
+       item->endOffset--;
+       
+     // and like an insert in aNewParent
+-    if ((item->startNode.get() == aNewParent) && (item->startOffset > aNewOffset))
++    if ((item->startNode == aNewParent) && (item->startOffset > aNewOffset))
+       item->startOffset++;
+-    if ((item->endNode.get() == aNewParent) && (item->endOffset > aNewOffset))
++    if ((item->endNode == aNewParent) && (item->endOffset > aNewOffset))
+       item->endOffset++;
+   }
+   return NS_OK;
+@@ -689,8 +689,8 @@ nsresult nsRangeStore::StoreRange(nsIDOM
+ nsresult nsRangeStore::StoreRange(nsIDOMRange *aRange)
+ {
+   if (!aRange) return NS_ERROR_NULL_POINTER;
+-  aRange->GetStartContainer(getter_AddRefs(startNode));
+-  aRange->GetEndContainer(getter_AddRefs(endNode));
++  aRange->GetStartContainer(&startNode);
++  aRange->GetEndContainer(&endNode);
+   aRange->GetStartOffset(&startOffset);
+   aRange->GetEndOffset(&endOffset);
+   return NS_OK;
new file mode 100644
--- /dev/null
+++ b/nsURIHashKey-okonstack2
@@ -0,0 +1,12 @@
+diff --git a/layout/style/nsCSSLoader.h b/layout/style/nsCSSLoader.h
+--- a/layout/style/nsCSSLoader.h
++++ b/layout/style/nsCSSLoader.h
+@@ -239,7 +239,7 @@ public:
+   {
+   }
+   nsURIAndPrincipalHashKey(const nsURIAndPrincipalHashKey& toCopy)
+-    : nsURIHashKey(toCopy)
++    : nsURIHashKey(toCopy), mPrincipal(toCopy.mPrincipal)
+   {
+     NS_NOTREACHED("This code doesn't work!");
+   }
--- a/series
+++ b/series
@@ -1,24 +1,24 @@
+# This series is currently based against actionmonkey
+# revision ae61246c0f6e
 tamarin-remove-extra-auto-storage-specifiers
 tamarin-const-workitem.patch
 tamarin-gcstack-access
 tamarin-workitems-notgc-noassert
 tamarin-enable-traces
 tamarin-debug-print-finalizers
 tamarin-finalizable-merge-fixup
 tamarin-remove-finalize-method
 tamarin-valgrind-annotations
 tamarin-stack-access2
 tamarin-double-mark-is-ok
 tamarin-uninline-fixedmalloc
 tamarin-gcc43-strict-warnings
 tamarin-bug-427030-v1.patch
-# This series is currently based against a local merge
-# revision aa10c3c78ba9
 crashrepoter-notparallel
 core-refcounting
 template-hashtable-getters
 gfx-refcounting
 64bit
 nscore-class-annotation-types
 psm-remove-init-isupports
 success-macros.patch
@@ -187,14 +187,16 @@ nsTransitionKey-sucky-hack
 WalkState-okonstack
 nsMorkReader-stackclass
 LazyMessage-okonstack
 PendingLookup-constmembers
 nsProxiedService-stackclass
 nsNSSCertificate-nostack
 workaround-TestProxies-garburator-crash
 BookmarkImportFrame-notonstack
-jst-build-fixes
+nsURIHashKey-okonstack2
+nsRangeStore-okonstack2
+xpcom-request-context2
 empty-patch-before-automatic
 automatic-garburator
 automatic-gcobject
 automatic-remove-addrefs
 empty-patch-after-automatic
new file mode 100644
--- /dev/null
+++ b/xpcom-request-context2
@@ -0,0 +1,12 @@
+diff --git a/config/config.mk b/config/config.mk
+--- a/config/config.mk
++++ b/config/config.mk
+@@ -510,6 +510,8 @@ JAVA_DIST_DIR = $(DEPTH)/$(JAVA_GEN_DIR)
+ JAVA_DIST_DIR = $(DEPTH)/$(JAVA_GEN_DIR)
+ JAVA_IFACES_PKG_NAME = org/mozilla/interfaces
+ 
++REQUIRES += js
++
+ REQ_INCLUDES	= -I$(srcdir) -I. $(foreach d,$(REQUIRES),-I$(DIST)/include/$d) -I$(DIST)/include 
+ ifdef LIBXUL_SDK
+ REQ_INCLUDES_SDK = $(foreach d,$(REQUIRES),-I$(LIBXUL_SDK)/include/$d) -I$(LIBXUL_SDK)/include