Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-25 10:02:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update to 37.0

Browse source
This commit is contained in:
Tigro 2015-03-31 22:59:44 +03:00
parent ba51354322
commit e0d238f984
4 changed files with 48 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,3 +1,3 @@
sources: sources:
firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36 firefox-searchengines-bing.xml: ccdb7c0cc2d288714f70f8a92f0adfc2766f2b36
firefox-36.0.4.source.tar.bz2: ccd8fb7881dcb9ae07a47ceeea561e50b80d55ea firefox-37.0.source.tar.bz2: c23a3d36603edd9d2fbac51afe7a4825c0ac15d8

40
firefox-36-kde.patch → firefox-37-kde.patch
View file

@ -1,11 +1,11 @@
# HG changeset patch # HG changeset patch
# Parent ae5fa7b97ee57df54434bebc6dbda400b7525340 # Parent 409c60c5454efb61ebecf0edc8822a0e92f563f3
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1272 @@ @@ -0,0 +1,1288 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -295,17 +295,22 @@ new file mode 100644
+ <panel id="social-share-panel" + <panel id="social-share-panel"
+ class="social-panel" + class="social-panel"
+ type="arrow" + type="arrow"
+ orient="horizontal" + orient="vertical"
+ onpopupshowing="SocialShare.onShowing()" + onpopupshowing="SocialShare.onShowing()"
+ onpopuphidden="SocialShare.onHidden()" + onpopuphidden="SocialShare.onHidden()"
+ hidden="true"> + hidden="true">
+ <vbox class="social-share-toolbar"> + <hbox class="social-share-toolbar">
+ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"> + <toolbarbutton id="manage-share-providers" class="toolbarbutton share-provider-button"
+ tooltiptext="&social.addons.label;"
+ oncommand="BrowserOpenAddonsMgr('addons://list/service');
+ this.parentNode.parentNode.hidePopup();"/>
+ <arrowscrollbox id="social-share-provider-buttons" orient="horizontal" flex="1" pack="end">
+ <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio" + <toolbarbutton id="add-share-provider" class="toolbarbutton share-provider-button" type="radio"
+ group="share-providers" tooltiptext="&findShareServices.label;" + group="share-providers" tooltiptext="&findShareServices.label;"
+ oncommand="SocialShare.showDirectory()"/> + oncommand="SocialShare.showDirectory()"/>
+ </arrowscrollbox> + </arrowscrollbox>
+ </vbox> + </hbox>
+ <hbox id="share-container" flex="1"/>
+ </panel> + </panel>
+ +
+ <panel id="social-notification-panel" + <panel id="social-notification-panel"
@ -580,6 +585,17 @@ new file mode 100644
+ +
+ <tooltip id="dynamic-shortcut-tooltip" + <tooltip id="dynamic-shortcut-tooltip"
+ onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/>
+
+ <menupopup id="emeNotificationsPopup">
+ <menuitem id="emeNotificationsNotNow"
+ label="Not now"
+ acceskey="N"
+ oncommand="gEMEHandler.onNotNow(this);"/>
+ <menuitem id="emeNotificationsDontAskAgain"
+ label="Don't ask me again"
+ acceskey="D"
+ oncommand="gEMEHandler.onDontAskAgain(this);"/>
+ </menupopup>
+ </popupset> + </popupset>
+ +
+#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef CAN_DRAW_IN_TITLEBAR
@ -642,7 +658,6 @@ new file mode 100644
+ </toolbar> + </toolbar>
+ +
+ <toolbar id="TabsToolbar" + <toolbar id="TabsToolbar"
+ class="toolbar-primary"
+ fullscreentoolbar="true" + fullscreentoolbar="true"
+ customizable="true" + customizable="true"
+ mode="icons" + mode="icons"
@ -728,7 +743,7 @@ new file mode 100644
+ to the default placements of buttons in CustomizableUI.jsm, so the + to the default placements of buttons in CustomizableUI.jsm, so the
+ customization code doesn't get confused. + customization code doesn't get confused.
+ --> + -->
+ <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" + <toolbar id="nav-bar"
+ aria-label="&navbarCmd.label;" + aria-label="&navbarCmd.label;"
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="small" + iconsize="small"
@ -801,6 +816,7 @@ new file mode 100644
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="translated-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="eme-notification-icon" class="notification-anchor-icon" role="button"/>
+ </box> + </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup + <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events. + code fires onmousedown, and hence eats our favicon drag events.
@ -1300,7 +1316,7 @@ diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
<button id="editBookmarkPanelDeleteButton" <button id="editBookmarkPanelDeleteButton"
class="editBookmarkPanelBottomButton" class="editBookmarkPanelBottomButton"
label="&editBookmark.cancel.label;" label="&editBookmark.cancel.label;"
@@ -1198,17 +1198,17 @@ @@ -1214,17 +1214,17 @@
<hbox id="full-screen-warning-container" hidden="true" fadeout="true"> <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
<hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
@ -1333,10 +1349,10 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
* content/browser/browser.xul (content/browser.xul) * content/browser/browser.xul (content/browser.xul)
+* content/browser/browser-kde.xul (content/browser-kde.xul) +* content/browser/browser-kde.xul (content/browser-kde.xul)
+% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde +% override chrome://browser/content/browser.xul chrome://browser/content/browser-kde.xul desktop=kde
* content/browser/browser-eme.properties (content/browser-eme.properties)
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul) * content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js) content/browser/content.js (content/content.js)
content/browser/content-UITour.js (content/content-UITour.js)
content/browser/defaultthemes/1.footer.jpg (content/defaultthemes/1.footer.jpg) 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.header.jpg (content/defaultthemes/1.header.jpg)
content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg) content/browser/defaultthemes/1.icon.jpg (content/defaultthemes/1.icon.jpg)
@ -1427,7 +1443,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
// be set while the prefs are open. // be set while the prefs are open.
@@ -572,16 +578,27 @@ var gMainPane = { @@ -549,16 +555,27 @@ var gMainPane = {
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
{ {
@ -1895,7 +1911,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -689,19 +689,21 @@ @@ -688,19 +688,21 @@
@RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/profile/prefs.js @RESPATH@/browser/defaults/profile/prefs.js

6
firefox.spec
View file

@ -7,7 +7,7 @@
# This also means only STABLE upstream releases, NO betas. # This also means only STABLE upstream releases, NO betas.
# This is a discussed topic. Please, do not flame it again. # This is a discussed topic. Please, do not flame it again.
%define major 36.0.4 %define major 37.0
%define ff_epoch 0 %define ff_epoch 0
# (tpg) set version HERE !!! # (tpg) set version HERE !!!
%define realver %{major} %define realver %{major}
@ -52,8 +52,8 @@ Patch2: firefox-vendor.patch
Patch8: firefox-25.0-disable-check-default-browser.patch Patch8: firefox-25.0-disable-check-default-browser.patch
Patch10: firefox-3.5.3-default-mail-handler.patch Patch10: firefox-3.5.3-default-mail-handler.patch
# Patches for kde integration of FF # Patches for kde integration of FF
Patch11: firefox-36-kde.patch Patch11: firefox-37-kde.patch
Patch12: mozilla-36-kde.patch Patch12: mozilla-37-kde.patch
#Patch13: mozilla-kde-background.patch #Patch13: mozilla-kde-background.patch
Patch34: xulrunner_nojit.patch Patch34: xulrunner_nojit.patch

32
mozilla-36-kde.patch → mozilla-37-kde.patch
View file

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent aba9432d1fd32a118ba24e92c6b6e99ddb0b9bdc # Parent 2b183c17f6e4693372442af1a8ee0be364f8cba0
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -46,7 +46,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1172,16 +1173,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1197,17 +1216,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -100,7 +100,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
@@ -1301,26 +1320,38 @@ static nsresult pref_InitInitialObjects( @@ -1294,26 +1313,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 */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -223,9 +223,9 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#ifdef MOZ_WIDGET_ANDROID #ifdef MOZ_WIDGET_ANDROID
#include "AndroidBridge.h" #include "AndroidBridge.h"
using namespace mozilla::widget::android;
#endif #endif
@@ -2717,16 +2721,25 @@ nsDownload::SetState(DownloadState aStat
@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -251,12 +251,12 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
int64_t goat = PR_Now() - mStartTime; int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec; showTaskbarAlert = goat > alertIntervalUSec;
@@ -2757,16 +2770,17 @@ nsDownload::SetState(DownloadState aStat @@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat
NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title,
message, !removeWhenDone, message, !removeWhenDone,
mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"),
mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"), mDownloadManager, EmptyString(), NS_LITERAL_STRING("auto"),
EmptyString(), EmptyString(), nullptr); EmptyString(), EmptyString(), nullptr, mPrivate);
} }
} }
} }
@ -3137,13 +3137,13 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
--- a/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp
+++ b/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp
@@ -1,32 +1,34 @@ @@ -4,32 +4,34 @@
/* -*- 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
* 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/. */ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/Types.h" #include "mozilla/Types.h"
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
+#include <gdk/gdkx.h> +#include <gdk/gdkx.h>
@ -3172,7 +3172,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr; nsIFile *nsFilePicker::mPrevDisplayDirectory = nullptr;
void void
@@ -224,17 +226,19 @@ nsFilePicker::AppendFilters(int32_t aFil @@ -238,17 +240,19 @@ nsFilePicker::AppendFilters(int32_t aFil
return nsBaseFilePicker::AppendFilters(aFilterMask); return nsBaseFilePicker::AppendFilters(aFilterMask);
} }
@ -3193,7 +3193,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
mFilters.AppendElement(filter); mFilters.AppendElement(filter);
mFilterNames.AppendElement(name); mFilterNames.AppendElement(name);
@@ -349,16 +353,32 @@ nsFilePicker::Show(int16_t *aReturn) @@ -363,16 +367,32 @@ nsFilePicker::Show(int16_t *aReturn)
NS_IMETHODIMP NS_IMETHODIMP
nsFilePicker::Open(nsIFilePickerShownCallback *aCallback) nsFilePicker::Open(nsIFilePickerShownCallback *aCallback)
@ -3226,7 +3226,7 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
GtkFileChooserAction action = GetGtkFileChooserAction(mMode); GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE) const gchar *accept_button = (action == GTK_FILE_CHOOSER_ACTION_SAVE)
@@ -537,8 +557,235 @@ nsFilePicker::Done(GtkWidget* file_choos @@ -551,8 +571,235 @@ nsFilePicker::Done(GtkWidget* file_choos
if (mCallback) { if (mCallback) {
mCallback->Done(result); mCallback->Done(result);
mCallback = nullptr; mCallback = nullptr;
@ -3561,7 +3561,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION", mozilla::AndroidBridge::Bridge()->GetStaticStringField("android/os/Build$VERSION",
"RELEASE", "RELEASE",
osVersion); osVersion);
isTablet = mozilla::widget::android::GeckoAppShell::IsTablet(); isTablet = mozilla::widget::GeckoAppShell::IsTablet();
} }
+ desktop = NS_LITERAL_STRING("android"); + desktop = NS_LITERAL_STRING("android");
#endif #endif