mirror of
https://abf.rosa.ru/djam/firefox.git
synced 2025-02-23 18:12:56 +00:00
Updated to 62.0.3
This commit is contained in:
Алзим
parent
afecdc7a82
commit
026a750775
10 changed files with 174 additions and 143 deletions
2
.abf.yml
2
.abf.yml
|
|
@ -1,3 +1,3 @@
|
|||
sources:
|
||||
firefox-61.0.2.source.tar.xz: 6e445d9d7da982452bf212948aff701d47f6f0c0
|
||||
firefox-62.0.3.source.tar.xz: 063b22b863cec227608d0195979cc5bbaa6d3f3c
|
||||
firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
|
||||
|
|
|
|||
12
build-disable-elfhack.patch
Normal file
12
build-disable-elfhack.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -up firefox-62.0.2/toolkit/moz.configure.elfhack firefox-62.0.2/toolkit/moz.configure
|
||||
--- firefox-62.0.2/toolkit/moz.configure.elfhack 2018-09-27 14:32:56.549507561 +0200
|
||||
+++ firefox-62.0.2/toolkit/moz.configure 2018-09-27 14:33:08.219532121 +0200
|
||||
@@ -1195,7 +1195,7 @@ with only_when(has_elfhack):
|
||||
option('--disable-elf-hack', help='Disable elf hacks')
|
||||
|
||||
set_config('USE_ELF_HACK',
|
||||
- depends_if('--enable-elf-hack')(lambda _: True))
|
||||
+ depends_if('--enable-elf-hack')(lambda _: False))
|
||||
|
||||
|
||||
@depends(check_build_environment)
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
--- firefox-50.1.0.old/config/config.mk 2016-11-01 04:15:27.000000000 +0800
|
||||
+++ firefox-50.1.0.new/config/config.mk 2017-01-01 20:40:17.313820042 +0800
|
||||
@@ -556,7 +556,7 @@
|
||||
|
||||
ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION))
|
||||
CHECK_STDCXX = $(call CHECK_SYMBOLS,$(1),GLIBCXX,libstdc++,v[1] > 3 || (v[1] == 3 && v[2] == 4 && v[3] > 16))
|
||||
-CHECK_GLIBC = $(call CHECK_SYMBOLS,$(1),GLIBC,libc,v[1] > 2 || (v[1] == 2 && v[2] > 12))
|
||||
+CHECK_GLIBC = $(call CHECK_SYMBOLS,$(1),GLIBC,libc,v[1] > 2 || (v[1] == 2 && v[2] > 19))
|
||||
endif
|
||||
|
||||
ifeq (,$(filter $(OS_TARGET),WINNT Darwin))
|
||||
12
firefox-62.0.2-include-cmath.patch
Normal file
12
firefox-62.0.2-include-cmath.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur firefox-62.0.2-orig/gfx/angle/checkout/src/compiler/translator/SymbolTable_autogen.cpp firefox-62.0.2/gfx/angle/checkout/src/compiler/translator/SymbolTable_autogen.cpp
|
||||
--- firefox-62.0.2-orig/gfx/angle/checkout/src/compiler/translator/SymbolTable_autogen.cpp 2018-09-20 19:41:23.000000000 +0300
|
||||
+++ firefox-62.0.2/gfx/angle/checkout/src/compiler/translator/SymbolTable_autogen.cpp 2018-10-03 14:30:16.693344732 +0300
|
||||
@@ -9,6 +9,8 @@
|
||||
// SymbolTable_autogen.cpp:
|
||||
// Compile-time initialized built-ins.
|
||||
|
||||
+#include <cmath>
|
||||
+
|
||||
#include "compiler/translator/SymbolTable.h"
|
||||
|
||||
#include "angle_gl.h"
|
||||
|
|
@ -1,11 +1,11 @@
|
|||
# HG changeset patch
|
||||
# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc
|
||||
# Parent 0629fb9c6879e14c1b5e3cbff53b0d44371f0127
|
||||
|
||||
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,1293 @@
|
||||
@@ -0,0 +1,1291 @@
|
||||
+#filter substitution
|
||||
+<?xml version="1.0"?>
|
||||
+# -*- Mode: HTML -*-
|
||||
|
|
@ -21,6 +21,7 @@ new file mode 100644
|
|||
+<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/searchbar.css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/places/places.css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
|
||||
+<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
|
||||
|
|
@ -107,6 +108,8 @@ new file mode 100644
|
|||
+ <menuitem id="context_reloadTab" label="&reloadTab.label;" accesskey="&reloadTab.accesskey;"
|
||||
+ oncommand="gBrowser.reloadTab(TabContextMenu.contextTab);"/>
|
||||
+ <menuitem id="context_toggleMuteTab" oncommand="TabContextMenu.contextTab.toggleMuteAudio();"/>
|
||||
+ <menuitem id="context_toggleMuteSelectedTabs" hidden="true"
|
||||
+ oncommand="gBrowser.toggleMuteAudioOnMultiSelectedTabs(TabContextMenu.contextTab);"/>
|
||||
+ <menuseparator/>
|
||||
+ <menuitem id="context_pinTab" label="&pinTab.label;"
|
||||
+ accesskey="&pinTab.accesskey;"
|
||||
|
|
@ -117,6 +120,13 @@ new file mode 100644
|
|||
+ <menuitem id="context_duplicateTab" label="&duplicateTab.label;"
|
||||
+ accesskey="&duplicateTab.accesskey;"
|
||||
+ oncommand="duplicateTabIn(TabContextMenu.contextTab, 'tab');"/>
|
||||
+ <menu id="context_reopenInContainer"
|
||||
+ label="&reopenInContainer.label;"
|
||||
+ accesskey="&reopenInContainer.accesskey;"
|
||||
+ hidden="true">
|
||||
+ <menupopup oncommand="reopenInContainer(event);"
|
||||
+ onpopupshowing="return createReopenInContainerMenu(event);" />
|
||||
+ </menu>
|
||||
+ <menuitem id="context_openTabInWindow" label="&moveToNewWindow.label;"
|
||||
+ accesskey="&moveToNewWindow.accesskey;"
|
||||
+ tbattr="tabbrowser-multiple"
|
||||
|
|
@ -147,6 +157,9 @@ new file mode 100644
|
|||
+ observes="History:UndoCloseTab"/>
|
||||
+ <menuitem id="context_closeTab" label="&closeTab.label;" accesskey="&closeTab.accesskey;"
|
||||
+ oncommand="gBrowser.removeTab(TabContextMenu.contextTab, { animate: true });"/>
|
||||
+ <menuitem id="context_closeSelectedTabs" label="&closeSelectedTabs.label;"
|
||||
+ hidden="true" accesskey="&closeSelectedTabs.accesskey;"
|
||||
+ oncommand="gBrowser.removeMultiSelectedTabs();"/>
|
||||
+ </menupopup>
|
||||
+
|
||||
+ <!-- bug 415444/582485: event.stopPropagation is here for the cloned version
|
||||
|
|
@ -226,17 +239,16 @@ new file mode 100644
|
|||
+ tabspecific="true"
|
||||
+ onpopupshown="StarUI.panelShown(event);"
|
||||
+ aria-labelledby="editBookmarkPanelTitle">
|
||||
+ <row id="editBookmarkPanelHeader" align="center" hidden="true">
|
||||
+ <vbox align="center">
|
||||
+ <image id="editBookmarkPanelStarIcon"/>
|
||||
+ </vbox>
|
||||
+ <vbox>
|
||||
+ <label id="editBookmarkPanelTitle"/>
|
||||
+ <description id="editBookmarkPanelDescription"/>
|
||||
+ </vbox>
|
||||
+ </row>
|
||||
+ <box class="panel-header">
|
||||
+ <label id="editBookmarkPanelTitle"/>
|
||||
+ </box>
|
||||
+ <html:div id="editBookmarkPanelFaviconContainer">
|
||||
+ <html:img id="editBookmarkPanelFavicon"/>
|
||||
+ </html:div>
|
||||
+ <box id="editBookmarkPanelImage"/>
|
||||
+#include ../../components/places/content/editBookmarkPanel.inc.xul
|
||||
+ <hbox id="editBookmarkPanelBottomButtons" pack="end">
|
||||
+ <hbox id="editBookmarkPanelBottomButtons"
|
||||
+ style="min-width: 30em;">
|
||||
+#ifdef XP_UNIX
|
||||
+ <button id="editBookmarkPanelDoneButton"
|
||||
+ class="editBookmarkPanelBottomButton"
|
||||
|
|
@ -245,13 +257,11 @@ new file mode 100644
|
|||
+ oncommand="StarUI.panel.hidePopup();"/>
|
||||
+ <button id="editBookmarkPanelRemoveButton"
|
||||
+ class="editBookmarkPanelBottomButton"
|
||||
+ oncommand="StarUI.removeBookmarkButtonCommand();"
|
||||
+ accesskey="&editBookmark.removeBookmark.accessKey;"/>
|
||||
+ oncommand="StarUI.removeBookmarkButtonCommand();"/>
|
||||
+#else
|
||||
+ <button id="editBookmarkPanelRemoveButton"
|
||||
+ class="editBookmarkPanelBottomButton"
|
||||
+ oncommand="StarUI.removeBookmarkButtonCommand();"
|
||||
+ accesskey="&editBookmark.removeBookmark.accessKey;"/>
|
||||
+ oncommand="StarUI.removeBookmarkButtonCommand();"/>
|
||||
+ <button id="editBookmarkPanelDoneButton"
|
||||
+ class="editBookmarkPanelBottomButton"
|
||||
+ label="&editBookmark.done.label;"
|
||||
|
|
@ -340,12 +350,24 @@ new file mode 100644
|
|||
+ </panel>
|
||||
+
|
||||
+ <menupopup id="toolbar-context-menu"
|
||||
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));">
|
||||
+ onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator')); UpdateDownloadsAutoHide(this); UpdateManageExtension(this)">
|
||||
+ <menuitem oncommand="openAboutAddonsForContextAction(this.parentElement)"
|
||||
+ accesskey="&customizeMenu.manageExtension.accesskey;"
|
||||
+ label="&customizeMenu.manageExtension.label;"
|
||||
+ contexttype="toolbaritem"
|
||||
+ class="customize-context-manageExtension"/>
|
||||
+ <menuseparator/>
|
||||
+ <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)"
|
||||
+ accesskey="&customizeMenu.pinToOverflowMenu.accesskey;"
|
||||
+ label="&customizeMenu.pinToOverflowMenu.label;"
|
||||
+ contexttype="toolbaritem"
|
||||
+ class="customize-context-moveToPanel"/>
|
||||
+ <menuitem oncommand="onDownloadsAutoHideChange(event)"
|
||||
+ type="checkbox"
|
||||
+ accesskey="&customizeMenu.autoHideDownloadsButton.accesskey;"
|
||||
+ label="&customizeMenu.autoHideDownloadsButton.label;"
|
||||
+ contexttype="toolbaritem"
|
||||
+ class="customize-context-autoHide"/>
|
||||
+ <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)"
|
||||
+ accesskey="&customizeMenu.removeFromToolbar.accesskey;"
|
||||
+ label="&customizeMenu.removeFromToolbar.label;"
|
||||
|
|
@ -422,17 +444,8 @@ new file mode 100644
|
|||
+#include ../../components/places/content/placesContextMenu.inc.xul
|
||||
+
|
||||
+ <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top">
|
||||
+ <hbox>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ <button class="ctrlTab-preview" flex="1"/>
|
||||
+ </hbox>
|
||||
+ <hbox pack="center">
|
||||
+ <button id="ctrlTab-showAll" class="ctrlTab-preview" noicon="true"/>
|
||||
+ </hbox>
|
||||
+ <hbox id="ctrlTab-previews"/>
|
||||
+ <hbox id="ctrlTab-showAll-container" pack="center"/>
|
||||
+ </panel>
|
||||
+
|
||||
+ <panel id="pageActionPanel"
|
||||
|
|
@ -460,21 +473,19 @@ new file mode 100644
|
|||
+ </panelview>
|
||||
+ </panelmultiview>
|
||||
+ </panel>
|
||||
+ <panel id="pageActionFeedback"
|
||||
+
|
||||
+ <panel id="confirmation-hint"
|
||||
+ role="alert"
|
||||
+ type="arrow"
|
||||
+ hidden="true"
|
||||
+ flip="slide"
|
||||
+ position="bottomcenter topright"
|
||||
+ tabspecific="true"
|
||||
+ noautofocus="true"
|
||||
+ copyURLFeedback="©URLFeedback.label;"
|
||||
+ sendToDeviceFeedback="&sendToDeviceFeedback.label;"
|
||||
+ sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
|
||||
+ <hbox id="pageActionFeedbackAnimatableBox">
|
||||
+ <image id="pageActionFeedbackAnimatableImage"/>
|
||||
+ noautofocus="true">
|
||||
+ <hbox id="confirmation-hint-checkmark-animation-container">
|
||||
+ <image id="confirmation-hint-checkmark-image"/>
|
||||
+ </hbox>
|
||||
+ <label id="pageActionFeedbackMessage"/>
|
||||
+ <label id="confirmation-hint-message"/>
|
||||
+ </panel>
|
||||
+
|
||||
+ <menupopup id="pageActionContextMenu"
|
||||
|
|
@ -524,6 +535,7 @@ new file mode 100644
|
|||
+#include ../../components/customizableui/content/panelUI.inc.xul
|
||||
+#include ../../components/controlcenter/content/panel.inc.xul
|
||||
+#include ../../components/downloads/content/downloadsPanel.inc.xul
|
||||
+#include browser-allTabsMenu.inc.xul
|
||||
+
|
||||
+ <hbox id="downloads-animation-container" mousethrough="always">
|
||||
+ <vbox id="downloads-notification-anchor" hidden="true">
|
||||
|
|
@ -675,29 +687,10 @@ new file mode 100644
|
|||
+
|
||||
+ <toolbarbutton id="alltabs-button"
|
||||
+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button"
|
||||
+ type="menu"
|
||||
+ oncommand="gTabsPanel.showAllTabsPanel();"
|
||||
+ label="&listAllTabs.label;"
|
||||
+ tooltiptext="&listAllTabs.label;"
|
||||
+ removable="false">
|
||||
+ <menupopup id="alltabs-popup"
|
||||
+ position="after_end">
|
||||
+ <menuitem id="alltabs_undoCloseTab"
|
||||
+ key="key_undoCloseTab"
|
||||
+ label="&undoCloseTab.label;"
|
||||
+ observes="History:UndoCloseTab"/>
|
||||
+ <menuseparator id="alltabs-popup-separator-1"/>
|
||||
+ <menu id="alltabs_containersTab"
|
||||
+ label="&newUserContext.label;">
|
||||
+ <menupopup id="alltabs_containersMenuTab" />
|
||||
+ </menu>
|
||||
+ <menuseparator id="alltabs-popup-separator-2"/>
|
||||
+ <menu id="alltabs_hiddenTabs"
|
||||
+ label="&hiddenTabs.label;">
|
||||
+ <menupopup id="alltabs_hiddenTabsMenu"/>
|
||||
+ </menu>
|
||||
+ <menuseparator id="alltabs-popup-separator-3"/>
|
||||
+ </menupopup>
|
||||
+ </toolbarbutton>
|
||||
+ removable="false"/>
|
||||
+
|
||||
+ <hbox class="titlebar-placeholder" type="post-tabs"
|
||||
+ ordinal="1000"
|
||||
|
|
@ -778,7 +771,7 @@ new file mode 100644
|
|||
+ key="goHome"
|
||||
+ onclick="BrowserGoHome(event);"
|
||||
+ cui-areatype="toolbar"
|
||||
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
|
||||
+ aboutHomeOverrideTooltip="&homeButton.defaultPage.tooltip;"/>
|
||||
+ <toolbarspring cui-areatype="toolbar" class="chromeclass-toolbar-additional"/>
|
||||
+ <toolbaritem id="urlbar-container" flex="400" persist="width"
|
||||
+ removable="false"
|
||||
|
|
@ -826,6 +819,8 @@ new file mode 100644
|
|||
+ tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
|
||||
+ tooltiptext="&urlbar.popupBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="autoplay-media" class="blocked-permission-icon autoplay-media-icon" role="button"
|
||||
+ tooltiptext="&urlbar.autoplayMediaBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
|
||||
+ tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="plugin:flash" class="blocked-permission-icon plugin-icon" role="button"
|
||||
|
|
@ -842,6 +837,8 @@ new file mode 100644
|
|||
+ tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
|
||||
+ <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
|
||||
+ tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
|
||||
+ <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
|
||||
+ tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/>
|
||||
+ <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
|
||||
+ tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
|
||||
+ <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
|
||||
|
|
@ -1137,7 +1134,7 @@ new file mode 100644
|
|||
+ placespopup="true"
|
||||
+ context="placesContext"
|
||||
+ onpopupshowing="if (!this.parentNode._placesView)
|
||||
+ new PlacesMenu(event, 'place:folder=TOOLBAR',
|
||||
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.toolbarGuid}`,
|
||||
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);">
|
||||
+ <menuitem id="BMB_viewBookmarksToolbar"
|
||||
+ class="menuitem-iconic subviewbutton"
|
||||
|
|
@ -1156,7 +1153,7 @@ new file mode 100644
|
|||
+ placespopup="true"
|
||||
+ context="placesContext"
|
||||
+ onpopupshowing="if (!this.parentNode._placesView)
|
||||
+ new PlacesMenu(event, 'place:folder=UNFILED_BOOKMARKS',
|
||||
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.unfiledGuid}`,
|
||||
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
|
||||
+ </menu>
|
||||
+ <menu id="BMB_mobileBookmarks"
|
||||
|
|
@ -1168,7 +1165,7 @@ new file mode 100644
|
|||
+ placespopup="true"
|
||||
+ context="placesContext"
|
||||
+ onpopupshowing="if (!this.parentNode._placesView)
|
||||
+ new PlacesMenu(event, 'place:folder=MOBILE_BOOKMARKS',
|
||||
+ new PlacesMenu(event, `place:parent=${PlacesUtils.bookmarks.mobileGuid}`,
|
||||
+ PlacesUIUtils.getViewForNode(this.parentNode.parentNode).options);"/>
|
||||
+ </menu>
|
||||
+
|
||||
|
|
@ -1224,9 +1221,10 @@ new file mode 100644
|
|||
+ <vbox id="appcontent" flex="1">
|
||||
+ <notificationbox id="high-priority-global-notificationbox" notificationside="top"/>
|
||||
+ <tabbox id="tabbrowser-tabbox"
|
||||
+ flex="1" eventnode="document" tabcontainer="tabbrowser-tabs"
|
||||
+ onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();">
|
||||
+ <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels">
|
||||
+ flex="1" eventnode="document" tabcontainer="tabbrowser-tabs">
|
||||
+ <tabpanels id="tabbrowser-tabpanels"
|
||||
+ flex="1" class="plain" selectedIndex="0"
|
||||
+ onselect="if (event.target == this) gBrowser.updateCurrentBrowser();">
|
||||
+ <notificationbox flex="1" notificationside="top">
|
||||
+ <!-- Set large flex to allow the devtools toolbox to set a flex attribute.
|
||||
+ We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't.
|
||||
|
|
@ -1302,7 +1300,7 @@ new file mode 100644
|
|||
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
||||
--- a/browser/base/jar.mn
|
||||
+++ b/browser/base/jar.mn
|
||||
@@ -44,16 +44,18 @@ browser.jar:
|
||||
@@ -24,16 +24,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/aboutTabCrashed.css (content/aboutTabCrashed.css)
|
||||
|
|
@ -1314,13 +1312,13 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
|||
+* content/browser/browser-kde.xul (content/browser-kde.xul)
|
||||
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
|
||||
content/browser/browser-addons.js (content/browser-addons.js)
|
||||
content/browser/browser-allTabsMenu.js (content/browser-allTabsMenu.js)
|
||||
content/browser/browser-captivePortal.js (content/browser-captivePortal.js)
|
||||
content/browser/browser-ctrlTab.js (content/browser-ctrlTab.js)
|
||||
content/browser/browser-customization.js (content/browser-customization.js)
|
||||
content/browser/browser-data-submission-info-bar.js (content/browser-data-submission-info-bar.js)
|
||||
content/browser/browser-compacttheme.js (content/browser-compacttheme.js)
|
||||
#ifndef MOZILLA_OFFICIAL
|
||||
content/browser/browser-development-helpers.js (content/browser-development-helpers.js)
|
||||
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
|
||||
|
|
@ -1341,9 +1339,9 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||
#include "nsIEHistoryEnumerator.h"
|
||||
#endif
|
||||
|
||||
#include "rdf.h"
|
||||
#include "nsFeedSniffer.h"
|
||||
@@ -31,18 +31,16 @@ using namespace mozilla::browser;
|
||||
#include "AboutRedirector.h"
|
||||
@@ -30,18 +30,16 @@ using namespace mozilla::browser;
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
|
|
@ -1362,7 +1360,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||
|
||||
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer)
|
||||
|
||||
@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
|
||||
@@ -59,17 +57,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME
|
||||
NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID);
|
||||
#endif
|
||||
|
||||
|
|
@ -1384,7 +1382,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
|||
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
|
||||
@@ -327,16 +327,23 @@ var gMainPane = {
|
||||
@@ -321,16 +321,23 @@ var gMainPane = {
|
||||
this._backoffIndex++ : backoffTimes.length - 1]);
|
||||
};
|
||||
|
||||
|
|
@ -1408,7 +1406,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
|
|||
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
|
||||
|
||||
this.updateDefaultPerformanceSettingsPref();
|
||||
@@ -868,16 +875,27 @@ var gMainPane = {
|
||||
@@ -861,16 +868,27 @@ var gMainPane = {
|
||||
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
|
||||
this._backoffIndex = 0;
|
||||
|
||||
|
|
@ -1752,9 +1750,9 @@ 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
|
||||
@@ -452,16 +452,18 @@
|
||||
@RESPATH@/browser/defaults/blocklists
|
||||
@RESPATH@/browser/defaults/pinning
|
||||
@@ -455,16 +455,18 @@
|
||||
@RESPATH@/browser/defaults/settings/pinning
|
||||
@RESPATH@/browser/defaults/settings/main
|
||||
|
||||
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
|
||||
; Technically this is an app pref file, but we are keeping it in the original
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ defaultPref("browser.startup.homepage", "data:text/html,browser.startup.homepage
|
|||
pref("startup.homepage_welcome_url", "file:///usr/share/branding-configs/fresh/first_startup.html");
|
||||
pref("browser.shell.checkDefaultBrowser", false);
|
||||
pref("browser.ctrlTab.previews", true);
|
||||
pref("browser.tabs.insertRelatedAfterCurrent", false);
|
||||
pref("browser.backspace_action", 2);
|
||||
pref("browser.display.use_system_colors", true);
|
||||
pref("browser.download.folderList", 1);
|
||||
|
|
|
|||
93
firefox.spec
93
firefox.spec
|
|
@ -1,3 +1,6 @@
|
|||
#No build in 62.0.2
|
||||
%define debug_package %{nil}
|
||||
|
||||
#
|
||||
# WARNING, READ FIRST:
|
||||
#
|
||||
|
|
@ -7,10 +10,8 @@
|
|||
# This also means only STABLE upstream releases, NO betas.
|
||||
# This is a discussed topic. Please, do not flame it again.
|
||||
|
||||
%define major 61.0.2
|
||||
%define major 62.0.3
|
||||
%define ff_epoch 0
|
||||
%define relurl 0
|
||||
%define rel_url 6b51784853e47e091d213d421a19cb623af718f0
|
||||
# (tpg) set version HERE !!!
|
||||
%define realver %{major}
|
||||
%define firefox_appid \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
|
||||
|
|
@ -34,21 +35,19 @@ Summary: Next generation web browser
|
|||
Name: firefox
|
||||
Version: %{major}
|
||||
Epoch: %{ff_epoch}
|
||||
Release: 3
|
||||
Release: 1
|
||||
License: MPLv1+
|
||||
Group: Networking/WWW
|
||||
Url: http://www.mozilla.com/firefox/
|
||||
%if %{relurl}
|
||||
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/%{rel_url}.tar.bz2?/mozilla-release-%{rel_url}.tar.bz2
|
||||
%else
|
||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{name}-%{realver}.source.tar.xz
|
||||
%endif
|
||||
Source1: firefox.rpmlintrc
|
||||
# https://www.mozilla.org/en-US/firefox/all/
|
||||
Source2: firefox-dictionary-61.0.2.tar.bz2
|
||||
Source4: %{name}.desktop
|
||||
Source7: firefox.cfg
|
||||
Source9: kde.js
|
||||
Source10: mozilla-api-key
|
||||
Source11: google-api-key
|
||||
|
||||
# Patches for kde integration of FF
|
||||
# http://www.rosenauer.org/hg/mozilla/summary
|
||||
|
|
@ -57,7 +56,6 @@ Patch12: mozilla-kde.patch
|
|||
Patch13: mozilla-kde-background.patch
|
||||
|
||||
Patch35: firefox-37-build-with-time-independent-uuids.patch
|
||||
Patch37: firefox-50.1-fix-glibc-check.patch
|
||||
|
||||
# Fedora specific patches
|
||||
# Unable to install addons from https pages
|
||||
|
|
@ -65,6 +63,9 @@ Patch215: firefox-enable-addons.patch
|
|||
Patch219: rhbz-1173156.patch
|
||||
|
||||
Patch300: firefox-56.0-build-error.patch
|
||||
# Build errors in 62.0
|
||||
Patch302: firefox-62.0.2-include-cmath.patch
|
||||
Patch303: build-disable-elfhack.patch
|
||||
|
||||
BuildRequires: gtk+2-devel
|
||||
%if %{toolkit_gtk3}
|
||||
|
|
@ -76,13 +77,16 @@ BuildRequires: unzip
|
|||
BuildRequires: zip
|
||||
BuildRequires: clang
|
||||
BuildRequires: clang-devel
|
||||
%if 0%{?clang}
|
||||
BuildRequires: lld
|
||||
%endif
|
||||
BuildRequires: libatomic-devel
|
||||
BuildRequires: pkgconfig(xinerama)
|
||||
BuildRequires: pkgconfig(xscrnsaver)
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: pkgconfig(python)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
BuildRequires: pkgconfig(libIDL-2.0)
|
||||
BuildRequires: makedepend
|
||||
|
|
@ -186,25 +190,22 @@ Files and macros mainly for building Firefox extensions.
|
|||
#---------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%if %{relurl}
|
||||
%setup -qn mozilla-release-%{rel_url}
|
||||
%else
|
||||
%setup -q
|
||||
%endif
|
||||
|
||||
## KDE INTEGRATION
|
||||
%patch11 -p1 -b .kdepatch
|
||||
%patch12 -p1 -b .kdemoz
|
||||
#%%patch13 -p1 -b .kdebackground
|
||||
#%%patch13 -p1 -b .kdebackground #No work in 60.0
|
||||
|
||||
%patch35 -p1
|
||||
%patch37 -p1
|
||||
|
||||
# Fedora patches
|
||||
%patch215 -p1 -b .addons
|
||||
%patch219 -p2 -b .rhbz-1173156
|
||||
|
||||
%patch300 -p1
|
||||
%patch302 -p1
|
||||
%patch303 -p1
|
||||
|
||||
pushd js/src
|
||||
autoconf-2.13
|
||||
|
|
@ -217,57 +218,71 @@ perl ./certdata.perl /etc/pki/tls/mozilla/certdata.txt
|
|||
popd
|
||||
|
||||
%build
|
||||
|
||||
%if 0%{?clang}
|
||||
%define linker lld
|
||||
export CC=clang
|
||||
export CXX=clang++
|
||||
export LINKER=ld.lld
|
||||
%else
|
||||
%define linker gold
|
||||
CFLAGS="$CFLAGS -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object"
|
||||
CXXFLAGS="$CFLAGS -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object"
|
||||
CXXFLAGS="$CXXFLAGS -Wno-error=coverage-mismatch -Wno-error=free-nonheap-object"
|
||||
export CFLAGS
|
||||
export CXXFLAGS
|
||||
%endif
|
||||
|
||||
export MOZCONFIG=`pwd`/mozconfig
|
||||
cat << EOF > $MOZCONFIG
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
mk_add_options BUILD_OFFICIAL=1
|
||||
mk_add_options MOZILLA_OFFICIAL=1
|
||||
mk_add_options MOZ_MAKE_FLAGS="%{_smp_mflags}"
|
||||
mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj
|
||||
ac_add_options --host=%{_host}
|
||||
ac_add_options --target=%{_target_platform}
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --prefix="%{_prefix}"
|
||||
ac_add_options --libdir="%{_libdir}"
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-pthreads
|
||||
ac_add_options --without-system-libvpx
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --disable-updater
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --disable-debug
|
||||
ac_add_options --disable-tests
|
||||
ac_add_options --disable-updater
|
||||
%if %{toolkit_gtk3}
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk3
|
||||
%else
|
||||
ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||
%endif
|
||||
ac_add_options --enable-official-branding
|
||||
ac_add_options --disable-system-sqlite
|
||||
# # Enables security hardening compiler options
|
||||
# ac_add_options --enable-hardening
|
||||
ac_add_options --enable-linker=%{linker}
|
||||
# # Optimization for size is broken with gcc7 and later
|
||||
# ac_add_options --enable-optimize="-O2"
|
||||
ac_add_options --enable-release
|
||||
ac_add_options --enable-startup-notification
|
||||
# # Enable compatibility with older libstdc++
|
||||
# #ac_add_options --enable-stdcxx-compat
|
||||
ac_add_options --host=%{_host}
|
||||
ac_add_options --libdir="%{_libdir}"
|
||||
ac_add_options --prefix="%{_prefix}"
|
||||
ac_add_options --target=%{_target_platform}
|
||||
ac_add_options --with-distribution-id=org.rosa
|
||||
ac_add_options --disable-crashreporter
|
||||
ac_add_options --disable-debug
|
||||
# Uncomment the following line if you wish to use Google's geolocaton API
|
||||
# (needed for use with saved maps with Google Maps)
|
||||
ac_add_options --with-google-api-keyfile=%{SOURCE11}
|
||||
# Uncomment the following line if you wish to use Mozilla Location Service
|
||||
ac_add_options --with-mozilla-api-keyfile=%{SOURCE10}
|
||||
ac_add_options --with-system-bz2
|
||||
ac_add_options --with-system-jpeg
|
||||
ac_add_options --with-system-nspr
|
||||
ac_add_options --with-system-nss
|
||||
ac_add_options --with-system-zlib
|
||||
ac_add_options --with-unsigned-addon-scopes=app
|
||||
ac_add_options --without-system-libvpx
|
||||
#ac_add_options --enable-rust-debug
|
||||
|
||||
EOF
|
||||
|
||||
perl -p -i -e 's|\-0|\-9|g' config/make-jars.pl
|
||||
|
||||
# force memory efficient linking
|
||||
# force memory efficient linking and ets
|
||||
%if 0%{?clang}
|
||||
export LDFLAGS="%{ldflags} -Wl,--no-keep-memory"
|
||||
%else
|
||||
export LDFLAGS="%{ldflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
|
||||
%endif
|
||||
export MOZ_SERVICES_SYNC="1"
|
||||
export STRIP=/bin/true
|
||||
./mach build
|
||||
|
||||
%install
|
||||
|
|
|
|||
1
google-api-key
Normal file
1
google-api-key
Normal file
|
|
@ -0,0 +1 @@
|
|||
AIzaSyBPGXa4AYD4FC3HJK7LnIKxm4fDusVuuco
|
||||
1
mozilla-api-key
Normal file
1
mozilla-api-key
Normal file
|
|
@ -0,0 +1 @@
|
|||
9008bb7e-1e22-4038-94fe-047dd48ccc0b
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# HG changeset patch
|
||||
# Parent 8671b358718cb8898a55fada20fc9999408daefe
|
||||
# Parent 989a507ffc5faf9a3bd950c2391a24afa9f463c8
|
||||
Description: Add KDE integration to Firefox (toolkit parts)
|
||||
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
|
||||
Author: Lubos Lunak <lunak@suse.com>
|
||||
|
|
@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||
using namespace mozilla;
|
||||
|
||||
#ifdef DEBUG
|
||||
@@ -4201,25 +4202,37 @@ Preferences::InitInitialObjects(bool aIs
|
||||
@@ -4189,25 +4190,37 @@ Preferences::InitInitialObjects(bool aIs
|
||||
// application pref files for backwards compatibility.
|
||||
static const char* specialFiles[] = {
|
||||
#if defined(XP_MACOSX)
|
||||
|
|
@ -65,7 +65,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
|||
|
||||
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
||||
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
||||
@@ -4268,17 +4281,17 @@ Preferences::InitInitialObjects(bool aIs
|
||||
@@ -4256,17 +4269,17 @@ Preferences::InitInitialObjects(bool aIs
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
||||
|
|
@ -132,7 +132,7 @@ diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/c
|
|||
diff --git a/python/mozbuild/mozpack/chrome/manifest.py b/python/mozbuild/mozpack/chrome/manifest.py
|
||||
--- a/python/mozbuild/mozpack/chrome/manifest.py
|
||||
+++ b/python/mozbuild/mozpack/chrome/manifest.py
|
||||
@@ -34,16 +34,17 @@ class ManifestEntry(object):
|
||||
@@ -39,16 +39,17 @@ class ManifestEntry(object):
|
||||
'platformversion',
|
||||
'os',
|
||||
'osversion',
|
||||
|
|
@ -171,7 +171,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
|
|||
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
|
||||
--- a/toolkit/content/jar.mn
|
||||
+++ b/toolkit/content/jar.mn
|
||||
@@ -68,16 +68,18 @@ toolkit.jar:
|
||||
@@ -69,16 +69,18 @@ toolkit.jar:
|
||||
content/global/bindings/checkbox.xml (widgets/checkbox.xml)
|
||||
content/global/bindings/colorpicker.xml (widgets/colorpicker.xml)
|
||||
content/global/bindings/datekeeper.js (widgets/datekeeper.js)
|
||||
|
|
@ -848,7 +848,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
|
|||
diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build
|
||||
--- a/toolkit/xre/moz.build
|
||||
+++ b/toolkit/xre/moz.build
|
||||
@@ -65,17 +65,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
|
||||
@@ -71,17 +71,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
|
||||
'../components/printingui',
|
||||
]
|
||||
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
|
||||
|
|
@ -1291,7 +1291,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
|
|||
using mozilla::dom::RemoteHandlerApp;
|
||||
|
||||
namespace {
|
||||
@@ -264,17 +264,17 @@ HandlerServiceParent::RecvExists(const H
|
||||
@@ -265,17 +265,17 @@ HandlerServiceParent::RecvExists(const H
|
||||
}
|
||||
|
||||
mozilla::ipc::IPCResult
|
||||
|
|
@ -2166,7 +2166,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||
const char* directive;
|
||||
int argc;
|
||||
|
||||
@@ -441,16 +442,17 @@ ParseManifest(NSLocationType aType, File
|
||||
@@ -437,16 +438,17 @@ ParseManifest(NSLocationType aType, File
|
||||
NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled");
|
||||
NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired");
|
||||
NS_NAMED_LITERAL_STRING(kApplication, "application");
|
||||
|
|
@ -2184,7 +2184,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||
NS_NAMED_LITERAL_STRING(kMain, "main");
|
||||
NS_NAMED_LITERAL_STRING(kContent, "content");
|
||||
|
||||
@@ -496,44 +498,49 @@ ParseManifest(NSLocationType aType, File
|
||||
@@ -492,44 +494,49 @@ ParseManifest(NSLocationType aType, File
|
||||
CopyUTF8toUTF16(s, abi);
|
||||
abi.Insert(char16_t('_'), 0);
|
||||
abi.Insert(osTarget, 0);
|
||||
|
|
@ -2234,7 +2234,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||
process = kMain;
|
||||
}
|
||||
|
||||
@@ -635,25 +642,27 @@ ParseManifest(NSLocationType aType, File
|
||||
@@ -631,25 +638,27 @@ ParseManifest(NSLocationType aType, File
|
||||
TriState stOsVersion = eUnspecified;
|
||||
TriState stOs = eUnspecified;
|
||||
TriState stABI = eUnspecified;
|
||||
|
|
@ -2262,7 +2262,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
|
|||
}
|
||||
|
||||
#if defined(MOZ_WIDGET_ANDROID)
|
||||
@@ -698,16 +707,17 @@ ParseManifest(NSLocationType aType, File
|
||||
@@ -694,16 +703,17 @@ ParseManifest(NSLocationType aType, File
|
||||
}
|
||||
|
||||
if (!ok ||
|
||||
|
|
@ -2300,7 +2300,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build
|
|||
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
||||
--- a/xpcom/io/nsLocalFileUnix.cpp
|
||||
+++ b/xpcom/io/nsLocalFileUnix.cpp
|
||||
@@ -46,16 +46,17 @@
|
||||
@@ -47,16 +47,17 @@
|
||||
#include "prproces.h"
|
||||
#include "nsIDirectoryEnumerator.h"
|
||||
#include "nsISimpleEnumerator.h"
|
||||
|
|
@ -2318,14 +2318,14 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
|||
#include "prmem.h"
|
||||
#include "plbase64.h"
|
||||
|
||||
@@ -1955,59 +1956,74 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||
return InitWithNativePath(aPersistentDescriptor);
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -1999,63 +2000,78 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||
NS_IMETHODIMP
|
||||
nsLocalFile::Reveal()
|
||||
{
|
||||
if (!FilePreferences::IsAllowedPath(mPath)) {
|
||||
return NS_ERROR_FILE_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
|
||||
- if (!giovfs) {
|
||||
|
|
@ -2384,6 +2384,10 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
|||
NS_IMETHODIMP
|
||||
nsLocalFile::Launch()
|
||||
{
|
||||
if (!FilePreferences::IsAllowedPath(mPath)) {
|
||||
return NS_ERROR_FILE_ACCESS_DENIED;
|
||||
}
|
||||
|
||||
#ifdef MOZ_WIDGET_GTK
|
||||
+ if( nsKDEUtils::kdeSupport()) {
|
||||
+ nsTArray<nsCString> command;
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue