firefox-91.0-1

f/firefox/firefox-vl.spec

@@ -1,16 +1,15 @@
 %bcond_with clang
 
 # do not include minor version number in MOZILLA_FIVE_HOME
-%global ffmajor 78.12
-%global geckomajor 78.12
+%global ffmajor 91
 %global ffminor 0
 %global ffversion %{ffmajor}%{?ffminor:.%{ffminor}}
 %define ffdir %{_libdir}/firefox
 %define tarballdir firefox-%{ffversion}
 %global mozappdir     %{_libdir}/%{name}
 %global langpackdir   %{mozappdir}/distribution/extensions
-
 %global nodewrapperdir %{_builddir}/%{tarballdir}/bin
+%global build_with_pgo    0
 
 %define firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
 %define homepage https://vinelinux.org/
@@ -21,8 +20,6 @@
 
 %define desktop_file_utils_version 0.6
 %define libjpeg_turbo_version 1.1.0
-#%define gecko_version %{geckomajor}%{?ffminor:.%{ffminor}}
-%define gecko_version %{geckomajor}
 
 ExclusiveArch: i386 i586 i686 x86_64 ia64 ppc
 
@@ -39,7 +36,7 @@ Packager:       daisuke
 URL:            https://www.mozilla.org/ja/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}esr/source/firefox-%{version}esr.source.tar.xz
-Source2:        cbindgen-vendor-0.14.3.tar.xz
+Source2:        cbindgen-vendor.tar.xz
 
 Source230:      mozconfig-firefox-vine6
 Source240:      mozconfig-firefox-vine7
@@ -76,11 +73,8 @@ Source3000:     firefox.metainfo.xml
 #Patch26:        build-icu-big-endian.patch
 #Patch32:        build-rust-ppc64le.patch
 #Patch35:        build-ppc-jit.patch
-# Always feel lucky for unsupported platforms:
-# https://bugzilla.mozilla.org/show_bug.cgi?id=1347128
-#Patch37:        build-jit-atomic-always-lucky.patch
 # Fixing missing cacheFlush when JS_CODEGEN_NONE is used (s390x)
-#Patch38:        build-cacheFlush-missing.patch
+Patch38:        build-cacheFlush-missing.patch
 #Patch40:        build-aarch64-skia.patch
 Patch41:        build-disable-elfhack.patch
 #Patch44:        build-arm-libopus.patch
@@ -88,38 +82,45 @@ Patch46:        firefox-nss-version.patch
 #Patch47:        fedora-shebang-build.patch
 #Patch48:        build-arm-wasm.patch
 #Patch49:        build-arm-libaom.patch
+Patch53:        firefox-gcc-build.patch
+# This should be fixed in Firefox 83
+Patch54:        mozilla-1669639.patch
+Patch55:        firefox-testing.patch
+Patch57:        firefox-disable-ffvpx-with-vapi.patch
+#Patch58:        firefox-crashreporter-build.patch
+#Patch59:        build-python-1.patch
+#Patch60:        build-python-2.patch
+Patch61:        firefox-glibc-dynstack.patch
+
+# Test patches
+# Generate without context by
+# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-xpcshell
+# GENDIFF_DIFF_ARGS=-U0 gendiff firefox-xxxx .firefox-tests-reftest
+Patch100:       firefox-tests-xpcshell.patch
+#Patch101:       firefox-tests-reftest.patch
+Patch102:       firefox-tests-xpcshell-freeze.patch
 
 # Fedora specific patches
 Patch215:        firefox-enable-addons.patch
 Patch219:        rhbz-1173156.patch
-Patch221:        firefox-fedora-ua.patch
+Patch221:        firefox-vine-ua.patch
 Patch224:        mozilla-1170092.patch
-#ARM run-time patch
-Patch226:        rhbz-1354671.patch
-Patch227:        firefox-locale-debug.patch
+#Patch228:        disable-openh264-download.patch
+Patch229:        firefox-nss-addon-hack.patch
 
 # Upstream patches
 Patch402:        mozilla-1196777.patch
-Patch412:        mozilla-1337988.patch
-Patch415:        Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
-Patch417:        bug1375074-save-restore-x28.patch
-Patch422:        mozilla-1580174-webrtc-popup.patch
-
-# Wayland specific upstream patches
-#Patch574:        firefox-pipewire-0-2.patch
-#Patch575:        firefox-pipewire-0-3.patch
-
-#VA-API patches
-Patch584:        firefox-disable-ffvpx-with-vapi.patch
-Patch585:        firefox-vaapi-extra-frames.patch
-Patch589:        mozilla-1634213.patch
+Patch407:        mozilla-1667096.patch
+Patch408:        mozilla-1663844.patch
+Patch415:        mozilla-1670333.patch
+Patch420:        mochitest-wayland-workaround.patch
+#Patch423:        mozilla-1646135.patch
+#Patch424:        mozilla-1715254.patch
 
 # PGO/LTO patches
 Patch600:        pgo.patch
 Patch602:        mozilla-1516803.patch
 
-#Patch700:        rust-1.47.patch
-
 # customization patches
 
 ## Vine patch
@@ -155,8 +156,9 @@ BuildRequires:  nasm
 BuildRequires:  nodejs > 10.0.0
 BuildRequires:  pango-devel
 BuildRequires:  pulseaudio-libs-devel
-BuildRequires:  python-devel
-BuildRequires:  python
+BuildRequires:  python3
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 BuildRequires:  rust >= 1.34.0
 BuildRequires:  cargo
 BuildRequires:  startup-notification-devel
@@ -165,6 +167,8 @@ BuildRequires:  wget
 BuildRequires:  yasm
 BuildRequires:  zip
 BuildRequires:  zlib-devel
+BuildRequires:  nspr-devel
+BuildRequires:  nss-devel
 
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 
@@ -195,40 +199,51 @@ FX ウェブブラウザは Mozilla テクノロジーをベースとしたオ
 %setup -q -n %{name}-%{version} -c
 cd %{tarballdir}
 
+
+
 %if 0%{?disable_elfhack}
 %patch41 -p1 -b .disable-elfhack
 %endif
-%patch46 -p1 -b .nss-version
+#patch46 -p1 -b .nss-version
+#patch48 -p1 -b .build-arm-wasm
+#patch49 -p1 -b .build-arm-libaom
+%patch53 -p1 -b .firefox-gcc-build
+%patch54 -p1 -b .1669639
+%patch55 -p1 -b .testing
+%patch57 -p1 -b .ffvpx-with-vapi
+#patch58 -p1 -b .firefox-crashreporter-build
+#patch59 -p1 -b .build-python-1
+#patch60 -p1 -b .build-python-2
+%patch61 -p1 -b .glibc-dynstack
+
+# Test patches
+%patch100 -p1 -b .firefox-tests-xpcshell
+#patch101 -p1 -b .firefox-tests-reftest
+%patch102 -p1 -b .firefox-tests-xpcshell-freeze
 
 # Fedora patches
 %patch215 -p1 -b .addons
 %patch219 -p1 -b .rhbz-1173156
-%patch221 -p1 -b .fedora-ua
+%patch221 -p1 -b .vine-ua
 %patch224 -p1 -b .1170092
-#ARM run-time patch
-%ifarch aarch64
-%patch226 -p1 -b .1354671
-%endif
-%patch227 -p1 -b .locale-debug
+#patch228 -p1 -b .disable-openh264-download
+%patch229 -p1 -b .firefox-nss-addon-hack
 
 %patch402 -p1 -b .1196777
-%ifarch %{arm}
-%patch415 -p1 -b .1238661
-%endif
-
-#patch584 -p1 -b .firefox-disable-ffvpx-with-vapi
-#patch585 -p1 -b .firefox-vaapi-extra-frames
-#patch589 -p1 -b .mozilla-1634213
+#patch407 -p1 -b .1667096
+%patch408 -p1 -b .1663844
+%patch415 -p1 -b .1670333
+%patch420 -p1 -b .mochitest-wayland-workaround
+#patch423 -p1 -b .1646135
+#patch424 -p1 -b .1715254
 
 # PGO patches
+%if %{build_with_pgo}
+%if !%{build_with_clang}
 %patch600 -p1 -b .pgo
-#fix
 %patch602 -p1 -b .1516803
-
-# for rust-1.47
-# %patch700 -p1 -b .rust-1.47
-
-#%patch1000 -p0 -b .ignore-exception
+%endif
+%endif
 
 perl -pi \
 -e 's|pref\("extensions.langpacks.signatures.required".*$|pref("extensions.langpacks.signatures.required", false);|' \
@@ -262,10 +277,6 @@ echo 'ac_add_options --enable-optimize=%{?optimize_flags}' >> .mozconfig
 echo "ac_add_options --disable-debug-symbols" >> .mozconfig
 echo "ac_add_options --disable-debug" >> .mozconfig
 
-%if %{with clang}
-echo "ac_add_options --enable-linker=lld" >> .mozconfig
-%endif
-
 echo 'export NODEJS="%{nodewrapperdir}/node-stdout-nonblocking-wrapper"' >> .mozconfig
 
 # Remove executable bit to make brp-mangle-shebangs happy.
@@ -314,6 +325,7 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
 MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
+export MOZ_DEBUG_FLAGS=" "
 
 export MOZILLA_OFFICIAL=1
 export BUILD_OFFICIAL=1
@@ -323,26 +335,28 @@ export PREFIX='%{_prefix}'
 export LIBDIR='%{_libdir}'
 
 %if %{with clang}
-export CC=clang
-export CXX=clang++
-export LLVM_PROFDATA="llvm-profdata"
-export AR="llvm-ar"
-export NM="llvm-nm"
-export RANLIB="llvm-ranlib"
+echo "export CC=clang" >> .mozconfig
+echo "export CXX=clang++" >> .mozconfig
+echo "export LLVM_PROFDATA=\"llvm-profdata\"" >> .mozconfig
+echo "export AR=\"llvm-ar\"" >> .mozconfig
+echo "export NM=\"llvm-nm\"" >> .mozconfig
+echo "export RANLIB=\"llvm-ranlib\"" >> .mozconfig
+echo "ac_add_options --enable-linker=lld" >> .mozconfig
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wno-ignored-optimization-argument"
 %else
-export CC=gcc
-export CXX=g++
-export AR="gcc-ar"
-export NM="gcc-nm"
-export RANLIB="gcc-ranlib"
+echo "export CC=gcc" >> .mozconfig
+echo "export CXX=g++" >> .mozconfig
+echo "export AR=\"gcc-ar\"" >> .mozconfig
+echo "export NM=\"gcc-nm\"" >> .mozconfig
+echo "export RANLIB=\"gcc-ranlib\"" >> .mozconfig
 MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
 %endif
 
+echo "export CFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig
+echo "export CXXFLAGS=\"$MOZ_OPT_FLAGS\"" >> .mozconfig
+echo "export LDFLAGS=\"$MOZ_LINK_FLAGS\"" >> .mozconfig
+
 export RPM_OPT_FLAGS=$MOZ_OPT_FLAGS
-export CFLAGS=$MOZ_OPT_FLAGS
-export CXXFLAGS=$MOZ_OPT_FLAGS
-export LDFLAGS=$MOZ_LINK_FLAGS
 export RUSTFLAGS="-Cdebuginfo=0"
 
 MOZ_SMP_FLAGS=-j1
@@ -359,13 +373,12 @@ MOZ_SMP_FLAGS=-j1
 sed -i 's/\(MOZ_PKG_FATAL_WARNINGS =\).*/\1 0/' \
   browser/installer/Makefile.in &&
 
-export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
-#export MOZ_SERVICES_SYNC="1"
-#export STRIP=/bin/true
-MOZ_NOSPAM=1 ./mach build
+echo "mk_add_options MOZ_MAKE_FLAGS=\"$MOZ_SMP_FLAGS\"" >> .mozconfig
+#echo "mk_add_options MOZ_SERVICES_SYNC=1" >> .mozconfig
+#echo "export STRIP=/bin/true" >> .mozconfig
+export MACH_USE_SYSTEM_PYTHON=1
 
-#export LDFLAGS="-Wl,-rpath,%{ffdir}"
-#%__make -f client.mk build MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
+./mach build 2>&1 | cat -
 
 #---------------------------------------------------------------------
 
@@ -553,6 +566,11 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Aug 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 91.0-1
+- updated to 91.0.
+- updated Source2.
+- refreshed patches.
+
 * Fri Jul 16 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 78.12.0-1
 - updated to 78.12.0.