Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-12-06 13:47:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2014-11-13 09:16:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-12-06 13:47:13.000000000 +0100 @@ -1,0 +2,29 @@ +Sat Nov 29 21:23:03 UTC 2014 - [email protected] + +- 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 + +------------------------------------------------------------------- @@ -10 +38,0 @@ -- requires NSS 3.17.2 Old: ---- firefox-33.1-source.tar.xz l10n-33.1.tar.xz New: ---- firefox-34.0.5-source.tar.xz l10n-34.0.5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -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 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 ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -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 ++++++ firefox-33.1-source.tar.xz -> firefox-34.0.5-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-33.1-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-34.0.5-source.tar.xz differ: char 26, line 1 ++++++ firefox-kde-114.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -1,27 +1,27 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# 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 = { - if (kde_session == 1) { - var shellObj = Components.classes["@mozilla.org/file/local;1"] - .createInstance(Components.interfaces.nsILocalFile); - shellObj.initWithPath("/usr/bin/kwriteconfig"); - var process = Components.classes["@mozilla.org/process/util;1"] - .createInstance(Components.interfaces.nsIProcess); - process.init(shellObj); - var args = ["--file", "kdeglobals", "--group", "General", "--key", -- "BrowserApplication", "MozillaFirefox"]; -+ "BrowserApplication", "firefox"]; - process.run(false, args, args.length); +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); + shellObj.initWithPath("/usr/bin/kwriteconfig"); + var process = Components.classes["@mozilla.org/process/util;1"] + .createInstance(Components.interfaces.nsIProcess); + process.init(shellObj); + var args = ["--file", "kdeglobals", "--group", "General", "--key", +- "BrowserApplication", "MozillaFirefox"]; ++ "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 - }; ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -2,7 +2,7 @@ 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 @@ + <!-- 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 @@ + 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 @@ + 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 @@ + 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 @@ + <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 @@ + 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 @@ + + <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 @@ 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 @@ <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/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 @@ * 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 @@ #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,52 +1421,38 @@ // 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; - shellSvc.setDefaultBrowser(true, false); -+ if (kde_session == 1) { -+ var shellObj = Components.classes["@mozilla.org/file/local;1"] -+ .createInstance(Components.interfaces.nsILocalFile); -+ shellObj.initWithPath("/usr/bin/kwriteconfig"); -+ var process = Components.classes["@mozilla.org/process/util;1"] -+ .createInstance(Components.interfaces.nsIProcess); -+ process.init(shellObj); -+ var args = ["--file", "kdeglobals", "--group", "General", "--key", -+ "BrowserApplication", "MozillaFirefox"]; -+ process.run(false, args, args.length); -+ } + try { + shellSvc.setDefaultBrowser(true, false); ++ if (kde_session == 1) { ++ var shellObj = Components.classes["@mozilla.org/file/local;1"] ++ .createInstance(Components.interfaces.nsILocalFile); ++ shellObj.initWithPath("/usr/bin/kwriteconfig"); ++ var process = Components.classes["@mozilla.org/process/util;1"] ++ .createInstance(Components.interfaces.nsIProcess); ++ process.init(shellObj); ++ var args = ["--file", "kdeglobals", "--group", "General", "--key", ++ "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 @@ 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 @@ + 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 @@ +}; + +#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 @@ + 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 @@ 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 ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -1,12 +1,12 @@ # HG changeset patch -# Parent 78b2c4af37108b3a2b6a856da7544335001cd444 +# Parent 11ad195fb502ca7c1ba3c8836b2d91be56d64ce4 # User Wolfgang Rosenauer <[email protected]> Add searchplugins to chrome packaging for proper localization diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -381,16 +381,20 @@ pref("browser.helperApps.deleteTempFileO +@@ -388,16 +388,20 @@ pref("browser.helperApps.deleteTempFileO #endif // search engines URL @@ -41,8 +41,8 @@ else -SEARCHPLUGINS_NAMES = $(shell cat $(call MERGE_FILE,/searchplugins/list.txt)) ddg +SEARCHPLUGINS_NAMES = $(shell cat \ -+ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ -+ @srcdir@/en-US/searchplugins/list.txt ) ) ddg ++ $(firstword $(wildcard $(LOCALE_SRCDIR)/searchplugins/list.txt) \ ++ @srcdir@/en-US/searchplugins/list.txt ) ) ddg endif SEARCHPLUGINS_PATH := $(FINAL_TARGET)/searchplugins SEARCHPLUGINS := $(addsuffix .xml,$(SEARCHPLUGINS_NAMES)) @@ -96,39 +96,10 @@ @$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$* endif @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* -diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml ---- a/browser/locales/en-US/searchplugins/google.xml -+++ b/browser/locales/en-US/searchplugins/google.xml -@@ -11,25 +11,17 @@ - <Image width="130" height="52">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIIAAAA0CAYAAABGkOCVAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDIxIDc5LjE1NDkxMSwgMjAxMy8xMC8yOS0xMTo0NzoxNiAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjMwQjQ3MEVGRjQxMTExRTM5RkNCRjhFNDM0QjY3OEQ1IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjMwQjQ3MEYwRjQxMTExRTM5RkNCRjhFNDM0QjY3OEQ1Ij4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MzBCNDcwRURGNDExMTFFMzlGQ0JGOEU0MzRCNjc4RDUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MzBCNDcwRUVGNDExMTFFMzlGQ0JGOEU0MzRCNjc4RDUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz5U94CwAAArpElEQVR42ux9B5hU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</Image> - <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&q={searchTerms}"/> - <Url type="text/html" method="GET" template="https://www.google.com/search";> - <Param name="q" value="{searchTerms}"/> - <Param name="ie" value="utf-8"/> - <Param name="oe" value="utf-8"/> - <Param name="aq" value="t"/> - <Param name="rls" value="{moz:distributionID}:{moz:locale}:{moz:official}"/> --#if MOZ_UPDATE_CHANNEL == beta -- <MozParam name="client" condition="defaultEngine" trueValue="firefox-beta" falseValue="firefox"/> --#elif MOZ_UPDATE_CHANNEL == aurora -- <MozParam name="client" condition="defaultEngine" trueValue="firefox-aurora" falseValue="firefox"/> --#elif MOZ_UPDATE_CHANNEL == nightly -- <MozParam name="client" condition="defaultEngine" trueValue="firefox-nightly" falseValue="firefox"/> --#else - <MozParam name="client" condition="defaultEngine" trueValue="firefox-a" falseValue="firefox"/> --#endif - <MozParam name="channel" condition="purpose" purpose="contextmenu" value="rcs"/> - <MozParam name="channel" condition="purpose" purpose="keyword" value="fflb"/> - <MozParam name="channel" condition="purpose" purpose="searchbar" value="sb"/> - <MozParam name="channel" condition="purpose" purpose="homepage" value="np"/> - <MozParam name="channel" condition="purpose" purpose="newtab" value="nts"/> - <MozParam name="source" condition="purpose" purpose="homepage" value="hp"/> - </Url> - <Url type="text/html" method="GET" template="https://www.google.com/"; rel="searchform"/> diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -135,14 +135,15 @@ +@@ -139,14 +139,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -1,13 +1,13 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# 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";); ++++++ l10n-33.1.tar.xz -> l10n-34.0.5.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-33.1.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-34.0.5.tar.xz differ: char 26, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -4,9 +4,9 @@ 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 @@ 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 @@ ''' 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 @@ #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 @@ 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/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 @@ NS_DECL_NSISYSTEMPROXYSETTINGS nsUnixSystemProxySettings() - : mSchemeProxySettings(5) + : mSchemeProxySettings(4) @@ -38,16 +40,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; @@ -2625,20 +2627,6 @@ + }; + +#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 @@ '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 @@ #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/. - - include $(topsrcdir)/config/rules.mk - - CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS) - CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS) - -+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre -+ - CFLAGS += $(TK_CFLAGS) - CXXFLAGS += $(TK_CFLAGS) +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' + + LOCAL_INCLUDES += [ + '../shared', + '../xpwidgets', + '/layout/generic', + '/layout/xul', + '/other-licenses/atk-1.0', ++ '/toolkit/xre' + ] + + if CONFIG['MOZ_X11']: + LOCAL_INCLUDES += [ + '../shared/x11', + ] - 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 @@ }; #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 @@ 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); @@ -3533,8 +3526,8 @@ OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; if (GetVersionEx(&info)) { nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), - info.dwMajorVersion, - info.dwMinorVersion); + info.dwMajorVersion, + info.dwMinorVersion); } + desktop = NS_LITERAL_STRING("win"); #pragma warning(pop) @@ -3542,18 +3535,20 @@ SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor(); SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor(); nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), - majorVersion, - minorVersion); + majorVersion, + minorVersion); + desktop = NS_LITERAL_STRING("macosx"); #elif defined(MOZ_WIDGET_GTK) nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"), - gtk_major_version, - gtk_minor_version); + gtk_major_version, + gtk_minor_version); + desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); #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 @@ // 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 @@ 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 @@ + 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 @@ #ifdef MOZ_WIDGET_ANDROID stTablet == eBad || #endif - stABI == eBad) + stABI == eBad) { continue; + } + + #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 (directive->regfunc) { - if (GeckoProcessType_Default != XRE_GetProcessType()) + 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 @@ #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 @@ { #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 @@ - 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 @@ 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 @@ + 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); - } ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -1,11 +1,11 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# 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); ++++++ mozilla-preferences.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -7,9 +7,9 @@ # 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"); ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -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 @@ # 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 @@ # 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 - ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -7,7 +7,7 @@ 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 @@ + 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 @@ 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/. -+ -+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) -+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) +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']) ++ + 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 @@ #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 @@ 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 - - ifdef MOZ_DIRECTSHOW - OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) - endif - --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 +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' + ] + ++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' + ] - ifeq (OpenBSD,$(OS_ARCH)) + if CONFIG['ACCESSIBILITY']: ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.RRNFqT/_old 2014-12-06 13:47:26.000000000 +0100 +++ /var/tmp/diff_new_pack.RRNFqT/_new 2014-12-06 13:47:26.000000000 +0100 @@ -1,2 +1,2 @@ -REV=a4d51da32fe7 +REV=8274648ad79f REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
