[arch-commits] Commit in thunderbird/trunk (3 files)

Wed Sep 8 23:01:30 UTC 2021

Date: Wednesday, September 8, 2021 @ 23:01:29
  Author: anthraxx
Revision: 423604

upgpkg: thunderbird 91.1.0-2: fix addons & optdeps, add metainfo, remove inetutils

- FS#70484 Use upstream metainfo file
- FS#69326 Fix libotr optdepends
- FS#67241 Add libnotify optdepends
- FS#70506 Remove inetutils
- FS#72077 Never check thunderbird addon signing: https://bugzilla.mozilla.org/show_bug.cgi?id=1727113

Added:
  thunderbird/trunk/disable-addon-signing.patch
  thunderbird/trunk/metainfo.patch
Modified:
  thunderbird/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   20 ++++++++++------
 disable-addon-signing.patch |   52 ++++++++++++++++++++++++++++++++++++++++++
 metainfo.patch              |   11 ++++++++
 3 files changed, 76 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================

--- PKGBUILD	2021-09-08 22:41:39 UTC (rev 423603)
+++ PKGBUILD	2021-09-08 23:01:29 UTC (rev 423604)
@@ -8,7 +8,7 @@
 pkgbase=thunderbird
 pkgname=(thunderbird)
 pkgver=91.1.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Standalone mail and news reader from mozilla.org'
 url='https://www.mozilla.org/thunderbird/'
 arch=(x86_64)
@@ -22,12 +22,9 @@
   libicuuc.so freetype2 libfreetype.so fontconfig libfontconfig.so glib2
   libglib-2.0.so pixman libpixman-1.so gnupg
 )
-optdepends=(
-  'libotr: OTR support for active one-to-one chats'
-)
 makedepends=(
   unzip zip diffutils python python-setuptools yasm nasm mesa imake libpulse
-  inetutils xorg-server-xvfb autoconf2.13 rust clang llvm cbindgen nodejs
+  xorg-server-xvfb autoconf2.13 rust clang llvm cbindgen nodejs
   gawk perl findutils libotr
 )
 options=(!emptydirs !makeflags)
@@ -35,7 +32,9 @@
         thunderbird.desktop
         vendor-prefs.js
         distribution.ini
-        mozconfig.cfg)
+        mozconfig.cfg
+        metainfo.patch
+        disable-addon-signing.patch)
 validpgpkeys=(
   14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release at mozilla.com>
   4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release at mozilla.com>
@@ -85,7 +84,10 @@
 }
 
 package_thunderbird() {
-  optdepends=('libcanberra: sound support')
+  optdepends=(
+    'libotr: OTR support for active one-to-one chats'
+    'libnotify: Notification integration'
+  )
 
   cd $pkgname-$pkgver
   DESTDIR="$pkgdir" ./mach install
@@ -93,6 +95,8 @@
   install -Dm 644 ../vendor-prefs.js -t "$pkgdir/usr/lib/$pkgname/defaults/pref"
   install -Dm 644 ../distribution.ini -t "$pkgdir/usr/lib/$pkgname/distribution"
   install -Dm 644 ../thunderbird.desktop -t "$pkgdir/usr/share/applications"
+  install -Dm 644 comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml \
+    "$pkgdir/usr/share/metainfo/net.thunderbird.Thunderbird.appdata.xml"
 
   for i in 16 22 24 32 48 64 128 256; do
     install -Dm644 comm/mail/branding/thunderbird/default${i}.png \
@@ -216,6 +220,8 @@
             '6918c0de63deeddc6f53b9ba331390556c12e0d649cf54587dfaabb98b32d6a597b63cf02809c7c58b15501720455a724d527375a8fb9d757ccca57460320734'
             '5cd3ac4c94ef6dcce72fba02bc18b771a2f67906ff795e0e3d71ce7db6d8a41165bd5443908470915bdbdb98dddd9cf3f837c4ba3a36413f55ec570e6efdbb9f'
             '328422adac0cfe6af4ecdcd864004b7ada8f8171aa954fecc23a7e883e90a9bb0848372faa1100440dc754922f965e1e7b98c185aa88df190bff1051d2146c85'
+            '7e43b1f25827ddae615ad43fc1e11c6ba439d6c2049477dfe60e00188a70c0a76160c59a97cc01d1fd99c476f261c7cecb57628b5be48874be7cf991c22db290'
+            '230c87675244b6ffe09953a4fb2fe966b66dbd2b876dcdab61d8b7f43a919226887d188934e61f6d4cefb1252178b5d8fd25da5566f18b07b9bdea754eeaa266'
             '8cce7b8044360bf13a4c5274ad99f7f6ed6b4ea326d4d71fe02a612af544ebd558d04817ec0fbd325800ad3bcc12ae23677744391ee42520fc9bdc7776bdf141'
             '771dda615d6e6e8c93b57aa3fb9a7e3ca1ac199ab691e8ee16e40e8960d9f6b5bb2df990bf1431766b222c6808316f2fbe2367d3be78a4a1c5a6ad41badf0dc3'
             '082aae91c3cf2ce70b4c42d4036b0ef5e3827a55c047b91e0ca5e38cfe0f536f7d166084cd52057eea5517bc2d3d0562ac79949d7c55f3cf5571ce64c0990488'

Added: disable-addon-signing.patch
===================================================================
--- disable-addon-signing.patch	                        (rev 0)
+++ disable-addon-signing.patch	2021-09-08 23:01:29 UTC (rev 423604)
@@ -0,0 +1,52 @@
+
+# HG changeset patch
+# User Rob Lemley <rob at thunderbird.net>
+# Date 1630704147 0
+# Node ID 56c3c3a87360237414e838ea8fe8547d597e0ff0
+# Parent  b56ce92dbc14fb3a55f771d6a85e89e73e6f25d0
+Bug 1727113 - Never require that addons are signed for Thunderbird. r=john.bieling
+
+imply_option apparently can be used to override config options that do not
+have a --enable/disable flag and are set (for Firefox) only via build time
+environment variables.
+
+This will effectively disable addon signing for all Thunderbird builds
+regardless of MOZ_REQUIRE_SIGNING's presence or value.
+
+Testing on Daily is not too useful, beta or release versions should be tested
+thoroughly.
+
+Differential Revision: https://phabricator.services.mozilla.com/D124361
+
+diff --git a/mail/config/mozconfigs/common b/mail/config/mozconfigs/common
+--- a/comm/mail/config/mozconfigs/common
++++ b/comm/mail/config/mozconfigs/common
+@@ -1,6 +1,3 @@
+ ac_add_options --enable-application=comm/mail
+ 
+-# Disable enforcing that add-ons are signed by the trusted root.
+-MOZ_REQUIRE_SIGNING=
+-
+ . "$topsrcdir/build/mozconfig.common.override"
+diff --git a/mail/moz.configure b/mail/moz.configure
+--- a/comm/mail/moz.configure
++++ b/comm/mail/moz.configure
+@@ -7,16 +7,17 @@
+ set_config("MOZ_THUNDERBIRD", True)
+ set_define("MOZ_THUNDERBIRD", True)
+ 
+ imply_option("MOZ_APP_BASENAME", "Thunderbird")
+ set_config("MOZ_APPUPDATE_HOST", "aus.thunderbird.net")
+ imply_option("MOZ_CRASHREPORTER_URL", "https://crash-reports.thunderbird.net/")
+ 
+ imply_option("--enable-default-browser-agent", False)
++imply_option("MOZ_REQUIRE_SIGNING", False)
+ 
+ 
+ @depends(target_is_windows, target_is_linux)
+ def bundled_fonts(is_windows, is_linux):
+     if is_windows or is_linux:
+         return True
+ 
+ 
+

Added: metainfo.patch
===================================================================
--- metainfo.patch	                        (rev 0)
+++ metainfo.patch	2021-09-08 23:01:29 UTC (rev 423604)
@@ -0,0 +1,11 @@
+diff -Naur thunderbird-78.9.1.orig/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml thunderbird-78.9.1/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml
+--- thunderbird-78.9.1.orig/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:05:05.808596043 +0000
++++ thunderbird-78.9.1/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml	2021-04-17 02:06:12.052455998 +0000
+@@ -1,6 +1,7 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <component type="desktop-application">
+   <id>net.thunderbird.Thunderbird</id>
++  <launchable type="desktop-id">thunderbird.desktop</launchable>
+   <metadata_license>CC0-1.0</metadata_license>
+   <name>Thunderbird</name>
+   <summary>Thunderbird is a free and open source email, newsfeed, chat, and calendaring client</summary>

