From 7c2463d872aec893de71632cedc800e1e2cdc286 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Tue, 07 Oct 2008 13:38:48 +0000
Subject: Update to xulrunner 1.9.0.2

---
(limited to 'config/modulesets/patches')

diff --git a/config/modulesets/patches/xulrunner-build.patch b/config/modulesets/patches/xulrunner-build.patch
deleted file mode 100644
index 6bec310..0000000
--- a/config/modulesets/patches/xulrunner-build.patch
+++ /dev/null
@@ -1,75 +0,0 @@
---- /tmp/Makefile.in    2008-04-07 13:55:44.000000000 +0200
-+++ extensions/python/dom/src/Makefile.in       2008-04-07 13:56:27.000000000 +0200
-@@ -22,7 +22,7 @@
- # We always need the Python and pyxpcom includes and libs.
- LOCAL_INCLUDES = $(MOZ_PYTHON_INCLUDES)
- EXTRA_LIBS += $(MOZ_PYTHON_LIBS) \
--              $(call EXPAND_LIBNAME_PATH,pyxpcom,$(DIST)/lib) \
-+              $(DIST)/lib/$(DLL_PREFIX)pyxpcom$(DLL_SUFFIX) \
-               $(NULL)
- 
- # In the shorter term we need JS too.
-Index: config/rules.mk
-===================================================================
-RCS file: /cvsroot/mozilla/config/rules.mk,v
-retrieving revision 3.554
-diff -u -r3.554 rules.mk
---- config/rules.mk	14 May 2007 14:21:44 -0000	3.554
-+++ config/rules.mk	21 May 2007 00:41:20 -0000
-@@ -775,6 +775,12 @@
- install:: $(SDK_HEADERS)
- 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(includedir)/$(MODULE)
- endif
-+
-+ifneq (,$(SDK_LIBRARY))
-+install:: $(SDK_LIBRARY)
-+	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)
-+endif
-+
- endif
- 
- install:: $(SHARED_LIBRARY) $(IMPORT_LIBRARY) $(LIBRARY) $(PROGRAM) $(SIMPLE_PROGRAMS) $(JAVA_LIBRARY)
---- extensions/python/xpcom/src/module/Makefile.in.orig	2007-05-28 20:48:26.000000000 +0200
-+++ extensions/python/xpcom/src/module/Makefile.in	2007-05-28 20:49:03.000000000 +0200
-@@ -95,8 +95,8 @@
- 
- install::
- ifneq ($(OS_ARCH),WINNT)
--	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom
--	mv $(DISTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DISTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
-+	$(SYSINSTALL) $(IFLAGS2) $(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom
-+	mv $(DESTDIR)$(pyexecdir)/xpcom/$(SHARED_LIBRARY) $(DESTDIR)$(pyexecdir)/xpcom/_xpcom$(MOZ_PYTHON_DLL_SUFFIX)
- endif
- 
- clobber::
---- extensions/python/xpcom/Makefile.in.orig	2007-05-29 10:17:10.000000000 +0200
-+++ extensions/python/xpcom/Makefile.in	2007-05-29 10:17:22.000000000 +0200
-@@ -97,9 +97,9 @@
- 	$(INSTALL) $(PYSRCS_XPCOMTOOLS) $(DIST)/bin/python/xpcom/tools
- 
- install::
--	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DISTDIR)$(pyexecdir)/xpcom
--	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DISTDIR)$(pyexecdir)/xpcom/client
--	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DISTDIR)$(pyexecdir)/xpcom/server
-+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOM) $(DESTDIR)$(pyexecdir)/xpcom
-+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMCLIENT) $(DESTDIR)$(pyexecdir)/xpcom/client
-+	$(SYSINSTALL) $(IFLAGS1) $(PYSRCS_XPCOMSERVER) $(DESTDIR)$(pyexecdir)/xpcom/server
- 
- clobber::
- 	rm -rf $(DIST)/bin/python/xpcom
-Index: extensions/python/dom/test/pyxultest/application.ini
-===================================================================
-RCS file: /cvsroot/mozilla/extensions/python/dom/test/pyxultest/application.ini,v
-retrieving revision 1.2
-diff -u -r1.2 application.ini
---- extensions/python/dom/test/pyxultest/application.ini	29 Apr 2006 01:56:36 -0000	1.2
-+++ extensions/python/dom/test/pyxultest/application.ini	21 Aug 2007 22:36:44 -0000
-@@ -15,7 +15,7 @@
- 
- ; This field specifies your application's build ID (timestamp).  This field is
- ; required.
--BuildID=@BUILD_ID@
-+BuildID=20070625
- 
- ; This field specifies a compact copyright notice for your application.  This
- ; field is optional.
diff --git a/config/modulesets/patches/xulrunner-skip-gre-registration.patch b/config/modulesets/patches/xulrunner-skip-gre-registration.patch
deleted file mode 100644
index 059a4b1..0000000
--- a/config/modulesets/patches/xulrunner-skip-gre-registration.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: xulrunner/installer/Makefile.in
-===================================================================
-RCS file: /cvsroot/mozilla/xulrunner/installer/Makefile.in,v
-retrieving revision 1.10
-diff -u -r1.10 Makefile.in
---- xulrunner/installer/Makefile.in	10 Aug 2007 12:56:59 -0000	1.10
-+++ xulrunner/installer/Makefile.in	21 Aug 2007 22:55:59 -0000
-@@ -71,6 +71,8 @@
- $(MOZILLA_VERSION).system.conf: $(topsrcdir)/config/milestone.txt Makefile
- 	printf "[%s]\nGRE_PATH=%s\nxulrunner=true" $(MOZILLA_VERSION) $(installdir)> $@
- 
-+SKIP_GRE_REGISTRATION = 1
-+
- ifndef SKIP_GRE_REGISTRATION
- # to register xulrunner per-user, override this with $HOME/.gre.d
- regdir = /etc/gre.d
--
cgit v0.9.1