Merge branch 'c9' into a9
This commit is contained in:
commit
ffea8e0395
@ -1,6 +1,6 @@
|
|||||||
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
|
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
|
||||||
c0e4d44aee25bed036ad1f534bbd53a395f77f3c SOURCES/firefox-102.5.0esr.processed-source.tar.xz
|
f78af65376ced0abecd8b503fa42de39bd544e09 SOURCES/firefox-102.6.0esr.processed-source.tar.xz
|
||||||
cd8dfecbe2062065caf994fba339d87e95342068 SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz
|
3dbdb807716e21787197f342bb0ffeb4da5e24d5 SOURCES/firefox-langpacks-102.6.0esr-20221206.tar.xz
|
||||||
da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
|
da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
|
||||||
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
||||||
fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
|
fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,6 +1,6 @@
|
|||||||
SOURCES/cbindgen-vendor.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/firefox-102.5.0esr.processed-source.tar.xz
|
SOURCES/firefox-102.6.0esr.processed-source.tar.xz
|
||||||
SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz
|
SOURCES/firefox-langpacks-102.6.0esr-20221206.tar.xz
|
||||||
SOURCES/mochitest-python.tar.gz
|
SOURCES/mochitest-python.tar.gz
|
||||||
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
|
||||||
SOURCES/nss-3.79.0-6.el8_1.src.rpm
|
SOURCES/nss-3.79.0-6.el8_1.src.rpm
|
||||||
|
@ -1,13 +1,11 @@
|
|||||||
diff -up firefox-102.2.0/build/moz.configure/nss.configure.nss-version firefox-102.2.0/build/moz.configure/nss.configure
|
--- firefox-102.6.0/build/moz.configure/nss.configure.firefox-nss-version 2022-12-06 19:14:59.439978420 +0100
|
||||||
--- firefox-102.2.0/build/moz.configure/nss.configure.nss-version 2022-08-23 18:17:14.699869558 +0200
|
+++ firefox-102.6.0/build/moz.configure/nss.configure 2022-12-06 19:18:23.299471634 +0100
|
||||||
+++ firefox-102.2.0/build/moz.configure/nss.configure 2022-08-23 18:15:33.790051448 +0200
|
|
||||||
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h
|
@@ -9,7 +9,7 @@ system_lib_option("--with-system-nss", h
|
||||||
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
imply_option("--with-system-nspr", True, when="--with-system-nss")
|
||||||
|
|
||||||
nss_pkg = pkg_check_modules(
|
nss_pkg = pkg_check_modules(
|
||||||
- "NSS", "nss >= 3.79.1", when="--with-system-nss", config=False
|
- "NSS", "nss >= 3.79.2", when="--with-system-nss", config=False
|
||||||
+ "NSS", "nss >= 3.79", when="--with-system-nss", config=False
|
+ "NSS", "nss >= 3.79", when="--with-system-nss", config=False
|
||||||
)
|
)
|
||||||
|
|
||||||
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
set_config("MOZ_SYSTEM_NSS", True, when="--with-system-nss")
|
||||||
diff -up firefox-102.2.0/.nss-version firefox-102.2.0/
|
|
||||||
|
33248
SOURCES/libwebrtc-screen-cast-sync.patch
Normal file
33248
SOURCES/libwebrtc-screen-cast-sync.patch
Normal file
File diff suppressed because it is too large
Load Diff
@ -201,7 +201,7 @@ end}
|
|||||||
|
|
||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 102.5.0
|
Version: 102.6.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
URL: https://www.mozilla.org/firefox/
|
URL: https://www.mozilla.org/firefox/
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
@ -226,7 +226,7 @@ ExcludeArch: aarch64 s390 ppc
|
|||||||
# Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
# Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||||
Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz
|
Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz
|
||||||
%if %{with langpacks}
|
%if %{with langpacks}
|
||||||
Source1: firefox-langpacks-%{version}%{?pre_version}-20221109.tar.xz
|
Source1: firefox-langpacks-%{version}%{?pre_version}-20221206.tar.xz
|
||||||
%endif
|
%endif
|
||||||
Source2: cbindgen-vendor.tar.xz
|
Source2: cbindgen-vendor.tar.xz
|
||||||
Source3: process-official-tarball
|
Source3: process-official-tarball
|
||||||
@ -292,6 +292,8 @@ Patch228: disable-openh264-download.patch
|
|||||||
Patch229: firefox-nss-addon-hack.patch
|
Patch229: firefox-nss-addon-hack.patch
|
||||||
Patch230: D110204-fscreen.diff
|
Patch230: D110204-fscreen.diff
|
||||||
Patch231: webrtc-nss-fix.patch
|
Patch231: webrtc-nss-fix.patch
|
||||||
|
# Backported WebRTC changes for PipeWire/Wayland screen sharing support
|
||||||
|
Patch232: libwebrtc-screen-cast-sync.patch
|
||||||
|
|
||||||
# Upstream patches
|
# Upstream patches
|
||||||
Patch415: mozilla-1670333.patch
|
Patch415: mozilla-1670333.patch
|
||||||
@ -309,7 +311,6 @@ Patch424: D158770.diff
|
|||||||
Patch600: pgo.patch
|
Patch600: pgo.patch
|
||||||
Patch602: mozilla-1516803.patch
|
Patch602: mozilla-1516803.patch
|
||||||
|
|
||||||
# Backported WebRTC changes for PipeWire/Wayland screen sharing support
|
|
||||||
Patch1008: build-rhel7-nasm-dwarf.patch
|
Patch1008: build-rhel7-nasm-dwarf.patch
|
||||||
|
|
||||||
%if %{?system_nss}
|
%if %{?system_nss}
|
||||||
@ -657,6 +658,7 @@ echo "use_rustts %{?use_rustts}"
|
|||||||
%patch229 -p1 -b .firefox-nss-addon-hack
|
%patch229 -p1 -b .firefox-nss-addon-hack
|
||||||
%patch230 -p1 -b .D110204-fscreen.diff
|
%patch230 -p1 -b .D110204-fscreen.diff
|
||||||
%patch231 -p1 -b .webrtc-nss-fix
|
%patch231 -p1 -b .webrtc-nss-fix
|
||||||
|
%patch232 -p1 -b .libwebrtc-screen-cast-sync
|
||||||
|
|
||||||
%patch415 -p1 -b .1670333
|
%patch415 -p1 -b .1670333
|
||||||
%patch416 -p1 -b .mozilla-bmo1005535
|
%patch416 -p1 -b .mozilla-bmo1005535
|
||||||
@ -1426,9 +1428,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue Nov 22 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.5.0-1.alma
|
* Thu Dec 15 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.6.0-1.alma
|
||||||
- Debrand for AlmaLinux
|
- Debrand for AlmaLinux
|
||||||
|
|
||||||
|
* Tue Dec 06 2022 Eike Rathke <erack@redhat.com> - 102.6.0-1
|
||||||
|
- Update to 102.6.0 build1
|
||||||
|
* Fri Nov 25 2022 Jan Horak <jhorak@redhat.com> - 102.5.0-2
|
||||||
|
- Added libwebrtc screencast patch for newer features
|
||||||
|
|
||||||
* Wed Nov 09 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
|
* Wed Nov 09 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
|
||||||
- Update to 102.5.0 build1
|
- Update to 102.5.0 build1
|
||||||
* Wed Oct 12 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
|
* Wed Oct 12 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
|
||||||
|
Loading…
Reference in New Issue
Block a user