[jhbuild] [3.0] grab patch from upstream hg repository to fix mozilla build issue

[Frederic Peters <fpeters src gnome org>]

commit 73f2cce8fa16e64d9d3c1c21d1eedbee51c8192a
Author: Frédéric Péters <fpeters 0d be>
Date:   Sat May 1 16:08:15 2010 +0200

    [3.0] grab patch from upstream hg repository to fix mozilla build issue

 modulesets/gnome-external-deps-3.0.modules |    6 +-
 patches/mozilla.automationutils.patch      |   88 ++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 2 deletions(-)
---
diff --git a/modulesets/gnome-external-deps-3.0.modules b/modulesets/gnome-external-deps-3.0.modules
index ad3fd24..73c7d04 100644
--- a/modulesets/gnome-external-deps-3.0.modules
+++ b/modulesets/gnome-external-deps-3.0.modules
@@ -539,7 +539,7 @@
 	     --disable-gnomevfs --disable-gnomeui
 	     --with-default-mozilla-five-home=${libdir}/mozilla
 	     --enable-system-cairo
-	     --with-system-nspr --with-system-nss
+	     --with-system-nss
 	     --disable-mochitest
 	     --disable-debug --enable-optimize=-O2 --disable-tests
 	     --disable-javaxpcom
@@ -553,7 +553,9 @@
             version="1.9.1.7"
             hash="sha256:a0876896c66cbf06d8bb929687248ac28b99388068e4b5bd29f16366c38e0185"
             md5sum="82e6f568ddeaae52e85aa089277f5d14" size="46919155"
-            checkoutdir="mozilla-1.9.1" />
+            checkoutdir="mozilla-1.9.1">
+      <patch file="mozilla.automationutils.patch" strip="1"/>
+    </branch>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="sqlite3"/>
diff --git a/patches/mozilla.automationutils.patch b/patches/mozilla.automationutils.patch
new file mode 100644
index 0000000..2294af4
--- /dev/null
+++ b/patches/mozilla.automationutils.patch
@@ -0,0 +1,88 @@
+
+# HG changeset patch
+# User Neil Rashbrook <neil parkwaycc co uk>
+# Date 1267475713 -3600
+# Node ID 4fdc73ee872985801d3a9ccb368300cafe87e062
+# Parent 5b9590ed573d045bfc62dfa03ab2d47b62349c80
+Bug 525047 - 'make clean' deletes automationutils.py.
+r=ted a-1.9.1.9=dveditz.
+
+--- a/build/Makefile.in
++++ b/build/Makefile.in
+@@ -74,7 +74,7 @@ _LEAKTEST_DIR = $(DEPTH)/_leaktest
+ 
+ _LEAKTEST_FILES =    \
+ 		automation.py \
+-		$(CURDIR)/automationutils.py \
++		automationutils.py \
+ 		leaktest.py \
+ 		bloatcycle.html \
+ 		$(topsrcdir)/build/pgo/server-locations.txt \
+--- a/build/automation-build.mk
++++ b/build/automation-build.mk
+@@ -70,11 +70,6 @@ else
+ AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
+ endif
+ 
+-$(CURDIR)/automationutils.py: $(MOZILLA_DIR)/build/automationutils.py
+-	$(INSTALL) $< .
+-
+-automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk $(CURDIR)/automationutils.py
++automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk
+ 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
+ 	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
+-
+-GARBAGE += automation.py $(CURDIR)/automationutils.py
+--- a/build/automation.py.in
++++ b/build/automation.py.in
+@@ -49,14 +49,14 @@ import subprocess
+ import sys
+ import threading
+ 
+-from automationutils import checkForCrashes
+-
+ """
+ Runs the browser from a script, and provides useful utilities
+ for setting up the browser environment.
+ """
+ 
+ SCRIPT_DIR = os.path.abspath(os.path.realpath(os.path.dirname(sys.argv[0])))
++sys.path.insert(0, SCRIPT_DIR);
++from automationutils import checkForCrashes
+ 
+ __all__ = [
+            "UNIXISH",
+--- a/build/pgo/Makefile.in
++++ b/build/pgo/Makefile.in
+@@ -54,7 +54,7 @@ include $(topsrcdir)/build/automation-bu
+ 
+ _PGO_FILES = 	\
+ 		automation.py \
+-		$(CURDIR)/automationutils.py \
++		$(topsrcdir)/build/automationutils.py \
+ 		profileserver.py \
+ 		genpgocert.py \
+ 		index.html \
+--- a/layout/tools/reftest/Makefile.in
++++ b/layout/tools/reftest/Makefile.in
+@@ -79,7 +79,7 @@ endif
+ _HARNESS_FILES = \
+   $(srcdir)/runreftest.py \
+   automation.py \
+-  $(CURDIR)/automationutils.py \
++  $(topsrcdir)/build/automationutils.py \
+   $(NULL)
+ 
+ $(_DEST_DIR):
+--- a/testing/mochitest/Makefile.in
++++ b/testing/mochitest/Makefile.in
+@@ -60,7 +60,7 @@ include $(topsrcdir)/build/automation-bu
+ _SERV_FILES = 	\
+ 		runtests.py \
+ 		automation.py \
+-		$(CURDIR)/automationutils.py \
++		$(topsrcdir)/build/automationutils.py \
+ 		gen_template.pl \
+ 		server.js \
+ 		harness-a11y.xul \
+