Update to xulrunner 1.9.0.2

3 files changed, 6 insertions, 97 deletions

diff --git a/config/modulesets/glucose-external.modules b/config/modulesets/glucose-external.modules
index 4eca3b1..b830363 100644
--- a/config/modulesets/glucose-external.modules
+++ b/config/modulesets/glucose-external.modules
@@ -13,6 +13,8 @@
       href="http://svn.o-hand.com/repos/matchbox/"/>
   <repository type="tarball" name="telepathy"
       href="http://telepathy.freedesktop.org/releases/"/>
+  <repository type="tarball" name="xulrunner"
+      href="http://dev.laptop.org/pub/sugar/xulrunner/"/>
   <repository type="git" name="dev.laptop.org/users/rwh"
       href="git://dev.laptop.org/users/rwh/"/>
   <tarball id="pygobject" version="2.14">
@@ -83,19 +85,17 @@
       <dep package="libmatchbox"/>
     </dependencies>
   </autotools>
-  <tarball id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --enable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" version="1.9" checkoutdir="mozilla">
-    <source href="http://dev.laptop.org/pub/sugar/xulrunner/xulrunner-1.9-source.tar.bz2"
-            size="37018711" md5sum="b514375509fd439e44def1e4a7873af4"/>
+  <autotools id="xulrunner" autogenargs="--disable-accessibility --with-pthreads --disable-strip --disable-install-strip --disable-tests --disable-debug --disable-installer --enable-optimize --enable-xinerama --enable-default-toolkit=cairo-gtk2 --disable-xprint --enable-pango --enable-svg --enable-canvas --enable-application=xulrunner --disable-javaxpcom --disable-gnomeui --disable-gnomevfs --disable-airbag --enable-extensions=default,cookie,python/xpcom --disable-crashreporter" makeinstallargs="install SKIP_GRE_REGISTRATION=1">
+    <branch repo="xulrunner" module="xulrunner-1.9.0.2-source.tar.bz2" version="1.9"
+            size="36945924" md5sum="0a6c68a5ab5b065fef221b586b8a3b8a" checkoutdir="mozilla"/>
     <dependencies>
     </dependencies>
    <patches>
-     <patch file="xulrunner-build.patch" strip="0"/>
-     <patch file="xulrunner-skip-gre-registration.patch" strip="0"/>
      <patch file="xulrunner-xds.patch" strip="0"/>
      <patch file="xulrunner-no-native-theme.patch" strip="0"/>
      <patch file="xulrunner-perms.patch" strip="0"/>
    </patches>
-  </tarball>
+  </autotools>
   <tarball id="abiword" autogenargs="--enable-libabiword --enable-debug --disable-bonobo --disable-gnomevfs --disable-gnomeui --disable-gucharmap --disable-printing" makefile="GNUmakefile" version="2.6.4">
     <source href="http://abisource.com/downloads/abiword/2.6.4/source/abiword-2.6.4.tar.gz"
             size="9277200" md5sum="16748b2d6e318e0e2a25581005e1943a"/>
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