From 7e3bd66d744b6d49bab40c7813aa2dca4e1da960 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 1 Feb 2021 12:23:49 +0100 Subject: [PATCH 1/3] Fix warnings from requires filtering MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Avoid using %{name} in %{mozappdir} definition as it's expanded separately for each subpackage when doing requires filtering, which then leads to expanding it as /usr/lib64/firefox, /usr/lib64/firefox-x11, /usr/lib64/firefox-wayland etc, which is incorrect. Just spell out "firefox" instead of "%{name}" to avoid this. find: ‘/builddir/build/BUILDROOT/firefox-85.0-8.npgo.fc33.x86_64/usr/lib64/firefox-x11’: No such file or directory --- firefox.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/firefox.spec b/firefox.spec index 3ef52af..3b15f0c 100644 --- a/firefox.spec +++ b/firefox.spec @@ -141,8 +141,8 @@ ExcludeArch: armv7hl %global nss_build_version %{nss_version} %endif -%global mozappdir %{_libdir}/%{name} -%global mozappdirdev %{_libdir}/%{name}-devel-%{version} +%global mozappdir %{_libdir}/firefox +%global mozappdirdev %{_libdir}/firefox-devel-%{version} %global langpackdir %{mozappdir}/langpacks %global tarballdir firefox-%{version} From 68ac29b2c1d2e456d72c1c15e9f05a024dd7fe43 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 1 Feb 2021 16:22:29 +0100 Subject: [PATCH 2/3] Enable WebRender on Wayland/KDE --- firefox-kde-webrender.patch | 33 +++++++++++++++++++++++++++++++++ firefox.spec | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 firefox-kde-webrender.patch diff --git a/firefox-kde-webrender.patch b/firefox-kde-webrender.patch new file mode 100644 index 0000000..b827a57 --- /dev/null +++ b/firefox-kde-webrender.patch @@ -0,0 +1,33 @@ +diff -up firefox-85.0/widget/GfxInfoX11.cpp.firefox-kde-webrender firefox-85.0/widget/GfxInfoX11.cpp +--- firefox-85.0/widget/GfxInfoX11.cpp.firefox-kde-webrender 2021-02-01 16:15:09.807773987 +0100 ++++ firefox-85.0/widget/GfxInfoX11.cpp 2021-02-01 16:20:26.115125315 +0100 +@@ -713,6 +713,14 @@ const nsTArray& GfxInfo:: + DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0), + "FEATURE_ROLLOUT_INTEL_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0"); + ++ APPEND_TO_DRIVER_BLOCKLIST_EXT( ++ OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, ++ DesktopEnvironment::KDE, WindowProtocol::Wayland, ++ DriverVendor::MesaAll, DeviceFamily::IntelRolloutWebRender, ++ nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS, ++ DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0), ++ "FEATURE_ROLLOUT_INTEL_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0"); ++ + // ATI Mesa baseline, chosen arbitrarily. + APPEND_TO_DRIVER_BLOCKLIST_EXT( + OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, +@@ -727,6 +735,14 @@ const nsTArray& GfxInfo:: + DriverVendor::MesaAll, DeviceFamily::AtiRolloutWebRender, + nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS, + DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0), ++ "FEATURE_ROLLOUT_ATI_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0"); ++ ++ APPEND_TO_DRIVER_BLOCKLIST_EXT( ++ OperatingSystem::Linux, ScreenSizeStatus::All, BatteryStatus::All, ++ DesktopEnvironment::KDE, WindowProtocol::Wayland, ++ DriverVendor::MesaAll, DeviceFamily::AtiRolloutWebRender, ++ nsIGfxInfo::FEATURE_WEBRENDER, nsIGfxInfo::FEATURE_ALLOW_ALWAYS, ++ DRIVER_GREATER_THAN_OR_EQUAL, V(18, 0, 0, 0), + "FEATURE_ROLLOUT_ATI_GNOME_WAYLAND_MESA", "Mesa 18.0.0.0"); + + #ifdef EARLY_BETA_OR_EARLIER diff --git a/firefox.spec b/firefox.spec index 3ef52af..b1b1d0b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -240,6 +240,7 @@ Patch226: rhbz-1354671.patch Patch227: firefox-locale-debug.patch Patch228: disable-openh264-download.patch Patch229: firefox-nss-addon-hack.patch +Patch230: firefox-kde-webrender.patch # Upstream patches Patch402: mozilla-1196777.patch @@ -453,6 +454,7 @@ This package contains results of tests executed during build. %patch227 -p1 -b .locale-debug %patch228 -p1 -b .disable-openh264-download %patch229 -p1 -b .firefox-nss-addon-hack +%patch230 -p1 -b .firefox-kde-webrender %patch402 -p1 -b .1196777 %patch407 -p1 -b .1667096 From 090200f68b6a39a69d240c44fea5345bc492bcfe Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 1 Feb 2021 16:23:56 +0100 Subject: [PATCH 3/3] Add Changelog --- firefox.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/firefox.spec b/firefox.spec index 7a81896..ca3b6de 100644 --- a/firefox.spec +++ b/firefox.spec @@ -174,7 +174,7 @@ ExcludeArch: armv7hl Summary: Mozilla Firefox Web browser Name: firefox Version: 85.0 -Release: 8%{?pre_tag}%{?dist} +Release: 9%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -1042,6 +1042,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Sat Jan 30 2021 Martin Stransky - 85.0-9 +- Enable WebRender on KDE/Wayland and AMD/Intel drivers. + * Sat Jan 30 2021 Martin Stransky - 85.0-8 - Enable Wayland backend on Fedora 34/KDE/Plasma (and other compositors) by default (https://bugzilla.redhat.com/show_bug.cgi?id=1922608).