From 1061b137476f9b5bc10d4cf2231b4cd854c8aaca Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 18:29:35 +0100 Subject: [PATCH] remove internal requirements for librnp.so [release 102.4.0-2mamba;Wed Oct 26 2022] --- thunderbird-102.3.2-cbindgen-0.24.patch | 17 +++++ thunderbird.spec | 96 ++++++++++++------------- 2 files changed, 63 insertions(+), 50 deletions(-) create mode 100644 thunderbird-102.3.2-cbindgen-0.24.patch diff --git a/thunderbird-102.3.2-cbindgen-0.24.patch b/thunderbird-102.3.2-cbindgen-0.24.patch new file mode 100644 index 0000000..3011e8a --- /dev/null +++ b/thunderbird-102.3.2-cbindgen-0.24.patch @@ -0,0 +1,17 @@ +Description: Remove an extra constant definition that is now being generated by newer versions of cbindgen (0.24), and causing build failures because it is defined in several places. +Author: Olivier Tilloy +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1773259 +Forwarded: not-needed + +--- a/gfx/webrender_bindings/webrender_ffi.h ++++ b/gfx/webrender_bindings/webrender_ffi.h +@@ -73,8 +73,6 @@ struct WrPipelineInfo; + struct WrPipelineIdAndEpoch; + using WrPipelineIdEpochs = nsTArray; + +-const uint64_t ROOT_CLIP_CHAIN = ~0; +- + } // namespace wr + } // namespace mozilla + + diff --git a/thunderbird.spec b/thunderbird.spec index 3254772..2654651 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1,7 +1,6 @@ %define distroname openmamba %define majversion %(echo %version | cut -d. -f 1-2) %define mozilla_version %(echo %version | cut -d. -f 1) -%define thunderbird_internal %{majversion} %define tbdir %{_libdir}/thunderbird #%define enable_debug_info 0 #%define build_langpack 1 @@ -9,8 +8,8 @@ #%define source_dir comm-esr%(echo %version | cut -d. -f1) Name: thunderbird -Version: 91.10.0 -Release: 1mamba +Version: 102.4.0 +Release: 2mamba Summary: Mozilla Thunderbird email, RSS, and newsgroup client Group: Graphical Desktop/Applications/Internet Vendor: openmamba @@ -28,6 +27,7 @@ Patch14: thunderbird-78.8.1-rust-1.48.patch Patch15: thunderbird-78.8.1-fix-passing-system-bzip2-ldflags.patch Patch16: thunderbird-91.4.1-python-setuptools-60.0.4.patch Patch17: thunderbird-91.5.1-libwayland-1.20.0.patch +Patch18: thunderbird-102.3.2-cbindgen-0.24.patch License: GPL,MPL 1.1,LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: firefox-devel @@ -39,9 +39,11 @@ BuildRequires: libXdamage-devel BuildRequires: libXext-devel BuildRequires: libXfixes-devel BuildRequires: libXi-devel +BuildRequires: libXrandr-devel BuildRequires: libXrender-devel -BuildRequires: libXt-devel -BuildRequires: libatk-devel +BuildRequires: libXtst-devel +BuildRequires: libalsa-devel +BuildRequires: libat-spi2-core-devel BuildRequires: libbotan-devel BuildRequires: libbzip2-devel BuildRequires: libcairo-devel @@ -62,7 +64,7 @@ BuildRequires: libnss-devel BuildRequires: libpango-devel BuildRequires: libpixman-devel BuildRequires: libstdc++6-devel -BuildRequires: libvpx-devel +BuildRequires: libvpx6-devel BuildRequires: libwebp-devel BuildRequires: libxcb-devel BuildRequires: libz-devel @@ -122,7 +124,7 @@ This package contains the %{2} language support files for Thunderbird.\ \ %files langpack-%{1}\ %defattr(-,root,root)\ -%{tbdir}/distribution/extensions/langpack-%{1}@thunderbird.mozilla.org.xpi +%{_libdir}/thunderbird/distribution/extensions/langpack-%{1}@thunderbird.mozilla.org.xpi %lang_subpkg af Afrikaans %lang_subpkg ar Arabic @@ -144,6 +146,7 @@ This package contains the %{2} language support files for Thunderbird.\ %lang_subpkg en-US %{quote:English (USA)} %lang_subpkg es-AR %{quote:Spanish (Latin American)} %lang_subpkg es-ES Spanish +%lang_subpkg es-MX %{quote:Spanish (Mexico)} %lang_subpkg et Estonian %lang_subpkg eu Basque #% lang_subpkg fa %{quote:Persian - Farsi (IR)} @@ -200,16 +203,20 @@ This package contains the %{2} language support files for Thunderbird.\ #% debug_package %prep -%setup -q +%setup -q -c #-D -T #:<< ___EOF -%global __provides_exclude_from ^%{_libdir}/thunderbird/.*$ -%global __requires_exclude ^(libxul\\.so.*|libldap.*\\.so.*|libldif.*\\.so.*|libmoz.*\\.so.*|libprldap.*\\.so.*)$ -#%patch14 -p1 -#%patch15 -p1 -%patch16 -p1 -#%patch17 -p1 -b .libwayland-1.20.0 +# Don't clean build at the end +%global __spec_rmbuild_cmd /bin/true + +%global __provides_exclude_from ^%{_libdir}/thunderbird/.*$ +%global __requires_exclude ^(libxul\\.so.*|libldap.*\\.so.*|libldif.*\\.so.*|libmoz.*\\.so.*|libprldap.*\\.so.*|librnp\\.so.*)$ + +cd thunderbird-%{version} + +#%patch16 -p1 +%patch18 -p1 -b .cbindgen-0.24 rm -f .mozconfig cat << EOF > .mozconfig @@ -248,10 +255,12 @@ ac_add_options --with-system-webp ac_add_options --with-system-libevent ac_add_options --enable-system-ffi ac_add_options --enable-system-pixman +# TODO +ac_add_options --without-wasm-sandboxed-libraries # Features ac_add_options --enable-alsa -ac_add_options --enable-openpgp +#ac_add_options --enable-openpgp #ac_add_options --enable-calendar ac_add_options --disable-jack ac_add_options --disable-crashreporter @@ -276,6 +285,7 @@ EOF %build #:<< ___EOF +cd thunderbird-%{version} export PYTHON=%{__python3} @@ -287,7 +297,7 @@ export LDFLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads" export RUSTFLAGS="-Cdebuginfo=0" %endif -export MACH_USE_SYSTEM_PYTHON=1 +export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=none ./mach configure ./mach build @@ -297,8 +307,9 @@ export MACH_USE_SYSTEM_PYTHON=1 %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" +cd thunderbird-%{version} + export DESTDIR=%{buildroot} -export MACH_USE_SYSTEM_PYTHON=1 ./mach install mkdir -p %{buildroot}%{_datadir}/applications @@ -313,7 +324,7 @@ install -D -m644 comm/mail/branding/thunderbird/TB-symbolic.svg \ %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg # FIXME handle system/user preferences with xdg-open -cat > %{buildroot}%{tbdir}/defaults/pref/vendor-prefs.js << _EOF +cat > %{buildroot}%{_libdir}/thunderbird/defaults/pref/vendor-prefs.js << _EOF // Use LANG environment variable to choose locale pref("intl.locale.requested", ""); @@ -414,40 +425,25 @@ fi %{_datadir}/applications/thunderbird.desktop %{_datadir}/icons/hicolor/*x*/apps/thunderbird.png %{_datadir}/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg -%dir %{tbdir} -%{tbdir}/thunderbird -%{tbdir}/thunderbird-bin -%{tbdir}/*.ini -%dir %{tbdir}/chrome -%dir %{tbdir}/chrome/icons -%dir %{tbdir}/chrome/icons/default -%{tbdir}/chrome/icons/default/*.png -%dir %{tbdir}/components -%ghost %{tbdir}/components/compreg.dat -%ghost %{tbdir}/components/xpti.dat -%dir %{tbdir}/defaults -%dir %{tbdir}/defaults/messenger -%{tbdir}/defaults/messenger/mailViews.dat -%{tbdir}/defaults/pref/*.js -%{tbdir}/dependentlibs.list -%{tbdir}/dictionaries -%dir %{tbdir}/distribution -%{_libdir}/thunderbird/distribution/distribution.ini -%dir %{tbdir}/distribution/extensions -%{tbdir}/hyphenation -#%{tbdir}/features/wetransfer@extensions.thunderbird.net.xpi -%dir %{tbdir}/fonts -%{tbdir}/fonts/TwemojiMozilla.ttf -#%{tbdir}/gtk2/libmozgtk.so -%dir %{tbdir}/isp -%{tbdir}/isp/* -%{tbdir}/lib*.so -%{tbdir}/plugin-container -%{tbdir}/omni.ja -%{tbdir}/pingsender -%{tbdir}/removed-files +%dir %{_libdir}/thunderbird +%{_libdir}/thunderbird/* +%ghost %{_libdir}/thunderbird/components/compreg.dat +%ghost %{_libdir}/thunderbird/components/xpti.dat +%exclude %{_libdir}/thunderbird/distribution/extensions/langpack-*@thunderbird.mozilla.org.xpi %changelog +* Wed Oct 26 2022 Silvan Calarco 102.4.0-2mamba +- remove internal requirements for librnp.so + +* Fri Oct 21 2022 Automatic Build System 102.4.0-1mamba +- automatic version update by autodist + +* Thu Oct 13 2022 Automatic Build System 102.3.3-1mamba +- automatic version update by autodist + +* Wed Oct 12 2022 Automatic Build System 102.3.2-1mamba +- automatic version update by autodist + * Thu Jun 02 2022 Automatic Build System 91.10.0-1mamba - automatic version update by autodist