summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO18
-rw-r--r--0001-Use-remoting-name-for-GDK-application-names.patch57
-rw-r--r--PKGBUILD22
-rw-r--r--add-missing-stub-for-wl_proxy_marshal_flags.patch15
-rw-r--r--metainfo.patch11
-rw-r--r--thunderbird-beta.desktop2
6 files changed, 93 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5c264c504311..545a608e5dc5 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 = 96.0b1
+ pkgver = 96.0b2
pkgrel = 1
url = https://www.thunderbird.net/channel/#beta
arch = x86_64
@@ -49,21 +49,23 @@ pkgbase = thunderbird-beta
optdepends = xdg-desktop-portal: Screensharing with Wayland
optdepends = libcanberra: sound support
optdepends = libotr: OTR support for active one-to-one chats
- provides = thunderbird=96.0b1
+ provides = thunderbird=96.0b2
options = !emptydirs
options = !makeflags
options = !strip
- source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/96.0b1/source/thunderbird-96.0b1.source.tar.xz
- source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/96.0b1/source/thunderbird-96.0b1.source.tar.xz.asc
+ source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/96.0b2/source/thunderbird-96.0b2.source.tar.xz
+ source = https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/96.0b2/source/thunderbird-96.0b2.source.tar.xz.asc
source = install-dir.patch
- source = metainfo.patch
+ source = 0001-Use-remoting-name-for-GDK-application-names.patch
+ source = add-missing-stub-for-wl_proxy_marshal_flags.patch
source = thunderbird-beta.desktop
validpgpkeys = 14F26682D0916CDD81E37B6D61B7B526D98F0353
validpgpkeys = 4360FE2109C49763186F8E21EBE41E90F6F12F6D
- sha256sums = 0249d399c772c8d28fa1954015e1515e404d05156c750b5e0eae50d443fd853b
+ sha256sums = 32222dc4b2e32c559d700785287bbcf72280907499a91dfd4b6a322547031702
sha256sums = SKIP
sha256sums = c959c9f2b60a42dc937f744c018196906727d468d8f1d7402fb4f743484c414b
- sha256sums = a30df8772e9cec05debdcd02b83de6ea92db6fb7c2a43f24f0bc6ebb2c5484a5
- sha256sums = 9f7eececd2426a13220a81eb8d34123311979e03aca40d5d4b79d0346beab5b5
+ sha256sums = 51cca2cab0fa9798f96b81ed24c238b2a7c98524f589ec500224bac9797b66fb
+ sha256sums = dd056c42b3a969cd57fc58be4d83491d806a087d86a2a8594de069d6de9fe04c
+ sha256sums = 336db628f428ea5efd2a58231fdb202db1521b604c8317b7151d1aa40793f3d3
pkgname = thunderbird-beta
diff --git a/0001-Use-remoting-name-for-GDK-application-names.patch b/0001-Use-remoting-name-for-GDK-application-names.patch
new file mode 100644
index 000000000000..86dddaba5fbb
--- /dev/null
+++ b/0001-Use-remoting-name-for-GDK-application-names.patch
@@ -0,0 +1,57 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <jan.steffens@gmail.com>
+Date: Mon, 25 Mar 2019 20:30:11 +0100
+Subject: [PATCH] Use remoting name for GDK application names
+
+---
+ toolkit/xre/nsAppRunner.cpp | 6 +-----
+ widget/gtk/nsAppShell.cpp | 12 +++++-------
+ 2 files changed, 6 insertions(+), 12 deletions(-)
+
+diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
+index 332f340179d3..840ad794f606 100644
+--- a/toolkit/xre/nsAppRunner.cpp
++++ b/toolkit/xre/nsAppRunner.cpp
+@@ -4285,11 +4285,7 @@ int XREMain::XRE_mainStartup(bool* aExitFlag) {
+ // consistently.
+
+ // Set program name to the one defined in application.ini.
+- {
+- nsAutoCString program(gAppData->name);
+- ToLowerCase(program);
+- g_set_prgname(program.get());
+- }
++ g_set_prgname(gAppData->remotingName);
+
+ // Initialize GTK here for splash.
+
+diff --git a/widget/gtk/nsAppShell.cpp b/widget/gtk/nsAppShell.cpp
+index 60de473de07a..004c066575c1 100644
+--- a/widget/gtk/nsAppShell.cpp
++++ b/widget/gtk/nsAppShell.cpp
+@@ -24,6 +24,8 @@
+ # include "WakeLockListener.h"
+ #endif
+ #include "gfxPlatform.h"
++#include "nsAppRunner.h"
++#include "mozilla/XREAppData.h"
+ #include "ScreenHelperGTK.h"
+ #include "HeadlessScreenHelper.h"
+ #include "mozilla/widget/ScreenManager.h"
+@@ -152,13 +154,9 @@ nsresult nsAppShell::Init() {
+ // See https://bugzilla.gnome.org/show_bug.cgi?id=747634
+ //
+ // Only bother doing this for the parent process, since it's the one
+- // creating top-level windows. (At this point, a child process hasn't
+- // received the list of registered chrome packages, so the
+- // GetBrandShortName call would fail anyway.)
+- nsAutoString brandName;
+- mozilla::widget::WidgetUtils::GetBrandShortName(brandName);
+- if (!brandName.IsEmpty()) {
+- gdk_set_program_class(NS_ConvertUTF16toUTF8(brandName).get());
++ // creating top-level windows.
++ if (gAppData) {
++ gdk_set_program_class(gAppData->remotingName);
+ }
+ }
+ }
diff --git a/PKGBUILD b/PKGBUILD
index bba652fb22d6..b429082657ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=thunderbird-beta
_pkgname=thunderbird
-pkgver=96.0b1
+pkgver=96.0b2
pkgrel=1
pkgdesc='Beta version of standalone mail and news reader from mozilla.org'
arch=('x86_64')
@@ -26,8 +26,15 @@ options=(!emptydirs !makeflags !strip)
provides=("thunderbird=$pkgver")
source=(https://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/$pkgver/source/thunderbird-$pkgver.source.tar.xz{,.asc}
install-dir.patch
- metainfo.patch
+ 0001-Use-remoting-name-for-GDK-application-names.patch
+ add-missing-stub-for-wl_proxy_marshal_flags.patch
"$pkgname".desktop)
+sha256sums=('32222dc4b2e32c559d700785287bbcf72280907499a91dfd4b6a322547031702'
+ 'SKIP'
+ 'c959c9f2b60a42dc937f744c018196906727d468d8f1d7402fb4f743484c414b'
+ '51cca2cab0fa9798f96b81ed24c238b2a7c98524f589ec500224bac9797b66fb'
+ 'dd056c42b3a969cd57fc58be4d83491d806a087d86a2a8594de069d6de9fe04c'
+ '336db628f428ea5efd2a58231fdb202db1521b604c8317b7151d1aa40793f3d3')
validpgpkeys=(
14F26682D0916CDD81E37B6D61B7B526D98F0353 # Mozilla Software Releases <release@mozilla.com>
4360FE2109C49763186F8E21EBE41E90F6F12F6D # Mozilla Software Releases <release@mozilla.com>
@@ -149,9 +156,6 @@ app.distributor.channel=$pkgname
app.partner.archlinux=archlinux
END
- install -Dvm644 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 -Dvm644 comm/mail/branding/thunderbird/default${i}.png \
"$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgname.png"
@@ -160,7 +164,7 @@ END
install -Dvm644 comm/mail/branding/thunderbird/content/about-logo.svg \
"$pkgdir/usr/share/icons/hicolor/scalable/apps/$pkgname.svg"
install -Dvm644 comm/mail/branding/thunderbird/TB-symbolic.svg \
- "$pkgdir/usr/share/icons/hicolor/symbolic/apps/thunderbird-symbolic.svg"
+ "$pkgdir/usr/share/icons/hicolor/symbolic/apps/$pkgname-symbolic.svg"
install -Dvm644 ../$pkgname.desktop \
"$pkgdir/usr/share/applications/$pkgname.desktop"
@@ -181,9 +185,3 @@ END
ln -srfv "$pkgdir/usr/lib/libnssckbi.so" "$nssckbi"
fi
}
-
-sha256sums=('0249d399c772c8d28fa1954015e1515e404d05156c750b5e0eae50d443fd853b'
- 'SKIP'
- 'c959c9f2b60a42dc937f744c018196906727d468d8f1d7402fb4f743484c414b'
- 'a30df8772e9cec05debdcd02b83de6ea92db6fb7c2a43f24f0bc6ebb2c5484a5'
- '9f7eececd2426a13220a81eb8d34123311979e03aca40d5d4b79d0346beab5b5')
diff --git a/add-missing-stub-for-wl_proxy_marshal_flags.patch b/add-missing-stub-for-wl_proxy_marshal_flags.patch
new file mode 100644
index 000000000000..891dfeba2952
--- /dev/null
+++ b/add-missing-stub-for-wl_proxy_marshal_flags.patch
@@ -0,0 +1,15 @@
+diff --git a/widget/gtk/mozwayland/mozwayland.c b/widget/gtk/mozwayland/mozwayland.c
+--- a/widget/gtk/mozwayland/mozwayland.c
++++ b/widget/gtk/mozwayland/mozwayland.c
+@@ -200,3 +200,10 @@
+
+ MOZ_EXPORT void wl_list_insert_list(struct wl_list* list,
+ struct wl_list* other) {}
++
++MOZ_EXPORT struct wl_proxy* wl_proxy_marshal_flags(
++ struct wl_proxy* proxy, uint32_t opcode,
++ const struct wl_interface* interface, uint32_t version, uint32_t flags,
++ ...) {
++ return NULL;
++}
+
diff --git a/metainfo.patch b/metainfo.patch
deleted file mode 100644
index a993baa03ba1..000000000000
--- a/metainfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur c/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml i/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml
---- c/comm/mail/branding/thunderbird/net.thunderbird.Thunderbird.appdata.xml 2021-04-17 02:05:05.808596043 +0000
-+++ i/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-beta.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 7f76c28fd7e4..93de2ad6f360 100644
--- a/thunderbird-beta.desktop
+++ b/thunderbird-beta.desktop
@@ -58,7 +58,7 @@ GenericName[zh_TW]=郵件用戶端
Exec=/usr/lib/thunderbird-beta/thunderbird %u
Terminal=false
Type=Application
-Icon=thunderbird
+Icon=thunderbird-beta
Categories=Network;Email;
MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
StartupNotify=true