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 79.0

Browse source
This commit is contained in:
Alzim 2020-08-11 23:13:47 +03:00
parent 187f756927
commit eca072192c
4 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.abf.yml
View file

@ -1,4 +1,4 @@
sources:
cbindgen-vendor.tar.xz: 0cb146ff00b592bbc44f77ac51dc10e607301668
firefox-78.0.2.source.tar.xz: 6dd99fc08df3f479fa3a8ff7a3ab527fbeeb4f61
cbindgen-vendor.tar.xz: b6ec6fb16bfb85b72e819e1ef643a2c830c4086f
firefox-79.0.source.tar.xz: 3cbe88ce74cf834c7f91f72977ac443995bcee83
ru@dictionaries.addons.mozilla.org.tar.bz2: 71f9303ba37f20b09fd6aa47f6b592acee06db2c

8
firefox.spec
View file

@ -14,7 +14,7 @@
%define _host i686-unknown-linux-gnu
%endif
%define major 78.0.2
%define major 79.0
%define ff_epoch 0
# (tpg) set version HERE !!!
%define realver %{major}
@ -46,13 +46,13 @@
# for i in /usr/lib64/firefox/* ; do if file $i | grep -q ELF ; then echo ; echo -- $i ; LC_ALL=C ldd $i | grep found ; fi; done
# To make this list:
# ( for i in /usr/lib64/firefox/* ; do if file $i | grep -q ELF ; then LC_ALL=C ldd $i | grep found | awk '{print $1}' | awk -F '\\.so' '{print $1}' ; fi; done ) | sort -u | tr '\n' '|'
%global __requires_exclude ^(liblgpllibs|libmozavutil|libmozgtk|libmozsandbox|libmozsqlite3|libnspr4|libnss3|libnssutil3|libplc4|libplds4|libsmime3|libssl3|libxul)\\.so(|\\(.*)$
%global __requires_exclude ^(liblgpllibs|libmozavutil|libmozgtk|libmozsandbox|libmozsqlite3|libnspr4|libnss3|libnssutil3|libplc4|libplds4|libsmime3|libssl3|libxul)\\.so.*$
Summary: Next generation web browser
Name: firefox
Version: %{major}
Epoch: %{ff_epoch}
Release: 2
Release: 1
License: MPLv1+
Group: Networking/WWW
Url: http://www.mozilla.com/firefox/
@ -68,7 +68,7 @@ Source11: google-api-key
Source80: loffice-libcxx-wrapper.sh
# Fedora
# https://github.com/eqrion/cbindgen/releases
# version 0.14.2
# version 0.14.3
Source12: cbindgen-vendor.tar.xz
Source13: gen_cbindgen-vendor.sh

3
gen_cbindgen-vendor.sh
View file

@ -12,7 +12,7 @@ to be used with 'cargo vendor' commmand.
"""
[dependencies]
cbindgen = "0.14.2"
cbindgen = "0.14.3"
[[bin]]
name = "dummy"
@ -27,6 +27,7 @@ cd vendor
tar -cJf ../cbindgen-vendor.tar.xz *
cd ..
rm -f Cargo.lock
rm -f Cargo.toml
rm -rf vendor

22
mozilla-kde.patch
View file

@ -3,7 +3,7 @@
# Date 1559294891 -7200
# Fri May 31 11:28:11 2019 +0200
# Node ID c2aa7198fb925e7fde96abf65b6f68b9b755f112
# Parent aa58e8c70d1448a08407c6c191ea8b76d61e8bf6
# Parent 43647626f7204e312a4e38cac0414a461b06667f
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
@@ -4566,25 +4567,37 @@ nsresult Preferences::InitInitialObjects
@@ -4570,25 +4571,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.
@@ -4630,17 +4643,17 @@ nsresult Preferences::InitInitialObjects
@@ -4634,17 +4647,17 @@ nsresult Preferences::InitInitialObjects
}
nsCOMPtr<nsIFile> path = do_QueryInterface(elem);
@ -91,7 +91,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
--- a/modules/libpref/moz.build
+++ b/modules/libpref/moz.build
@@ -114,16 +114,20 @@ EXPORTS.mozilla += [
@@ -117,16 +117,20 @@ EXPORTS.mozilla += [
]
EXPORTS.mozilla += sorted(['!' + g for g in gen_h])
@ -106,12 +106,12 @@ diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
+
gen_all_tuple = tuple(gen_h + gen_cpp + gen_rs)
GENERATED_FILES += [gen_all_tuple]
static_pref_list = GENERATED_FILES[gen_all_tuple]
static_pref_list.script = 'init/generate_static_pref_list.py:emit_code'
static_pref_list.inputs = ['init/StaticPrefList.yaml']
GeneratedFile(*gen_all_tuple, script='init/generate_static_pref_list.py',
entry_point='emit_code', inputs=['init/StaticPrefList.yaml'])
PYTHON_UNITTEST_MANIFESTS += [
'test/python.ini',
]
diff --git a/python/mozbuild/mozpack/chrome/flags.py b/python/mozbuild/mozpack/chrome/flags.py
--- a/python/mozbuild/mozpack/chrome/flags.py
+++ b/python/mozbuild/mozpack/chrome/flags.py
@ -356,7 +356,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
@@ -88,17 +88,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
@@ -90,17 +90,19 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co
'../components/printingui',
]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'uikit':
@ -1293,7 +1293,7 @@ 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
@@ -131,16 +131,17 @@ include('/ipc/chromium/chromium-config.m
@@ -133,16 +133,17 @@ include('/ipc/chromium/chromium-config.m
FINAL_LIBRARY = 'xul'