From 3bdd2525c15c2923159e655b325eeb4f23d3b955ef569ac3b93391079162ef8d Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 8 Oct 2020 14:14:28 +0000 Subject: [PATCH 1/2] - remove python2 dependencies for Leap 15 and TW OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=554 --- MozillaThunderbird.changes | 5 +++++ MozillaThunderbird.spec | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index c1b136d..03e3ce7 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Oct 8 14:13:49 UTC 2020 - Wolfgang Rosenauer + +- remove python2 dependencies for Leap 15 and TW + ------------------------------------------------------------------- Wed Oct 7 07:02:03 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index b49b1cf..961d739 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -90,13 +90,12 @@ BuildRequires: mozilla-nspr-devel >= 4.25.1 BuildRequires: mozilla-nss-devel >= 3.53.1 BuildRequires: nasm >= 2.14 BuildRequires: nodejs10 >= 10.21.0 -BuildRequires: python-devel %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 BuildRequires: python-libxml2 BuildRequires: python36 %else -BuildRequires: python2-xml BuildRequires: python3 >= 3.5 +BuildRequires: python3-devel %endif BuildRequires: rust >= 1.41 BuildRequires: rust-cbindgen >= 0.14.1 From 8d908f5892e8f0b374ceb970a579202ae9b5360112ec3c13ddc394cfb62450d1 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Fri, 16 Oct 2020 13:01:17 +0000 Subject: [PATCH 2/2] - Mozilla Thunderbird 78.3.3 * OpenPGP: Improved support for encrypting with subkeys * OpenPGP message status icons were not visible in message header pane * OpenPGP Key Manager was missing from Tools menu on macOS * Creating a new calendar event did not require an event title - remove python2 dependencies for TW - support wayland mode/autodetection in startup wrapper - replace some Requires to use requires_ge macro where appropriate - improve langpack build (as already used for Firefox) - add ccache statistics output to build OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=555 --- MozillaThunderbird.changes | 13 +++++- MozillaThunderbird.spec | 66 +++++++++++++++++++++------- l10n-78.3.2.tar.xz | 3 -- l10n-78.3.3.tar.xz | 3 ++ mozilla.sh.in | 15 +++++-- tar_stamps | 8 ++-- thunderbird-78.3.2.source.tar.xz | 3 -- thunderbird-78.3.2.source.tar.xz.asc | 16 ------- thunderbird-78.3.3.source.tar.xz | 3 ++ thunderbird-78.3.3.source.tar.xz.asc | 16 +++++++ 10 files changed, 99 insertions(+), 47 deletions(-) delete mode 100644 l10n-78.3.2.tar.xz create mode 100644 l10n-78.3.3.tar.xz delete mode 100644 thunderbird-78.3.2.source.tar.xz delete mode 100644 thunderbird-78.3.2.source.tar.xz.asc create mode 100644 thunderbird-78.3.3.source.tar.xz create mode 100644 thunderbird-78.3.3.source.tar.xz.asc diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 03e3ce7..65dd8d7 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,7 +1,16 @@ ------------------------------------------------------------------- -Thu Oct 8 14:13:49 UTC 2020 - Wolfgang Rosenauer +Thu Oct 15 14:31:39 UTC 2020 - Wolfgang Rosenauer -- remove python2 dependencies for Leap 15 and TW +- Mozilla Thunderbird 78.3.3 + * OpenPGP: Improved support for encrypting with subkeys + * OpenPGP message status icons were not visible in message header pane + * OpenPGP Key Manager was missing from Tools menu on macOS + * Creating a new calendar event did not require an event title +- remove python2 dependencies for TW +- support wayland mode/autodetection in startup wrapper +- replace some Requires to use requires_ge macro where appropriate +- improve langpack build (as already used for Firefox) +- add ccache statistics output to build ------------------------------------------------------------------- Wed Oct 7 07:02:03 UTC 2020 - Wolfgang Rosenauer diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 961d739..0a53a3d 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -26,8 +26,8 @@ # major 69 # mainver %major.99 %define major 78 -%define mainver %major.3.2 -%define orig_version 78.3.2 +%define mainver %major.3.3 +%define orig_version 78.3.3 %define orig_suffix %{nil} %define update_channel release %define source_prefix thunderbird-%{orig_version} @@ -62,11 +62,13 @@ %define localize 1 %define crashreporter 0 %if 0%{?sle_version} > 150100 -# pipewire is too old on Leap <=15.1 +# pipewire and wayland is too old on Leap <=15.1 # Activate only on everything newer %define with_pipewire0_3 1 +%define wayland_supported 1 %else %define with_pipewire0_3 0 +%define wayland_supported 0 %endif Name: %{pkgname} @@ -90,10 +92,17 @@ BuildRequires: mozilla-nspr-devel >= 4.25.1 BuildRequires: mozilla-nss-devel >= 3.53.1 BuildRequires: nasm >= 2.14 BuildRequires: nodejs10 >= 10.21.0 +# Leap 15 still requires python2 for BE (ICU creation) +%if 0%{?suse_version} < 1550 +BuildRequires: python-devel +BuildRequires: python2-xml +%endif %if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000 +# SLE12 exception BuildRequires: python-libxml2 BuildRequires: python36 %else +# TW is python2 free BuildRequires: python3 >= 3.5 BuildRequires: python3-devel %endif @@ -193,12 +202,13 @@ Patch24: mozilla-bmo1602730.patch Patch25: mozilla-bmo998749.patch Patch26: mozilla-bmo1626236.patch Patch27: mozilla-s390x-skia-gradient.patch -%endif # only_print_mozconfig +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh ### build options end -Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) -Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) +%requires_ge mozilla-nspr +%requires_ge mozilla-nss +%requires_ge libfreetype6 Recommends: libcanberra0 Recommends: libpulse0 Requires(post): desktop-file-utils @@ -292,7 +302,7 @@ fi %patch25 -p1 %patch26 -p1 %patch27 -p1 -%endif # only_print_mozconfig +%endif %build %if !%{with only_print_mozconfig} @@ -317,9 +327,9 @@ if test "$kdehelperversion" != %{kde_helper_version}; then exit 1 fi %endif -%endif # only_print_mozconfig source %{SOURCE4} +%endif export CARGO_HOME=${RPM_BUILD_DIR}/%{srcname}-%{orig_version}/.cargo export MOZ_SOURCE_CHANGESET=$RELEASE_TAG @@ -408,9 +418,6 @@ ac_add_options --disable-elf-hack ac_add_options --with-system-nspr ac_add_options --with-system-nss ac_add_options --with-ccache -%if %{localize} -ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n -%endif ac_add_options --with-system-zlib ac_add_options --disable-updater ac_add_options --disable-tests @@ -472,14 +479,38 @@ xvfb-run --server-args="-screen 0 1920x1080x24" \ %if %localize mkdir -p %{buildroot}%{progdir}/extensions/ truncate -s 0 %{_tmppath}/translations.{common,other} +# langpack-build can not be done in parallel easily (see https://bugzilla.mozilla.org/show_bug.cgi?id=1660943) +# Therefore, we have to have a separate obj-dir for each language +# We do this, by creating a mozconfig-template with the necessary switches +# and a placeholder obj-dir, which gets copied and modified for each language + +# Create mozconfig-template for langbuild +cat << EOF > ${MOZCONFIG}_LANG +mk_add_options MOZILLA_OFFICIAL=1 +mk_add_options BUILD_OFFICIAL=1 +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj_LANG +ac_add_options --enable-application=comm/mail +ac_add_options --prefix=%{_prefix} +ac_add_options --with-l10n-base=$RPM_BUILD_DIR/l10n +ac_add_options --disable-updater +ac_add_options --enable-official-branding +EOF + sed -r '/^(ja-JP-mac|en-US|$)/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/comm/mail/locales/shipped-locales \ - | xargs -n 1 -I {} /bin/sh -c ' + | xargs -n 1 %{?jobs:-P %jobs} -I {} /bin/sh -c ' locale=$1 - ./mach build langpack-$locale - cp -rL ../obj/dist/xpi-stage/locale-$locale \ + cp ${MOZCONFIG}_LANG ${MOZCONFIG}_$locale + sed -i "s|obj_LANG|obj_$locale|" ${MOZCONFIG}_$locale + export MOZCONFIG=${MOZCONFIG}_$locale + # nsinstall is needed for langpack-build. It is already built by `./mach build`, but building it again is very fast + ./mach build config/nsinstall langpack-$locale + cp -rL ../obj_$locale/dist/xpi-stage/locale-$locale \ %{buildroot}%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org - # remove prefs and profile defaults from langpack + # remove prefs, profile defaults, and hyphenation from langpack rm -rf %{buildroot}%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org/defaults + rm -rf %{buildroot}%{progdir}/extensions/langpack-$locale@thunderbird.mozilla.org/hyphenation + # Build systems like to run out of disc-space, so we delete the build-dir here (we copied already all relevant files) + rm -rf ../obj_$locale/ # check against the fixed common list and sort into the right filelist _matched=0 for _match in ar ca cs da de el en-GB es-AR es-CL es-ES fi fr hu it ja ko nb-NO nl pl pt-BR pt-PT ru sv-SE zh-CN zh-TW; do @@ -490,7 +521,9 @@ sed -r '/^(ja-JP-mac|en-US|$)/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/comm/m >> %{_tmppath}/translations.$_l10ntarget ' -- {} %endif -%endif # only_print_mozconfig + +ccache -s +%endif %install cd $RPM_BUILD_DIR/obj @@ -520,6 +553,7 @@ mkdir --parents %{buildroot}%{_bindir}/ sed "s:%%PREFIX:%{_prefix}:g s:%%PROGDIR:%{progdir}:g s:%%APPNAME:%{progname}:g +s:%%WAYLAND_SUPPORTED:%{wayland_supported}:g s:%%PROFILE:.thunderbird:g" \ %{SOURCE3} > %{buildroot}%{progdir}/%{progname}.sh chmod 755 %{buildroot}%{progdir}/%{progname}.sh diff --git a/l10n-78.3.2.tar.xz b/l10n-78.3.2.tar.xz deleted file mode 100644 index 29c2a85..0000000 --- a/l10n-78.3.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46c46e19d52f44f7fbe31c91568f6fd408e3cd8ccf03fd697c143b3bc3b25824 -size 29052792 diff --git a/l10n-78.3.3.tar.xz b/l10n-78.3.3.tar.xz new file mode 100644 index 0000000..f23f74f --- /dev/null +++ b/l10n-78.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c00f2e1e5e60e3bc4cf9430003276bfc29961a065e63faffcdb642d13259f7bc +size 29062056 diff --git a/mozilla.sh.in b/mozilla.sh.in index df51608..d921bf0 100644 --- a/mozilla.sh.in +++ b/mozilla.sh.in @@ -87,6 +87,18 @@ export LD_LIBRARY_PATH # needed for SUN Java under Xorg >= 7.2 export LIBXCB_ALLOW_SLOPPY_LOCK=1 +# disable Gnome crash dialog (doesn't make sense anyway) +export GNOME_DISABLE_CRASH_DIALOG=1 + +# Wayland +# Only supported on newer systems +WAYLAND_SUPPORTED=%WAYLAND_SUPPORTED + +# $XDG_SESSION_TYPE should contain either x11 or wayland +if [ $WAYLAND_SUPPORTED -eq 1 ] && [ "$XDG_SESSION_TYPE" = "wayland" ]; then + export MOZ_ENABLE_WAYLAND=1 +fi + ## if [ -z "$MOZ_PLUGIN_PATH" ]; then export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR @@ -99,9 +111,6 @@ else fi fi -# disable Gnome crash dialog (doesn't make sense anyway) -export GNOME_DISABLE_CRASH_DIALOG=1 - moz_debug=0 script_args="" pass_arg_count=0 diff --git a/tar_stamps b/tar_stamps index 04bd7c2..3745b40 100644 --- a/tar_stamps +++ b/tar_stamps @@ -1,10 +1,10 @@ PRODUCT="thunderbird" CHANNEL="esr78" -VERSION="78.3.2" +VERSION="78.3.3" VERSION_SUFFIX="" -PREV_VERSION="78.3.1" +PREV_VERSION="78.3.2" PREV_VERSION_SUFFIX="" #SKIP_LOCALES="" # Uncomment to skip l10n and compare-locales-generation RELEASE_REPO="https://hg.mozilla.org/releases/comm-esr78" -RELEASE_TAG="6ee0e0ff64f4ccda9c478426d0b5d15cd583f8e6" -RELEASE_TIMESTAMP="20201006011220" +RELEASE_TAG="a7e8cbc5a527a8881fe14e5f95ae2aff2cd4eb4f" +RELEASE_TIMESTAMP="20201014192622" diff --git a/thunderbird-78.3.2.source.tar.xz b/thunderbird-78.3.2.source.tar.xz deleted file mode 100644 index ef02b77..0000000 --- a/thunderbird-78.3.2.source.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c608b1e0859b8cad4cd02d5fa3e70797eb4c021ed485d7bfcb8b1f7604c5ac1 -size 353894084 diff --git a/thunderbird-78.3.2.source.tar.xz.asc b/thunderbird-78.3.2.source.tar.xz.asc deleted file mode 100644 index 5bf9c8b..0000000 --- a/thunderbird-78.3.2.source.tar.xz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl97++IACgkQ8aZmj7t9 -Vy62gQ//aTqqLgRyL5eDCbvm9Xt2deGcdUj5YAIwdO1hXTIt7zi+vqQmxPEf7G1w -uQz1WxITjtci7S3diT7yZpgAvht1ck7b3IST3Oyn/4Q8J1J52BhDavabfLf7aYUq -laB8WcXiR02toiH9p23QUoNe+ktGH3Xighm+x7Yfe8uFferDVt67hSuJOSg622X4 -MjVSBbBgJUYeyHajo2VfBVhjTKKz2GdTErY05J+Ka72zY60eZvnc+AN719FFpnA8 -v0Lsq6PntMo9hdIDbY1JFqRaucpIB9Px2/1Zeh/D8gas0iZN9uGljzwKeAq7KQ3X -CsIjinwfo4Czd55hJA2tkotBsAo0ksD1nuImvQQD49Ce9xpLMLs5LvKDbd0cm5+b -aMZIsU1SaJ9rC5Crsv9z1afJoP008cfCefVcyEiZl3eu5GL9Xbx6Y4znLQqy7d2F -GxVIac4vDQ3BFYQItIOG0a0PvEiuFLDNWP58Vc9s9ML9m1J+i7rExYrS17HKIkD2 -JmVONidTS51zqNest7J/CQgPXBIFD3PlVdLt+2ANn1CAJjVugeKaLN2h1Pob/RHk -dSXGDAwICwpYWaf4+Ypo1FAUM7Uow3F3vTKGn3tmQorWL9QgE1BcUiuVu1lt5EST -EN4yfdMH9ua9wkPXSeNdibj7iX75Mr5dSrm7gNf7kaiR4yzMWJA= -=zLX4 ------END PGP SIGNATURE----- diff --git a/thunderbird-78.3.3.source.tar.xz b/thunderbird-78.3.3.source.tar.xz new file mode 100644 index 0000000..a467cab --- /dev/null +++ b/thunderbird-78.3.3.source.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e7852509dbed8b0586637a6080eb043c25a21fdee64ed63b68379dc30c29b3b0 +size 361488376 diff --git a/thunderbird-78.3.3.source.tar.xz.asc b/thunderbird-78.3.3.source.tar.xz.asc new file mode 100644 index 0000000..98b9f99 --- /dev/null +++ b/thunderbird-78.3.3.source.tar.xz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEECXsxMHeuYqAvhNpN8aZmj7t9Vy4FAl+HZ1IACgkQ8aZmj7t9 +Vy5Qyg//R4YYdnRyAPuvAbny8g4YjQtcXpC4m3Yd9mDromiRQVlDDC7QlYfg0psq ++N3UgzFjosmfJ0iBmdZdBFdUIUxTUZOrWYg3NkYdTTBOB9yvI9r4+WGaFiavfH5e +QLKTIHz8If8V1sb0zTyDe2rLE5FHIUflawP00DPPB1txPBRa4KOVf/8bXj1r2EGL +ha4SJ4rqALJZmup3asPP8DNRgFK7768k3azV2Ep4zsmEU75IQAyxbt/NWPsNztW6 +S/Sb2oJxH+FumWqcGe6pwSP2aL6uesoGw3gLZaFlYxZG+6O2BoaZ5dn3PE3Y3/X9 +f7RyXnq+VnnlxhAW+EibVJ8KHvY2ptlDhoTS8xBKyMQu+jaAeeiBaGynWIMW5NpU +AlVpEe7DQuDyFHnMF2LK/Udw/oMztGa7n8eTM2Lv+GiCE4kNmnlzENluIxYAm49e +LRnvS6Pn8YuzSF1t0LtyA59nNfUieKWCM0+vaP97p5viEyorR2RY9HwQnxlk+xMq +Zewoi4JOe2nBvsBBGnrFkxGdQkyX7eBjaJ8Lqmbwx217Ys2kQbLGJaKV49QVEQQr +b0k8gAd//1o1NBTTxEFnwV1+KgloTU0TqBf8OcMaICrnXwfhQJ4yUyvxaWFIfN/b +rYI4l8zhT+aIhBlwALH15mbHyHkdT7+Wr0G49HushIsu5q9nbSc= +=Tkvy +-----END PGP SIGNATURE-----