--- a/MozillaFirefox/MozillaFirefox.changes Mon Oct 19 11:59:08 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Sat Oct 31 20:58:31 2015 +0100
@@ -1,4 +1,24 @@
-------------------------------------------------------------------
+Sat Oct 31 19:50:03 UTC 2015 - wr@rosenauer.org
+
+- update to Firefox 42.0 (bnc#952810)
+ * Private Browsing with Tracking Protection blocks certain Web
+ elements that could be used to record your behavior across sites
+ * Control Center that contains site security and privacy controls
+ * Login Manager improvements
+ * WebRTC improvements
+ * Indicator added to tabs that play audio with one-click muting
+ * Media Source Extension for HTML5 video available for all sites
+- requires NSPR 4.10.10 and NSS 3.19.4
+- removed obsolete patches
+ * mozilla-arm-disable-edsp.patch
+ * mozilla-icu-strncat.patch
+ * mozilla-skia-be-le.patch
+ * toolkit-download-folder.patch
+- fixed build with enable-libproxy (bmo#1220399)
+ * mozilla-libproxy.patch
+
+-------------------------------------------------------------------
Thu Oct 15 08:25:54 UTC 2015 - wr@rosenauer.org
- update to Firefox 41.0.2 (bnc#950686)
--- a/MozillaFirefox/MozillaFirefox.spec Mon Oct 19 11:59:08 2015 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sat Oct 31 20:58:31 2015 +0100
@@ -19,9 +19,9 @@
# changed with every update
%define major 41
-%define mainver %major.0.2
-%define update_channel release
-%define releasedate 2015101500
+%define mainver %major.99
+%define update_channel beta
+%define releasedate 2015103000
# general build definitions
%if "%{update_channel}" != "aurora"
@@ -76,8 +76,8 @@
BuildRequires: libnotify-devel
BuildRequires: libproxy-devel
BuildRequires: makeinfo
-BuildRequires: mozilla-nspr-devel >= 4.10.8
-BuildRequires: mozilla-nss-devel >= 3.19.2
+BuildRequires: mozilla-nspr-devel >= 4.10.10
+BuildRequires: mozilla-nss-devel >= 3.19.4
BuildRequires: nss-shared-helper-devel
BuildRequires: python-devel
BuildRequires: startup-notification-devel
@@ -137,20 +137,17 @@
Source15: firefox-appdata.xml
Source16: MozillaFirefox.changes
# Gecko/Toolkit
-Patch1: toolkit-download-folder.patch
-Patch2: mozilla-nongnome-proxies.patch
-Patch4: mozilla-shared-nss-db.patch
-Patch5: mozilla-kde.patch
-Patch6: mozilla-preferences.patch
-Patch7: mozilla-language.patch
-Patch8: mozilla-ntlm-full-path.patch
-Patch9: mozilla-repo.patch
-Patch10: mozilla-icu-strncat.patch
-Patch11: mozilla-arm-disable-edsp.patch
-Patch12: mozilla-openaes-decl.patch
-Patch14: mozilla-skia-be-le.patch
-Patch15: mozilla-bmo1005535.patch
-Patch16: mozilla-no-stdcxx-check.patch
+Patch1: mozilla-nongnome-proxies.patch
+Patch2: mozilla-shared-nss-db.patch
+Patch3: mozilla-kde.patch
+Patch4: mozilla-preferences.patch
+Patch5: mozilla-language.patch
+Patch6: mozilla-ntlm-full-path.patch
+Patch7: mozilla-repo.patch
+Patch8: mozilla-openaes-decl.patch
+Patch9: mozilla-bmo1005535.patch
+Patch10: mozilla-no-stdcxx-check.patch
+Patch11: mozilla-libproxy.patch
# Firefox/browser
Patch101: firefox-kde.patch
Patch102: firefox-no-default-ualocale.patch
@@ -252,18 +249,15 @@
cd $RPM_BUILD_DIR/mozilla
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
-%patch9 -p1
+#%patch9 -p1
%patch10 -p1
%patch11 -p1
-%patch12 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
# Firefox
%patch101 -p1
%patch102 -p1
--- a/MozillaFirefox/create-tar.sh Mon Oct 19 11:59:08 2015 +0200
+++ b/MozillaFirefox/create-tar.sh Sat Oct 31 20:58:31 2015 +0100
@@ -1,9 +1,9 @@
#!/bin/bash
-CHANNEL="release"
+CHANNEL="beta"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_41_0_2_RELEASE"
-VERSION="41.0.2"
+RELEASE_TAG="FIREFOX_42_0b9_RELEASE"
+VERSION="41.99"
# mozilla
if [ -d mozilla ]; then
--- a/MozillaFirefox/mozilla-arm-disable-edsp.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-arm-disable-edsp.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-icu-strncat.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-icu-strncat.patch
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/mozilla-libproxy.patch Sat Oct 31 20:58:31 2015 +0100
@@ -0,0 +1,1 @@
+../mozilla-libproxy.patch
\ No newline at end of file
--- a/MozillaFirefox/mozilla-skia-be-le.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-skia-be-le.patch
\ No newline at end of file
--- a/MozillaFirefox/toolkit-download-folder.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../toolkit-download-folder.patch
\ No newline at end of file
--- a/firefox-kde.patch Mon Oct 19 11:59:08 2015 +0200
+++ b/firefox-kde.patch Sat Oct 31 20:58:31 2015 +0100
@@ -1,11 +1,11 @@
# HG changeset patch
-# Parent 8d1e0e3997402b94742eded6477abed4b559f373
+# Parent 95b421ca30846be2b5d7230d72263e6dff042d0b
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644
--- /dev/null
+++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1264 @@
+@@ -0,0 +1,1234 @@
+#filter substitution
+<?xml version="1.0"?>
+# -*- Mode: HTML -*-
@@ -66,6 +66,7 @@
+ screenX="4" screenY="4"
+ fullscreenbutton="true"
+ sizemode="normal"
++ retargetdocumentfocus="urlbar"
+ persist="screenX screenY width height sizemode">
+
+# All JS files which are not content (only) dependent that browser.xul
@@ -153,7 +154,14 @@
+ <panel type="autocomplete" id="PopupSearchAutoComplete" noautofocus="true" hidden="true"/>
+
+ <!-- for url bar autocomplete -->
-+ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true"/>
++ <panel type="autocomplete-richlistbox" id="PopupAutoCompleteRichResult" noautofocus="true" hidden="true">
++#ifdef NIGHTLY_BUILD
++ <hbox id="urlbar-search-footer" flex="1" align="stretch" pack="end">
++ <button id="urlbar-search-settings" label="&changeSearchSettings.button;"
++ oncommand="BrowserUITelemetry.countSearchSettingsEvent('urlbar'); openPreferences('paneSearch')"/>
++ </hbox>
++#endif
++ </panel>
+
+ <!-- for select dropdowns. The menupopup is what shows the list of options,
+ and the popuponly menulist makes things like the menuactive attributes
@@ -197,7 +205,7 @@
+ </row>
+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
+ <hbox id="editBookmarkPanelBottomButtons" pack="end">
-+#ifndef XP_UNIX
++#ifdef XP_UNIX
+ <button id="editBookmarkPanelDoneButton"
+ class="editBookmarkPanelBottomButton"
+ label="&editBookmark.done.label;"
@@ -718,6 +726,7 @@
+ autocompletesearchparam="enable-actions"
+ autocompletepopup="PopupAutoCompleteRichResult"
+ completeselectedindex="true"
++ shrinkdelay="250"
+ tabscrolling="true"
+ showcommentcolumn="true"
+ showimagecolumn="true"
@@ -741,8 +750,6 @@
+ <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
-+ <image id="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"/>
@@ -764,10 +771,13 @@
+ onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
+ onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
+ ondragstart="gIdentityHandler.onDragStart(event);">
-+ <image id="page-proxy-favicon"
-+ consumeanchor="identity-box"
-+ onclick="PageProxyClickHandler(event);"
-+ pageproxystate="invalid"/>
++ <hbox id="identity-icons"
++ consumeanchor="identity-box">
++ <image id="tracking-protection-icon"/>
++ <image id="page-proxy-favicon"
++ onclick="PageProxyClickHandler(event);"
++ pageproxystate="invalid"/>
++ </hbox>
+ <hbox id="identity-icon-labels">
+ <label id="identity-icon-label" class="plain" flex="1"/>
+ <label id="identity-icon-country-label" class="plain"/>
@@ -782,10 +792,6 @@
+ hidden="true"
+ tooltiptext="&pageReportIcon.tooltip;"
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
-+ <image id="readinglist-addremove-button"
-+ class="urlbar-icon"
-+ hidden="true"
-+ onclick="ReadingListUI.buttonClick(event);"/>
+ <image id="reader-mode-button"
+ class="urlbar-icon"
+ hidden="true"
@@ -916,22 +922,6 @@
+ new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
+ </menu>
-+ <menuseparator>
-+ <observes element="readingListSidebar" attribute="hidden"/>
-+ </menuseparator>
-+ <menu id="BMB_readingList"
-+ class="menu-iconic bookmark-item subviewbutton"
-+ label="&readingList.label;"
-+ container="true">
-+ <observes element="readingListSidebar" attribute="hidden"/>
-+ <menupopup id="BMB_readingListPopup"
-+ placespopup="true"
-+ onpopupshowing="ReadingListUI.onReadingListPopupShowing(this);">
-+ <menuitem id="BMB_viewReadingListSidebar" class="subviewbutton"
-+ oncommand="SidebarUI.show('readingListSidebar');"
-+ label="&readingList.showSidebar.label;"/>
-+ </menupopup>
-+ </menu>
+ <menuseparator/>
+ <!-- Bookmarks menu items will go here -->
+ <menuitem id="BMB_bookmarksShowAll"
@@ -978,7 +968,7 @@
+ class="chromeclass-toolbar-additional"
+ removable="false">
+ <toolbarbutton id="PanelUI-menu-button"
-+ class="toolbarbutton-1"
++ class="toolbarbutton-1 badged-button"
+ consumeanchor="PanelUI-button"
+ label="&brandShortName;"
+ tooltiptext="&appmenu.tooltip;"/>
@@ -1196,26 +1186,6 @@
+ <vbox id="full-screen-warning-message" align="center">
+ <description id="full-screen-domain-text"/>
+ <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
-+ <vbox id="full-screen-approval-pane" align="center">
-+ <hbox>
-+#ifdef XP_UNIX
-+ <button label="&fullscreenExitButton.label;"
-+ oncommand="FullScreen.setFullscreenAllowed(false);"
-+ class="full-screen-approval-button"/>
-+ <button label="&fullscreenAllowButton.label;"
-+ oncommand="FullScreen.setFullscreenAllowed(true);"
-+ class="full-screen-approval-button"/>
-+#else
-+ <button label="&fullscreenAllowButton.label;"
-+ oncommand="FullScreen.setFullscreenAllowed(true);"
-+ class="full-screen-approval-button"/>
-+ <button label="&fullscreenExitButton.label;"
-+ oncommand="FullScreen.setFullscreenAllowed(false);"
-+ class="full-screen-approval-button"/>
-+#endif
-+ </hbox>
-+ <checkbox id="full-screen-remember-decision"/>
-+ </vbox>
+ </vbox>
+ </hbox>
+ </hbox>
@@ -1270,47 +1240,6 @@
+</deck>
+
+</window>
-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
-@@ -184,17 +184,17 @@
- class="editBookmarkPanelHeaderButton"
- oncommand="StarUI.removeBookmarkButtonCommand();"
- accesskey="&editBookmark.removeBookmark.accessKey;"/>
- </hbox>
- </vbox>
- </row>
- <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/>
- <hbox id="editBookmarkPanelBottomButtons" pack="end">
--#ifndef XP_UNIX
-+#ifdef XP_UNIX
- <button id="editBookmarkPanelDoneButton"
- class="editBookmarkPanelBottomButton"
- label="&editBookmark.done.label;"
- default="true"
- oncommand="StarUI.panel.hidePopup();"/>
- <button id="editBookmarkPanelDeleteButton"
- class="editBookmarkPanelBottomButton"
- label="&editBookmark.cancel.label;"
-@@ -1185,17 +1185,17 @@
-
- <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
- <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
- <vbox id="full-screen-warning-message" align="center">
- <description id="full-screen-domain-text"/>
- <description class="full-screen-description" value="&fullscreenExitHint2.value;"/>
- <vbox id="full-screen-approval-pane" align="center">
- <hbox>
--#ifdef XP_UNIX
-+#ifndef XP_UNIX
- <button label="&fullscreenExitButton.label;"
- oncommand="FullScreen.setFullscreenAllowed(false);"
- class="full-screen-approval-button"/>
- <button label="&fullscreenAllowButton.label;"
- oncommand="FullScreen.setFullscreenAllowed(true);"
- class="full-screen-approval-button"/>
- #else
- <button label="&fullscreenAllowButton.label;"
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn
+++ b/browser/base/jar.mn
@@ -1351,11 +1280,11 @@
#if defined(XP_WIN)
#include "nsIEHistoryEnumerator.h"
+ #include "nsEdgeReadingListExtractor.h"
#endif
#include "rdf.h"
- #include "nsFeedSniffer.h"
-@@ -31,18 +31,16 @@ using namespace mozilla::browser;
+@@ -32,18 +32,16 @@ using namespace mozilla::browser;
/////////////////////////////////////////////////////////////////////////////
@@ -1370,11 +1299,11 @@
#if defined(XP_WIN)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsIEHistoryEnumerator)
+ NS_GENERIC_FACTORY_CONSTRUCTOR(nsEdgeReadingListExtractor)
#endif
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
-
-@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
+@@ -63,17 +61,17 @@ NS_DEFINE_NAMED_CID(NS_EDGEREADINGLISTEX
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
#endif
@@ -1390,26 +1319,26 @@
{ &kNS_BROWSER_ABOUT_REDIRECTOR_CID, false, nullptr, AboutRedirector::Create },
#if defined(XP_WIN)
{ &kNS_WINIEHISTORYENUMERATOR_CID, false, nullptr, nsIEHistoryEnumeratorConstructor },
+ { &kNS_EDGEREADINGLISTEXTRACTOR_CID, false, nullptr, nsEdgeReadingListExtractorConstructor },
#elif defined(XP_MACOSX)
{ &kNS_SHELLSERVICE_CID, false, nullptr, nsMacShellServiceConstructor },
- #endif
-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.
- */
+diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
+--- a/browser/components/preferences/in-content/main.js
++++ b/browser/components/preferences/in-content/main.js
+@@ -14,16 +14,22 @@ var gMainPane = {
init: function ()
{
- this._pane = document.getElementById("paneMain");
+ function setEventListener(aId, aEventType, aCallback)
+ {
+ document.getElementById(aId)
+ .addEventListener(aEventType, aCallback.bind(gMainPane));
+ }
+ var env = Components.classes["@mozilla.org/process/environment;1"]
-+ .getService(Components.interfaces.nsIEnvironment);
++ .getService(Components.interfaces.nsIEnvironment);
+ var kde_session = 0;
+ if (env.get('KDE_FULL_SESSION') == "true")
-+ kde_session = 1;
++ kde_session = 1;
+
#ifdef HAVE_SHELL_SERVICE
this.updateSetDefaultBrowser();
@@ -1419,7 +1348,7 @@
// when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open.
-@@ -527,16 +533,27 @@ var gMainPane = {
+@@ -709,16 +715,27 @@ var gMainPane = {
*/
setDefaultBrowser: function()
{
@@ -1430,17 +1359,17 @@
shellSvc.setDefaultBrowser(true, false);
+ if (kde_session == 1) {
+ var shellObj = Components.classes["@mozilla.org/file/local;1"]
-+ .createInstance(Components.interfaces.nsILocalFile);
++ .createInstance(Components.interfaces.nsILocalFile);
+ shellObj.initWithPath("/usr/bin/kwriteconfig");
+ var process = Components.classes["@mozilla.org/process/util;1"]
-+ .createInstance(Components.interfaces.nsIProcess);
++ .createInstance(Components.interfaces.nsIProcess);
+ process.init(shellObj);
+ var args = ["--file", "kdeglobals", "--group", "General", "--key",
+ "BrowserApplication", "firefox"];
+ process.run(false, args, args.length);
+ }
} catch (ex) {
- Components.utils.reportError(ex);
+ Cu.reportError(ex);
return;
}
let selectedIndex =
@@ -1887,7 +1816,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
-@@ -703,19 +703,21 @@
+@@ -709,19 +709,21 @@
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/profile/prefs.js
--- a/mozilla-arm-disable-edsp.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-# HG changeset patch
-# User Adrian Schröter <adrian@suse.de>
-# Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759
-# Parent 4ecf304db9dc3ea6259b6f16ed5af1022ff1034c
-disable ESDP support (no BNC or BMO reference yet :-()
-
-diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h
---- a/mozglue/build/arm.h
-+++ b/mozglue/build/arm.h
-@@ -116,17 +116,17 @@ namespace mozilla {
- extern bool MFBT_DATA neon_enabled;
- #endif
- #endif
- }
-
- #if defined(MOZILLA_PRESUME_EDSP)
- # define MOZILLA_MAY_SUPPORT_EDSP 1
- inline bool supports_edsp() { return true; }
--#elif defined(MOZILLA_MAY_SUPPORT_EDSP) \
-+#elif 0 \
- && defined(MOZILLA_ARM_HAVE_CPUID_DETECTION)
- inline bool supports_edsp() { return arm_private::edsp_enabled; }
- #else
- inline bool supports_edsp() { return false; }
- #endif
-
- #if defined(MOZILLA_PRESUME_ARMV6)
- # define MOZILLA_MAY_SUPPORT_ARMV6 1
--- a/mozilla-icu-strncat.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-# HG changeset patch
-# Parent 29be2a4daa0f512d22bde85b97b5460839026571
-# User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent a7d16f0faf5d4881dbea524340f881d5850710e4
-From: Jan Engelhardt <jengelh@inai.de>
-Reference: http://bugs.icu-project.org/trac/ticket/7808
-
-diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
---- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
-+++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
-@@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE
- FILE *p = NULL;
- size_t n;
- static char buf[512] = "";
- char cmdBuf[1024];
- UErrorCode status = U_ZERO_ERROR;
- const char cmd[] = "icu-config --incpkgdatafile";
-
- /* #1 try the same path where pkgdata was called from. */
-- findDirname(progname, cmdBuf, 1024, &status);
-+ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
- if(U_SUCCESS(status)) {
- if (cmdBuf[0] != 0) {
-- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
-+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
- }
-- uprv_strncat(cmdBuf, cmd, 1024);
-+ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
-
- if(verbose) {
- fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
- }
- p = popen(cmdBuf, "r");
- }
-
- if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) {
--- a/mozilla-kde.patch Mon Oct 19 11:59:08 2015 +0200
+++ b/mozilla-kde.patch Sat Oct 31 20:58:31 2015 +0100
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 3f3d1e5db92a45cf3758ee5ba77c577fcfb364c9
+# Parent 21f164ba2522a31ab9cfb4766acff17526183f8e
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@@ -28,7 +28,7 @@
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 @@
+@@ -30,16 +30,17 @@
#include "nsIZipReader.h"
#include "nsPrefBranch.h"
#include "nsXPIDLString.h"
@@ -46,7 +46,7 @@
#include "prefread.h"
#include "prefapi_private_data.h"
-@@ -1153,16 +1154,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
+@@ -1148,16 +1149,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId)
{
@@ -81,7 +81,7 @@
return NS_OK;
bool hasMore;
-@@ -1178,17 +1197,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1173,17 +1192,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -100,7 +100,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
-@@ -1282,26 +1301,38 @@ static nsresult pref_InitInitialObjects(
+@@ -1277,26 +1296,38 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = {
#if defined(XP_MACOSX)
@@ -205,7 +205,7 @@
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp
-@@ -46,16 +46,20 @@
+@@ -51,16 +51,20 @@
#ifdef XP_WIN
#include <shlobj.h>
#include "nsWindowsHelpers.h"
@@ -226,7 +226,7 @@
#include "AndroidBridge.h"
#endif
-@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat
+@@ -2714,16 +2718,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function.
@@ -252,7 +252,7 @@
int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec;
-@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat
+@@ -2754,16 +2767,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"),
@@ -2183,9 +2183,9 @@
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
-@@ -14,16 +14,17 @@
- #include "prenv.h"
+@@ -15,16 +15,17 @@
#include "nsPrintfCString.h"
+ #include "nsNetCID.h"
#include "nsNetUtil.h"
#include "nsISupportsPrimitives.h"
#include "nsIGSettingsService.h"
@@ -2201,7 +2201,7 @@
nsUnixSystemProxySettings()
: mSchemeProxySettings(4)
-@@ -38,16 +39,17 @@ private:
+@@ -39,16 +40,17 @@ private:
nsCOMPtr<nsIGSettingsService> mGSettings;
nsCOMPtr<nsIGSettingsCollection> mProxySettings;
nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings;
@@ -2219,7 +2219,7 @@
nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly)
{
// dbus prevents us from being threadsafe, but this routine should not block anyhow
-@@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG
+@@ -505,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG
nsresult
nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec,
@@ -2239,7 +2239,7 @@
if (mGConf)
return GetProxyFromGConf(aScheme, aHost, aPort, aResult);
-@@ -539,8 +544,34 @@ static const mozilla::Module::ContractID
+@@ -540,8 +545,34 @@ static const mozilla::Module::ContractID
static const mozilla::Module kUnixProxyModule = {
mozilla::Module::kVersion,
@@ -2277,7 +2277,7 @@
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
--- a/toolkit/xre/moz.build
+++ b/toolkit/xre/moz.build
-@@ -43,17 +43,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
+@@ -48,17 +48,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'ui
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
EXPORTS += ['nsQAppInstance.h']
SOURCES += [
@@ -3606,7 +3606,7 @@
+ desktop = NS_LITERAL_STRING("android");
#endif
- if (XRE_GetProcessType() == GeckoProcessType_Content) {
+ if (XRE_IsContentProcess()) {
process = kContent;
} else {
process = kMain;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mozilla-libproxy.patch Sat Oct 31 20:58:31 2015 +0100
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Wolfgang Rosenauer <wr@rosenauer.org>
+# Parent 95b421ca30846be2b5d7230d72263e6dff042d0b
+Bug 1220399 - building with libproxy support fails
+
+diff --git a/toolkit/system/unixproxy/nsLibProxySettings.cpp b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+--- a/toolkit/system/unixproxy/nsLibProxySettings.cpp
++++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
+@@ -2,16 +2,17 @@
+ /* 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 "nsISystemProxySettings.h"
+ #include "mozilla/ModuleUtils.h"
+ #include "nsIServiceManager.h"
+ #include "nsIURI.h"
++#include "nsNetCID.h"
+ #include "nsString.h"
+ #include "nsCOMPtr.h"
+ #include "nspr.h"
+
+ extern "C" {
+ #include <proxy.h>
+ }
+
--- a/mozilla-shared-nss-db.patch Mon Oct 19 11:59:08 2015 +0200
+++ b/mozilla-shared-nss-db.patch Sat Oct 31 20:58:31 2015 +0100
@@ -7,13 +7,13 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8296,16 +8296,31 @@ if test "$MOZ_ENABLE_SKIA"; then
- MOZ_ENABLE_SKIA_GPU=1
+@@ -8309,16 +8309,31 @@ if test "$MOZ_ENABLE_SKIA"; then
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
fi
fi
AC_SUBST(MOZ_ENABLE_SKIA)
+ AC_SUBST_LIST(SKIA_INCLUDES)
dnl ========================================================
+dnl Check for nss-shared-helper
@@ -122,7 +122,7 @@
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
-@@ -203,16 +203,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
+@@ -205,16 +205,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG['
'stagefright_omx',
]
--- a/mozilla-skia-be-le.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-# HG changeset patch
-# Parent 2cf5e1715c64a30c340872b58816c3a329bd12dc
-Part 2 of
-Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error: skia/SkCanvas.h: No such file or directory when skia is disabled
-
-diff --git a/gfx/skia/trunk/include/core/SkPreConfig.h b/gfx/skia/trunk/include/core/SkPreConfig.h
---- a/gfx/skia/trunk/include/core/SkPreConfig.h
-+++ b/gfx/skia/trunk/include/core/SkPreConfig.h
-@@ -87,16 +87,24 @@
-
- #if !defined(SK_WARN_UNUSED_RESULT)
- #define SK_WARN_UNUSED_RESULT __attribute__((warn_unused_result))
- #endif
-
- //////////////////////////////////////////////////////////////////////
-
- #if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
-+ #if defined(__BIG_ENDIAN__)
-+ #define SK_CPU_BENDIAN
-+ #elif defined(__LITTLE_ENDIAN__)
-+ #define SK_CPU_LENDIAN
-+ #endif
-+#endif
-+
-+#if !defined(SK_CPU_BENDIAN) && !defined(SK_CPU_LENDIAN)
- #if defined(__sparc) || defined(__sparc__) || \
- defined(_POWER) || defined(__powerpc__) || \
- defined(__ppc__) || defined(__hppa) || \
- defined(__PPC__) || defined(__PPC64__) || \
- defined(_MIPSEB) || defined(__ARMEB__) || \
- defined(__s390__) || \
- (defined(__sh__) && defined(__BIG_ENDIAN__)) || \
- (defined(__ia64) && defined(__BIG_ENDIAN__))
-diff --git a/js/src/jsdtoa.cpp b/js/src/jsdtoa.cpp
---- a/js/src/jsdtoa.cpp
-+++ b/js/src/jsdtoa.cpp
-@@ -47,16 +47,17 @@ using namespace js;
- static inline void* dtoa_malloc(size_t size) { return js_malloc(size); }
- static inline void dtoa_free(void* p) { return js_free(p); }
-
- #define NO_GLOBAL_STATE
- #define NO_ERRNO
- #define MALLOC dtoa_malloc
- #define FREE dtoa_free
- #include "dtoa.c"
-+#undef CONST
-
- /* Mapping of JSDToStrMode -> js_dtoa mode */
- static const uint8_t dtoaModes[] = {
- 0, /* DTOSTR_STANDARD */
- 0, /* DTOSTR_STANDARD_EXPONENTIAL, */
- 3, /* DTOSTR_FIXED, */
- 2, /* DTOSTR_EXPONENTIAL, */
- 2}; /* DTOSTR_PRECISION */
--- a/series Mon Oct 19 11:59:08 2015 +0200
+++ b/series Sat Oct 31 20:58:31 2015 +0100
@@ -1,5 +1,4 @@
# xulrunner/gecko patches
-toolkit-download-folder.patch
mozilla-pkgconfig.patch
mozilla-nongnome-proxies.patch
mozilla-shared-nss-db.patch
@@ -8,13 +7,11 @@
mozilla-language.patch
mozilla-ntlm-full-path.patch
mozilla-repo.patch
-mozilla-icu-strncat.patch
-mozilla-arm-disable-edsp.patch
mozilla-idldir.patch
mozilla-openaes-decl.patch
-mozilla-skia-be-le.patch
-mozilla-bmo1005535.patch
+#mozilla-bmo1005535.patch
mozilla-no-stdcxx-check.patch
+mozilla-libproxy.patch
# Firefox patches
firefox-kde.patch
--- a/toolkit-download-folder.patch Mon Oct 19 11:59:08 2015 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-From: Wolfgang Rosenauer
-Subject: Don't use localized Downloads unless XDG is set up
-References:
-https://bugzilla.novell.com/show_bug.cgi?id=501724
-
-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
-@@ -383,17 +383,17 @@ var gMainPane = {
- // and was available as an option in the 1.5 drop down. On XP this
- // was in My Documents, on OSX it was in User Docs. In 2.0, we did
- // away with the drop down option, although the special label was
- // still supported for the folder if it existed. Because it was
- // not exposed it was rarely used.
- // With 3.0, a new desktop folder - 'Downloads' was introduced for
- // platforms and versions that don't support a default system downloads
- // folder. See nsDownloadManager for details.
-- downloadFolder.label = bundlePreferences.getString("downloadsFolderName");
-+ downloadFolder.label = "Downloads";
- iconUrlSpec = fph.getURLSpecFromFile(yield this._indexToFolder(1));
- } else {
- // 'Desktop'
- downloadFolder.label = bundlePreferences.getString("desktopFolderName");
- iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop"));
- }
- downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";
- }),
-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
-@@ -1356,18 +1356,20 @@ nsDownloadManager::GetDefaultDownloadsDi
- // Vista:
- // Downloads
- // XP/2K:
- // My Documents/Downloads
- // Linux:
- // XDG user dir spec, with a fallback to Home/Downloads
-
- nsXPIDLString folderName;
-- mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"),
-- getter_Copies(folderName));
-+ // We don't want localized "Downloads" unless XDG is used
-+ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),
-+ // getter_Copies(folderName));
-+ folderName.AssignLiteral("Downloads");
-
- #if defined (XP_MACOSX)
- rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR,
- NS_GET_IID(nsIFile),
- getter_AddRefs(downloadDir));
- NS_ENSURE_SUCCESS(rv, rv);
- #elif defined(XP_WIN)
- rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR,