mirror of
https://abf.rosa.ru/djam/firefox-esr78.git
synced 2025-02-24 02:02:47 +00:00
Updated to 75.0
This commit is contained in:
parent
d5d7cbea7d
commit
8a14754a88
4 changed files with 20 additions and 42 deletions
4
.abf.yml
4
.abf.yml
|
@ -1,4 +1,4 @@
|
||||||
sources:
|
sources:
|
||||||
cbindgen-vendor.tar.xz: aae66d207b33f90799755b1c81b4fc8ee1f2aff4
|
cbindgen-vendor.tar.xz: aae66d207b33f90799755b1c81b4fc8ee1f2aff4
|
||||||
firefox-74.0.1.source.tar.xz: 539e0b41fc363a155c90adbb4e37993a459e53bc
|
firefox-75.0.source.tar.xz: df7904c16d525eb791728d655258b7d1fe064db9
|
||||||
firefox-dictionary-61.0.2.tar.bz2: 25929c585dc8568a32d5be49aacc672f0ed2202f
|
ru@dictionaries.addons.mozilla.org.tar.bz2: b419c75adb89e5734e744c523e200acc52760629
|
||||||
|
|
|
@ -41,9 +41,9 @@
|
||||||
#include "Units.h"
|
#include "Units.h"
|
||||||
-#include "prenv.h"
|
-#include "prenv.h"
|
||||||
+#include "nspr4/prenv.h"
|
+#include "nspr4/prenv.h"
|
||||||
#include "mozilla/StaticPresData.h"
|
|
||||||
|
|
||||||
class nsBidi;
|
class nsBidi;
|
||||||
|
class nsIPrintSettings;
|
||||||
--- firefox-56.0/xpcom/threads/nsThreadUtils.h-orig 2017-09-14 23:16:02.000000000 +0300
|
--- firefox-56.0/xpcom/threads/nsThreadUtils.h-orig 2017-09-14 23:16:02.000000000 +0300
|
||||||
+++ firefox-56.0/xpcom/threads/nsThreadUtils.h 2017-09-28 21:57:22.344002369 +0300
|
+++ firefox-56.0/xpcom/threads/nsThreadUtils.h 2017-09-28 21:57:22.344002369 +0300
|
||||||
@@ -7,8 +7,8 @@
|
@@ -7,8 +7,8 @@
|
||||||
|
|
34
firefox.spec
34
firefox.spec
|
@ -14,7 +14,7 @@
|
||||||
%define _host i686-unknown-linux-gnu
|
%define _host i686-unknown-linux-gnu
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define major 74.0.1
|
%define major 75.0
|
||||||
%define ff_epoch 0
|
%define ff_epoch 0
|
||||||
# (tpg) set version HERE !!!
|
# (tpg) set version HERE !!!
|
||||||
%define realver %{major}
|
%define realver %{major}
|
||||||
|
@ -29,7 +29,6 @@
|
||||||
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
|
%define nss_version %(pkg-config --modversion nss &>/dev/null && pkg-config --modversion nss 2>/dev/null || echo 0)
|
||||||
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0)
|
%define nspr_version %(pkg-config --modversion nspr &>/dev/null && pkg-config --modversion nspr 2>/dev/null |sed -e 's!\.0!!' || echo 0)
|
||||||
|
|
||||||
%define _no_use_syshunspell 0
|
|
||||||
%define toolkit_gtk3 1
|
%define toolkit_gtk3 1
|
||||||
|
|
||||||
# Firefox 61.0: ERROR: Only GCC 6.1 or newer is supported (found version 5.5.0).
|
# Firefox 61.0: ERROR: Only GCC 6.1 or newer is supported (found version 5.5.0).
|
||||||
|
@ -47,8 +46,7 @@ Group: Networking/WWW
|
||||||
Url: http://www.mozilla.com/firefox/
|
Url: http://www.mozilla.com/firefox/
|
||||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{name}-%{realver}.source.tar.xz
|
Source0: https://archive.mozilla.org/pub/firefox/releases/%{realver}/source/%{name}-%{realver}.source.tar.xz
|
||||||
Source1: firefox.rpmlintrc
|
Source1: firefox.rpmlintrc
|
||||||
# https://www.mozilla.org/en-US/firefox/all/
|
Source2: ru@dictionaries.addons.mozilla.org.tar.bz2
|
||||||
Source2: firefox-dictionary-61.0.2.tar.bz2
|
|
||||||
Source4: %{name}.desktop
|
Source4: %{name}.desktop
|
||||||
Source7: firefox.cfg
|
Source7: firefox.cfg
|
||||||
Source9: kde.js
|
Source9: kde.js
|
||||||
|
@ -120,9 +118,6 @@ BuildRequires: libffi-devel
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: rootcerts >= 1:20110830.00
|
BuildRequires: rootcerts >= 1:20110830.00
|
||||||
BuildRequires: pkgconfig(xt)
|
BuildRequires: pkgconfig(xt)
|
||||||
%if %_no_use_syshunspell
|
|
||||||
BuildRequires: hunspell-devel
|
|
||||||
%endif
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: pkgconfig(alsa)
|
BuildRequires: pkgconfig(alsa)
|
||||||
BuildRequires: wget
|
BuildRequires: wget
|
||||||
|
@ -150,9 +145,6 @@ Requires: indexhtml
|
||||||
Requires: xdg-utils
|
Requires: xdg-utils
|
||||||
# fixes bug #42096
|
# fixes bug #42096
|
||||||
Requires: mailcap
|
Requires: mailcap
|
||||||
%if %_no_use_syshunspell
|
|
||||||
Recommends: hunspell-en
|
|
||||||
%endif
|
|
||||||
Recommends: %{_lib}canberra0
|
Recommends: %{_lib}canberra0
|
||||||
Recommends: %{_lib}cups2
|
Recommends: %{_lib}cups2
|
||||||
|
|
||||||
|
@ -177,7 +169,7 @@ windows, cookies and downloaded files.
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_bindir}/mozilla-firefox
|
%{_bindir}/mozilla-firefox
|
||||||
%{_datadir}/applications/*.desktop
|
%{_datadir}/applications/*.desktop
|
||||||
%{_datadir}/dict/mozilla
|
%{_datadir}/mozilla/extensions/%{firefox_appid}/
|
||||||
%{_iconsdir}/%{name}.png
|
%{_iconsdir}/%{name}.png
|
||||||
%{_iconsdir}/hicolor/*/apps/*.png
|
%{_iconsdir}/hicolor/*/apps/*.png
|
||||||
%{_liconsdir}/%{name}.png
|
%{_liconsdir}/%{name}.png
|
||||||
|
@ -293,7 +285,7 @@ ac_add_options --enable-default-toolkit=cairo-gtk2
|
||||||
# # Enables security hardening compiler options
|
# # Enables security hardening compiler options
|
||||||
# ac_add_options --enable-hardening
|
# ac_add_options --enable-hardening
|
||||||
# # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
|
# # https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
|
||||||
# ac_add_options --enable-linker=%{linker}
|
# ac_add_options --enable-linker=%%{linker}
|
||||||
# # Optimization for size is broken with gcc7 and later
|
# # Optimization for size is broken with gcc7 and later
|
||||||
# ac_add_options --enable-optimize="-O2"
|
# ac_add_options --enable-optimize="-O2"
|
||||||
ac_add_options --enable-official-branding
|
ac_add_options --enable-official-branding
|
||||||
|
@ -364,6 +356,8 @@ install -m 644 %{SOURCE9} %{buildroot}%{mozillalibdir}/defaults/preferences/kde.
|
||||||
mkdir -p %{buildroot}%{pluginsdir}
|
mkdir -p %{buildroot}%{pluginsdir}
|
||||||
mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
|
mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
|
||||||
mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
|
mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
|
||||||
|
# added ru dictionaries
|
||||||
|
tar xjf %{SOURCE2} -C %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}/
|
||||||
|
|
||||||
# (tpg) desktop entry
|
# (tpg) desktop entry
|
||||||
mkdir -p %{buildroot}%{_datadir}/applications
|
mkdir -p %{buildroot}%{_datadir}/applications
|
||||||
|
@ -401,17 +395,6 @@ cat << EOF > %{buildroot}%{mozillalibdir}/defaults/profile/chrome/userChrome.css
|
||||||
}
|
}
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# use the no system myspell dictionaries
|
|
||||||
%if %_no_use_syshunspell
|
|
||||||
rm -fr %{buildroot}%{mozillalibdir}/dictionaries
|
|
||||||
ln -s %{_datadir}/dict/mozilla/ %{buildroot}%{mozillalibdir}/dictionaries
|
|
||||||
%else
|
|
||||||
rm -fr %{buildroot}%{mozillalibdir}/dictionaries
|
|
||||||
mkdir -p %{buildroot}%{_datadir}/dict/mozilla/
|
|
||||||
tar xjf %{SOURCE2} -C %{buildroot}%{_datadir}/dict/mozilla/
|
|
||||||
ln -s %{_datadir}/dict/mozilla/ %{buildroot}%{mozillalibdir}/dictionaries
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# (lm) touch and %%ghost bookmarks.html to a proper uninstall
|
# (lm) touch and %%ghost bookmarks.html to a proper uninstall
|
||||||
touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html
|
touch %{buildroot}%{mozillalibdir}/defaults/profile/bookmarks.html
|
||||||
|
|
||||||
|
@ -442,11 +425,6 @@ FIN
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||||
|
|
||||||
%pre
|
|
||||||
if [ -d %{mozillalibdir}/browser/dictionaries ]; then
|
|
||||||
rm -fr %{mozillalibdir}/browser/dictionaries
|
|
||||||
fi
|
|
||||||
|
|
||||||
%post
|
%post
|
||||||
if [ ! -r /etc/sysconfig/oem ]; then
|
if [ ! -r /etc/sysconfig/oem ]; then
|
||||||
case `grep META_CLASS /etc/sysconfig/system` in
|
case `grep META_CLASS /etc/sysconfig/system` in
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# Date 1559294891 -7200
|
# Date 1559294891 -7200
|
||||||
# Fri May 31 11:28:11 2019 +0200
|
# Fri May 31 11:28:11 2019 +0200
|
||||||
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
|
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
|
||||||
# Parent d942febc5733911d795d1cec027fb4f3c0a6e53b
|
# Parent fbac8545cf6f461803505c2d1f57531798dee96a
|
||||||
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>
|
||||||
|
@ -13,7 +13,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
|
||||||
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
||||||
--- a/modules/libpref/Preferences.cpp
|
--- a/modules/libpref/Preferences.cpp
|
||||||
+++ b/modules/libpref/Preferences.cpp
|
+++ b/modules/libpref/Preferences.cpp
|
||||||
@@ -84,16 +84,17 @@
|
@@ -83,16 +83,17 @@
|
||||||
#include "nsXPCOM.h"
|
#include "nsXPCOM.h"
|
||||||
#include "nsXULAppAPI.h"
|
#include "nsXULAppAPI.h"
|
||||||
#include "nsZipArchive.h"
|
#include "nsZipArchive.h"
|
||||||
|
@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
||||||
#ifdef MOZ_MEMORY
|
#ifdef MOZ_MEMORY
|
||||||
# include "mozmemory.h"
|
# include "mozmemory.h"
|
||||||
#endif
|
#endif
|
||||||
@@ -4539,25 +4540,37 @@ nsresult Preferences::InitInitialObjects
|
@@ -4535,25 +4536,37 @@ nsresult Preferences::InitInitialObjects
|
||||||
// application pref files for backwards compatibility.
|
// application pref files for backwards compatibility.
|
||||||
static const char* specialFiles[] = {
|
static const char* specialFiles[] = {
|
||||||
#if defined(XP_MACOSX)
|
#if defined(XP_MACOSX)
|
||||||
|
@ -69,7 +69,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
|
||||||
|
|
||||||
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
// Load jar:$app/omni.jar!/defaults/preferences/*.js
|
||||||
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
|
||||||
@@ -4603,17 +4616,17 @@ nsresult Preferences::InitInitialObjects
|
@@ -4599,17 +4612,17 @@ nsresult Preferences::InitInitialObjects
|
||||||
}
|
}
|
||||||
|
|
||||||
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
|
||||||
|
@ -800,7 +800,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
|
||||||
using mozilla::dom::RemoteHandlerApp;
|
using mozilla::dom::RemoteHandlerApp;
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
@@ -288,17 +288,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
@@ -294,17 +294,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
||||||
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
|
mozilla::ipc::IPCResult HandlerServiceParent::RecvExistsForProtocolOS(
|
||||||
const nsCString& aProtocolScheme, bool* aHandlerExists) {
|
const nsCString& aProtocolScheme, bool* aHandlerExists) {
|
||||||
if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
|
if (aProtocolScheme.Length() > MAX_SCHEME_LENGTH) {
|
||||||
|
@ -819,7 +819,7 @@ diff --git a/uriloader/exthandler/HandlerServiceParent.cpp b/uriloader/exthandle
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Check if a handler exists for the provided protocol. Check the datastore
|
* Check if a handler exists for the provided protocol. Check the datastore
|
||||||
@@ -317,17 +317,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
@@ -323,17 +323,17 @@ mozilla::ipc::IPCResult HandlerServicePa
|
||||||
nsCOMPtr<nsIExternalProtocolService> protoSvc =
|
nsCOMPtr<nsIExternalProtocolService> protoSvc =
|
||||||
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
|
do_GetService(NS_EXTERNALPROTOCOLSERVICE_CONTRACTID, &rv);
|
||||||
if (NS_WARN_IF(NS_FAILED(rv))) {
|
if (NS_WARN_IF(NS_FAILED(rv))) {
|
||||||
|
@ -1295,7 +1295,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
|
||||||
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
|
||||||
--- a/widget/gtk/moz.build
|
--- a/widget/gtk/moz.build
|
||||||
+++ b/widget/gtk/moz.build
|
+++ b/widget/gtk/moz.build
|
||||||
@@ -128,16 +128,17 @@ include('/ipc/chromium/chromium-config.m
|
@@ -129,16 +129,17 @@ include('/ipc/chromium/chromium-config.m
|
||||||
|
|
||||||
FINAL_LIBRARY = 'xul'
|
FINAL_LIBRARY = 'xul'
|
||||||
|
|
||||||
|
@ -1404,15 +1404,15 @@ diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp
|
||||||
+ return NS_OK;
|
+ return NS_OK;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
nsCString title;
|
NS_ConvertUTF16toUTF8 title(mTitle);
|
||||||
title.Adopt(ToNewUTF8String(mTitle));
|
|
||||||
|
|
||||||
GtkWindow* parent_widget =
|
GtkWindow* parent_widget =
|
||||||
GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
|
GTK_WINDOW(mParentWidget->GetNativeData(NS_NATIVE_SHELLWIDGET));
|
||||||
|
|
||||||
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
|
GtkFileChooserAction action = GetGtkFileChooserAction(mMode);
|
||||||
|
|
||||||
@@ -572,16 +599,240 @@ void nsFilePicker::Done(void* file_choos
|
const gchar* accept_button;
|
||||||
|
@@ -571,16 +598,240 @@ void nsFilePicker::Done(void* file_choos
|
||||||
mCallback->Done(result);
|
mCallback->Done(result);
|
||||||
mCallback = nullptr;
|
mCallback = nullptr;
|
||||||
} else {
|
} else {
|
||||||
|
@ -1852,7 +1852,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
|
||||||
# include "prmem.h"
|
# include "prmem.h"
|
||||||
# include "plbase64.h"
|
# include "plbase64.h"
|
||||||
|
|
||||||
@@ -1904,62 +1905,77 @@ nsLocalFile::SetPersistentDescriptor(con
|
@@ -1907,62 +1908,77 @@ nsLocalFile::SetPersistentDescriptor(con
|
||||||
|
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsLocalFile::Reveal() {
|
nsLocalFile::Reveal() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue