From 716c9e379e3d439e3a8325af7dc150dc8ee93089 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 7 Jul 2025 07:38:56 +0800 Subject: [PATCH] 128.12.0 (cherry picked from commit 3791baf733937badf35bc3a8ebf694f2b2795884) --- icu-76.patch | 11 ++++++++++ ...z => thunderbird-128.12.0esr.source.tar.xz | 4 ++-- ...bird-langpacks-128.12.0esr-20250630.tar.xz | 4 ++-- thunderbird-mozconfig | 7 ++++++- thunderbird.spec | 20 +++++++++++++------ 5 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 icu-76.patch rename thunderbird-128.11.1esr.source.tar.xz => thunderbird-128.12.0esr.source.tar.xz (32%) rename thunderbird-langpacks-128.11.1esr-20250611.tar.xz => thunderbird-langpacks-128.12.0esr-20250630.tar.xz (32%) diff --git a/icu-76.patch b/icu-76.patch new file mode 100644 index 0000000..6a94fa6 --- /dev/null +++ b/icu-76.patch @@ -0,0 +1,11 @@ +--- thunderbird-128.12.0/js/moz.configure.orig 2025-07-06 12:09:10.637465000 +0800 ++++ thunderbird-128.12.0/js/moz.configure 2025-07-06 12:09:30.917088400 +0800 +@@ -1305,7 +1305,7 @@ + return enable_system_icu + + +-system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1", when="--with-system-icu") ++system_icu = pkg_check_modules("MOZ_ICU", "icu-i18n >= 73.1 icu-uc >= 73.1", when="--with-system-icu") + + + @depends(enable_system_icu_option) diff --git a/thunderbird-128.11.1esr.source.tar.xz b/thunderbird-128.12.0esr.source.tar.xz similarity index 32% rename from thunderbird-128.11.1esr.source.tar.xz rename to thunderbird-128.12.0esr.source.tar.xz index 6ce8cca..a9dda93 100644 --- a/thunderbird-128.11.1esr.source.tar.xz +++ b/thunderbird-128.12.0esr.source.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d3cdfcf7c2f7d262e6abb2d39e43f183fa6cc07c7cb0b4c2ebef349f2f4d946 -size 676156916 +oid sha256:f4232c8b4285d932d779fec90169b2a7008070a214571cf0fce0a68315ae7423 +size 681085772 diff --git a/thunderbird-langpacks-128.11.1esr-20250611.tar.xz b/thunderbird-langpacks-128.12.0esr-20250630.tar.xz similarity index 32% rename from thunderbird-langpacks-128.11.1esr-20250611.tar.xz rename to thunderbird-langpacks-128.12.0esr-20250630.tar.xz index 32b8f61..b3edeba 100644 --- a/thunderbird-langpacks-128.11.1esr-20250611.tar.xz +++ b/thunderbird-langpacks-128.12.0esr-20250630.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0c027d463496f766089d94f146c02fffc63aa5bb4139f4b852d62ce4e69fe07a -size 42048664 +oid sha256:fe0607fa57da35b1b2bdf2a30c790ad8e63989129ff9ef5783d75b8fab347fda +size 42375456 diff --git a/thunderbird-mozconfig b/thunderbird-mozconfig index 3b3b26f..2f93cd4 100644 --- a/thunderbird-mozconfig +++ b/thunderbird-mozconfig @@ -27,8 +27,13 @@ ac_add_options --without-sysroot #ac_add_options --prefix="$PREFIX" #ac_add_options --libdir="$LIBDIR" ac_add_options --with-system-jpeg +ac_add_options --with-system-png ac_add_options --with-system-zlib -#ac_add_options --with-system-libvpx +ac_add_options --with-system-bz2 +ac_add_options --with-system-libvpx +ac_add_options --with-system-webp +ac_add_options --enable-system-pixman +ac_add_options --with-system-libevent #ac_add_options --disable-tests #ac_add_options --disable-strip ## temporary disable system cairo, because compilation fails diff --git a/thunderbird.spec b/thunderbird.spec index fb0bb91..e50d04a 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -59,13 +59,13 @@ Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.11.1 +Version: 128.12.0 Release: 1 URL: https://www.mozilla.org/projects/thunderbird/ -License: MPLv1.1 or GPLv2+ or LGPLv2+ +License: MPL-2.0 OR GPL-2.0-or-later OR LGPL-2.0-or-later Source0: https://ftp.mozilla.org/pub/thunderbird/releases/%{version}esr/source/thunderbird-%{version}esr.source.tar.xz %if %{build_langpacks} -Source1: %{name}-langpacks-%{version}esr-20250611.tar.xz +Source1: %{name}-langpacks-%{version}esr-20250630.tar.xz %endif Source3: get-calendar-langpacks.sh Source4: cbindgen-vendor.tar.xz @@ -83,6 +83,7 @@ Source32: node-stdout-nonblocking-wrapper # Build patches Patch0: build-aarch64-skia.patch +Patch1: icu-76.patch # gcc 12 build fix patches Patch422: 0001-GLIBCXX-fix-for-GCC-12.patch @@ -107,9 +108,12 @@ BuildRequires: libjpeg-devel BuildRequires: zip BuildRequires: bzip2-devel BuildRequires: zlib-devel -#BuildRequires: libIDL-devel -BuildRequires: pkgconfig(gtk+-3.0) -BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 +BuildRequires: pkgconfig(libevent) +BuildRequires: pkgconfig(libwebp) >= 1.0.2 +BuildRequires: pkgconfig(libwebpdemux) >= 1.0.2 +BuildRequires: pkgconfig(pixman-1) >= 0.40.0 +BuildRequires: pkgconfig(vpx) >= 1.10.0 BuildRequires: krb5-devel BuildRequires: pango-devel BuildRequires: freetype-devel >= %{freetype_version} @@ -215,6 +219,7 @@ debug %{name}, you want to install %{name}-debuginfo instead. # Build patches %patch -P 0 -p1 -b .build-aarch64-skia +%patch -P 1 -p1 -b .icu %patch -P 402 -p1 -b .526293 %patch -P 406 -p1 -b .1170092-etc-conf @@ -568,6 +573,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* Sun Jul 06 2025 Funda Wang - 128.12.0-1 +- update to 128.12.0 + * Sat Jun 14 2025 Funda Wang - 128.11.1-1 - update to 128.11.1 -- Gitee