122.0b2

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

5 files changed, 142 insertions, 93 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c2d0378bc28a..531c6bb28243 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = thunderbird-beta
 	pkgdesc = Beta version of standalone mail and news reader from mozilla.org
-	pkgver = 121.0b1
+	pkgver = 122.0b2
 	pkgrel = 1
 	url = https://www.thunderbird.net/channel/#beta
 	arch = x86_64
@@ -34,62 +34,61 @@ pkgbase = thunderbird-beta
 	makedepends = wasi-libc++abi
 	makedepends = yasm
 	makedepends = zip
-	depends = alsa-lib
-	depends = botan2
-	depends = bzip2
-	depends = libbz2.so
-	depends = cairo
-	depends = dbus-glib
-	depends = dbus
-	depends = libdbus-1.so
-	depends = ffmpeg
-	depends = fontconfig
-	depends = libfontconfig.so
-	depends = freetype2
-	depends = libfreetype.so
-	depends = gcc-libs
-	depends = gdk-pixbuf2
-	depends = glib2
-	depends = libglib-2.0.so
 	depends = glibc
-	depends = gnupg
-	depends = gtk3
 	depends = gtk3
 	depends = libgdk-3.so
 	depends = libgtk-3.so
+	depends = mime-types
+	depends = dbus
+	depends = libdbus-1.so
+	depends = dbus-glib
+	depends = alsa-lib
+	depends = nss
 	depends = hunspell
-	depends = icu
-	depends = libicui18n.so
-	depends = libicuuc.so
-	depends = json-c
-	depends = libcanberra
-	depends = libevent
-	depends = libffi
-	depends = libffi.so
-	depends = libjpeg-turbo
-	depends = libpulse
+	depends = sqlite
+	depends = ttf-font
 	depends = libvpx
 	depends = libvpx.so
+	depends = zlib
+	depends = bzip2
+	depends = libbz2.so
+	depends = botan2
 	depends = libwebp
 	depends = libwebp.so
 	depends = libwebpdemux.so
+	depends = libevent
+	depends = libjpeg-turbo
+	depends = libffi
+	depends = libffi.so
+	depends = nspr
+	depends = gcc-libs
+	depends = libpulse
 	depends = libx11
+	depends = libxrender
+	depends = libxfixes
+	depends = libxext
 	depends = libxcomposite
 	depends = libxdamage
-	depends = libxext
-	depends = libxfixes
-	depends = libxrender
 	depends = libxt
-	depends = mime-types
-	depends = nspr
-	depends = nss
 	depends = pango
 	depends = libpango-1.0.so
+	depends = cairo
+	depends = gdk-pixbuf2
+	depends = freetype2
+	depends = libfreetype.so
+	depends = fontconfig
+	depends = libfontconfig.so
+	depends = glib2
+	depends = libglib-2.0.so
 	depends = pixman
 	depends = libpixman-1.so
-	depends = sqlite
-	depends = ttf-font
-	depends = zlib
+	depends = gnupg
+	depends = json-c
+	depends = libcanberra
+	depends = ffmpeg
+	depends = icu
+	depends = libicui18n.so
+	depends = libicuuc.so
 	optdepends = networkmanager: Location detection via available WiFi networks
 	optdepends = libnotify: Notification integration
 	optdepends = pulseaudio: Audio support
@@ -97,21 +96,25 @@ pkgbase = thunderbird-beta
 	optdepends = hunspell-en_US: Spell checking, American English
 	optdepends = xdg-desktop-portal: Screensharing with Wayland
 	optdepends = libotr: OTR support for active one-to-one chats
-	provides = thunderbird=121.0b1
+	provides = thunderbird=122.0b2
 	options = !emptydirs
 	options = !makeflags
 	options = !strip
 	options = !lto
 	options = !debug
-	source = https://archive.mozilla.org/pub/thunderbird/releases/121.0b1/source/thunderbird-121.0b1.source.tar.xz
-	source = https://archive.mozilla.org/pub/thunderbird/releases/121.0b1/source/thunderbird-121.0b1.source.tar.xz.asc
+	source = https://archive.mozilla.org/pub/thunderbird/releases/122.0b2/source/thunderbird-122.0b2.source.tar.xz
+	source = https://archive.mozilla.org/pub/thunderbird/releases/122.0b2/source/thunderbird-122.0b2.source.tar.xz.asc
 	source = install-dir.patch
+	source = metainfo.patch
 	source = thunderbird-beta.desktop
+	source = thunderbird-system-icu-74.patch
 	validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
 	validpgpkeys = 4360FE2109C49763186F8E21EBE41E90F6F12F6D
-	b2sums = 5f57b0b9fdcb49c3ad5ace7f8aebd0bddba5e2d2be28d7dc08b87098de7c0ba808015556f7d21906d0e02cfcc1239c98511d32ffd9f0bd85a3a85389046a8af5
+	b2sums = f31192a1d61b71c081dbb1c6c1f0661d4a0d2edd132c158086464100cf94dcb63240e0706d1c3c2fd3b201cf385ff516c105d705574cc149f8b2e14adebea9b8
 	b2sums = SKIP
 	b2sums = ba188a0c1359f49390a789621b2c0bec67f4152f62c0dced26b31ec291abccfb5636dba0f8ed1f879e1a2a237e183b96b092d760e04e148a64da18660b87dcfb
-	b2sums = 3518012290b5b358d882d7d12bc2455345b89cef4abfbccaca025dfb935fcefe49806dd534e75b10c0c6a3495b7133a7feb3f11d7773a0ce252f8d68e15b5a24
+	b2sums = 2b31b26f49229f96a645f06892d576f49662de2e5c294a1c164569402f608f267762b1f4448ebea0b77030939952274cb2dfe524bf97f4fb2cdd5f7689b95bcd
+	b2sums = c0a500055dc2c5e25b538b010e54e79bea2fb91b9b5927063f429b8931d84f28ecb4c37aaa8895c4a84dafa5066985dd2d99b8294d87c7b311d88109ca036845
+	b2sums = a472abae3909c7100fe2367eeaac98f608ccf60385c930175701dcc96289af963a4aa91552ad84e1ffc157c8eeb166330887faff2504993519b0c46a162db470
 
 pkgname = thunderbird-beta
diff --git a/PKGBUILD b/PKGBUILD
index dc71a02fc82a..84715a667f6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,54 +4,53 @@
 
 pkgname=thunderbird-beta
 _pkgname=thunderbird
-pkgver=121.0b1
+pkgver=122.0b2
 pkgrel=1
 pkgdesc='Beta version of standalone mail and news reader from mozilla.org'
-arch=('x86_64')
-license=('MPL' 'GPL' 'LGPL')
-url="https://www.thunderbird.net/channel/#beta"
+arch=(x86_64)
+license=(MPL GPL LGPL)
+url='https://www.thunderbird.net/channel/#beta'
 depends=(
-  alsa-lib
-  botan2
-  bzip2 libbz2.so
-  cairo
-  dbus-glib
-  dbus libdbus-1.so
-  ffmpeg
-  fontconfig libfontconfig.so
-  freetype2 libfreetype.so
-  gcc-libs
-  gdk-pixbuf2
-  glib2 libglib-2.0.so
   glibc
-  gnupg
-  gtk3
   gtk3 libgdk-3.so libgtk-3.so
+  mime-types
+  dbus libdbus-1.so
+  dbus-glib
+  alsa-lib
+  nss
   hunspell
-  icu libicui18n.so libicuuc.so
-  json-c
-  libcanberra
+  sqlite
+  ttf-font
+  libvpx libvpx.so
+  zlib
+  bzip2 libbz2.so
+  botan2
+  libwebp libwebp.so libwebpdemux.so
   libevent
-  libffi libffi.so
   libjpeg-turbo
+  libffi libffi.so
+  nspr
+  gcc-libs
   libpulse
-  libvpx libvpx.so
-  libwebp libwebp.so libwebpdemux.so
   libx11
+  libxrender
+  libxfixes
+  libxext
   libxcomposite
   libxdamage
-  libxext
-  libxfixes
-  libxrender
   libxt
-  mime-types
-  nspr
-  nss
   pango libpango-1.0.so
+  cairo
+  gdk-pixbuf2
+  freetype2 libfreetype.so
+  fontconfig libfontconfig.so
+  glib2 libglib-2.0.so
   pixman libpixman-1.so
-  sqlite
-  ttf-font
-  zlib
+  gnupg
+  json-c
+  libcanberra
+  ffmpeg
+  icu libicui18n.so libicuuc.so
 )
 makedepends=(
   cbindgen
@@ -93,12 +92,16 @@ options=(!emptydirs !makeflags !strip !lto !debug)
 provides=("thunderbird=$pkgver")
 source=(https://archive.mozilla.org/pub/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc}
         install-dir.patch
+        metainfo.patch
         "$pkgname".desktop
+        thunderbird-system-icu-74.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
 )
-b2sums=('5f57b0b9fdcb49c3ad5ace7f8aebd0bddba5e2d2be28d7dc08b87098de7c0ba808015556f7d21906d0e02cfcc1239c98511d32ffd9f0bd85a3a85389046a8af5'
+b2sums=('f31192a1d61b71c081dbb1c6c1f0661d4a0d2edd132c158086464100cf94dcb63240e0706d1c3c2fd3b201cf385ff516c105d705574cc149f8b2e14adebea9b8'
         'SKIP'
         'ba188a0c1359f49390a789621b2c0bec67f4152f62c0dced26b31ec291abccfb5636dba0f8ed1f879e1a2a237e183b96b092d760e04e148a64da18660b87dcfb'
-        '3518012290b5b358d882d7d12bc2455345b89cef4abfbccaca025dfb935fcefe49806dd534e75b10c0c6a3495b7133a7feb3f11d7773a0ce252f8d68e15b5a24')
+        '2b31b26f49229f96a645f06892d576f49662de2e5c294a1c164569402f608f267762b1f4448ebea0b77030939952274cb2dfe524bf97f4fb2cdd5f7689b95bcd'
+        'c0a500055dc2c5e25b538b010e54e79bea2fb91b9b5927063f429b8931d84f28ecb4c37aaa8895c4a84dafa5066985dd2d99b8294d87c7b311d88109ca036845'
+        'a472abae3909c7100fe2367eeaac98f608ccf60385c930175701dcc96289af963a4aa91552ad84e1ffc157c8eeb166330887faff2504993519b0c46a162db470')
 validpgpkeys=(
   14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release@mozilla.com>
   4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release@mozilla.com>
@@ -248,13 +251,13 @@ app.partner.archlinux=archlinux
 END
 
   for i in 16 22 24 32 48 64 128 256; do
-    install -Dm644 comm/mail/branding/thunderbird/default${i}.png \
+    install -Dvm644 comm/mail/branding/thunderbird/default${i}.png \
       "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
   done
 
-  install -Dm644 comm/mail/branding/thunderbird/content/about-logo.svg \
+  install -Dvm644 comm/mail/branding/thunderbird/content/about-logo.svg \
     "$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
-  install -Dm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
+  install -Dvm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
     "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
 
   install -Dvm644 ../$pkgname.desktop \
diff --git a/metainfo.patch b/metainfo.patch
new file mode 100644
index 000000000000..afc9b5b3eb7d
--- /dev/null
+++ b/metainfo.patch
@@ -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>
diff --git a/thunderbird-beta.desktop b/thunderbird-beta.desktop
index 93de2ad6f360..384edcc64709 100644
--- a/thunderbird-beta.desktop
+++ b/thunderbird-beta.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Thunderbird (Beta)
+Name=Thunderbird Beta
 Comment=Send and receive mail with Thunderbird
 Comment[ast]=Lleer y escribir corréu electrónicu
 Comment[ca]=Llegiu i escriviu correu
@@ -23,7 +23,6 @@ Comment[pt_BR]=Leia e escreva suas mensagens
 Comment[ru]=Читайте и пишите письма
 Comment[sk]=Čítajte a píšte poštu pomocou programu Thunderbird
 Comment[sv]=Läs och skriv e-post
-Comment[ug]=ئېلخەت ۋە خەۋەرلەرنى Mozilla Thunderbird دا كۆرۈش ۋە يېزىش
 Comment[uk]=Читання та написання листів
 Comment[vi]=Đọc và soạn thư điện tử
 Comment[zh_CN]=阅读邮件或新闻
@@ -50,18 +49,18 @@ GenericName[pl]=Klient poczty
 GenericName[pt_BR]=Cliente de E-mail
 GenericName[ru]=Почтовый клиент
 GenericName[sk]=Poštový klient
-GenericName[ug]=ئېلخەت دېتالى
 GenericName[uk]=Поштова програма
 GenericName[vi]=Phần mềm khách quản lý thư điện tử
 GenericName[zh_CN]=邮件新闻客户端
 GenericName[zh_TW]=郵件用戶端
-Exec=/usr/lib/thunderbird-beta/thunderbird %u
+Exec=/usr/lib/thunderbird-beta/thunderbird --class="thunderbird-beta" %u
 Terminal=false
 Type=Application
 Icon=thunderbird-beta
 Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
+MimeType=message/rfc822;x-scheme-handler/mailto;text/calendar;text/vcard;text/x-vcard;x-scheme-handler/webcal;x-scheme-handler/webcals;x-scheme-handler/mid;
 StartupNotify=true
+StartupWMClass=thunderbird-beta
 Actions=ComposeMessage;OpenAddressBook;
 
 [Desktop Action ComposeMessage]
@@ -104,19 +103,17 @@ Name[pt_PT]=Escrever nova mensagem
 Name[rm]=Scriver in nov messadi
 Name[ro]=Scrie un mesaj nou
 Name[ru]=Создать новое сообщение
-Name[si]=නව ලිපියක් ලියන්න
 Name[sk]=Nová e-mailová správa
 Name[sl]=Sestavi novo sporočilo
 Name[sq]=Shkruani mesazh të ri
 Name[sr]=Писање нове поруке
 Name[sv_SE]=Skriv ett nytt meddelande
-Name[ta_LK]=புதிய செய்தியை எழுதுக
 Name[tr]=Yeni ileti yaz
 Name[uk]=Написати нового листа
 Name[vi]=Viết thư mới
 Name[zh_CN]=编写新消息
 Name[zh_TW]=寫一封新訊息
-Exec=/usr/lib/thunderbird-beta/thunderbird -compose
+Exec=/usr/lib/thunderbird-beta/thunderbird --class="thunderbird-beta" -compose
 
 [Desktop Action OpenAddressBook]
 Name=Open address book
@@ -158,16 +155,14 @@ Name[pt_PT]=Abrir livro de endereços
 Name[rm]=Avrir il cudeschet d'adressas
 Name[ro]=Deschide agenda de contacte
 Name[ru]=Открыть адресную книгу
-Name[si]=ලිපින පොත විවෘත කරන්න
 Name[sk]=Otvoriť adresár
 Name[sl]=Odpri adressar
 Name[sq]=Hapni libër adresash
 Name[sr]=Отвори адресар
 Name[sv_SE]=Öppna adressboken
-Name[ta_LK]=முகவரி பத்தகத்தை திறக்க
 Name[tr]=Adres defterini aç
 Name[uk]=Відкрити адресну книгу
 Name[vi]=Mở sổ địa chỉ
 Name[zh_CN]=打开通讯录
 Name[zh_TW]=開啟通訊錄
-Exec=/usr/lib/thunderbird-beta/thunderbird -addressbook
+Exec=/usr/lib/thunderbird-beta/thunderbird --class="thunderbird-beta" -addressbook
diff --git a/thunderbird-system-icu-74.patch b/thunderbird-system-icu-74.patch
new file mode 100644
index 000000000000..18dfb79a712e
--- /dev/null
+++ b/thunderbird-system-icu-74.patch
@@ -0,0 +1,37 @@
+
+# HG changeset patch
+# User André Bargull <andre.bargull@gmail.com>
+# Date 1697435923 -7200
+# Node ID d5f3b0c4f08a426ce00a153c04e177eecb6820e2
+# Parent  c63994f8259efdf6e745c960aa9e1409d5477049
+Bug xxx - Part 12: Add new line break classes. r?
+
+diff --git a/intl/lwbrk/LineBreaker.cpp b/intl/lwbrk/LineBreaker.cpp
+--- a/intl/lwbrk/LineBreaker.cpp
++++ b/intl/lwbrk/LineBreaker.cpp
+@@ -443,17 +443,23 @@ static int8_t GetClass(uint32_t u, LineB
+       /* JT = 34,                           [JT] */ CLASS_CHARACTER,
+       /* JV = 35,                           [JV] */ CLASS_CHARACTER,
+       /* CLOSE_PARENTHESIS = 36,            [CP] */ CLASS_CLOSE_LIKE_CHARACTER,
+       /* CONDITIONAL_JAPANESE_STARTER = 37, [CJ] */ CLASS_CLOSE,
+       /* HEBREW_LETTER = 38,                [HL] */ CLASS_CHARACTER,
+       /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+       /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+       /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER};
++      /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++      /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++      /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++      /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++      /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++      /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
++  };
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),
+                 "Gecko vs ICU LineBreak class mismatch");
+ 
+   auto cls = GetLineBreakClass(u);
+   MOZ_ASSERT(cls < mozilla::ArrayLength(sUnicodeLineBreakToClass));
+ 
+   // Overrides based on rules for the different line-break values given in
+