# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1282716007 -7200
# Node ID c5e051ab6cb8f2c9c5cc61c180b591600eb371d9
# Parent  765ad9b6362d7927f951dce743c80811f21ede8e
install sync components with Firefox-on-xulrunner builds (bmo#590411)

diff -r 765ad9b6362d -r c5e051ab6cb8 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Aug 24 09:30:55 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Aug 25 08:00:07 2010 +0200
@@ -63,6 +63,7 @@
 Patch10:        firefox-ui-lockdown.patch
 Patch11:        firefox-no-sync-l10n.patch
 Patch12:        firefox-sync-system-nss.patch
+Patch13:        firefox-sync-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -174,6 +175,7 @@
 #%patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
diff -r 765ad9b6362d -r c5e051ab6cb8 MozillaFirefox/firefox-sync-build.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/firefox-sync-build.patch	Wed Aug 25 08:00:07 2010 +0200
@@ -0,0 +1,1 @@
+../firefox-sync-build.patch
\ No newline at end of file
diff -r 765ad9b6362d -r c5e051ab6cb8 firefox-sync-build.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/firefox-sync-build.patch	Wed Aug 25 08:00:07 2010 +0200
@@ -0,0 +1,52 @@
+# HG changeset patch
+# Parent 0603e401d941cbfaa6dea050149bb5309ff4b5a0
+Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk
+
+diff --git a/browser/build.mk b/browser/build.mk
+--- a/browser/build.mk
++++ b/browser/build.mk
+@@ -40,16 +40,21 @@ include $(topsrcdir)/toolkit/toolkit-tie
+ endif
+ 
+ TIERS += app
+ 
+ ifdef MOZ_EXTENSIONS
+ tier_app_dirs += extensions
+ endif
+ 
++ifdef MOZ_SERVICES_SYNC
++tier_app_dirs += services/crypto
++tier_app_dirs += services/sync
++endif
++
+ tier_app_dirs += $(MOZ_BRANDING_DIRECTORY)
+ 
+ tier_app_dirs += browser
+ 
+ installer:
+ 	@$(MAKE) -C browser/installer installer
+ 
+ package:
+diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
+--- a/toolkit/toolkit-tiers.mk
++++ b/toolkit/toolkit-tiers.mk
+@@ -266,19 +266,14 @@ endif
+ ifdef MOZ_LEAKY
+ tier_platform_dirs        += tools/leaky
+ endif
+ 
+ ifdef MOZ_MAPINFO
+ tier_platform_dirs	+= tools/codesighs
+ endif
+ 
+-ifdef MOZ_SERVICES_SYNC
+-tier_platform_dirs += services/crypto
+-tier_platform_dirs += services/sync
+-endif
+-
+ ifdef ENABLE_TESTS
+ tier_platform_dirs += testing/mochitest
+ tier_platform_dirs += testing/xpcshell 
+ tier_platform_dirs += testing/mozmill
+ endif
+ 
diff -r 765ad9b6362d -r c5e051ab6cb8 series
--- a/series	Tue Aug 24 09:30:55 2010 +0200
+++ b/series	Wed Aug 25 08:00:07 2010 +0200
@@ -23,3 +23,4 @@
 #firefox-ui-lockdown.patch
 firefox-no-sync-l10n.patch
 firefox-sync-system-nss.patch
+firefox-sync-build.patch