diff --git a/srcpkgs/thunderbird/patches/fix-image-format-warning.patch b/srcpkgs/thunderbird/patches/fix-image-format-warning.patch deleted file mode 100644 index 7cdff60ce2f..00000000000 --- a/srcpkgs/thunderbird/patches/fix-image-format-warning.patch +++ /dev/null @@ -1,39 +0,0 @@ -# HG changeset patch -# User Lee Salzman -# Date 1462463631 14400 -# Thu May 05 11:53:51 2016 -0400 -# Node ID 8da374804a09977c8f89af5e6e0cb37cb074595d -# Parent 29662e28a9c93ac67ee0b8ddfb65a9f29bbf73f5 -handle big-endian formats in Cairo format conversions - ---- a/gfx/2d/HelpersCairo.h -+++ b/gfx/2d/HelpersCairo.h -@@ -147,7 +147,14 @@ static inline cairo_format_t GfxFormatToCairoFormat(Su - case SurfaceFormat::R5G6B5_UINT16: - return CAIRO_FORMAT_RGB16_565; - default: -- gfxCriticalError() << "Unknown image format " << (int)format; -+ // _UINT32 formats don't match B8G8R8[AX]8 on big-endian platforms, -+ // and Moz2d uses B8G8R8[AX]8 as if it was _UINT32. -+ // See bug 1269654 -+ if (format == SurfaceFormat::B8G8R8X8) { -+ return CAIRO_FORMAT_RGB24; -+ } else if (format != SurfaceFormat::B8G8R8A8) { -+ gfxCriticalError() << "Unknown image format " << (int)format; -+ } - return CAIRO_FORMAT_ARGB32; - } - } -@@ -177,7 +184,11 @@ static inline cairo_content_t GfxFormatToCairoContent( - case SurfaceFormat::A8: - return CAIRO_CONTENT_ALPHA; - default: -- gfxCriticalError() << "Unknown image content format " << (int)format; -+ if (format == SurfaceFormat::B8G8R8X8) { -+ return CAIRO_CONTENT_COLOR; -+ } else if (format != SurfaceFormat::B8G8R8A8) { -+ gfxCriticalError() << "Unknown image content format " << (int)format; -+ } - return CAIRO_CONTENT_COLOR_ALPHA; - } - } diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 950be4194b6..2aae5873916 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -3,18 +3,9 @@ # THIS PKG MUST BE SYNCHRONIZED WITH "srcpkgs/thunderbird-i18n". # pkgname=thunderbird -version=140.6.0 +version=140.7.0 revision=1 build_helper="rust" -short_desc="Standalone Mail/News reader" -maintainer="classabbyamp " -license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" -homepage="https://www.thunderbird.net/" -distfiles="${MOZILLA_SITE}/thunderbird/releases/${version}esr/source/thunderbird-${version}esr.source.tar.xz" -checksum=c5ff00249b032009f34486c927e0d6566ac9c5f0b1d036548b5a880d4bbbddc6 - -lib32disabled=yes - hostmakedepends="autoconf unzip zip pkg-config perl python3.11 yasm rust cargo llvm clang nodejs cbindgen nasm which tar" makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel libicu77-devel @@ -25,6 +16,16 @@ makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel libicu77-devel $(vopt_if xscreensaver libXScrnSaver-devel) $(vopt_if sndio sndio-devel) $(vopt_if jack jack-devel)" depends="nss>=3.72 nspr>=4.32 desktop-file-utils hicolor-icon-theme libotr" +short_desc="Standalone Mail/News reader" +maintainer="classabbyamp " +license="MPL-2.0, GPL-2.0-or-later, LGPL-2.1-or-later" +homepage="https://www.thunderbird.net/" +distfiles="${MOZILLA_SITE}/thunderbird/releases/${version}esr/source/thunderbird-${version}esr.source.tar.xz" +checksum=97a9be86fae8881d3aa0f899dfa864b51723596cdeb6a09b3ecc2a0e81f45c18 + +alternatives="librnp:/usr/lib/thunderbird/librnp.so:/usr/lib/thunderbird/thunderbird-librnp.so" +shlib_provides="librnp.so" # alternative +lib32disabled=yes build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" @@ -198,6 +199,7 @@ ac_add_options --enable-default-toolkit=$(vopt_if wayland 'cairo-gtk3-wayland' ' rm -f old-configure ./mach build } + do_install() { export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system export MOZBUILD_STATE_PATH="${wrksrc}/mozbuild" @@ -216,6 +218,9 @@ do_install() { ln -s /usr/share/hunspell ${DESTDIR}/usr/lib/thunderbird/dictionaries ln -s /usr/share/hyphen ${DESTDIR}/usr/lib/thunderbird/hyphenation + # support sequoia librnp + mv ${DESTDIR}/usr/lib/thunderbird/{,thunderbird-}librnp.so + # We don't want the development stuff rm -rf ${DESTDIR}/usr/{include,lib/thunderbird-devel,share/idl}