forked from pool/MozillaFirefox
- 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 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=415
This commit is contained in:
parent
140e4a12ee
commit
4a13134b83
@ -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
|
||||
|
||||
@ -7,7 +36,6 @@ Fri Nov 7 20:14:32 UTC 2014 - wr@rosenauer.org
|
||||
* Enhanced Tiles
|
||||
* Privacy tour introduced
|
||||
- fix typo in GStreamer Recommends
|
||||
- requires NSS 3.17.2
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 4 18:00:35 UTC 2014 - guillaume@opensuse.org
|
||||
|
@ -18,10 +18,10 @@
|
||||
|
||||
|
||||
# changed with every update
|
||||
%define major 33
|
||||
%define mainver %major.1
|
||||
%define major 34
|
||||
%define mainver %major.0.5
|
||||
%define update_channel release
|
||||
%define releasedate 2014110600
|
||||
%define releasedate 2014112600
|
||||
|
||||
# general build definitions
|
||||
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||
@ -56,14 +56,6 @@
|
||||
%else
|
||||
%define crashreporter 1
|
||||
%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
|
||||
BuildRequires: Mesa-devel
|
||||
@ -295,11 +287,10 @@ export BUILD_OFFICIAL=1
|
||||
export MOZ_TELEMETRY_REPORTING=1
|
||||
export MOZ_GOOGLE_API_KEY=%{_google_api_key}
|
||||
export CFLAGS="%{optflags} -fno-strict-aliasing"
|
||||
%ifarch %ix86
|
||||
export CFLAGS="${CFLAGS} -Os"
|
||||
%endif
|
||||
%ifarch %arm
|
||||
export CFLAGS="${CFLAGS/-g / }"
|
||||
%endif
|
||||
%ifarch %arm %ix86
|
||||
# Limit RAM usage during link
|
||||
export LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
|
||||
%endif
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d2e6d8c186ebcd6b6ee1122305c439cbdb90e06a9ecb66567739ff470e00530b
|
||||
size 28416
|
||||
oid sha256:63c9dc89cf88f95f3c12ade272ab7658426be5941f2475d039ec25e60642624e
|
||||
size 28420
|
||||
|
@ -2,8 +2,8 @@
|
||||
|
||||
CHANNEL="release"
|
||||
BRANCH="releases/mozilla-$CHANNEL"
|
||||
RELEASE_TAG="FIREFOX_33_1_RELEASE"
|
||||
VERSION="33.1"
|
||||
RELEASE_TAG="FIREFOX_34_0_5_RELEASE"
|
||||
VERSION="34.0.5"
|
||||
|
||||
# mozilla
|
||||
if [ -d mozilla ]; then
|
||||
|
@ -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
3
firefox-34.0.5-source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7f5848e377636af4e66c6fa738e61bd9623f0e4b60a94d4d8ee3d54b4976d24b
|
||||
size 139718892
|
@ -1,12 +1,12 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent ba2d9b1374e15e7c339a44452169d0afac2ca82e
|
||||
# Parent a5921092e6fb2dc39b1426139eb8406f5fd3cfa9
|
||||
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
|
||||
--- a/browser/components/preferences/advanced.js
|
||||
+++ b/browser/components/preferences/advanced.js
|
||||
@@ -751,17 +751,17 @@ var gAdvancedPane = {
|
||||
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
|
||||
--- a/browser/components/preferences/main.js
|
||||
+++ b/browser/components/preferences/main.js
|
||||
@@ -511,17 +511,17 @@ var gMainPane = {
|
||||
if (kde_session == 1) {
|
||||
var shellObj = Components.classes["@mozilla.org/file/local;1"]
|
||||
.createInstance(Components.interfaces.nsILocalFile);
|
||||
@ -19,9 +19,9 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
|
||||
+ "BrowserApplication", "firefox"];
|
||||
process.run(false, args, args.length);
|
||||
}
|
||||
} catch (ex) {
|
||||
Components.utils.reportError(ex);
|
||||
return;
|
||||
}
|
||||
let selectedIndex =
|
||||
shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
|
||||
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
|
@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/browser/base/content/browser-kde.xul
|
||||
@@ -0,0 +1,1238 @@
|
||||
@@ -0,0 +1,1269 @@
|
||||
+#filter substitution
|
||||
+<?xml version="1.0"?>
|
||||
+# -*- Mode: HTML -*-
|
||||
@ -145,6 +145,9 @@ new file mode 100644
|
||||
+ <!-- for search and content formfill/pw manager -->
|
||||
+ <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 -->
|
||||
+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
|
||||
+
|
||||
@ -242,6 +245,48 @@ new file mode 100644
|
||||
+ mousethrough="always">
|
||||
+ <box id="UITourHighlight"></box>
|
||||
+ </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"
|
||||
+ class="social-panel"
|
||||
@ -674,7 +719,7 @@ new file mode 100644
|
||||
+ aria-label="&navbarCmd.label;"
|
||||
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
||||
+ 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"
|
||||
+ overflowable="true"
|
||||
+ overflowbutton="nav-bar-overflow-button"
|
||||
@ -717,7 +762,7 @@ new file mode 100644
|
||||
+ ontextreverted="return this.handleRevert();"
|
||||
+ pageproxystate="invalid"
|
||||
+ 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">
|
||||
+ <image id="default-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="web-notifications-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-sharingDevices-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"
|
||||
+ 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"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||
+ label="&sharePageCmd.label;"
|
||||
@ -1107,6 +1137,7 @@ new file mode 100644
|
||||
+
|
||||
+ <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" hidden="true"/>
|
||||
+ <vbox id="appcontent" flex="1">
|
||||
+ <notificationbox id="high-priority-global-notificationbox"/>
|
||||
+ <tabbrowser id="content"
|
||||
+ flex="1" contenttooltip="aHTMLTooltip"
|
||||
+ 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
|
||||
--- a/browser/base/content/browser.xul
|
||||
+++ b/browser/base/content/browser.xul
|
||||
@@ -171,17 +171,17 @@
|
||||
@@ -174,17 +174,17 @@
|
||||
class="editBookmarkPanelHeaderButton"
|
||||
oncommand="StarUI.removeBookmarkButtonCommand();"
|
||||
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"
|
||||
class="editBookmarkPanelBottomButton"
|
||||
label="&editBookmark.cancel.label;"
|
||||
@@ -1164,17 +1164,17 @@
|
||||
@@ -1195,17 +1195,17 @@
|
||||
|
||||
<hbox id="full-screen-warning-container" hidden="true" fadeout="true">
|
||||
<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
|
||||
--- a/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-widget-left.png (content/aboutRobots-widget-left.png)
|
||||
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/chatWindow.xul (content/chatWindow.xul)
|
||||
content/browser/content.js (content/content.js)
|
||||
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/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
|
||||
content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
|
||||
content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg)
|
||||
content/browser/defaultthemes/1.header.jpg (content/defaultthemes/1.header.jpg)
|
||||
content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
|
||||
content/browser/defaultthemes/1.preview.jpg (content/defaultthemes/1.preview.jpg)
|
||||
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
|
||||
--- a/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)
|
||||
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
|
||||
#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
|
||||
@@ -25,16 +25,22 @@ var gAdvancedPane = {
|
||||
if (extraArgs && extraArgs["advancedTab"]){
|
||||
advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
|
||||
} else {
|
||||
var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
|
||||
if (preference.value !== null)
|
||||
advancedPrefs.selectedIndex = preference.value;
|
||||
}
|
||||
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
|
||||
--- a/browser/components/preferences/main.js
|
||||
+++ b/browser/components/preferences/main.js
|
||||
@@ -12,16 +12,22 @@ var gMainPane = {
|
||||
|
||||
/**
|
||||
* Initialization of this.
|
||||
*/
|
||||
init: function ()
|
||||
{
|
||||
this._pane = document.getElementById("paneMain");
|
||||
|
||||
+ var env = Components.classes["@mozilla.org/process/environment;1"]
|
||||
+ .getService(Components.interfaces.nsIEnvironment);
|
||||
@ -1390,14 +1421,14 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
|
||||
// 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.
|
||||
@@ -889,14 +895,25 @@ var gAdvancedPane = {
|
||||
* Set browser as the operating system default browser.
|
||||
@@ -497,16 +503,27 @@ var gMainPane = {
|
||||
*/
|
||||
setDefaultBrowser: function()
|
||||
{
|
||||
let shellSvc = getShellService();
|
||||
if (!shellSvc)
|
||||
return;
|
||||
try {
|
||||
shellSvc.setDefaultBrowser(true, false);
|
||||
+ if (kde_session == 1) {
|
||||
+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
|
||||
@ -1410,32 +1441,18 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
|
||||
+ "BrowserApplication", "MozillaFirefox"];
|
||||
+ process.run(false, args, args.length);
|
||||
+ }
|
||||
} catch (ex) {
|
||||
Components.utils.reportError(ex);
|
||||
return;
|
||||
}
|
||||
let selectedIndex =
|
||||
shellSvc.isDefaultBrowser(false, true) ? 1 : 0;
|
||||
document.getElementById("setDefaultPane").selectedIndex = selectedIndex;
|
||||
}
|
||||
#endif
|
||||
};
|
||||
diff --git a/browser/components/shell/src/Makefile.in b/browser/components/shell/src/Makefile.in
|
||||
--- a/browser/components/shell/src/Makefile.in
|
||||
+++ 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':
|
||||
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
|
||||
--- a/browser/components/shell/moz.build
|
||||
+++ b/browser/components/shell/moz.build
|
||||
@@ -30,16 +30,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
|
||||
SOURCES += [
|
||||
@ -1454,10 +1471,10 @@ diff --git a/browser/components/shell/src/moz.build b/browser/components/shell/s
|
||||
EXTRA_COMPONENTS += [
|
||||
'nsSetDefaultBrowser.js',
|
||||
'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
|
||||
--- /dev/null
|
||||
+++ b/browser/components/shell/src/nsKDEShellService.cpp
|
||||
+++ b/browser/components/shell/nsKDEShellService.cpp
|
||||
@@ -0,0 +1,238 @@
|
||||
+/* -*- 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
|
||||
@ -1697,10 +1714,10 @@ new file mode 100644
|
||||
+ NS_ADDREF(*_retval = defaultReader);
|
||||
+ 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
|
||||
--- /dev/null
|
||||
+++ b/browser/components/shell/src/nsKDEShellService.h
|
||||
+++ b/browser/components/shell/nsKDEShellService.h
|
||||
@@ -0,0 +1,60 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
@ -1762,10 +1779,10 @@ new file mode 100644
|
||||
+};
|
||||
+
|
||||
+#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
|
||||
--- /dev/null
|
||||
+++ b/browser/components/shell/src/nsUnixShellService.cpp
|
||||
+++ b/browser/components/shell/nsUnixShellService.cpp
|
||||
@@ -0,0 +1,52 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** BEGIN LICENSE BLOCK *****
|
||||
@ -1819,10 +1836,10 @@ new file mode 100644
|
||||
+ return nsKDEShellServiceConstructor( 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
|
||||
--- /dev/null
|
||||
+++ b/browser/components/shell/src/nsUnixShellService.h
|
||||
+++ b/browser/components/shell/nsUnixShellService.h
|
||||
@@ -0,0 +1,45 @@
|
||||
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
||||
+/* ***** 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
|
||||
--- a/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@/browser/defaults/profile/prefs.js
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
@ -1,13 +1,13 @@
|
||||
# HG changeset patch
|
||||
# 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
|
||||
|
||||
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
|
||||
@@ -259,17 +259,17 @@ pref("browser.uitour.whitelist.add.260",
|
||||
pref("browser.uitour.whitelist.add.340", "about:home");
|
||||
@@ -263,17 +263,17 @@ pref("browser.uitour.whitelist.add.340",
|
||||
pref("browser.uitour.whitelist.add.341", "www.mozilla.org,support.mozilla.org,about:home");
|
||||
|
||||
pref("browser.customizemode.tip0.shown", false);
|
||||
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
|
||||
|
@ -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
3
l10n-34.0.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f164489df4653c9b5d9ac4edadc7db94fd8862f74b61911bf6d363fd5d4d2011
|
||||
size 41325120
|
@ -4,9 +4,9 @@ Author: Lubos Lunak <lunak@suse.com>
|
||||
Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=170055
|
||||
|
||||
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
|
||||
--- 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/Makefile.in
|
||||
+++ b/modules/libpref/Makefile.in
|
||||
@@ -21,13 +21,15 @@ endif
|
||||
ifdef MOZ_SERVICES_HEALTHREPORT
|
||||
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
|
||||
$(INSTALL) $^ $(DIST)/bin/
|
||||
diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferences.cpp
|
||||
--- 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/Preferences.cpp
|
||||
+++ b/modules/libpref/Preferences.cpp
|
||||
@@ -27,16 +27,17 @@
|
||||
#include "nsIZipReader.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.flags = Flags(*flags)
|
||||
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
|
||||
@@ -1,9 +1,9 @@
|
||||
#
|
||||
# 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/.
|
||||
diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build
|
||||
--- a/toolkit/components/downloads/moz.build
|
||||
+++ b/toolkit/components/downloads/moz.build
|
||||
@@ -52,14 +52,15 @@ if not CONFIG['MOZ_SUITE']:
|
||||
]
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
FAIL_ON_WARNINGS = True
|
||||
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
-
|
||||
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
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
|
||||
--- a/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"
|
||||
using namespace mozilla::widget::android;
|
||||
#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));
|
||||
|
||||
// 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;
|
||||
showTaskbarAlert = goat > alertIntervalUSec;
|
||||
|
||||
@@ -2766,19 +2779,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(
|
||||
@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
|
||||
NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
|
||||
message, !removeWhenDone,
|
||||
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
|
||||
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
|
||||
--- a/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/bindings/autocomplete.xml (widgets/autocomplete.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
|
||||
|
||||
nsUnixSystemProxySettings()
|
||||
: mSchemeProxySettings(5)
|
||||
: mSchemeProxySettings(4)
|
||||
@@ -38,16 +40,17 @@ private:
|
||||
nsCOMPtr<nsIGSettingsService> mGSettings;
|
||||
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
|
||||
@ -2625,20 +2627,6 @@ new file mode 100644
|
||||
+ };
|
||||
+
|
||||
+#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
|
||||
--- a/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/nsExternalURLHandlerService.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
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
@ -3095,26 +3101,27 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
||||
#endif
|
||||
|
||||
// Now look up our extensions
|
||||
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
|
||||
--- a/widget/gtk/Makefile.in
|
||||
+++ b/widget/gtk/Makefile.in
|
||||
@@ -3,14 +3,16 @@
|
||||
# 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/.
|
||||
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
||||
--- a/widget/gtk/moz.build
|
||||
+++ b/widget/gtk/moz.build
|
||||
@@ -88,16 +88,17 @@ include('/ipc/chromium/chromium-config.m
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
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)
|
||||
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
|
||||
if CONFIG['MOZ_X11']:
|
||||
LOCAL_INCLUDES += [
|
||||
'../shared/x11',
|
||||
]
|
||||
|
||||
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||
+
|
||||
CFLAGS += $(TK_CFLAGS)
|
||||
CXXFLAGS += $(TK_CFLAGS)
|
||||
|
||||
ifdef MOZ_ENABLE_DBUS
|
||||
CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS)
|
||||
endif
|
||||
DEFINES['CAIRO_GFX'] = True
|
||||
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
|
||||
--- a/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
|
||||
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
|
||||
--- a/xpcom/components/ManifestParser.cpp
|
||||
+++ b/xpcom/components/ManifestParser.cpp
|
||||
@@ -31,16 +31,17 @@
|
||||
#include "nsTextFormatter.h"
|
||||
#include "nsVersionComparator.h"
|
||||
#include "nsXPCOMCIDInternal.h"
|
||||
@@ -34,16 +34,17 @@
|
||||
|
||||
#include "nsIConsoleService.h"
|
||||
#include "nsIScriptError.h"
|
||||
#include "nsIXULAppInfo.h"
|
||||
#include "nsIXULRuntime.h"
|
||||
#ifdef MOZ_B2G_LOADER
|
||||
#include "mozilla/XPTInterfaceInfoManager.h"
|
||||
#endif
|
||||
+#include "nsKDEUtils.h"
|
||||
|
||||
using namespace mozilla;
|
||||
|
||||
struct ManifestDirective
|
||||
{
|
||||
const char* directive;
|
||||
int argc;
|
||||
|
||||
@@ -398,16 +399,17 @@ ParseManifest(NSLocationType type, FileL
|
||||
#ifdef MOZ_B2G_LOADER
|
||||
#define XPTONLY_MANIFEST &nsComponentManagerImpl::XPTOnlyManifestManifest
|
||||
#define XPTONLY_XPT &nsComponentManagerImpl::XPTOnlyManifestXPT
|
||||
#else
|
||||
#define XPTONLY_MANIFEST nullptr
|
||||
#define XPTONLY_XPT nullptr
|
||||
#endif
|
||||
@@ -488,16 +489,17 @@ ParseManifest(NSLocationType aType, File
|
||||
NS_NAMED_LITERAL_STRING(kPlatform, "platform");
|
||||
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
|
||||
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");
|
||||
|
||||
nsAutoString appID;
|
||||
@@ -445,42 +447,47 @@ ParseManifest(NSLocationType type, FileL
|
||||
@@ -543,44 +545,49 @@ ParseManifest(NSLocationType aType, File
|
||||
CopyUTF8toUTF16(s, abi);
|
||||
abi.Insert(char16_t('_'), 0);
|
||||
abi.Insert(osTarget, 0);
|
||||
@ -3553,7 +3546,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
||||
#elif defined(MOZ_WIDGET_ANDROID)
|
||||
bool isTablet = false;
|
||||
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();
|
||||
}
|
||||
+ desktop = NS_LITERAL_STRING("android");
|
||||
@ -3563,9 +3558,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
||||
// at the end.
|
||||
nsTArray<CachedDirective> contracts;
|
||||
|
||||
char *token;
|
||||
char *newline = buf;
|
||||
@@ -562,24 +569,26 @@ ParseManifest(NSLocationType type, FileL
|
||||
char* token;
|
||||
char* newline = aBuf;
|
||||
@@ -669,25 +676,27 @@ ParseManifest(NSLocationType aType, File
|
||||
TriState stOsVersion = eUnspecified;
|
||||
TriState stOs = eUnspecified;
|
||||
TriState stABI = eUnspecified;
|
||||
@ -3576,7 +3571,8 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
||||
bool contentAccessible = false;
|
||||
+ TriState stDesktop = eUnspecified;
|
||||
|
||||
while (nullptr != (token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) && ok) {
|
||||
while ((token = nsCRT::strtok(whitespace, kWhitespace, &whitespace)) &&
|
||||
ok) {
|
||||
ToLowerCase(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) ||
|
||||
CheckVersionFlag(kOsVersion, wtoken, osVersion, stOsVersion) ||
|
||||
CheckVersionFlag(kAppVersion, wtoken, appVersion, stAppVersion) ||
|
||||
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion))
|
||||
CheckVersionFlag(kGeckoVersion, wtoken, geckoVersion, stGeckoVersion)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_ANDROID)
|
||||
bool tablet = false;
|
||||
if (CheckFlag(kTablet, wtoken, tablet)) {
|
||||
@@ -608,16 +617,17 @@ ParseManifest(NSLocationType type, FileL
|
||||
@@ -718,16 +727,17 @@ ParseManifest(NSLocationType aType, File
|
||||
}
|
||||
|
||||
if (!ok ||
|
||||
@ -3605,11 +3601,28 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
||||
#ifdef MOZ_WIDGET_ANDROID
|
||||
stTablet == eBad ||
|
||||
#endif
|
||||
stABI == eBad)
|
||||
stABI == eBad) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (directive->regfunc) {
|
||||
if (GeckoProcessType_Default != XRE_GetProcessType())
|
||||
#ifdef MOZ_B2G_LOADER
|
||||
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
|
||||
--- a/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 "plbase64.h"
|
||||
|
||||
@@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||
@@ -1965,55 +1966,57 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||
return InitWithNativePath(aPersistentDescriptor);
|
||||
#endif
|
||||
}
|
||||
@ -3641,11 +3654,13 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
||||
{
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
- 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) {
|
||||
- return NS_ERROR_FAILURE;
|
||||
- }
|
||||
-
|
||||
+
|
||||
+ nsAutoCString url;
|
||||
bool 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);
|
||||
- }
|
||||
+ url = mPath;
|
||||
} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
|
||||
} else if (giovfs &&
|
||||
NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
|
||||
return NS_OK;
|
||||
} else {
|
||||
nsCOMPtr<nsIFile> parentDir;
|
||||
@ -3705,7 +3721,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
||||
return rv;
|
||||
}
|
||||
return NS_ERROR_FAILURE;
|
||||
@@ -2016,16 +2019,22 @@ nsLocalFile::Reveal()
|
||||
@@ -2021,16 +2024,22 @@ nsLocalFile::Reveal()
|
||||
return NS_ERROR_FAILURE;
|
||||
#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;
|
||||
+ }
|
||||
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) {
|
||||
return giovfs->ShowURIForInput(mPath);
|
||||
} else if (gnomevfs) {
|
||||
/* GnomeVFS fallback */
|
||||
return gnomevfs->ShowURIForInput(mPath);
|
||||
}
|
||||
|
@ -1,11 +1,11 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent 13eb644c1216aed92b29dbc63fc26ce66f98c66c
|
||||
# Parent 5a29924228527f8882c83cf62d470963ea1ce62e
|
||||
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
|
||||
|
||||
diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
|
||||
--- 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/nsLocaleService.cpp
|
||||
+++ b/intl/locale/nsLocaleService.cpp
|
||||
@@ -122,16 +122,17 @@ nsLocaleService::nsLocaleService(void)
|
||||
nsRefPtr<nsLocale> resultLocale(new nsLocale());
|
||||
NS_ENSURE_TRUE_VOID(resultLocale);
|
||||
|
@ -7,9 +7,9 @@ package unconditionally.
|
||||
# HG changeset patch
|
||||
# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
|
||||
|
||||
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
|
||||
--- 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/init/all.js
|
||||
+++ b/modules/libpref/init/all.js
|
||||
@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy
|
||||
|
||||
pref("intl.accept_languages", "chrome://global/locale/intl.properties");
|
||||
|
@ -1,10 +1,10 @@
|
||||
# HG changeset patch
|
||||
# Parent 9b45fd4b00c45014b17358158cdb51805c8ca327
|
||||
# Parent 1478a2c97152e81b6d7cb89a4ab34da7310e3e86
|
||||
|
||||
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
|
||||
@@ -138,23 +138,23 @@ else
|
||||
@@ -137,24 +137,24 @@ else
|
||||
BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID)
|
||||
endif
|
||||
|
||||
@ -20,8 +20,10 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
|
||||
# bug: 746277 - preserve existing functionality.
|
||||
# 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))
|
||||
endif
|
||||
|
||||
MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt
|
||||
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
|
||||
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
|
||||
|
||||
|
@ -7,7 +7,7 @@ References:
|
||||
diff --git a/configure.in b/configure.in
|
||||
--- a/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
|
||||
AC_DEFINE(USE_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)
|
||||
+fi
|
||||
+AC_SUBST(MOZ_ENABLE_NSSHELPER)
|
||||
+AC_SUBST(NSSHELPER_CFLAGS)
|
||||
+AC_SUBST(NSSHELPER_LIBS)
|
||||
+AC_SUBST_LIST(NSSHELPER_CFLAGS)
|
||||
+AC_SUBST_LIST(NSSHELPER_LIBS)
|
||||
+
|
||||
+dnl ========================================================
|
||||
dnl disable xul
|
||||
@ -39,19 +39,29 @@ diff --git a/configure.in b/configure.in
|
||||
if test "$MOZ_XUL"; then
|
||||
AC_DEFINE(MOZ_XUL)
|
||||
else
|
||||
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/security/manager/ssl/src/Makefile.in
|
||||
@@ -0,0 +1,8 @@
|
||||
+#! gmake
|
||||
+#
|
||||
+# 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/.
|
||||
diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build
|
||||
--- a/security/manager/ssl/src/moz.build
|
||||
+++ b/security/manager/ssl/src/moz.build
|
||||
@@ -91,16 +91,19 @@ FAIL_ON_WARNINGS = True
|
||||
|
||||
FINAL_LIBRARY = 'xul'
|
||||
|
||||
LOCAL_INCLUDES += [
|
||||
'../../../certverifier',
|
||||
'../../../pkix/include',
|
||||
]
|
||||
|
||||
+CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS'])
|
||||
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
|
||||
+
|
||||
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
|
||||
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
|
||||
if CONFIG['NSS_DISABLE_DBM']:
|
||||
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
|
||||
--- a/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 "nsAppDirectoryServiceDefs.h"
|
||||
#include "nsComponentManagerUtils.h"
|
||||
@@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS()
|
||||
@@ -943,17 +950,31 @@ nsNSSComponent::InitializeNSS()
|
||||
if (NS_FAILED(rv)) {
|
||||
nsPSMInitPanic::SetPanic();
|
||||
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) {
|
||||
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
|
||||
--- a/toolkit/library/libxul.mk
|
||||
+++ b/toolkit/library/libxul.mk
|
||||
@@ -145,17 +145,17 @@ endif
|
||||
ifdef MOZ_WMF
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids)
|
||||
endif
|
||||
diff --git a/toolkit/library/libxul.mozbuild b/toolkit/library/libxul.mozbuild
|
||||
--- a/toolkit/library/libxul.mozbuild
|
||||
+++ b/toolkit/library/libxul.mozbuild
|
||||
@@ -22,16 +22,18 @@ DELAYLOAD_DLLS += [
|
||||
'psapi.dll',
|
||||
'rasapi32.dll',
|
||||
'rasdlg.dll',
|
||||
'secur32.dll',
|
||||
'wininet.dll',
|
||||
'winspool.drv'
|
||||
]
|
||||
|
||||
ifdef MOZ_DIRECTSHOW
|
||||
OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo)
|
||||
endif
|
||||
+OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS'])
|
||||
+
|
||||
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)
|
||||
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS)
|
||||
|
||||
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
|
||||
OS_LIBS += \
|
||||
$(TK_LIBS) \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
ifeq (OpenBSD,$(OS_ARCH))
|
||||
if CONFIG['ACCESSIBILITY']:
|
||||
|
@ -1,2 +1,2 @@
|
||||
REV=a4d51da32fe7
|
||||
REV=8274648ad79f
|
||||
REPO=http://hg.mozilla.org/releases/mozilla-release
|
||||
|
Loading…
Reference in New Issue
Block a user