rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to 60.4.0

Browse Source
This commit is contained in:
Jan Horak 2019-01-02 18:50:19 +01:00
parent 8a87d849da
commit 98d4599996
5 changed files with 25 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -223,3 +223,6 @@ thunderbird-langpacks-3.1.2-20100803.tar.bz2
/thunderbird-60.3.3.source.tar.xz
/thunderbird-langpacks-60.3.3-20181205.tar.xz
/lightning-langpacks-60.3.3.tar.xz
/thunderbird-60.4.0.source.tar.xz
/thunderbird-langpacks-60.4.0-20190102.tar.xz
/lightning-langpacks-60.4.0.tar.xz

12
mozbz-1500850-missing-dbus-header.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/widget/xremoteclient/DBusRemoteClient.cpp b/widget/xremoteclient/DBusRemoteClient.cpp
--- a/widget/xremoteclient/DBusRemoteClient.cpp
+++ b/widget/xremoteclient/DBusRemoteClient.cpp
@@ -13,6 +13,7 @@
#include "nsPrintfCString.h"
#include <dlfcn.h>
+#include <dbus/dbus-glib-lowlevel.h>
using mozilla::LogLevel;
static mozilla::LazyLogModule sRemoteLm("DBusRemoteClient");

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (thunderbird-60.3.3.source.tar.xz) = 30cffd9234d4b0820a4e3b966ebc3646780ebe455d06b6132d312169bd209d298c5e10d6721331645a9de6af646e96c4d75985aad0c09ece0e6c9d25f5555309
SHA512 (thunderbird-langpacks-60.3.3-20181205.tar.xz) = eea80dd18e8bf725985b12de57bd11e1d9eed7e93c04b17566667f321ab77664244cfe8186176b8a3b9048981fcf572e684885a8013ebffc9b32107dbdd1188a
SHA512 (lightning-langpacks-60.3.3.tar.xz) = 7c144f273097a0a5195865baf9ad8f769f7031d2165a7190f837437cf935c8042df899f0183687445bf83f8105691eb87046fc67bb2440b50e374858dcf7a593
SHA512 (thunderbird-60.4.0.source.tar.xz) = 084becec870ad1449196110ecd2d2cc397c32d9d5a682f3cf45a170b7bdf5c2197299a72034965e838af62534df870de5a46d49fd0d05a9c4c7fdf5e408e471d
SHA512 (thunderbird-langpacks-60.4.0-20190102.tar.xz) = 321e78494ae503578e6828d54e3c6d4da6944679d58f6b65c9270d6721fb4714c81e828cabb566e565c884cc20ec4dc098110ca86b872a99160abd47be4453a8
SHA512 (lightning-langpacks-60.4.0.tar.xz) = fb3f7928ffa45263b76d584a7c15abb56fdf6d8f5276eb8c8b7ec758e481a32f51d3406503ff987f1c3da31009d0e5f4d2d679ca5d51d7bc2c3608c0f73f3826

212
thunderbird-dbus-remote.patch
View File

@ -1,212 +0,0 @@
diff -up thunderbird-60.3.0/toolkit/components/remote/nsDBusRemoteService.cpp.old thunderbird-60.3.0/toolkit/components/remote/nsDBusRemoteService.cpp
--- thunderbird-60.3.0/toolkit/components/remote/nsDBusRemoteService.cpp.old 2018-10-30 12:45:34.000000000 +0100
+++ thunderbird-60.3.0/toolkit/components/remote/nsDBusRemoteService.cpp 2018-11-14 13:37:32.223714689 +0100
@@ -174,6 +174,7 @@ nsDBusRemoteService::Startup(const char*
return NS_ERROR_FAILURE;
}
dbus_connection_set_exit_on_disconnect(mConnection, false);
+ dbus_connection_setup_with_g_main(mConnection, nullptr);
mAppName = aAppName;
ToLowerCase(mAppName);
diff -up thunderbird-60.3.0/toolkit/components/remote/nsRemoteService.cpp.old thunderbird-60.3.0/toolkit/components/remote/nsRemoteService.cpp
--- thunderbird-60.3.0/toolkit/components/remote/nsRemoteService.cpp.old 2018-11-20 10:55:35.584756422 +0100
+++ thunderbird-60.3.0/toolkit/components/remote/nsRemoteService.cpp 2018-11-14 13:37:32.244714628 +0100
@@ -34,20 +34,18 @@ NS_IMPL_ISUPPORTS(nsRemoteService,
NS_IMETHODIMP
nsRemoteService::Startup(const char* aAppName, const char* aProfileName)
{
-#if 0
+#if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
nsresult rv;
mDBusRemoteService = new nsDBusRemoteService();
rv = mDBusRemoteService->Startup(aAppName, aProfileName);
if (NS_FAILED(rv)) {
mDBusRemoteService = nullptr;
}
+#elif !defined(MOZ_WAYLAND)
+ mGtkRemoteService = new nsGTKRemoteService();
+ mGtkRemoteService->Startup(aAppName, aProfileName);
#endif
- if (GDK_IS_X11_DISPLAY(gdk_display_get_default())) {
- mGtkRemoteService = new nsGTKRemoteService();
- mGtkRemoteService->Startup(aAppName, aProfileName);
- }
-
if (!mDBusRemoteService && !mGtkRemoteService)
return NS_ERROR_FAILURE;
@@ -73,7 +71,7 @@ nsRemoteService::RegisterWindow(mozIDOMW
NS_IMETHODIMP
nsRemoteService::Shutdown()
{
-#if defined(MOZ_ENABLE_DBUS)
+#if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
if (mDBusRemoteService) {
mDBusRemoteService->Shutdown();
mDBusRemoteService = nullptr;
diff -up thunderbird-60.3.0/toolkit/components/remote/nsXRemoteService.cpp.old thunderbird-60.3.0/toolkit/components/remote/nsXRemoteService.cpp
--- thunderbird-60.3.0/toolkit/components/remote/nsXRemoteService.cpp.old 2018-10-30 12:45:34.000000000 +0100
+++ thunderbird-60.3.0/toolkit/components/remote/nsXRemoteService.cpp 2018-10-31 01:08:14.000000000 +0100
@@ -192,5 +192,5 @@ nsXRemoteService::EnsureAtoms(void)
sMozUserAtom = XAtoms[i++];
sMozProfileAtom = XAtoms[i++];
sMozProgramAtom = XAtoms[i++];
- sMozCommandLineAtom = XAtoms[i++];
+ sMozCommandLineAtom = XAtoms[i];
}
diff -up thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.cpp.old thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.cpp
--- thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.cpp.old 2018-10-30 12:45:35.000000000 +0100
+++ thunderbird-60.3.0/widget/xremoteclient/DBusRemoteClient.cpp 2018-11-14 13:37:32.224714686 +0100
@@ -12,6 +12,7 @@
#include "mozilla/Base64.h"
#include "nsPrintfCString.h"
+#include <dbus/dbus-glib-lowlevel.h>
#include <dlfcn.h>
using mozilla::LogLevel;
@@ -43,6 +44,7 @@ DBusRemoteClient::Init()
return NS_ERROR_FAILURE;
dbus_connection_set_exit_on_disconnect(mConnection, false);
+ dbus_connection_setup_with_g_main(mConnection, nullptr);
return NS_OK;
}
diff -up thunderbird-60.3.0/widget/xremoteclient/moz.build.old thunderbird-60.3.0/widget/xremoteclient/moz.build
--- thunderbird-60.3.0/widget/xremoteclient/moz.build.old 2018-10-31 01:08:14.000000000 +0100
+++ thunderbird-60.3.0/widget/xremoteclient/moz.build 2018-11-14 13:37:32.244714628 +0100
@@ -11,7 +11,6 @@ FINAL_LIBRARY = 'xul'
SOURCES += [
'RemoteUtils.cpp',
- 'XRemoteClient.cpp',
]
if CONFIG['MOZ_ENABLE_DBUS'] and CONFIG['MOZ_WAYLAND']:
@@ -20,3 +19,7 @@ if CONFIG['MOZ_ENABLE_DBUS'] and CONFIG[
]
CXXFLAGS += CONFIG['TK_CFLAGS']
CXXFLAGS += CONFIG['MOZ_DBUS_GLIB_CFLAGS']
+else:
+ SOURCES += [
+ 'XRemoteClient.cpp',
+ ]
diff -up thunderbird-60.3.0/widget/xremoteclient/XRemoteClient.cpp.old thunderbird-60.3.0/widget/xremoteclient/XRemoteClient.cpp
--- thunderbird-60.3.0/widget/xremoteclient/XRemoteClient.cpp.old 2018-10-30 12:45:37.000000000 +0100
+++ thunderbird-60.3.0/widget/xremoteclient/XRemoteClient.cpp 2018-10-31 01:08:15.000000000 +0100
@@ -9,6 +9,7 @@
#include "mozilla/ArrayUtils.h"
#include "mozilla/IntegerPrintfMacros.h"
#include "mozilla/Sprintf.h"
+#include "mozilla/Unused.h"
#include "XRemoteClient.h"
#include "RemoteUtils.h"
#include "plstr.h"
@@ -41,7 +42,7 @@
#else
#define TO_LITTLE_ENDIAN32(x) (x)
#endif
-
+
#ifndef MAX_PATH
#ifdef PATH_MAX
#define MAX_PATH PATH_MAX
@@ -51,6 +52,7 @@
#endif
using mozilla::LogLevel;
+using mozilla::Unused;
static mozilla::LazyLogModule sRemoteLm("XRemoteClient");
@@ -118,7 +120,7 @@ XRemoteClient::Init()
mMozUserAtom = XAtoms[i++];
mMozProfileAtom = XAtoms[i++];
mMozProgramAtom = XAtoms[i++];
- mMozCommandLineAtom = XAtoms[i++];
+ mMozCommandLineAtom = XAtoms[i];
mInitialized = true;
@@ -472,12 +474,12 @@ XRemoteClient::FindBestWindow(const char
// pass in a program name and this window doesn't support that
// protocol, we don't include it in our list.
if (aProgram && strcmp(aProgram, "any")) {
- status = XGetWindowProperty(mDisplay, w, mMozProgramAtom,
- 0, (65536 / sizeof(long)),
- False, XA_STRING,
- &type, &format, &nitems, &bytesafter,
- &data_return);
-
+ Unused << XGetWindowProperty(mDisplay, w, mMozProgramAtom,
+ 0, (65536 / sizeof(long)),
+ False, XA_STRING,
+ &type, &format, &nitems, &bytesafter,
+ &data_return);
+
// If the return name is not the same as what someone passed in,
// we don't want this window.
if (data_return) {
@@ -507,11 +509,11 @@ XRemoteClient::FindBestWindow(const char
}
if (username) {
- status = XGetWindowProperty(mDisplay, w, mMozUserAtom,
- 0, (65536 / sizeof(long)),
- False, XA_STRING,
- &type, &format, &nitems, &bytesafter,
- &data_return);
+ Unused << XGetWindowProperty(mDisplay, w, mMozUserAtom,
+ 0, (65536 / sizeof(long)),
+ False, XA_STRING,
+ &type, &format, &nitems, &bytesafter,
+ &data_return);
// if there's a username compare it with what we have
if (data_return) {
@@ -529,11 +531,11 @@ XRemoteClient::FindBestWindow(const char
// there is, then we need to make sure it matches what someone
// passed in.
if (aProfile) {
- status = XGetWindowProperty(mDisplay, w, mMozProfileAtom,
- 0, (65536 / sizeof(long)),
- False, XA_STRING,
- &type, &format, &nitems, &bytesafter,
- &data_return);
+ Unused << XGetWindowProperty(mDisplay, w, mMozProfileAtom,
+ 0, (65536 / sizeof(long)),
+ False, XA_STRING,
+ &type, &format, &nitems, &bytesafter,
+ &data_return);
// If there's a profile compare it with what we have
if (data_return) {
diff -up thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp.old thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp
--- thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp.old 2018-11-22 10:24:36.980367239 +0100
+++ thunderbird-60.3.0/toolkit/xre/nsAppRunner.cpp 2018-11-22 10:23:22.702553710 +0100
@@ -1830,18 +1830,13 @@ StartRemoteClient(const char* aDesktopSt
{
nsAutoPtr<nsRemoteClient> client;
- if (aIsX11Display) {
- client = new XRemoteClient();
- } else {
#if defined(MOZ_ENABLE_DBUS) && defined(MOZ_WAYLAND)
- client = new DBusRemoteClient();
+ client = new DBusRemoteClient();
#else
- MOZ_ASSERT(false, "Missing remote implementation!");
- return REMOTE_NOT_FOUND;
+ client = new XRemoteClient();
#endif
- }
- nsresult rv = client->Init();
+ nsresult rv = client ? client->Init() : NS_ERROR_FAILURE;
if (NS_FAILED(rv))
return REMOTE_NOT_FOUND;

11
thunderbird.spec
View File

@ -83,14 +83,14 @@
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 60.3.3
Version: 60.4.0
Release: 1%{?dist}
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
Source0: ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
Source1: thunderbird-langpacks-%{version}-20181205.tar.xz
Source1: thunderbird-langpacks-%{version}-20190102.tar.xz
# Locales for lightning
Source2: lightning-langpacks-%{version}.tar.xz
%endif
@ -123,11 +123,11 @@ Patch305: build-big-endian.patch
Patch306: mozilla-1353817.patch
Patch307: build-disable-elfhack.patch
Patch309: mozilla-1460871-ldap-query.patch
Patch314: mozbz-1500850-missing-dbus-header.patch
# Fedora specific patches
Patch310: disable-dbus-remote.patch
Patch311: firefox-wayland.patch
Patch312: thunderbird-dbus-remote.patch
Patch313: firefox-wayland-crash-mozbz1507475.patch
# Upstream patches
@ -245,6 +245,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%patch304 -p1 -b .1245783
%patch309 -p1 -b .1460871-ldap-query
%patch314 -p1 -b .1500850-missing-dbus-header
# Patch for big endian platforms only
%if 0%{?big_endian}
%patch26 -p1 -b .icu
@ -271,7 +272,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
# TODO - needs fixes
%patch311 -p1 -b .wayland
%patch312 -p1 -b .thunderbird-dbus-remote
%patch313 -p1 -b .mozbz1507475
%if %{official_branding}
@ -692,6 +692,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
* Wed Jan 2 2019 Jan Horak <jhorak@redhat.com> - 60.4.0-1
- Update to 60.4.0
* Wed Dec 5 2018 Jan Horak <jhorak@redhat.com> - 60.3.3-1
- Update to 60.3.3