Djam/firefox
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox.git synced 2025-02-24 18:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 81.0

Browse source
This commit is contained in:
Alzim 2020-09-24 05:29:24 +03:00
parent fd2300368e
commit 51d51d5de8
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,4 +1,4 @@
sources:
cbindgen-vendor.tar.xz: b6ec6fb16bfb85b72e819e1ef643a2c830c4086f
firefox-80.0.1.source.tar.xz: 5c848661846b2f7902c893468022ef6e55ce769c
firefox-81.0.source.tar.xz: f8818767277e43fb1521fde82d67d954e5eb4fb0
ru@dictionaries.addons.mozilla.org.tar.bz2: 71f9303ba37f20b09fd6aa47f6b592acee06db2c

9
firefox.spec
View file

@ -14,7 +14,7 @@
%define _host i686-unknown-linux-gnu
%endif
%define major 80.0.1
%define major 81.0
%define ff_epoch 0
# (tpg) set version HERE !!!
%define realver %{major}
@ -74,6 +74,7 @@ Source13: gen_cbindgen-vendor.sh
# Patches for kde integration of FF
# http://www.rosenauer.org/hg/mozilla/summary
# https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox
Patch11: mozilla-kde.patch
Patch12: firefox-kde.patch
Patch13: mozilla-kde-background.patch
@ -152,7 +153,7 @@ BuildRequires: pkgconfig(theoradec)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(gconf-2.0)
BuildRequires: pkgconfig(fontconfig)
%if %{mdvver} <= 201910
%if %{mdvver} < 201910
BuildRequires: stdc++-gcc10-devel
%endif
@ -285,7 +286,7 @@ export PATH=/usr/libexec:$PATH
%if 0%{?clang}
%define linker lld
%if %{mdvver} <= 201910
%if %{mdvver} < 201910
# not using %%clang_gcc_wrapper here because it fails
# to deal with complex quotation like
# -DCPPUNIT_PLUGIN_EXPORT='extern "C" SAL_DLLPUBLIC_EXPORT'
@ -299,7 +300,7 @@ export PATH="${PWD}/local_bin:${PATH}"
%endif
export CC=clang
export CXX=clang++
%if %{mdvver} <= 201910
%if %{mdvver} < 201910
export CPP=clang-cpp
# libstdc++ from gcc5 is too old, use newer version of libstdc++
export CPPFLAGS="$CPPFLAGS -I%{_includedir}/libstdc++-gcc10 -I%{_includedir}/libstdc++-gcc10/$(ls %{_includedir}/libstdc++-gcc10/ | grep '\-linux-gnu' | head -n 1)"

12
mozilla-kde.patch
View file

@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent a22a4c4e41107a0809c33a83e9d14916738c5a82
# Parent e89d21ead66fbb34b6349edda42748a3ad9e6136
Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com>
@ -31,7 +31,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#ifdef MOZ_MEMORY
# include "mozmemory.h"
#endif
@@ -4530,25 +4531,37 @@ nsresult Preferences::InitInitialObjects
@@ -4536,25 +4537,37 @@ nsresult Preferences::InitInitialObjects
// application pref files for backwards compatibility.
static const char* specialFiles[] = {
#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
// or jar:$gre/omni.jar!/defaults/preferences/*.js.
@@ -4594,17 +4607,17 @@ nsresult Preferences::InitInitialObjects
@@ -4600,17 +4613,17 @@ nsresult Preferences::InitInitialObjects
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@ -175,7 +175,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloa
diff --git a/toolkit/mozapps/downloads/HelperAppDlg.jsm b/toolkit/mozapps/downloads/HelperAppDlg.jsm
--- a/toolkit/mozapps/downloads/HelperAppDlg.jsm
+++ b/toolkit/mozapps/downloads/HelperAppDlg.jsm
@@ -1203,36 +1203,66 @@ nsUnknownContentTypeDialog.prototype = {
@@ -1239,36 +1239,66 @@ nsUnknownContentTypeDialog.prototype = {
params.handlerApp &&
params.handlerApp.executable &&
params.handlerApp.executable.isFile()
@ -1293,11 +1293,11 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build
--- a/widget/gtk/moz.build
+++ b/widget/gtk/moz.build
@@ -133,16 +133,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'
@@ -134,16 +134,17 @@ FINAL_LIBRARY = 'xul'
LOCAL_INCLUDES += [
'/layout/base',
'/layout/forms',
'/layout/generic',
'/layout/xul',
'/other-licenses/atk-1.0',