# HG changeset patch # User Wolfgang Rosenauer # Date 1283331396 -7200 # Node ID 46ee28dc714535cfa70196a69eed67e2d52d28a3 # Parent 2add76c047fbe2404356e1273d213a1c8721c8b1 Update to 4.0b5 diff -r 2add76c047fb -r 46ee28dc7145 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Fri Aug 27 09:15:06 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Wed Sep 01 10:56:36 2010 +0200 @@ -36,7 +36,7 @@ Provides: firefox Version: 4.0b Release: 1 -%define releasedate 2010081700 +%define releasedate 2010083100 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -68,8 +68,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils -# Temporary obsolete -Obsoletes: MozillaFirefox4 %if 0%{?use_xulrunner} Requires: %{xulrunner} >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' %{xulrunner}) %requires_eq %{xulrunner} diff -r 2add76c047fb -r 46ee28dc7145 firefox-kde.patch --- a/firefox-kde.patch Fri Aug 27 09:15:06 2010 +0200 +++ b/firefox-kde.patch Wed Sep 01 10:56:36 2010 +0200 @@ -1121,8 +1121,8 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -19,16 +19,18 @@ browser.jar: - * content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml) +@@ -22,16 +22,18 @@ browser.jar: + * content/browser/aboutHome.css (content/aboutHome.css) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-icon-rtl.png (content/aboutRobots-icon-rtl.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) diff -r 2add76c047fb -r 46ee28dc7145 firefox-libxul-sdk.patch --- a/firefox-libxul-sdk.patch Fri Aug 27 09:15:06 2010 +0200 +++ b/firefox-libxul-sdk.patch Wed Sep 01 10:56:36 2010 +0200 @@ -1,7 +1,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -178,20 +178,22 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS +@@ -180,19 +180,21 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) @@ -15,7 +15,6 @@ + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 diff -r 2add76c047fb -r 46ee28dc7145 firefox-no-sync-l10n.patch --- a/firefox-no-sync-l10n.patch Fri Aug 27 09:15:06 2010 +0200 +++ b/firefox-no-sync-l10n.patch Wed Sep 01 10:56:36 2010 +0200 @@ -1,9 +1,10 @@ # HG changeset patch -# Parent 96eedd7737acfc529a441ca0cedd4c06fa737219 +# Parent c0749d2284c555e499beef7a8ae08d37abe45fcd + diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -182,17 +182,19 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG +@@ -184,17 +184,19 @@ install:: $(addsuffix .xml,$(SEARCH_PLUG libs-%: @@ -15,7 +16,6 @@ +ifdef MOZ_SERVICES_SYNC @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif - @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @@ -23,3 +23,4 @@ repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." + $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export diff -r 2add76c047fb -r 46ee28dc7145 firefox-sync-build.patch --- a/firefox-sync-build.patch Fri Aug 27 09:15:06 2010 +0200 +++ b/firefox-sync-build.patch Wed Sep 01 10:56:36 2010 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 0603e401d941cbfaa6dea050149bb5309ff4b5a0 +# Parent d7f423a91ae943643510a03fd2cb0360423e014f Bug 590411 - Sync/Weave is not included if FF is built against libxul sdk diff --git a/browser/build.mk b/browser/build.mk @@ -52,7 +52,7 @@ 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 +@@ -270,20 +270,15 @@ endif ifdef MOZ_LEAKY tier_platform_dirs += tools/leaky endif @@ -70,5 +70,6 @@ tier_platform_dirs += testing/mochitest tier_platform_dirs += testing/xpcshell tier_platform_dirs += testing/mozmill + tier_platform_dirs += testing/tools/screenshot endif diff -r 2add76c047fb -r 46ee28dc7145 mozilla-kde.patch --- a/mozilla-kde.patch Fri Aug 27 09:15:06 2010 +0200 +++ b/mozilla-kde.patch Wed Sep 01 10:56:36 2010 +0200 @@ -96,7 +96,7 @@ diff --git a/toolkit/components/downloads/src/nsDownloadManager.cpp b/toolkit/components/downloads/src/nsDownloadManager.cpp --- a/toolkit/components/downloads/src/nsDownloadManager.cpp +++ b/toolkit/components/downloads/src/nsDownloadManager.cpp -@@ -76,16 +76,20 @@ +@@ -71,16 +71,20 @@ #if defined(XP_WIN) && !defined(WINCE) #include @@ -117,7 +117,7 @@ #define DOWNLOAD_MANAGER_ALERT_ICON "chrome://mozapps/skin/downloads/downloadIcon.png" #define PREF_BDM_SHOWALERTONCOMPLETE "browser.download.manager.showAlertOnComplete" #define PREF_BDM_SHOWALERTINTERVAL "browser.download.manager.showAlertInterval" -@@ -2193,16 +2197,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2188,16 +2192,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -143,7 +143,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2228,16 +2241,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2223,16 +2236,17 @@ nsDownload::SetState(DownloadState aStat // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( @@ -155,12 +155,12 @@ + } // end non-KDE block } + #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) nsCOMPtr fileURL = do_QueryInterface(mTarget); - if (fileURL) { - nsCOMPtr file; - if (NS_SUCCEEDED(fileURL->GetFile(getter_AddRefs(file))) && file ) { + nsCOMPtr file; + nsAutoString path; - #if (defined(XP_WIN) && !defined(WINCE)) || defined(XP_MACOSX) + if (fileURL && diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -2532,14 +2532,14 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in -@@ -85,18 +85,19 @@ CMMSRCS = nsOSHelperAppService.mm \ - $(NULL) - else - OSHELPER = nsOSHelperAppService.cpp +@@ -94,18 +94,19 @@ LOCAL_INCLUDES += -I$(topsrcdir)/dom/bas + -I$(topsrcdir)/dom/ipc \ + -I$(topsrcdir)/content/base/src \ + -I$(topsrcdir)/content/events/src \ + -I$(topsrcdir)/netwerk/base/src \ + -I$(topsrcdir)/netwerk/protocol/http endif - LOCAL_INCLUDES = -I$(srcdir) - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -OSHELPER += nsGNOMERegistry.cpp +OSHELPER += nsCommonRegistry.cpp nsGNOMERegistry.cpp nsKDERegistry.cpp @@ -3104,7 +3104,7 @@ diff --git a/widget/src/gtk2/Makefile.in b/widget/src/gtk2/Makefile.in --- a/widget/src/gtk2/Makefile.in +++ b/widget/src/gtk2/Makefile.in -@@ -156,8 +156,11 @@ endif +@@ -155,11 +155,14 @@ endif DEFINES += -DCAIRO_GFX @@ -3116,6 +3116,9 @@ + +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre + + ifdef MOZ_X11 + INCLUDES += -I$(srcdir)/../shared/x11 + endif diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp --- a/widget/src/gtk2/nsFilePicker.cpp +++ b/widget/src/gtk2/nsFilePicker.cpp diff -r 2add76c047fb -r 46ee28dc7145 mozilla-xulrunner20/create-tar.sh --- a/mozilla-xulrunner20/create-tar.sh Fri Aug 27 09:15:06 2010 +0200 +++ b/mozilla-xulrunner20/create-tar.sh Wed Sep 01 10:56:36 2010 +0200 @@ -1,7 +1,7 @@ #!/bin/bash BRANCH="mozilla-central" -RELEASE_TAG="FIREFOX_4_0b4_RELEASE" +RELEASE_TAG="FIREFOX_4_0b5_RELEASE" VERSION="2.0b" # mozilla diff -r 2add76c047fb -r 46ee28dc7145 mozilla-xulrunner20/mozilla-xulrunner20.spec --- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Fri Aug 27 09:15:06 2010 +0200 +++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Wed Sep 01 10:56:36 2010 +0200 @@ -32,15 +32,14 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 2.0b Release: 1 -%define releasedate 2010081700 -%define version_internal 2.0b4 +%define releasedate 2010083100 +%define version_internal 2.0b5 %define apiversion 2.0 %define uaweight 199900 Summary: Mozilla Runtime Environment 2.0 Url: http://www.mozilla.org Group: Productivity/Other Provides: gecko20 -Obsoletes: mozilla-xulrunner193 # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package %define kde_helper_version 6 @@ -112,7 +111,6 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Mozilla JS 1.8 engine Group: Productivity/Other -Obsoletes: mozilla-js193 %description -n mozilla-js20 JavaScript is the Netscape-developed object scripting language used in millions @@ -145,7 +143,6 @@ Requires: %{name} = %{version} Provides: locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW) Obsoletes: %{name}-translations < %{version}-%{release} -Obsoletes: mozilla-xulrunner193-translations-common %description translations-common XULRunner is a single installable package that can be used to bootstrap @@ -163,7 +160,6 @@ Requires: %{name} = %{version} Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) Obsoletes: %{name}-translations < %{version}-%{release} -Obsoletes: mozilla-xulrunner193-translations-other %description translations-other XULRunner is a single installable package that can be used to bootstrap @@ -179,7 +175,6 @@ Group: Productivity/Other Requires: %{name} = %{version}-%{release} Requires(post): coreutils -Obsoletes: mozilla-xulrunner193-gnome %description gnome This subpackage contains the Necko Gnome-VFS and Gnome components which