--- a/MozillaFirefox/MozillaFirefox.changes Sat May 03 10:14:44 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Wed May 28 22:17:03 2014 +0200
@@ -1,7 +1,14 @@
-------------------------------------------------------------------
-Thu May 1 15:35:25 UTC 2014 - wr@rosenauer.org
-
-- update to Firefox 30.0b1
+Wed May 28 20:15:32 UTC 2014 - wr@rosenauer.org
+
+- update to Aurora 31 (20140527)
+- rebased patches
+- requires NSPR 4.10.5 and NSS 3.16.1
+
+-------------------------------------------------------------------
+Thu May 15 07:27:58 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 30.0b4
- rebased patches
- removed obsolete patches
* firefox-browser-css.patch
@@ -19,8 +26,13 @@
- enabled GStreamer 1.0 usage for 13.2 and above
-------------------------------------------------------------------
-Thu May 1 15:29:04 UTC 2014 - wr@rosenauer.org
-
+Sat May 10 06:09:37 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 29.0.1
+ * Seer disabled by default (bmo#1005958)
+ * Session Restore failed with a corrupted sessionstore.js file
+ (bmo#1001167)
+ * pdf.js printing white page (bmo#1003707, bnc#876833)
- general.useragent.locale gets overwritten with en-US while it
should be using the active langpack's setting
--- a/MozillaFirefox/MozillaFirefox.spec Sat May 03 10:14:44 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Wed May 28 22:17:03 2014 +0200
@@ -74,7 +74,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2014050300
+%define releasedate 2014052700
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
--- a/firefox-branded-icons.patch Sat May 03 10:14:44 2014 +0200
+++ b/firefox-branded-icons.patch Wed May 28 22:17:03 2014 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent ab6659ccbfbbfed31bce1bcd696a820069b9d7c0
+# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
@@ -29,13 +29,13 @@
diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in
--- a/browser/branding/official/Makefile.in
+++ b/browser/branding/official/Makefile.in
-@@ -36,18 +36,21 @@ BRANDING_FILES := \
+@@ -35,18 +35,21 @@ BRANDING_FILES := \
document.icns \
dsstore \
$(NULL)
endif
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ ifdef MOZ_WIDGET_GTK
BRANDING_FILES := \
default16.png \
+ default22.png \
@@ -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
-@@ -611,18 +611,21 @@
+@@ -613,18 +613,21 @@
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/chrome/toolkit@JAREXT@
--- a/firefox-kde.patch Sat May 03 10:14:44 2014 +0200
+++ b/firefox-kde.patch Wed May 28 22:17:03 2014 +0200
@@ -2,7 +2,7 @@
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1213 @@
+@@ -0,0 +1,1197 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -554,7 +554,7 @@
+ iconsize="small"
+ aria-label="&tabsToolbar.label;"
+ context="toolbar-context-menu"
-+ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button,tabs-closebutton"
++ defaultset="tabbrowser-tabs,new-tab-button,alltabs-button"
+ collapsed="true">
+
+#if defined(MOZ_WIDGET_GTK) || defined(MOZ_WIDGET_QT)
@@ -605,13 +605,6 @@
+ </menupopup>
+ </toolbarbutton>
+
-+ <toolbarbutton id="tabs-closebutton"
-+ class="close-button tabs-closebutton close-icon"
-+ command="cmd_close"
-+ label="&closeTab.label;"
-+ cui-areatype="toolbar"
-+ tooltiptext="&closeTab.label;"/>
-+
+#if !defined(MOZ_WIDGET_GTK) && !defined(MOZ_WIDGET_QT)
+ <hbox class="private-browsing-indicator" skipintoolbarset="true"/>
+#endif
@@ -651,7 +644,7 @@
+
+ <hbox id="nav-bar-customization-target" flex="1">
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
-+ forwarddisabled="true" title="&locationItem.title;" removable="false"
++ title="&locationItem.title;" removable="false"
+ cui-areatype="toolbar"
+ class="chromeclass-location" overflows="false">
+ <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
@@ -661,21 +654,14 @@
+ onclick="checkForMiddleClick(this, event);"
+ tooltip="back-button-tooltip"
+ context="backForwardMenu"/>
-+ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
-+ label="&forwardCmd.label;"
-+ command="Browser:ForwardOrForwardDuplicate"
-+ cui-areatype="toolbar"
-+ onclick="checkForMiddleClick(this, event);"
-+ tooltip="forward-button-tooltip"
-+ context="backForwardMenu"/>
-+ <dummyobservertarget hidden="true"
-+ onbroadcast="if (this.getAttribute('disabled') == 'true')
-+ this.parentNode.setAttribute('forwarddisabled', 'true');
-+ else
-+ this.parentNode.removeAttribute('forwarddisabled');">
-+ <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
-+ </dummyobservertarget>
-+ <hbox id="urlbar-wrapper" flex="1" align="center">
++ <hbox id="urlbar-wrapper" flex="1">
++ <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
++ label="&forwardCmd.label;"
++ command="Browser:ForwardOrForwardDuplicate"
++ cui-areatype="toolbar"
++ onclick="checkForMiddleClick(this, event);"
++ tooltip="forward-button-tooltip"
++ context="backForwardMenu"/>
+ <textbox id="urlbar" flex="1"
+ placeholder="&urlbar.placeholder2;"
+ type="autocomplete"
@@ -713,6 +699,8 @@
+ <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
++ <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
+ </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events.
@@ -810,6 +798,12 @@
+ oncommand="toggleSidebar('viewBookmarksSidebar');">
+ <observes element="viewBookmarksSidebar" attribute="checked"/>
+ </menuitem>
++ <!-- NB: temporary solution for bug 985024, this should go away soon. -->
++ <menuitem id="BMB_bookmarksShowAllTop"
++ class="menuitem-iconic subviewbutton"
++ label="&showAllBookmarks2.label;"
++ command="Browser:ShowAllBookmarks"
++ key="manBookmarkKb"/>
+ <menuseparator/>
+ <menuitem id="BMB_subscribeToPageMenuitem"
+#ifndef XP_MACOSX
@@ -961,7 +955,6 @@
+ collapsed="true"
+ customizable="true">
+ <toolbaritem id="personal-bookmarks"
-+ flex="1"
+ title="&bookmarksToolbarItem.label;"
+ cui-areatype="toolbar"
+ removable="true">
@@ -1064,7 +1057,7 @@
+ <sidebarheader id="sidebar-header" align="center">
+ <label id="sidebar-title" persist="value" flex="1" crop="end" control="sidebar"/>
+ <image id="sidebar-throbber"/>
-+ <toolbarbutton class="tabs-closebutton close-icon" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
++ <toolbarbutton class="close-icon tabbable" tooltiptext="&sidebarCloseButton.tooltip;" oncommand="toggleSidebar();"/>
+ </sidebarheader>
+ <browser id="sidebar" flex="1" autoscroll="false" disablehistory="true"
+ style="min-width: 14em; width: 18em; max-width: 36em;"/>
@@ -1191,22 +1184,13 @@
+
+ <svg:svg height="0">
+#include tab-shape.inc.svg
-+
++ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
+#ifndef XP_MACOSX
-+ <svg:clipPath id="keyhole-forward-clip-path" clipPathUnits="objectBoundingBox">
-+ <svg:path d="m 0,0 c .3,.25 .3,.75, 0,1 l 1,0 0,-1 z"/>
-+ </svg:clipPath>
-+ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
++ <svg:path d="m 1,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
++#else
++ <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
++#endif
+ </svg:clipPath>
-+#else
-+ <svg:clipPath id="osx-keyhole-forward-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="M 0,0 a 16 16 0 0 1 0,24 l 10000,0 l 0,-24 l -10000,0 z"/>
-+ </svg:clipPath>
-+ <svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
-+ <svg:path d="M -12,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/>
-+ </svg:clipPath>
-+#endif
+ </svg:svg>
+
+</vbox>
@@ -1219,7 +1203,7 @@
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
-@@ -66,16 +66,18 @@ browser.jar:
+@@ -65,16 +65,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
@@ -1233,11 +1217,11 @@
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js)
+ content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff)
+ content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff)
+ content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff)
content/browser/newtab/newTab.xul (content/newtab/newTab.xul)
* content/browser/newtab/newTab.js (content/newtab/newTab.js)
- content/browser/newtab/newTab.css (content/newtab/newTab.css)
- content/browser/newtab/preloaderContent.js (content/newtab/preloaderContent.js)
- * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp
@@ -1301,7 +1285,7 @@
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
-@@ -24,16 +24,22 @@ var gAdvancedPane = {
+@@ -25,16 +25,22 @@ var gAdvancedPane = {
if (extraArgs && extraArgs["advancedTab"]){
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
} else {
@@ -1324,7 +1308,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -903,14 +909,25 @@ var gAdvancedPane = {
+@@ -884,14 +890,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser.
*/
setDefaultBrowser: function()
@@ -1801,7 +1785,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
-@@ -641,19 +641,21 @@
+@@ -643,19 +643,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js
--- a/firefox-multilocale-chrome.patch Sat May 03 10:14:44 2014 +0200
+++ b/firefox-multilocale-chrome.patch Wed May 28 22:17:03 2014 +0200
@@ -1,12 +1,12 @@
# HG changeset patch
-# Parent 4b6055d24a2bbc4a37490214df4acf08269f14ff
+# Parent 8e7e4170601428db00564f738c8223c8d5122274
# User Wolfgang Rosenauer <wr@rosenauer.org>
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
-@@ -368,16 +368,20 @@ pref("browser.helperApps.deleteTempFileO
+@@ -375,16 +375,20 @@ pref("browser.helperApps.deleteTempFileO
#endif
// search engines URL
@@ -121,14 +121,14 @@
<MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/>
<MozParam name="channel" condition="purpose" purpose="searchbar" value="sb"/>
<MozParam name="channel" condition="purpose" purpose="homepage" value="np"/>
+ <MozParam name="channel" condition="purpose" purpose="newtab" value="nts"/>
<MozParam name="source" condition="purpose" purpose="homepage" value="hp"/>
</Url>
- <SearchForm>https://www.google.com/</SearchForm>
- </SearchPlugin>
+ <Url type="text/html" method="GET" template="https://www.google.com/" rel="searchform"/>
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn
-@@ -123,14 +123,15 @@
+@@ -130,14 +130,15 @@
locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties)
#endif
% locale browser-region @AB_CD@ %locale/browser-region/
--- a/mozilla-kde.patch Sat May 03 10:14:44 2014 +0200
+++ b/mozilla-kde.patch Wed May 28 22:17:03 2014 +0200
@@ -44,7 +44,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1119,16 +1120,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -79,7 +79,7 @@
return NS_OK;
bool hasMore;
-@@ -1144,17 +1163,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -98,7 +98,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1248,26 +1267,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1263,26 +1282,38 @@ 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)
@@ -196,7 +196,7 @@
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -42,16 +42,20 @@
+@@ -43,16 +43,20 @@
#ifdef XP_WIN
#include <shlobj.h>
#include "nsWindowsHelpers.h"
@@ -217,7 +217,7 @@
#include "AndroidBridge.h"
using namespace mozilla::widget::android;
#endif
-@@ -2695,16 +2699,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -243,7 +243,7 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2732,19 +2745,20 @@ nsDownload::SetState(DownloadState aStat
+@@ -2759,19 +2772,20 @@ 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(
@@ -268,7 +268,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
-@@ -56,29 +56,33 @@ toolkit.jar:
+@@ -58,29 +58,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml)
@@ -290,7 +290,7 @@
content/global/bindings/menulist.xml (widgets/menulist.xml)
content/global/bindings/notification.xml (widgets/notification.xml)
content/global/bindings/numberbox.xml (widgets/numberbox.xml)
- content/global/bindings/popup.xml (widgets/popup.xml)
+ * content/global/bindings/popup.xml (widgets/popup.xml)
*+ content/global/bindings/preferences.xml (widgets/preferences.xml)
+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml)
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
@@ -760,7 +760,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1334 @@
+@@ -0,0 +1,1333 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1335,9 +1335,8 @@
+ <children includes="prefpane"/>
+ </xul:deck>
+ </xul:hbox>
-+ <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
++ <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end">
+#ifdef XP_UNIX_GNOME
-+ >
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@@ -1346,16 +1345,14 @@
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+#elif XP_UNIX
-+ pack="end">
-+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
-+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+ <xul:spacer anonid="spacer" flex="1"/>
-+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++ <xul:spacer anonid="spacer" flex="1"/>
++ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+#else
-+ pack="end">
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
@@ -1384,6 +1381,8 @@
+#ifdef XP_MACOSX
+ // no buttons on Mac except Help
+ cancelButton.hidden = true;
++ // Move Help button to the end
++ document.getAnonymousElementByAttribute(this, "anonid", "spacer").hidden = true;
+ // Also, don't fire onDialogAccept on enter
+ acceptButton.disabled = true;
+#else
@@ -2129,7 +2128,7 @@
+ nsresult GetProxyFromKDE(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult);
};
- NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
+ NS_IMPL_ISUPPORTS(nsUnixSystemProxySettings, nsISystemProxySettings)
NS_IMETHODIMP
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
@@ -2900,32 +2899,35 @@
if (QDesktopServices::openUrl(QUrl(spec.get()))) {
rv = NS_OK;
}
-@@ -48,22 +51,22 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
- {
- // if mDefaultApplication is set, it means the application has been set from
+@@ -50,24 +53,24 @@ nsMIMEInfoUnix::GetHasDefaultHandler(boo
// either /etc/mailcap or ${HOME}/.mailcap, in which case we don't want to
// give the GNOME answer.
if (mDefaultApplication)
return nsMIMEInfoImpl::GetHasDefaultHandler(_retval);
*_retval = false;
-- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
-+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
- if (!mimeInfo) {
- nsAutoCString ext;
- nsresult rv = GetPrimaryExtension(ext);
- if (NS_SUCCEEDED(rv)) {
-- mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
-+ mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+
+ if (mClass == eProtocolInfo) {
+- *_retval = nsGNOMERegistry::HandlerExists(mSchemeOrType.get());
++ *_retval = nsCommonRegistry::HandlerExists(mSchemeOrType.get());
+ } else {
+- nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mSchemeOrType);
++ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsCommonRegistry::GetFromType(mSchemeOrType);
+ if (!mimeInfo) {
+ nsAutoCString ext;
+ nsresult rv = GetPrimaryExtension(ext);
+ if (NS_SUCCEEDED(rv)) {
+- mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
++ mimeInfo = nsCommonRegistry::GetFromExtension(ext);
+ }
}
+ if (mimeInfo)
+ *_retval = true;
}
- if (mimeInfo)
- *_retval = true;
if (*_retval)
return NS_OK;
-
-@@ -97,16 +100,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -102,16 +105,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
if (action.isValid()) {
action.trigger();
@@ -2959,7 +2961,7 @@
nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID, &rv);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> uri;
-@@ -124,17 +144,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -129,17 +149,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
/* Fallback to GnomeVFS */
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType, getter_AddRefs(app))) && app)
@@ -3000,7 +3002,7 @@
#include "nsXPIDLString.h"
#include "nsIURL.h"
#include "nsIFileStreams.h"
-@@ -1157,26 +1157,26 @@ nsresult nsOSHelperAppService::OSProtoco
+@@ -1146,26 +1146,26 @@ nsresult nsOSHelperAppService::OSProtoco
ContentAction::Action::defaultActionForScheme(QString(aProtocolScheme) + ':');
if (action.isValid())
@@ -3029,12 +3031,12 @@
nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
{
-@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
+@@ -1252,17 +1252,17 @@ nsOSHelperAppService::GetFromExtension(c
mime_types_description,
true);
if (NS_FAILED(rv) || majorType.IsEmpty()) {
-
+
#ifdef MOZ_WIDGET_GTK
LOG(("Looking in GNOME registry\n"));
nsRefPtr<nsMIMEInfoBase> gnomeInfo =
@@ -3048,14 +3050,14 @@
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
majorType,
-@@ -1386,17 +1386,17 @@ nsOSHelperAppService::GetFromType(const
+@@ -1372,17 +1372,17 @@ nsOSHelperAppService::GetFromType(const
#ifdef MOZ_WIDGET_GTK
nsRefPtr<nsMIMEInfoBase> gnomeInfo;
if (handler.IsEmpty()) {
// No useful data yet. Check the GNOME registry. Unfortunately, newer
// GNOME versions no longer have type-to-extension mappings, so we might
// get back a MIMEInfo without any extensions set. In that case we'll have
- // to look in our mime.types files for the extensions.
+ // to look in our mime.types files for the extensions.
LOG(("Looking in GNOME registry\n"));
- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
+ gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
@@ -3143,7 +3145,7 @@
mFilters.AppendElement(filter);
mFilterNames.AppendElement(name);
-@@ -350,16 +354,32 @@ nsFilePicker::Show(int16_t *aReturn)
+@@ -351,16 +355,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@@ -3176,7 +3178,7 @@
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
-@@ -538,8 +558,235 @@ nsFilePicker::Done(GtkWidget* file_choos
+@@ -539,8 +559,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) {
mCallback->Done(result);
mCallback = nullptr;
@@ -3600,7 +3602,7 @@
#include "prmem.h"
#include "plbase64.h"
-@@ -1813,46 +1814,52 @@ nsLocalFile::SetPersistentDescriptor(con
+@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor);
#endif
}
@@ -3667,7 +3669,7 @@
return rv;
}
return NS_ERROR_FAILURE;
-@@ -1860,16 +1867,23 @@ nsLocalFile::Reveal()
+@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE;
#endif
}
--- a/mozilla-shared-nss-db.patch Sat May 03 10:14:44 2014 +0200
+++ b/mozilla-shared-nss-db.patch Wed May 28 22:17:03 2014 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8069,16 +8069,31 @@ if test "$MOZ_ENABLE_SKIA"; then
+@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -79,7 +79,7 @@
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
-@@ -1129,17 +1136,31 @@ nsNSSComponent::InitializeNSS()
+@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS()
if (NS_FAILED(rv)) {
nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE;
@@ -112,14 +112,14 @@
if (init_rv != SECSuccess) {
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
}
-diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
---- a/toolkit/library/Makefile.in
-+++ b/toolkit/library/Makefile.in
-@@ -161,17 +161,17 @@ endif
- ifneq (,$(filter WINNT,$(OS_ARCH)))
- SDK_LIBRARY = $(IMPORT_LIBRARY)
- else
- SDK_LIBRARY = $(SHARED_LIBRARY)
+diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk
+--- a/toolkit/library/libxul.mk
++++ b/toolkit/library/libxul.mk
+@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid
+ endif
+
+ ifdef MOZ_DIRECTSHOW
+ OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
endif
EXTRA_DSO_LDOPTS += $(LIBS_DIR)
@@ -128,9 +128,9 @@
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
- CXXFLAGS += $(TK_CFLAGS)
OS_LIBS += \
$(TK_LIBS) \
$(NULL)
endif
+ ifeq (OpenBSD,$(OS_ARCH))