pool/MozillaFirefox
SHA256
5
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- update to Firefox 34.0.5 (bnc#908009)

Browse Source 
* Default search engine changed to Yahoo! for North America
  * Default search engine changed to Yandex for Belarusian, Kazakh,
    and Russian locales
  * Improved search bar (en-US only)
  * Firefox Hello real-time communication client
  * Easily switch themes/personas directly in the Customizing mode
  * Implementation of HTTP/2 (draft14) and ALPN
  * Disabled SSLv3
  * MFSA 2014-83/CVE-2014-1587/CVE-2014-1588
    Miscellaneous memory safety hazards
  * MFSA 2014-84/CVE-2014-1589 (bmo#1043787)
    XBL bindings accessible via improper CSS declarations
  * MFSA 2014-85/CVE-2014-1590 (bmo#1087633)
    XMLHttpRequest crashes with some input streams
  * MFSA 2014-86/CVE-2014-1591 (bmo#1069762)
    CSP leaks redirect data via violation reports
  * MFSA 2014-87/CVE-2014-1592 (bmo#1088635)
    Use-after-free during HTML5 parsing
  * MFSA 2014-88/CVE-2014-1593 (bmo#1085175)
    Buffer overflow while parsing media content
  * MFSA 2014-89/CVE-2014-1594 (bmo#1074280)
    Bad casting from the BasicThebesLayer to BasicContainerLayer
- rebased patches
- limit linker memory usage for %ix86

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=415
This commit is contained in:
Wolfgang Rosenauer 2014-12-02 22:01:52 +00:00 committed by Git OBS Bridge
parent 140e4a12ee
commit 4a13134b83
18 changed files with 356 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MozillaFirefox.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sat Nov 29 21:23:03 UTC 2014 - wr@rosenauer.org
- update to Firefox 34.0.5 (bnc#908009)
* Default search engine changed to Yahoo! for North America
* Default search engine changed to Yandex for Belarusian, Kazakh,
and Russian locales
* Improved search bar (en-US only)
* Firefox Hello real-time communication client
* Easily switch themes/personas directly in the Customizing mode
* Implementation of HTTP/2 (draft14) and ALPN
* Disabled SSLv3
* MFSA 2014-83/CVE-2014-1587/CVE-2014-1588
Miscellaneous memory safety hazards
* MFSA 2014-84/CVE-2014-1589 (bmo#1043787)
XBL bindings accessible via improper CSS declarations
* MFSA 2014-85/CVE-2014-1590 (bmo#1087633)
XMLHttpRequest crashes with some input streams
* MFSA 2014-86/CVE-2014-1591 (bmo#1069762)
CSP leaks redirect data via violation reports
* MFSA 2014-87/CVE-2014-1592 (bmo#1088635)
Use-after-free during HTML5 parsing
* MFSA 2014-88/CVE-2014-1593 (bmo#1085175)
Buffer overflow while parsing media content
* MFSA 2014-89/CVE-2014-1594 (bmo#1074280)
Bad casting from the BasicThebesLayer to BasicContainerLayer
- rebased patches
- limit linker memory usage for %ix86
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org
@ -7,7 +36,6 @@ Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org
* Enhanced Tiles * Enhanced Tiles
* Privacy tour introduced * Privacy tour introduced
- fix typo in GStreamer Recommends - fix typo in GStreamer Recommends
- requires NSS 3.17.2
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org

19
MozillaFirefox.spec
View File

@ -18,10 +18,10 @@
# changed with every update # changed with every update
%define major 33 %define major 34
%define mainver %major.1 %define mainver %major.0.5
%define update_channel release %define update_channel release
%define releasedate 2014110600 %define releasedate 2014112600
# general build definitions # general build definitions
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} %define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@ -56,14 +56,6 @@
%else %else
%define crashreporter 1 %define crashreporter 1
%endif %endif
%if 0%{?suse_version} > 1210
%if 0%{?suse_version} > 1310
%define gstreamer_ver 1.0
%define gstreamer 1
%else
%define gstreamer_ver 0.10
%endif
%endif
Name: MozillaFirefox Name: MozillaFirefox
BuildRequires: Mesa-devel BuildRequires: Mesa-devel
@ -295,11 +287,10 @@ export BUILD_OFFICIAL=1
export MOZ_TELEMETRY_REPORTING=1 export MOZ_TELEMETRY_REPORTING=1
export MOZ_GOOGLE_API_KEY=%{_google_api_key} export MOZ_GOOGLE_API_KEY=%{_google_api_key}
export CFLAGS="%{optflags} -fno-strict-aliasing" export CFLAGS="%{optflags} -fno-strict-aliasing"
%ifarch %ix86
export CFLAGS="${CFLAGS} -Os"
%endif
%ifarch %arm %ifarch %arm
export CFLAGS="${CFLAGS/-g / }" export CFLAGS="${CFLAGS/-g / }"
%endif
%ifarch %arm %ix86
# Limit RAM usage during link # Limit RAM usage during link
export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif %endif

4
compare-locales.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d2e6d8c186ebcd6b6ee1122305c439cbdb90e06a9ecb66567739ff470e00530b oid sha256:63c9dc89cf88f95f3c12ade272ab7658426be5941f2475d039ec25e60642624e
size 28416 size 28420

4
create-tar.sh
View File

@ -2,8 +2,8 @@
CHANNEL="release" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_33_1_RELEASE" RELEASE_TAG="FIREFOX_34_0_5_RELEASE"
VERSION="33.1" VERSION="34.0.5"
# mozilla # mozilla
if [ -d mozilla ]; then if [ -d mozilla ]; then

3
firefox-33.1-source.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8b1364cb142052a8c00143dd15c7192ba47ae5648f4380f14a2e2d8b8f22c9a2
size 132110996

3
firefox-34.0.5-source.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7f5848e377636af4e66c6fa738e61bd9623f0e4b60a94d4d8ee3d54b4976d24b
size 139718892

40
firefox-kde-114.patch
View File

@ -1,27 +1,27 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e # Parent a5921092e6fb2dc39b1426139eb8406f5fd3cfa9
With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox With openSUSE 11.4 the desktop file name changed from MozillaFirefox to firefox
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
--- a/browser/components/preferences/advanced.js --- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/advanced.js +++ b/browser/components/preferences/main.js
@@ -751,17 +751,17 @@ var gAdvancedPane = { @@ -511,17 +511,17 @@ var gMainPane = {
if (kde_session == 1) { if (kde_session == 1) {
var shellObj = Components.classes["@mozilla.org/file/local;1"] var shellObj = Components.classes["@mozilla.org/file/local;1"]
.createInstance(Components.interfaces.nsILocalFile); .createInstance(Components.interfaces.nsILocalFile);
shellObj.initWithPath("/usr/bin/kwriteconfig"); shellObj.initWithPath("/usr/bin/kwriteconfig");
var process = Components.classes["@mozilla.org/process/util;1"] var process = Components.classes["@mozilla.org/process/util;1"]
.createInstance(Components.interfaces.nsIProcess); .createInstance(Components.interfaces.nsIProcess);
process.init(shellObj); process.init(shellObj);
var args = ["--file", "kdeglobals", "--group", "General", "--key", var args = ["--file", "kdeglobals", "--group", "General", "--key",
- "BrowserApplication", "MozillaFirefox"]; - "BrowserApplication", "MozillaFirefox"];
+ "BrowserApplication", "firefox"]; + "BrowserApplication", "firefox"];
process.run(false, args, args.length); process.run(false, args, args.length);
}
} catch (ex) {
Components.utils.reportError(ex);
return;
} }
let selectedIndex = let selectedIndex =
shellSvc.isDefaultBrowser(false, true) ? 1 : 0; shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
}
#endif
};

185
firefox-kde.patch
View File

@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1238 @@ @@ -0,0 +1,1269 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -145,6 +145,9 @@ new file mode 100644
+ <!-- for search and content formfill/pw manager --> + <!-- for search and content formfill/pw manager -->
+ <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/> + <panel type="autocomplete" id="PopupAutoComplete" noautofocus="true" hidden="true"/>
+ +
+ <!-- for search with one-off buttons -->
+ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
+
+ <!-- for url bar autocomplete --> + <!-- for url bar autocomplete -->
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/> + <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
+ +
@ -242,6 +245,48 @@ new file mode 100644
+ mousethrough="always"> + mousethrough="always">
+ <box id="UITourHighlight"></box> + <box id="UITourHighlight"></box>
+ </panel> + </panel>
+ <!-- Used to highlight the new search experience -->
+ <panel id="SearchHighlight1"
+ class="SearchHighlight"
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
+ <label class="SearchHighlightTitle">One-Click Searches</label>
+ <description class="SearchHighlightText" flex="1">Search any of these sites instantly, without changing your default.</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot filled"/>
+ <spacer class="dot"/>
+ <spacer flex="1"/>
+ <button label="Next"/>
+ </hbox>
+ </panel>
+ <panel id="SearchHighlight2"
+ class="SearchHighlight"
+ type="arrow"
+ hidden="true"
+ noautofocus="true"
+ noautohide="true"
+ orient="vertical"
+ align="stretch">
+ <label class="SearchHighlightTitle">Smart Suggestions</label>
+ <description class="SearchHighlightText" flex="1">Suggestions from your default search engine appear as you type.</description>
+ <hbox class="SearchHighlightFooter" align="center">
+ <spacer class="dot"/>
+ <spacer class="dot filled"/>
+ <spacer flex="1"/>
+ <button label="Thanks!"/>
+ </hbox>
+ </panel>
+
+ <panel id="abouthome-search-panel" orient="vertical" type="arrow" hidden="true">
+ <hbox id="abouthome-search-panel-manage" class="abouthome-search-panel-item"
+ onclick="openPreferences('paneSearch')">
+ <label>&cmd_engineManager.label;</label>
+ </hbox>
+ </panel>
+ +
+ <panel id="social-share-panel" + <panel id="social-share-panel"
+ class="social-panel" + class="social-panel"
@ -674,7 +719,7 @@ new file mode 100644
+ aria-label="&navbarCmd.label;" + aria-label="&navbarCmd.label;"
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small" + iconsize="small"
+ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item" + defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item"
+ customizationtarget="nav-bar-customization-target" + customizationtarget="nav-bar-customization-target"
+ overflowable="true" + overflowable="true"
+ overflowbutton="nav-bar-overflow-button" + overflowbutton="nav-bar-overflow-button"
@ -717,7 +762,7 @@ new file mode 100644
+ ontextreverted="return this.handleRevert();" + ontextreverted="return this.handleRevert();"
+ pageproxystate="invalid" + pageproxystate="invalid"
+ onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
+ onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> + onblur="setTimeout(() => { document.getElementById('identity-box').style.MozUserFocus = ''; }, 0);">
+ <box id="notification-popup-box" hidden="true" align="center"> + <box id="notification-popup-box" hidden="true" align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
@ -729,7 +774,8 @@ new file mode 100644
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="bad-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="bad-content-unblocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/>
@ -922,22 +968,6 @@ new file mode 100644
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+ +
+ <!-- XXX Bug 1013989 will provide a label for the button -->
+ <!-- This uses badged to be compatible with the social api code it shares.
+ We may also want it to be badged in the future, for notification
+ purposes. -->
+ <toolbarbutton id="loop-call-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class"
+ type="badged"
+ removable="true"
+ tooltiptext="&loopCallButton.tooltip;"
+ oncommand="LoopUI.openCallPanel(event);"
+ cui-areatype="toolbar"
+ >
+ </toolbarbutton>
+
+
+ <toolbarbutton id="social-share-button" + <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
+ label="&sharePageCmd.label;" + label="&sharePageCmd.label;"
@ -1107,6 +1137,7 @@ new file mode 100644
+ +
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/> + <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
+ <vbox id="appcontent" flex="1"> + <vbox id="appcontent" flex="1">
+ <notificationbox id="high-priority-global-notificationbox"/>
+ <tabbrowser id="content" + <tabbrowser id="content"
+ flex="1" contenttooltip="aHTMLTooltip" + flex="1" contenttooltip="aHTMLTooltip"
+ tabcontainer="tabbrowser-tabs" + tabcontainer="tabbrowser-tabs"
@ -1244,7 +1275,7 @@ new file mode 100644
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
--- a/browser/base/content/browser.xul --- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul +++ b/browser/base/content/browser.xul
@@ -171,17 +171,17 @@ @@ -174,17 +174,17 @@
class="editBookmarkPanelHeaderButton" class="editBookmarkPanelHeaderButton"
oncommand="StarUI.removeBookmarkButtonCommand();" oncommand="StarUI.removeBookmarkButtonCommand();"
accesskey="&editBookmark.removeBookmark.accessKey;"/> accesskey="&editBookmark.removeBookmark.accessKey;"/>
@ -1263,7 +1294,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
<button id="editBookmarkPanelDeleteButton" <button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton" class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;" label="&editBookmark.cancel.label;"
@@ -1164,17 +1164,17 @@ @@ -1195,17 +1195,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true"> <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@ -1285,7 +1316,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
diff --git a/browser/base/jar.mn b/browser/base/jar.mn diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn --- a/browser/base/jar.mn
+++ b/browser/base/jar.mn +++ b/browser/base/jar.mn
@@ -70,16 +70,18 @@ browser.jar: @@ -71,16 +71,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
@ -1299,11 +1330,11 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul) * content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js) content/browser/content.js (content/content.js)
content/browser/newtab/newTab.xul (content/newtab/newTab.xul) content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
* content/browser/newtab/newTab.js (content/newtab/newTab.js) content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
content/browser/newtab/newTab.css (content/newtab/newTab.css) content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg)
content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) content/browser/defaultthemes/2.footer.jpg (content/defaultthemes/2.footer.jpg)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp
@ -1364,17 +1395,17 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
#elif defined(XP_MACOSX) #elif defined(XP_MACOSX)
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor }, { &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
#endif #endif
diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
--- a/browser/components/preferences/advanced.js --- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/advanced.js +++ b/browser/components/preferences/main.js
@@ -25,16 +25,22 @@ var gAdvancedPane = { @@ -12,16 +12,22 @@ var gMainPane = {
if (extraArgs && extraArgs["advancedTab"]){
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]); /**
} else { * Initialization of this.
var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex"); */
if (preference.value !== null) init: function ()
advancedPrefs.selectedIndex = preference.value; {
} this._pane = document.getElementById("paneMain");
+ var env = Components.classes["@mozilla.org/process/environment;1"] + var env = Components.classes["@mozilla.org/process/environment;1"]
+ .getService(Components.interfaces.nsIEnvironment); + .getService(Components.interfaces.nsIEnvironment);
@ -1390,52 +1421,38 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open. // be set while the prefs are open.
@@ -889,14 +895,25 @@ var gAdvancedPane = { @@ -497,16 +503,27 @@ var gMainPane = {
* Set browser as the operating system default browser.
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
{ {
let shellSvc = getShellService(); let shellSvc = getShellService();
if (!shellSvc) if (!shellSvc)
return; return;
shellSvc.setDefaultBrowser(true, false); try {
+ if (kde_session == 1) { shellSvc.setDefaultBrowser(true, false);
+ var shellObj = Components.classes["@mozilla.org/file/local;1"] + if (kde_session == 1) {
+ .createInstance(Components.interfaces.nsILocalFile); + var shellObj = Components.classes["@mozilla.org/file/local;1"]
+ shellObj.initWithPath("/usr/bin/kwriteconfig"); + .createInstance(Components.interfaces.nsILocalFile);
+ var process = Components.classes["@mozilla.org/process/util;1"] + shellObj.initWithPath("/usr/bin/kwriteconfig");
+ .createInstance(Components.interfaces.nsIProcess); + var process = Components.classes["@mozilla.org/process/util;1"]
+ process.init(shellObj); + .createInstance(Components.interfaces.nsIProcess);
+ var args = ["--file", "kdeglobals", "--group", "General", "--key", + process.init(shellObj);
+ "BrowserApplication", "MozillaFirefox"]; + var args = ["--file", "kdeglobals", "--group", "General", "--key",
+ process.run(false, args, args.length); + "BrowserApplication", "MozillaFirefox"];
+ } + process.run(false, args, args.length);
+ }
} catch (ex) {
Components.utils.reportError(ex);
return;
}
let selectedIndex = let selectedIndex =
shellSvc.isDefaultBrowser(false, true) ? 1 : 0; shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
document.getElementById("setDefaultPane").selectedIndex = selectedIndex; document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
} }
#endif diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
}; --- a/browser/components/shell/moz.build
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in +++ b/browser/components/shell/moz.build
--- a/browser/components/shell/src/Makefile.in @@ -30,16 +30,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
+++ b/browser/components/shell/src/Makefile.in
@@ -2,10 +2,12 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
CXXFLAGS += $(TK_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+
clobber::
rm -f $(DIST)/lib/$(LIBRARY_NAME).lib
diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/src/moz.build
--- a/browser/components/shell/src/moz.build
+++ b/browser/components/shell/src/moz.build
@@ -10,16 +10,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ SOURCES += [
@ -1454,10 +1471,10 @@ diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/s
EXTRA_COMPONENTS += [ EXTRA_COMPONENTS += [
'nsSetDefaultBrowser.js', 'nsSetDefaultBrowser.js',
'nsSetDefaultBrowser.manifest', 'nsSetDefaultBrowser.manifest',
diff --git a/browser/components/shell/src/nsKDEShellService.cpp b/browser/components/shell/src/nsKDEShellService.cpp diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.cpp +++ b/browser/components/shell/nsKDEShellService.cpp
@@ -0,0 +1,238 @@ @@ -0,0 +1,238 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public +/* This Source Code Form is subject to the terms of the Mozilla Public
@ -1697,10 +1714,10 @@ new file mode 100644
+ NS_ADDREF(*_retval = defaultReader); + NS_ADDREF(*_retval = defaultReader);
+ return NS_OK; + return NS_OK;
+} +}
diff --git a/browser/components/shell/src/nsKDEShellService.h b/browser/components/shell/src/nsKDEShellService.h diff --git a/browser/components/shell/nsKDEShellService.h b/browser/components/shell/nsKDEShellService.h
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/src/nsKDEShellService.h +++ b/browser/components/shell/nsKDEShellService.h
@@ -0,0 +1,60 @@ @@ -0,0 +1,60 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK ***** +/* ***** BEGIN LICENSE BLOCK *****
@ -1762,10 +1779,10 @@ new file mode 100644
+}; +};
+ +
+#endif // nskdeshellservice_h____ +#endif // nskdeshellservice_h____
diff --git a/browser/components/shell/src/nsUnixShellService.cpp b/browser/components/shell/src/nsUnixShellService.cpp diff --git a/browser/components/shell/nsUnixShellService.cpp b/browser/components/shell/nsUnixShellService.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.cpp +++ b/browser/components/shell/nsUnixShellService.cpp
@@ -0,0 +1,52 @@ @@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK ***** +/* ***** BEGIN LICENSE BLOCK *****
@ -1819,10 +1836,10 @@ new file mode 100644
+ return nsKDEShellServiceConstructor( aOuter, aIID, aResult ); + return nsKDEShellServiceConstructor( aOuter, aIID, aResult );
+ return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult ); + return nsGNOMEShellServiceConstructor( aOuter, aIID, aResult );
+} +}
diff --git a/browser/components/shell/src/nsUnixShellService.h b/browser/components/shell/src/nsUnixShellService.h diff --git a/browser/components/shell/nsUnixShellService.h b/browser/components/shell/nsUnixShellService.h
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/components/shell/src/nsUnixShellService.h +++ b/browser/components/shell/nsUnixShellService.h
@@ -0,0 +1,45 @@ @@ -0,0 +1,45 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ***** BEGIN LICENSE BLOCK ***** +/* ***** BEGIN LICENSE BLOCK *****
@ -1872,7 +1889,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -658,19 +658,21 @@ @@ -686,19 +686,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

39
firefox-multilocale-chrome.patch
View File

File diff suppressed because one or more lines are too long

6
firefox-no-default-ualocale.patch
View File

@ -1,13 +1,13 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 39f441dc7ba560595404d47506b0ce70180f99fd # Parent 042ade9d1f6415e52caecf1389bbb67c2da569d4
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -259,17 +259,17 @@ pref("browser.uitour.whitelist.add.260", @@ -263,17 +263,17 @@ pref("browser.uitour.whitelist.add.340",
pref("browser.uitour.whitelist.add.340", "about:home"); pref("browser.uitour.whitelist.add.341", "www.mozilla.org,support.mozilla.org,about:home");
pref("browser.customizemode.tip0.shown", false); pref("browser.customizemode.tip0.shown", false);
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");

3
l10n-33.1.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ca376a0e3c18fcdb04952db50a56c6afa346f0a0da1341ab8ec4edb1f5909c54
size 41139352

3
l10n-34.0.5.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f164489df4653c9b5d9ac4edadc7db94fd8862f74b61911bf6d363fd5d4d2011
size 41325120

234
mozilla-kde.patch
View File

@ -4,9 +4,9 @@ Author: Lubos Lunak <lunak@suse.com>
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751 Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
https://bugzilla.novell.com/show_bug.cgi?id=170055 https://bugzilla.novell.com/show_bug.cgi?id=170055
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in diff --git a/modules/libpref/Makefile.in b/modules/libpref/Makefile.in
--- a/modules/libpref/src/Makefile.in --- a/modules/libpref/Makefile.in
+++ b/modules/libpref/src/Makefile.in +++ b/modules/libpref/Makefile.in
@@ -21,13 +21,15 @@ endif @@ -21,13 +21,15 @@ endif
ifdef MOZ_SERVICES_HEALTHREPORT ifdef MOZ_SERVICES_HEALTHREPORT
ifneq (android,$(MOZ_WIDGET_TOOLKIT)) ifneq (android,$(MOZ_WIDGET_TOOLKIT))
@ -23,9 +23,9 @@ diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
libs:: greprefs.js libs:: greprefs.js
$(INSTALL) $^ $(DIST)/bin/ $(INSTALL) $^ $(DIST)/bin/
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/src/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/src/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -27,16 +27,17 @@ @@ -27,16 +27,17 @@
#include "nsIZipReader.h" #include "nsIZipReader.h"
#include "nsPrefBranch.h" #include "nsPrefBranch.h"
@ -179,20 +179,26 @@ diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpac
''' '''
self.base = base self.base = base
self.flags = Flags(*flags) self.flags = Flags(*flags)
diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
--- a/toolkit/components/downloads/Makefile.in --- a/toolkit/components/downloads/moz.build
+++ b/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/moz.build
@@ -1,9 +1,9 @@ @@ -52,14 +52,15 @@ if not CONFIG['MOZ_SUITE']:
# ]
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk FAIL_ON_WARNINGS = True
CXXFLAGS += $(TK_CFLAGS) FINAL_LIBRARY = 'xul'
-
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre LOCAL_INCLUDES += [
'../protobuf',
- '/ipc/chromium/src'
+ '/ipc/chromium/src',
+ '/toolkit/xre'
]
DEFINES['GOOGLE_PROTOBUF_NO_RTTI'] = True
CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp
@ -217,7 +223,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h" #include "AndroidBridge.h"
using namespace mozilla::widget::android; using namespace mozilla::widget::android;
#endif #endif
@@ -2729,16 +2733,25 @@ nsDownload::SetState(DownloadState aStat @@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -243,17 +249,13 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
int64_t goat = PR_Now() - mStartTime; int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec; showTaskbarAlert = goat > alertIntervalUSec;
@@ -2766,19 +2779,20 @@ nsDownload::SetState(DownloadState aStat @@ -2751,16 +2764,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(
NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
message, !removeWhenDone, message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
EmptyString(), nullptr); EmptyString(), EmptyString(), nullptr);
- } }
+ }
} }
} }
+ } + }
@ -268,7 +270,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn --- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn
@@ -54,29 +54,33 @@ toolkit.jar: @@ -55,29 +55,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js) content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/browser.xml (widgets/browser.xml)
@ -2131,7 +2133,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
NS_DECL_NSISYSTEMPROXYSETTINGS NS_DECL_NSISYSTEMPROXYSETTINGS
nsUnixSystemProxySettings() nsUnixSystemProxySettings()
: mSchemeProxySettings(5) : mSchemeProxySettings(4)
@@ -38,16 +40,17 @@ private: @@ -38,16 +40,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings;
@ -2625,20 +2627,6 @@ new file mode 100644
+ }; + };
+ +
+#endif // nsKDEUtils +#endif // nsKDEUtils
diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
--- a/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in
@@ -6,9 +6,10 @@
ifdef MOZ_ENABLE_DBUS
OS_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
ifneq (,$(filter qt gtk2 gtk3, $(MOZ_WIDGET_TOOLKIT)))
CXXFLAGS += $(TK_CFLAGS) $(MOZ_DBUS_GLIB_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
endif
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build
@ -2662,6 +2650,24 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
'android/nsExternalSharingAppService.cpp', 'android/nsExternalSharingAppService.cpp',
'android/nsExternalURLHandlerService.cpp', 'android/nsExternalURLHandlerService.cpp',
'android/nsMIMEInfoAndroid.cpp', 'android/nsMIMEInfoAndroid.cpp',
@@ -129,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/content/base/src',
'/dom/base',
'/dom/ipc',
'/netwerk/base/src',
'/netwerk/protocol/http',
+ '/toolkit/xre'
]
if CONFIG['MOZ_ENABLE_DBUS']:
CXXFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_CFLAGS']
if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3'):
CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -3095,26 +3101,27 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#endif #endif
// Now look up our extensions // Now look up our extensions
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/Makefile.in --- a/widget/gtk/moz.build
+++ b/widget/gtk/Makefile.in +++ b/widget/gtk/moz.build
@@ -3,14 +3,16 @@ @@ -88,16 +88,17 @@ include('/ipc/chromium/chromium-config.m
# License, v. 2.0. If a copy of the MPL was not distributed with this FINAL_LIBRARY = 'xul'
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += [
'../shared',
'../xpwidgets',
'/layout/generic',
'/layout/xul',
'/other-licenses/atk-1.0',
+ '/toolkit/xre'
]
CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS) if CONFIG['MOZ_X11']:
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS) LOCAL_INCLUDES += [
'../shared/x11',
]
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre DEFINES['CAIRO_GFX'] = True
+
CFLAGS += $(TK_CFLAGS)
CXXFLAGS += $(TK_CFLAGS)
ifdef MOZ_ENABLE_DBUS
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
endif
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
--- a/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp
@ -3464,42 +3471,28 @@ diff --git a/widget/gtk/nsFilePicker.h b/widget/gtk/nsFilePicker.h
}; };
#endif #endif
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
--- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in
@@ -2,9 +2,10 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk
ifdef MOZ_WIDGET_GTK
CXXFLAGS += $(TK_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
endif
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp
@@ -31,16 +31,17 @@ @@ -34,16 +34,17 @@
#include "nsTextFormatter.h"
#include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h"
#include "nsIConsoleService.h" #include "nsIConsoleService.h"
#include "nsIScriptError.h" #include "nsIScriptError.h"
#include "nsIXULAppInfo.h" #include "nsIXULAppInfo.h"
#include "nsIXULRuntime.h" #include "nsIXULRuntime.h"
#ifdef MOZ_B2G_LOADER
#include "mozilla/XPTInterfaceInfoManager.h"
#endif
+#include "nsKDEUtils.h" +#include "nsKDEUtils.h"
using namespace mozilla; #ifdef MOZ_B2G_LOADER
#define XPTONLY_MANIFEST &nsComponentManagerImpl::XPTOnlyManifestManifest
struct ManifestDirective #define XPTONLY_XPT &nsComponentManagerImpl::XPTOnlyManifestXPT
{ #else
const char* directive; #define XPTONLY_MANIFEST nullptr
int argc; #define XPTONLY_XPT nullptr
#endif
@@ -398,16 +399,17 @@ ParseManifest(NSLocationType type, FileL @@ -488,16 +489,17 @@ ParseManifest(NSLocationType aType, File
NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kPlatform, "platform");
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kApplication, "application"); NS_NAMED_LITERAL_STRING(kApplication, "application");
@ -3517,7 +3510,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
nsAutoString appID; nsAutoString appID;
@@ -445,42 +447,47 @@ ParseManifest(NSLocationType type, FileL @@ -543,44 +545,49 @@ ParseManifest(NSLocationType aType, File
CopyUTF8toUTF16(s, abi); CopyUTF8toUTF16(s, abi);
abi.Insert(char16_t('_'), 0); abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0); abi.Insert(osTarget, 0);
@ -3533,8 +3526,8 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
if (GetVersionEx(&info)) { if (GetVersionEx(&info)) {
nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
info.dwMajorVersion, info.dwMajorVersion,
info.dwMinorVersion); info.dwMinorVersion);
} }
+ desktop = NS_LITERAL_STRING("win"); + desktop = NS_LITERAL_STRING("win");
#pragma warning(pop) #pragma warning(pop)
@ -3542,18 +3535,20 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
majorVersion, majorVersion,
minorVersion); minorVersion);
+ desktop = NS_LITERAL_STRING("macosx"); + desktop = NS_LITERAL_STRING("macosx");
#elif defined(MOZ_WIDGET_GTK) #elif defined(MOZ_WIDGET_GTK)
nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
gtk_major_version, gtk_major_version,
gtk_minor_version); gtk_minor_version);
+ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); + desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
#elif defined(MOZ_WIDGET_ANDROID) #elif defined(MOZ_WIDGET_ANDROID)
bool isTablet = false; bool isTablet = false;
if (mozilla::AndroidBridge::Bridge()) { if (mozilla::AndroidBridge::Bridge()) {
mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", "RELEASE", osVersion); mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
"RELEASE",
osVersion);
isTablet = mozilla::widget::android::GeckoAppShell::IsTablet(); isTablet = mozilla::widget::android::GeckoAppShell::IsTablet();
} }
+ desktop = NS_LITERAL_STRING("android"); + desktop = NS_LITERAL_STRING("android");
@ -3563,9 +3558,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
// at the end. // at the end.
nsTArray<CachedDirective> contracts; nsTArray<CachedDirective> contracts;
char *token; char* token;
char *newline = buf; char* newline = aBuf;
@@ -562,24 +569,26 @@ ParseManifest(NSLocationType type, FileL @@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File
TriState stOsVersion = eUnspecified; TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified; TriState stOs = eUnspecified;
TriState stABI = eUnspecified; TriState stABI = eUnspecified;
@ -3576,7 +3571,8 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
bool contentAccessible = false; bool contentAccessible = false;
+ TriState stDesktop = eUnspecified; + TriState stDesktop = eUnspecified;
while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) { while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
ok) {
ToLowerCase(token); ToLowerCase(token);
NS_ConvertASCIItoUTF16 wtoken(token); NS_ConvertASCIItoUTF16 wtoken(token);
@ -3586,13 +3582,13 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
+ CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) || + CheckStringFlag(kDesktop, wtoken, desktop, stDesktop) ||
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) || CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) || CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
continue; continue;
}
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
bool tablet = false; bool tablet = false;
if (CheckFlag(kTablet, wtoken, tablet)) { @@ -718,16 +727,17 @@ ParseManifest(NSLocationType aType, File
@@ -608,16 +617,17 @@ ParseManifest(NSLocationType type, FileL
} }
if (!ok || if (!ok ||
@ -3605,11 +3601,28 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
stTablet == eBad || stTablet == eBad ||
#endif #endif
stABI == eBad) stABI == eBad) {
continue; continue;
}
if (directive->regfunc) { #ifdef MOZ_B2G_LOADER
if (GeckoProcessType_Default != XRE_GetProcessType()) diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
--- a/xpcom/components/moz.build
+++ b/xpcom/components/moz.build
@@ -47,12 +47,13 @@ FINAL_LIBRARY = 'xul'
GENERATED_INCLUDES += ['..']
LOCAL_INCLUDES += [
'../base',
'../build',
'../ds',
'../reflect/xptinfo',
'/chrome',
'/modules/libjar',
+ '/toolkit/xre'
]
if CONFIG['MOZ_WIDGET_GTK']:
CXXFLAGS += CONFIG['TK_CFLAGS']
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp
@ -3631,7 +3644,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prmem.h" #include "prmem.h"
#include "plbase64.h" #include "plbase64.h"
@@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con @@ -1965,55 +1966,57 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor); return InitWithNativePath(aPersistentDescriptor);
#endif #endif
} }
@ -3641,11 +3654,13 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
{ {
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs =
- do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (!giovfs && !gnomevfs) { - if (!giovfs && !gnomevfs) {
- return NS_ERROR_FAILURE; - return NS_ERROR_FAILURE;
- } - }
- -
+
+ nsAutoCString url; + nsAutoCString url;
bool isDirectory; bool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory))) { if (NS_FAILED(IsDirectory(&isDirectory))) {
@ -3662,7 +3677,8 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
- return gnomevfs->ShowURIForInput(mPath); - return gnomevfs->ShowURIForInput(mPath);
- } - }
+ url = mPath; + url = mPath;
} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { } else if (giovfs &&
NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
return NS_OK; return NS_OK;
} else { } else {
nsCOMPtr<nsIFile> parentDir; nsCOMPtr<nsIFile> parentDir;
@ -3705,7 +3721,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
return rv; return rv;
} }
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@@ -2016,16 +2019,22 @@ nsLocalFile::Reveal() @@ -2021,16 +2024,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
#endif #endif
} }
@ -3721,10 +3737,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } + }
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); nsCOMPtr<nsIGnomeVFSService> gnomevfs =
do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (giovfs) { if (giovfs) {
return giovfs->ShowURIForInput(mPath); return giovfs->ShowURIForInput(mPath);
} else if (gnomevfs) { } else if (gnomevfs) {
/* GnomeVFS fallback */ /* GnomeVFS fallback */
return gnomevfs->ShowURIForInput(mPath); return gnomevfs->ShowURIForInput(mPath);
}

8
mozilla-language.patch
View File

@ -1,11 +1,11 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c # Parent 5a29924228527f8882c83cf62d470963ea1ce62e
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
--- a/intl/locale/src/nsLocaleService.cpp --- a/intl/locale/nsLocaleService.cpp
+++ b/intl/locale/src/nsLocaleService.cpp +++ b/intl/locale/nsLocaleService.cpp
@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void) @@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
nsRefPtr<nsLocale> resultLocale(new nsLocale()); nsRefPtr<nsLocale> resultLocale(new nsLocale());
NS_ENSURE_TRUE_VOID(resultLocale); NS_ENSURE_TRUE_VOID(resultLocale);

6
mozilla-preferences.patch
View File

@ -7,9 +7,9 @@ package unconditionally.
# HG changeset patch # HG changeset patch
# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c # Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js
--- a/modules/libpref/src/init/all.js --- a/modules/libpref/init/all.js
+++ b/modules/libpref/src/init/all.js +++ b/modules/libpref/init/all.js
@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy @@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy
pref("intl.accept_languages", "chrome://global/locale/intl.properties"); pref("intl.accept_languages", "chrome://global/locale/intl.properties");

29
mozilla-repo.patch
View File

@ -1,10 +1,10 @@
# HG changeset patch # HG changeset patch
# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327 # Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk
@@ -138,23 +138,23 @@ else @@ -137,24 +137,24 @@ else
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
endif endif
@ -20,8 +20,10 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
# bug: 746277 - preserve existing functionality. # bug: 746277 - preserve existing functionality.
# MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists # MOZILLA_DIR="": cd $(SPACE); hg # succeeds if ~/.hg exists
########################################################################### ###########################################################################
ifdef MOZILLA_OFFICIAL
-MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) -MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
+#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL)) +#MOZ_SOURCE_REPO = $(call getSourceRepo,$(MOZILLA_DIR)$(NULL) $(NULL))
endif
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json
@ -29,26 +31,3 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
# JavaScript Shell # JavaScript Shell
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
endif # PACKAGE_NAME_MK_INCLUDED
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
@@ -39,17 +39,17 @@ TOOLKIT_EM_VERSION=$(shell $(PERL) $(top
# Valid if null: {warn,error}IfEmpty
DEFINES += -DTOOLKIT_EM_VERSION='"$(TOOLKIT_EM_VERSION)"'
MOZ_SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node|short}\n' 2>/dev/null))
ifdef MOZ_SOURCE_STAMP
INIARGS = --sourcestamp=$(MOZ_SOURCE_STAMP)
- source_repo := $(call getSourceRepo)
+ source_repo ?= $(call getSourceRepo)
# extra sanity check for old versions of hg, no showconfig support
ifneq (,$(filter http%,$(source_repo)))
INIARGS += --sourcerepo=$(source_repo)
endif
endif # MOZ_SOURCE_STAMP

82
mozilla-shared-nss-db.patch
View File

@ -7,7 +7,7 @@ References:
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then @@ -8199,16 +8199,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1 MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU) AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@ -27,8 +27,8 @@ diff --git a/configure.in b/configure.in
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER) + AC_DEFINE(MOZ_ENABLE_NSSHELPER)
+fi +fi
+AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(MOZ_ENABLE_NSSHELPER)
+AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST_LIST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS) +AC_SUBST_LIST(NSSHELPER_LIBS)
+ +
+dnl ======================================================== +dnl ========================================================
dnl disable xul dnl disable xul
@ -39,19 +39,29 @@ diff --git a/configure.in b/configure.in
if test "$MOZ_XUL"; then if test "$MOZ_XUL"; then
AC_DEFINE(MOZ_XUL) AC_DEFINE(MOZ_XUL)
else else
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
new file mode 100644 --- a/security/manager/ssl/src/moz.build
--- /dev/null +++ b/security/manager/ssl/src/moz.build
+++ b/security/manager/ssl/src/Makefile.in @@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True
@@ -0,0 +1,8 @@
+#! gmake FINAL_LIBRARY = 'xul'
+#
+# This Source Code Form is subject to the terms of the Mozilla Public LOCAL_INCLUDES += [
+# License, v. 2.0. If a copy of the MPL was not distributed with this '../../../certverifier',
+# file, You can obtain one at http://mozilla.org/MPL/2.0/. '../../../pkix/include',
]
+CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS'])
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
+ +
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) if CONFIG['NSS_DISABLE_DBM']:
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) DEFINES['NSS_DISABLE_DBM'] = '1'
DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True'
DEFINES['NSS_ENABLE_ECC'] = 'True'
for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
DEFINES[var] = '"%s"' % CONFIG[var]
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp
@ -79,7 +89,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
#include "nsCertVerificationThread.h" #include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h"
@@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS() @@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS()
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
nsPSMInitPanic::SetPanic(); nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE; return NS_ERROR_NOT_AVAILABLE;
@ -112,25 +122,25 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
if (init_rv != SECSuccess) { if (init_rv != SECSuccess) {
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n")); PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
} }
diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild
--- a/toolkit/library/libxul.mk --- a/toolkit/library/libxul.mozbuild
+++ b/toolkit/library/libxul.mk +++ b/toolkit/library/libxul.mozbuild
@@ -145,17 +145,17 @@ endif @@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [
ifdef MOZ_WMF 'psapi.dll',
OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids) 'rasapi32.dll',
endif 'rasdlg.dll',
'secur32.dll',
'wininet.dll',
'winspool.drv'
]
ifdef MOZ_DIRECTSHOW +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) +
endif if CONFIG['MOZ_METRO']:
DELAYLOAD_DLLS += [
'API-MS-WIN-CORE-WINRT-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
'API-MS-WIN-CORE-WINRT-STRING-L' + CONFIG['CRTEXPDLLVERSION'] + '.DLL',
'uiautomationcore.dll'
]
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) if CONFIG['ACCESSIBILITY']:
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
OS_LIBS += \
$(TK_LIBS) \
$(NULL)
endif
ifeq (OpenBSD,$(OS_ARCH))

2
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=a4d51da32fe7 REV=8274648ad79f
REPO=http://hg.mozilla.org/releases/mozilla-release REPO=http://hg.mozilla.org/releases/mozilla-release