From f1167d5e44c39a4ccfbbffc82e508237211aa9a3 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Mar 22 2024 09:17:38 +0000 Subject: Make wayland backend default on F40+ --- diff --git a/thunderbird.sh.in b/thunderbird.sh.in index a4173d6..3299b30 100644 --- a/thunderbird.sh.in +++ b/thunderbird.sh.in @@ -81,6 +81,8 @@ if [ "$WAYLAND_DISPLAY" ]; then export MOZ_DBUS_REMOTE=1 fi +__WAYLAND_X11_PLACEHOLDER__ + ## ## Automatically installed langpacks are tracked by .fedora-langpack-install ## config file. diff --git a/thunderbird.spec b/thunderbird.spec index 12cbef0..6df2d4d 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -227,6 +227,7 @@ based on RNP. %{mozappdir}/rnp-cli %{mozappdir}/rnpkeys +%if 0%{?fedora} < 40 %package wayland Summary: Thunderbird Wayland launcher. Requires: %{name} @@ -236,6 +237,7 @@ to run Thunderbird natively on Wayland. %files wayland %{_bindir}/thunderbird-wayland %attr(644,root,root) %{_datadir}/applications/mozilla-thunderbird-wayland.desktop +%endif %if %{enable_mozilla_crashreporter} %global moz_debug_prefix %{_prefix}/lib/debug @@ -559,9 +561,12 @@ done desktop-file-install --vendor mozilla \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE20} +# wayland desktop file only for older fedoras +%if 0%{?fedora} < 40 desktop-file-install --vendor mozilla \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE29} +%endif # set up the thunderbird start script @@ -569,9 +574,15 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/thunderbird %{__cat} %{SOURCE21} | %{__sed} -e 's,__PREFIX__,%{_prefix},g' > \ $RPM_BUILD_ROOT/%{_bindir}/thunderbird %{__chmod} 755 $RPM_BUILD_ROOT/%{_bindir}/thunderbird +# Enable wayland by default on f40+ +%if 0%{?fedora} >= 40 +sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,export MOZ_ENABLE_WAYLAND=1,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird +%else +sed -i -e 's,__WAYLAND_X11_PLACEHOLDER__,,g' $RPM_BUILD_ROOT/%{_bindir}/thunderbird %{__cat} %{SOURCE28} | %{__sed} -e 's,__PREFIX__,%{_prefix},g' > \ %{buildroot}%{_bindir}/thunderbird-wayland %{__chmod} 755 %{buildroot}%{_bindir}/thunderbird-wayland +%endif # set up our default preferences %{__cat} %{SOURCE12} | %{__sed} -e 's,THUNDERBIRD_RPM_VR,%{version}-%{release},g' \