# HG changeset patch # User Wolfgang Rosenauer # Date 1335648028 -7200 # Node ID 7d934b2f5014b7cd7480dd563d0a72385b412c2f # Parent df9c4a6e84f81c3e082b5366e0f95b2be1783c5b rebased and removed upstreamed and obsolete patches diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Wed Apr 25 13:47:56 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Sat Apr 28 23:20:28 2012 +0200 @@ -49,7 +49,7 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 0 -%define releasedate 2012042500 +%define releasedate 2012042800 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -88,21 +88,15 @@ Patch9: mozilla-repo.patch Patch10: mozilla-dump_syms-static.patch Patch11: mozilla-sle11.patch -Patch12: mozilla-linux3.patch -Patch14: mozilla-disable-neon-option.patch -Patch15: mozilla-yarr-pcre.patch -Patch16: mozilla-system-nspr.patch -Patch17: mozilla-revert_621446.patch -Patch18: mozilla-libnotify.patch -Patch19: mozilla-gcc47.patch +Patch12: mozilla-disable-neon-option.patch +Patch13: mozilla-yarr-pcre.patch # Firefox/browser -Patch31: firefox-browser-css.patch -Patch32: firefox-cross-desktop.patch -Patch33: firefox-kde.patch -Patch34: firefox-kde-114.patch -Patch38: firefox-no-default-ualocale.patch -Patch39: firefox-multilocale-chrome.patch -Patch41: firefox-branded-icons.patch +Patch30: firefox-browser-css.patch +Patch31: firefox-kde.patch +Patch32: firefox-kde-114.patch +Patch33: firefox-no-default-ualocale.patch +Patch34: firefox-multilocale-chrome.patch +Patch35: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -225,25 +219,19 @@ %if %suse_version < 1120 %patch11 -p1 %endif -%patch12 -p1 -%patch14 -p1 -#%patch15 -p1 -%patch16 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 +#%patch12 -p1 +#%patch13 -p1 # +%patch30 -p1 +%if %suse_version >= 1110 %patch31 -p1 -%patch32 -p1 -%if %suse_version >= 1110 -%patch33 -p1 %endif %if %suse_version >= 1140 -%patch34 -p1 +%patch32 -p1 %endif -%patch38 -p1 -%patch39 -p1 -%patch41 -p1 +%patch33 -p1 +%patch34 -p1 +%patch35 -p1 %build # no need to add build time to binaries diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/firefox-cross-desktop.patch --- a/MozillaFirefox/firefox-cross-desktop.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../firefox-cross-desktop.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/mozilla-gcc47.patch --- a/MozillaFirefox/mozilla-gcc47.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-gcc47.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/mozilla-libnotify.patch --- a/MozillaFirefox/mozilla-libnotify.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-libnotify.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/mozilla-linux3.patch --- a/MozillaFirefox/mozilla-linux3.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-linux3.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/mozilla-revert_621446.patch --- a/MozillaFirefox/mozilla-revert_621446.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-revert_621446.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 MozillaFirefox/mozilla-system-nspr.patch --- a/MozillaFirefox/mozilla-system-nspr.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-system-nspr.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-branded-icons.patch --- a/firefox-branded-icons.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/firefox-branded-icons.patch Sat Apr 28 23:20:28 2012 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 4a29f791f190ebb5de41590d70d52c7510d9477c +# Parent cb004c79ce12bac3db93e34909cc979f2eecab4b diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -160,16 +160,21 @@ endif - endif # LIBXUL_SDK +@@ -161,16 +161,21 @@ endif + endif #} LIBXUL_SDK ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) libs:: @@ -54,7 +54,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -450,18 +450,21 @@ +@@ -478,18 +478,21 @@ @BINPATH@/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png #ifdef SHIP_FEEDBACK @BINPATH@/distribution/extensions/testpilot@labs.mozilla.com.xpi diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-browser-css.patch --- a/firefox-browser-css.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/firefox-browser-css.patch Sat Apr 28 23:20:28 2012 +0200 @@ -9,12 +9,12 @@ diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css --- a/browser/themes/gnomestripe/browser.css +++ b/browser/themes/gnomestripe/browser.css -@@ -1016,16 +1016,30 @@ toolbar[iconsize="small"] #feed-button { - } +@@ -1026,16 +1026,30 @@ toolbar[iconsize="small"] #feed-button { #urlbar-display { margin-top: 0; margin-bottom: 0; + -moz-margin-start: 0; color: GrayText; } @@ -36,7 +36,7 @@ #page-proxy-favicon { width: 16px; height: 16px; - margin: 2px 4px; - } - - #page-proxy-favicon:not([src]) { + margin-top: 2px; + margin-bottom: 2px; + -moz-margin-start: 4px; + -moz-margin-end: 3px; diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-cross-desktop.patch --- a/firefox-cross-desktop.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,91 +0,0 @@ -# HG changeset patch -# Parent fd2da289a3c15b8c96c248df2710d879793f22c9 -# User Wolfgang Rosenauer -Bug 526717 - remove non-working "Set as desktop background" from the UI for unsupported desktops - -diff --git a/browser/base/content/nsContextMenu.js b/browser/base/content/nsContextMenu.js ---- a/browser/base/content/nsContextMenu.js -+++ b/browser/base/content/nsContextMenu.js -@@ -262,17 +262,17 @@ nsContextMenu.prototype = { - - // Set as Desktop background depends on whether an image was clicked on, - // and only works if we have a shell service. - var haveSetDesktopBackground = false; - #ifdef HAVE_SHELL_SERVICE - // Only enable Set as Desktop Background if we can get the shell service. - var shell = getShellService(); - if (shell) -- haveSetDesktopBackground = true; -+ haveSetDesktopBackground = shell.canSetDesktopBackground; - #endif - this.showItem("context-setDesktopBackground", - haveSetDesktopBackground && this.onLoadedImage); - - if (haveSetDesktopBackground && this.onLoadedImage) { - document.getElementById("context-setDesktopBackground") - .disabled = this.disableSetDesktopBackground(); - } -diff --git a/browser/components/shell/public/nsIShellService.idl b/browser/components/shell/public/nsIShellService.idl ---- a/browser/components/shell/public/nsIShellService.idl -+++ b/browser/components/shell/public/nsIShellService.idl -@@ -69,16 +69,25 @@ interface nsIShellService : nsISupports - /** - * Used to determine whether or not to show a "Set Default Browser" - * query dialog. This attribute is true if the application is starting - * up and "browser.shell.checkDefaultBrowser" is true, otherwise it - * is false. - */ - attribute boolean shouldCheckDefaultBrowser; - -+ /** -+ * Used to determine whether or not to offer "Set as desktop background" -+ * context menu item. Even if shell service is available it is not -+ * guaranteed that it is able to set the background for every desktop -+ * which is especially true for Linux with its many different desktop -+ * environments. -+ */ -+ readonly attribute boolean canSetDesktopBackground; -+ - /** - * Flags for positioning/sizing of the Desktop Background image. - */ - const long BACKGROUND_TILE = 1; - const long BACKGROUND_STRETCH = 2; - const long BACKGROUND_CENTER = 3; - const long BACKGROUND_FILL = 4; - const long BACKGROUND_FIT = 5; -diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp ---- a/browser/components/shell/src/nsGNOMEShellService.cpp -+++ b/browser/components/shell/src/nsGNOMEShellService.cpp -@@ -377,16 +377,31 @@ nsGNOMEShellService::SetShouldCheckDefau - pserve->GetBranch("", getter_AddRefs(prefs)); - - if (prefs) - prefs->SetBoolPref(PREF_CHECKDEFAULTBROWSER, aShouldCheck); - - return NS_OK; - } - -+NS_IMETHODIMP -+nsGNOMEShellService::GetCanSetDesktopBackground(bool* aResult) -+{ -+ // setting desktop background is currently only supported -+ // for Gnome or desktops using the same GSettings and GConf keys -+ const char* gnomeSession = getenv("GNOME_DESKTOP_SESSION_ID"); -+ if (gnomeSession) { -+ *aResult = true; -+ } else { -+ *aResult = false; -+ } -+ -+ return NS_OK; -+} -+ - static nsresult - WriteImage(const nsCString& aPath, imgIContainer* aImage) - { - #ifndef MOZ_WIDGET_GTK2 - return NS_ERROR_NOT_AVAILABLE; - #else - nsCOMPtr imgToPixbuf = - do_GetService("@mozilla.org/widget/image-to-gdk-pixbuf;1"); diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-kde.patch --- a/firefox-kde.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/firefox-kde.patch Sat Apr 28 23:20:28 2012 +0200 @@ -1158,12 +1158,12 @@ #endif #if defined(XP_WIN) && !defined(__MINGW32__) - #include "nsIEProfileMigrator.h" - #elif defined(XP_MACOSX) - #include "nsSafariProfileMigrator.h" + #include "nsIEHistoryEnumerator.h" #endif -@@ -67,18 +67,16 @@ using namespace mozilla::browser; + #include "rdf.h" + #include "nsFeedSniffer.h" +@@ -65,18 +65,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1177,12 +1177,12 @@ #endif #if defined(XP_WIN) && !defined(__MINGW32__) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEProfileMigrator) - #elif defined(XP_MACOSX) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsSafariProfileMigrator) + NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator) #endif -@@ -102,17 +100,17 @@ NS_DEFINE_NAMED_CID(NS_SAFARIPROFILEMIGR + NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) + +@@ -97,17 +95,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) #endif NS_DEFINE_NAMED_CID(NS_PRIVATE_BROWSING_SERVICE_WRAPPER_CID); @@ -1197,10 +1197,10 @@ { &kNS_FEEDSNIFFER_CID, false, NULL, nsFeedSnifferConstructor }, { &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, NULL, AboutRedirector::Create }, #if defined(XP_WIN) && !defined(__MINGW32__) - { &kNS_WINIEPROFILEMIGRATOR_CID, false, NULL, nsIEProfileMigratorConstructor }, + { &kNS_WINIEHISTORYENUMERATOR_CID, false, NULL, nsIEHistoryEnumeratorConstructor }, #elif defined(XP_MACOSX) { &kNS_SHELLSERVICE_CID, false, NULL, nsMacShellServiceConstructor }, - { &kNS_SAFARIPROFILEMIGRATOR_CID, false, NULL, nsSafariProfileMigratorConstructor }, + #endif diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js @@ -1714,7 +1714,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -467,16 +467,17 @@ +@@ -495,16 +495,17 @@ #endif #endif diff -r df9c4a6e84f8 -r 7d934b2f5014 firefox-multilocale-chrome.patch --- a/firefox-multilocale-chrome.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/firefox-multilocale-chrome.patch Sat Apr 28 23:20:28 2012 +0200 @@ -1,13 +1,13 @@ # HG changeset patch # User Wolfgang Rosenauer -# Parent de9c23d6bfd0b0a30aa3dfc55377658756ec6f70 +# Parent 1428abd68ddc03822b43154c98d0a95e43cfb0d1 Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -341,16 +341,20 @@ pref("browser.download.manager.scanWhenD - pref("browser.download.manager.resumeOnWakeDelay", 10000); +@@ -356,16 +356,20 @@ pref("browser.download.useToolkitUI", tr + pref("browser.download.panel.removeFinishedDownloads", false); // search engines URL pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/"); @@ -95,7 +95,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -97,11 +97,12 @@ +@@ -103,14 +103,15 @@ locale/browser-region/region.properties (%chrome/browser-region/region.properties) # the following files are browser-specific overrides * locale/browser/netError.dtd (%chrome/overrides/netError.dtd) @@ -108,3 +108,6 @@ % locale testpilot @AB_CD@ %locale/feedback/ locale/feedback/main.dtd (%feedback/main.dtd) locale/feedback/main.properties (%feedback/main.properties) + % locale webapprt @AB_CD@ %locale/webapprt/ + locale/webapprt/webapp.dtd (%webapprt/webapp.dtd) + locale/webapprt/webapp.properties (%webapprt/webapp.properties) diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-gcc47.patch --- a/mozilla-gcc47.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,105 +0,0 @@ -# HG changeset patch -# Parent 11d55dfd8e3a732ea60761b259e20790b0ecec43 -Patch to make Mozilla build with gcc 4.7, including -- Bug 734490 - "no viable overloaded 'PRIxPTR'" when building with Clang or GCC 4.7 (TM: Mozilla14) - -diff --git a/layout/base/tests/TestPoisonArea.cpp b/layout/base/tests/TestPoisonArea.cpp ---- a/layout/base/tests/TestPoisonArea.cpp -+++ b/layout/base/tests/TestPoisonArea.cpp -@@ -392,53 +392,53 @@ ReservePoisonArea() - { - if (sizeof(uintptr_t) == 8) { - // Use the hardware-inaccessible region. - // We have to avoid 64-bit constants and shifts by 32 bits, since this - // code is compiled in 32-bit mode, although it is never executed there. - uintptr_t result = (((uintptr_t(0x7FFFFFFFu) << 31) << 1 | - uintptr_t(0xF0DEAFFFu)) & - ~uintptr_t(PAGESIZE-1)); -- printf("INFO | poison area assumed at 0x%.*"PRIxPTR"\n", SIZxPTR, result); -+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR "\n", SIZxPTR, result); - return result; - } else { - // First see if we can allocate the preferred poison address from the OS. - uintptr_t candidate = (0xF0DEAFFF & ~(PAGESIZE-1)); - void *result = ReserveRegion(candidate, false); - if (result == (void *)candidate) { - // success - inaccessible page allocated -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (preferred addr)\n", SIZxPTR, (uintptr_t)result); - return candidate; - } - - // That didn't work, so see if the preferred address is within a range - // of permanently inacessible memory. - if (ProbeRegion(candidate)) { - // success - selected page cannot be usable memory - if (result != MAP_FAILED) - ReleaseRegion(result); -- printf("INFO | poison area assumed at 0x%.*"PRIxPTR -+ printf("INFO | poison area assumed at 0x%.*" PRIxPTR - " (preferred addr)\n", SIZxPTR, candidate); - return candidate; - } - - // The preferred address is already in use. Did the OS give us a - // consolation prize? - if (result != MAP_FAILED) { -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (consolation prize)\n", SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - // It didn't, so try to allocate again, without any constraint on - // the address. - result = ReserveRegion(0, false); - if (result != MAP_FAILED) { -- printf("INFO | poison area allocated at 0x%.*"PRIxPTR -+ printf("INFO | poison area allocated at 0x%.*" PRIxPTR - " (fallback)\n", SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - printf("ERROR | no usable poison area found\n"); - return 0; - } - } -@@ -450,17 +450,17 @@ static uintptr_t - ReservePositiveControl() - { - - void *result = ReserveRegion(0, false); - if (result == MAP_FAILED) { - printf("ERROR | allocating positive control | %s\n", LastErrMsg()); - return 0; - } -- printf("INFO | positive control allocated at 0x%.*"PRIxPTR"\n", -+ printf("INFO | positive control allocated at 0x%.*" PRIxPTR "\n", - SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - /* The "negative control" area confirms that our probe logic does detect a - * page that is readable, writable, or executable. - */ - static uintptr_t -@@ -481,17 +481,17 @@ ReserveNegativeControl() - // Now mark it executable as well as readable and writable. - // (mmap(PROT_EXEC) may fail when applied to anonymous memory.) - - if (MakeRegionExecutable(result)) { - printf("ERROR | making negative control executable | %s\n", LastErrMsg()); - return 0; - } - -- printf("INFO | negative control allocated at 0x%.*"PRIxPTR"\n", -+ printf("INFO | negative control allocated at 0x%.*" PRIxPTR "\n", - SIZxPTR, (uintptr_t)result); - return (uintptr_t)result; - } - - static void - JumpTo(uintptr_t opaddr) - { - #ifdef __ia64 diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-kde.patch --- a/mozilla-kde.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/mozilla-kde.patch Sat Apr 28 23:20:28 2012 +0200 @@ -45,7 +45,7 @@ #include "prefapi.h" #include "prefread.h" #include "prefapi_private_data.h" -@@ -937,16 +938,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -941,16 +942,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -80,7 +80,7 @@ return NS_OK; bool hasMore; -@@ -962,17 +981,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -966,17 +985,17 @@ static nsresult pref_LoadPrefsInDirList( nsCAutoString leaf; path->GetNativeLeafName(leaf); @@ -99,7 +99,7 @@ { nsZipItemPtr manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1062,28 +1081,40 @@ static nsresult pref_InitInitialObjects( +@@ -1070,28 +1089,40 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -137,9 +137,9 @@ NS_WARNING("Error parsing application default preferences."); // Load jar:$app/omni.jar!/defaults/preferences/*.js + // or jar:$gre/omni.jar!/defaults/preferences/*.js. nsRefPtr appJarReader = mozilla::Omnijar::GetReader(mozilla::Omnijar::APP); - if (appJarReader) { - rv = appJarReader->FindInit("defaults/preferences/*.js$", &findPtr); + // GetReader(mozilla::Omnijar::APP) returns null when $app == $gre, in which diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -179,7 +179,7 @@ #include "AndroidBridge.h" #endif -@@ -2221,16 +2225,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2259,16 +2263,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -205,7 +205,7 @@ PRInt64 goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2254,19 +2267,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2292,19 +2305,20 @@ nsDownload::SetState(DownloadState aStat // If downloads are automatically removed per the user's // retention policy, there's no reason to make the text clickable // because if it is, they'll click open the download manager and @@ -2192,7 +2192,7 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -96,17 +96,18 @@ else +@@ -100,17 +100,18 @@ else ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsNativeAppSupportCocoa.mm EXPORTS += MacQuirks.h @@ -3755,7 +3755,7 @@ diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in -@@ -188,17 +188,17 @@ include $(topsrcdir)/ipc/chromium/chromi +@@ -189,17 +189,17 @@ include $(topsrcdir)/ipc/chromium/chromi DEFINES += -D_IMPL_NS_COM ifeq ($(OS_ARCH),Linux) @@ -3795,7 +3795,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1796,44 +1797,51 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1798,44 +1799,51 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3861,7 +3861,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -1859,16 +1867,23 @@ nsLocalFile::Launch() +@@ -1861,16 +1869,23 @@ nsLocalFile::Launch() if (nsnull == connection) return NS_ERROR_FAILURE; diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-libnotify.patch --- a/mozilla-libnotify.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,61 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent c684863b1eb3bcae92ef24bc2ac511985b1ad7e4 -Bug 737646 - no biff notification if notification-daemon not running - -diff --git a/toolkit/system/gnome/nsAlertsIconListener.cpp b/toolkit/system/gnome/nsAlertsIconListener.cpp ---- a/toolkit/system/gnome/nsAlertsIconListener.cpp -+++ b/toolkit/system/gnome/nsAlertsIconListener.cpp -@@ -47,16 +47,17 @@ - #include - - // Compatibility macro for (user_data); - alert->SendCallback(); - } - -@@ -338,27 +339,34 @@ nsAlertsIconListener::InitAlertAsync(con - appShortName.AssignLiteral("Mozilla"); - } - - if (!notify_init(appShortName.get())) - return NS_ERROR_FAILURE; - - GList *server_caps = notify_get_server_caps(); - if (server_caps) { -+ gHasCaps = true; - for (GList* cap = server_caps; cap != NULL; cap = cap->next) { - if (!strcmp((char*) cap->data, "actions")) { - gHasActions = true; - break; - } - } - g_list_foreach(server_caps, (GFunc)g_free, NULL); - g_list_free(server_caps); - } - } - -+ if (!gHasCaps) { -+ // if notify_get_server_caps() failed above we need to assume -+ // there is no notification-server to display anything -+ return NS_ERROR_FAILURE; -+ } -+ - if (!gHasActions && aAlertTextClickable) - return NS_ERROR_FAILURE; // No good, fallback to XUL - - nsCOMPtr obsServ = - do_GetService("@mozilla.org/observer-service;1"); - if (obsServ) - obsServ->AddObserver(this, "quit-application", true); - diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-linux3.patch --- a/mozilla-linux3.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ -# HG changeset patch -# Parent bf7c3e1c6174630743f9f94808c4dd3a2edc0c6b -diff --git a/toolkit/crashreporter/tools/symbolstore.py b/toolkit/crashreporter/tools/symbolstore.py ---- a/toolkit/crashreporter/tools/symbolstore.py -+++ b/toolkit/crashreporter/tools/symbolstore.py -@@ -376,16 +376,17 @@ def GetVCSFilename(file, srcdirs): - return (file.replace("\\", "/"), root) - - def GetPlatformSpecificDumper(**kwargs): - """This function simply returns a instance of a subclass of Dumper - that is appropriate for the current platform.""" - return {'win32': Dumper_Win32, - 'cygwin': Dumper_Win32, - 'linux2': Dumper_Linux, -+ 'linux3': Dumper_Linux, - 'sunos5': Dumper_Solaris, - 'darwin': Dumper_Mac}[sys.platform](**kwargs) - - def SourceIndex(fileStream, outputPath, vcs_root): - """Takes a list of files, writes info to a data block in a .stream file""" - # Creates a .pdb.stream file in the mozilla\objdir to be used for source indexing - # Create the srcsrv data block that indexes the pdb file - result = True diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-repo.patch --- a/mozilla-repo.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/mozilla-repo.patch Sat Apr 28 23:20:28 2012 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 271b5143e89573cbbde51d0b830a6116756a52e6 +# Parent d50497c25f208e4868a386f081edc790a505795c diff --git a/build/Makefile.in b/build/Makefile.in --- a/build/Makefile.in +++ b/build/Makefile.in -@@ -89,17 +89,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ +@@ -95,17 +95,17 @@ DEFINES += -DMOZ_APP_VERSION="$(MOZ_APP_ APP_INI_DEPS += $(DEPTH)/config/autoconf.mk MOZ_SOURCE_STAMP := $(firstword $(shell cd $(topsrcdir)/$(MOZ_BUILD_APP)/.. && hg parent --template="{node|short}\n" 2>/dev/null)) @@ -48,7 +48,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -161,20 +161,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME +@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME TEST_PACKAGE = $(PKG_BASENAME).tests.zip ifneq (,$(wildcard $(DIST)/bin/application.ini)) @@ -74,22 +74,28 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in -@@ -229,17 +229,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR - endif - endif +@@ -240,20 +240,20 @@ endif MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)) - # strip a trailing slash from the repo URL because it's not always present, - # and we want to construct a working URL in buildconfig.html - # make+shell+sed = awful - _dollar=$$ --SOURCE_REPO := $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) -+SOURCE_REPO ?= $(shell cd $(topsrcdir) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" ) + ifdef MOZ_SOURCE_STAMP + + INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - ifdef MOZ_SOURCE_STAMP - INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP) - # extra sanity check for old versions of hg - # that don't support showconfig - ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) - INIARGS += --sourcerepo=$(SOURCE_REPO) - endif + # strip a trailing slash from the repo URL because it's not always present, + # and we want to construct a working URL in buildconfig.html +- SOURCE_REPO := $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) +- SOURCE_REPO := $(strip $(SOURCE_REPO)) +- SOURCE_REPO := $(patsubst ssh://%,http://%,$(SOURCE_REPO)) +- SOURCE_REPO := $(patsubst %/,%,$(SOURCE_REPO)) ++ SOURCE_REPO ?= $(firstword $(shell hg --repository $(topsrcdir) showconfig paths.default 2>/dev/null)) ++ SOURCE_REPO ?= $(strip $(SOURCE_REPO)) ++ SOURCE_REPO ?= $(patsubst ssh://%,http://%,$(SOURCE_REPO)) ++ SOURCE_REPO ?= $(patsubst %/,%,$(SOURCE_REPO)) + $(call errorIfEmpty,SOURCE_REPO) + + # extra sanity check for old versions of hg, no showconfig support + ifeq (http,$(patsubst http%,http,$(SOURCE_REPO))) + INIARGS += --sourcerepo=$(SOURCE_REPO) + endif + + endif # MOZ_SOURCE_STAMP diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-revert_621446.patch --- a/mozilla-revert_621446.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,148 +0,0 @@ -# HG changeset patch -# Parent 8da41a2cee774ce4d00b9ac1032a495b8bc560a0 -Revert investigation patch for bmo#621446; as it is useless on desktop and breaks the build for certain compilers - -diff --git a/netwerk/protocol/http/HttpChannelParent.cpp b/netwerk/protocol/http/HttpChannelParent.cpp ---- a/netwerk/protocol/http/HttpChannelParent.cpp -+++ b/netwerk/protocol/http/HttpChannelParent.cpp -@@ -52,29 +52,25 @@ - #include "nsIBadCertListener2.h" - #include "nsICacheEntryDescriptor.h" - #include "nsSerializationHelper.h" - #include "nsISerializable.h" - #include "nsIAssociatedContentSecurity.h" - #include "nsIApplicationCacheService.h" - #include "nsIOfflineCacheUpdate.h" - #include "nsIRedirectChannelRegistrar.h" --#include "prinit.h" - - namespace mozilla { - namespace net { - - HttpChannelParent::HttpChannelParent(PBrowserParent* iframeEmbedding) - : mIPCClosed(false) - , mStoredStatus(0) - , mStoredProgress(0) - , mStoredProgressMax(0) -- , mSentRedirect1Begin(false) -- , mSentRedirect1BeginFailed(false) -- , mReceivedRedirect2Verify(false) - { - // Ensure gHttpHandler is initialized: we need the atom table up and running. - nsIHttpProtocolHandler* handler; - CallGetService(NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "http", &handler); - NS_ASSERTION(handler, "no http handler"); - - mTabParent = do_QueryObject(static_cast(iframeEmbedding)); - } -@@ -326,21 +322,16 @@ HttpChannelParent::RecvUpdateAssociatedC - mAssociatedContentSecurity->SetCountSubRequestsHighSecurity(high); - mAssociatedContentSecurity->SetCountSubRequestsLowSecurity(low); - mAssociatedContentSecurity->SetCountSubRequestsBrokenSecurity(broken); - mAssociatedContentSecurity->SetCountSubRequestsNoSecurity(no); - } - return true; - } - --// Bug 621446 investigation, we don't want conditional PR_Aborts bellow to be --// merged to a single address. --#pragma warning(disable : 4068) --#pragma GCC optimize ("O0") -- - bool - HttpChannelParent::RecvRedirect2Verify(const nsresult& result, - const RequestHeaderTuples& changedHeaders) - { - if (NS_SUCCEEDED(result)) { - nsCOMPtr newHttpChannel = - do_QueryInterface(mRedirectChannel); - -@@ -348,40 +339,21 @@ HttpChannelParent::RecvRedirect2Verify(c - for (PRUint32 i = 0; i < changedHeaders.Length(); i++) { - newHttpChannel->SetRequestHeader(changedHeaders[i].mHeader, - changedHeaders[i].mValue, - changedHeaders[i].mMerge); - } - } - } - -- if (!mRedirectCallback) { -- // Bug 621446 investigation (optimization turned off above) -- if (mReceivedRedirect2Verify) -- NS_RUNTIMEABORT("Duplicate fire"); -- if (mSentRedirect1BeginFailed) -- NS_RUNTIMEABORT("Send to child failed"); -- if (mSentRedirect1Begin && NS_FAILED(result)) -- NS_RUNTIMEABORT("Redirect failed"); -- if (mSentRedirect1Begin && NS_SUCCEEDED(result)) -- NS_RUNTIMEABORT("Redirect succeeded"); -- if (!mRedirectChannel) -- NS_RUNTIMEABORT("Missing redirect channel"); -- } -- -- mReceivedRedirect2Verify = true; -- - mRedirectCallback->OnRedirectVerifyCallback(result); - mRedirectCallback = nsnull; - return true; - } - --// Bug 621446 investigation --#pragma GCC reset_options -- - bool - HttpChannelParent::RecvDocumentChannelCleanup() - { - // From now on only using mAssociatedContentSecurity. Free everything else. - mChannel = 0; // Reclaim some memory sooner. - mCacheDescriptor = 0; // Else we'll block other channels reading same URI - return true; - } -@@ -583,24 +555,18 @@ HttpChannelParent::StartRedirect(PRUint3 - - nsHttpChannel *httpChan = static_cast(mChannel.get()); - nsHttpResponseHead *responseHead = httpChan->GetResponseHead(); - bool result = SendRedirect1Begin(newChannelId, - IPC::URI(newURI), - redirectFlags, - responseHead ? *responseHead - : nsHttpResponseHead()); -- if (!result) { -- // Bug 621446 investigation -- mSentRedirect1BeginFailed = true; -+ if (!result) - return NS_BINDING_ABORTED; -- } -- -- // Bug 621446 investigation -- mSentRedirect1Begin = true; - - // Result is handled in RecvRedirect2Verify above - - mRedirectChannel = newChannel; - mRedirectCallback = callback; - return NS_OK; - } - -diff --git a/netwerk/protocol/http/HttpChannelParent.h b/netwerk/protocol/http/HttpChannelParent.h ---- a/netwerk/protocol/http/HttpChannelParent.h -+++ b/netwerk/protocol/http/HttpChannelParent.h -@@ -128,18 +128,14 @@ private: - nsCOMPtr mRedirectChannel; - nsCOMPtr mRedirectCallback; - - // state for combining OnStatus/OnProgress with OnDataAvailable - // into one IPDL call to child. - nsresult mStoredStatus; - PRUint64 mStoredProgress; - PRUint64 mStoredProgressMax; -- -- bool mSentRedirect1Begin : 1; -- bool mSentRedirect1BeginFailed : 1; -- bool mReceivedRedirect2Verify : 1; - }; - - } // namespace net - } // namespace mozilla - - #endif // mozilla_net_HttpChannelParent_h diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-shared-nss-db.patch --- a/mozilla-shared-nss-db.patch Wed Apr 25 13:47:56 2012 +0200 +++ b/mozilla-shared-nss-db.patch Sat Apr 28 23:20:28 2012 +0200 @@ -7,10 +7,10 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -581,16 +581,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS - MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ +@@ -590,16 +590,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ + MOZ_ALSA_CFLAGS = @MOZ_ALSA_CFLAGS@ GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8213,16 +8213,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8180,16 +8180,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -66,7 +66,7 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -118,12 +118,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) +@@ -119,12 +119,14 @@ EXTRA_DEPS = $(NSS_DEP_LIBS) DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ @@ -109,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" #include "nsDirectoryService.h" -@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(bool showW +@@ -1776,18 +1783,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,7 +149,7 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -471,17 +471,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -439,17 +439,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO endif endif endif diff -r df9c4a6e84f8 -r 7d934b2f5014 mozilla-system-nspr.patch --- a/mozilla-system-nspr.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -# HG changeset patch -# User Wolfgang Rosenauer -# Parent e94edfdb1f5bd5c29dc54cfb83768f9c84f3f4de -Bug 736854 - PHal.ipdl includes NSPR incorrectly - breaking system NSPR usage - -diff --git a/hal/sandbox/PHal.ipdl b/hal/sandbox/PHal.ipdl ---- a/hal/sandbox/PHal.ipdl -+++ b/hal/sandbox/PHal.ipdl -@@ -34,17 +34,17 @@ - * and other provisions required by the GPL or the LGPL. If you do not delete - * the provisions above, a recipient may use your version of this file under - * the terms of any one of the MPL, the GPL or the LGPL. - * - * ***** END LICENSE BLOCK ***** */ - - include protocol PContent; - include protocol PBrowser; --include "nspr/prtime.h"; -+include "prtime.h"; - include "mozilla/HalSensor.h"; - include "mozilla/HalTypes.h"; - - using PRTime; - using mozilla::hal::FlashMode; - using mozilla::hal::LightType; - using mozilla::hal::LightMode; - using mozilla::hal::SensorType; diff -r df9c4a6e84f8 -r 7d934b2f5014 series --- a/series Wed Apr 25 13:47:56 2012 +0200 +++ b/series Sat Apr 28 23:20:28 2012 +0200 @@ -15,17 +15,11 @@ mozilla-repo.patch mozilla-dump_syms-static.patch mozilla-sle11.patch -mozilla-linux3.patch -mozilla-disable-neon-option.patch -mozilla-system-nspr.patch -mozilla-revert_621446.patch -mozilla-libnotify.patch -mozilla-gcc47.patch +#mozilla-disable-neon-option.patch #mozilla-yarr-pcre.patch # Firefox patches firefox-browser-css.patch -firefox-cross-desktop.patch firefox-kde.patch firefox-kde-114.patch #firefox-ui-lockdown.patch diff -r df9c4a6e84f8 -r 7d934b2f5014 xulrunner/mozilla-gcc47.patch --- a/xulrunner/mozilla-gcc47.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-gcc47.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 xulrunner/mozilla-libnotify.patch --- a/xulrunner/mozilla-libnotify.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-libnotify.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 xulrunner/mozilla-linux3.patch --- a/xulrunner/mozilla-linux3.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-linux3.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 xulrunner/mozilla-revert_621446.patch --- a/xulrunner/mozilla-revert_621446.patch Wed Apr 25 13:47:56 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-revert_621446.patch \ No newline at end of file diff -r df9c4a6e84f8 -r 7d934b2f5014 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Wed Apr 25 13:47:56 2012 +0200 +++ b/xulrunner/xulrunner.spec Sat Apr 28 23:20:28 2012 +0200 @@ -46,7 +46,7 @@ BuildRequires: mozilla-nss-devel >= 3.13.4 Version: 13.98 Release: 0 -%define releasedate 2012042500 +%define releasedate 2012042800 %define version_internal 14.0 %define apiversion 14 %define uaweight 1400000 @@ -73,17 +73,12 @@ Patch3: idldir.patch Patch4: mozilla-nongnome-proxies.patch Patch5: mozilla-prefer_plugin_pref.patch -Patch9: mozilla-language.patch -Patch11: mozilla-ntlm-full-path.patch -Patch12: mozilla-dump_syms-static.patch -Patch13: mozilla-sle11.patch -Patch14: mozilla-linux3.patch -Patch15: mozilla-arm-cpu-detection.patch -Patch16: mozilla-system-nspr.patch -Patch17: mozilla-revert_621446.patch -Patch18: mozilla-yarr-pcre.patch -Patch19: mozilla-libnotify.patch -Patch20: mozilla-gcc47.patch +Patch6: mozilla-language.patch +Patch7: mozilla-ntlm-full-path.patch +Patch8: mozilla-dump_syms-static.patch +Patch9: mozilla-sle11.patch +Patch10: mozilla-arm-cpu-detection.patch +Patch11: mozilla-yarr-pcre.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -194,19 +189,14 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%if %suse_version < 1120 %patch9 -p1 -%patch11 -p1 -%patch12 -p1 -%if %suse_version < 1120 -%patch13 -p1 %endif -%patch14 -p1 -%patch15 -p1 -%patch16 -p1 -#%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 +%patch10 -p1 +%patch11 -p1 %build # no need to add build time to binaries