pool/MozillaThunderbird
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 26004 from mozilla:Factory

Browse Source 
Copy from mozilla:Factory/MozillaThunderbird based on submit request 26004 from user wrosenauer

OBS-URL: https://build.opensuse.org/request/show/26004
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=43
This commit is contained in:
OBS User autobuild 2009-12-08 12:41:27 +00:00 committed by Git OBS Bridge
commit b88efcea82
15 changed files with 321 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MozillaThunderbird.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Mon Dec 7 10:04:05 CET 2009 - wr@rosenauer.org
- update to 3.0 (bnc#559819)
- update enigmail to final version 1.0.0
- use --disable-updater and removed obsolete UI patch and
pref changes
- use internal cairo up to 11.1 (Gecko now requires at least 1.8.8)
- added mozilla-clipboard.patch fixing a common crash (bmo#495392)
- removed upstreamed patch thunderbird-cs-smtpauth.patch
-------------------------------------------------------------------
Wed Oct 7 21:41:15 CEST 2009 - wr@rosenauer.org

51
MozillaThunderbird.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package MozillaThunderbird (Version 3.0b4)
# spec file for package MozillaThunderbird (Version 3.0.0)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2009 Wolfgang Rosenauer <wr@rosenauer.org>
@ -27,10 +27,11 @@ BuildRequires: hunspell-devel
%if %suse_version > 1100
BuildRequires: nss-shared-helper-devel
%endif
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
%define mainversion 3.0b4
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
%define mainversion 3.0.0
Version: %{mainversion}
Release: 3
Release: 1
%define releasedate 2009113000
Summary: The Stand-Alone Mozilla Mail Component
Url: http://www.mozilla.org/products/thunderbird/
Group: Productivity/Networking/Email/Clients
@ -43,24 +44,24 @@ Source4: l10n-%{version}.tar.bz2
Source6: suse-default-prefs.js
Source7: find-external-requires.sh
Source8: MozillaThunderbird-rpmlintrc
Source9: enigmail-20090813.tar.bz2
Source9: enigmail-1.0.0.tar.bz2
Source10: create-tar.sh
Patch1: thunderbird-cs-smtpauth.patch
Patch1: mozilla-clipboard.patch
Patch2: thunderbird-appname.patch
Patch3: mozilla-startup-notification.patch
Patch4: mozilla-gtkfilepicker-buttonorder.patch
Patch5: tb-develdirs.patch
Patch7: mozilla-path_len.patch
Patch8: mozilla-helper-app.patch
Patch9: mozilla-shared-nss-db.patch
Patch10: mozilla-system-hunspell.patch.bz2
Patch11: thunderbird-shared-nss-db.patch
Patch12: thunderbird-no-update.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: coreutils fileutils textutils /bin/sh
### build options
%define build_enigmail 1
%define has_system_cairo 0
%if %suse_version > 1100
%if %suse_version > 1110
%define has_system_cairo 1
%endif
%define localize 1
@ -72,7 +73,6 @@ PreReq: coreutils fileutils textutils /bin/sh
%global __find_provides %provfind
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
%define releasedate 2009091500
%define progname thunderbird
%define progdir %{_prefix}/%_lib/thunderbird
%define libgssapi libgssapi_krb5.so.2
@ -85,9 +85,9 @@ Mozilla application suite.
%package translations-common
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Common translations for MozillaThunderbird
Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN)
Provides: locale(%{name}:ar;ca;cs;de;en_GB;es_AR;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
Group: System/Localization
PreReq: %{name} = %{mainversion}
Obsoletes: %{name}-translations < %{version}-%{release}
@ -98,9 +98,9 @@ of MozillaThunderbird.
%package translations-other
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Extra translations for MozillaThunderbird
Provides: locale(%{name}:af;be;bn_BD;el;et;eu;fy_NL;ga_IE;gl;id;is;lt;nn_NO;pa_IN;ro;si;sk;sq;ta_LK;tr;uk;vi)
Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;gl;he;id;is;ka;lt;nn_NO;pa_IN;ro;si;sk;sq;sr;ta_LK;tr;uk;vi)
Group: System/Localization
PreReq: %{name} = %{mainversion}
Obsoletes: %{name}-translations < %{version}-%{release}
@ -111,7 +111,7 @@ of MozillaThunderbird.
%package devel
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Mozilla Thunderbird SDK
Group: Development/Libraries/Other
Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
@ -127,7 +127,7 @@ Software Development Kit to build plugins/extensions against Thunderbird.
%package lightning
Version: 0.9
Release: 1
License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Summary: Calendaring extension for Thunderbird
Group: Productivity/Networking/Email/Clients
PreReq: %{name} = %{mainversion}
@ -138,9 +138,9 @@ This package contains the Lightning calendar extension for Mozilla Thunderbird.
%if %build_enigmail
%package -n enigmail
Version: 0.96.99
Release: 4
License: GPL v2 or later ; MPL 1.1
Version: 1.0.0
Release: 1
License: GPLv2+ ; MPLv1.1+
Summary: OpenPGP addon for Thunderbird and SeaMonkey
Group: Productivity/Networking/Email/Clients
Url: http://enigmail.mozdev.org
@ -165,8 +165,10 @@ popd
%endif
# xulrunner patches
pushd mozilla
%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch8 -p1
%patch7 -p1
%patch9 -p1
pushd extensions
@ -177,11 +179,6 @@ popd
%patch2
%patch5
%patch11
%patch12 -p1
# l10n patches
pushd ../l10n
%patch1
popd
%build
export SUSE_ASNEEDED=0
@ -218,6 +215,7 @@ ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-l10n-base=../l10n
ac_add_options --disable-updater
#ac_add_options --with-system-png # no apng support
%if %lightning
ac_add_options --enable-extensions=default,lightning
@ -241,7 +239,7 @@ make -f client.mk build
#
### enigmail build
%if %build_enigmail
mv $RPM_BUILD_DIR/enigmail/src $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail
cp -r $RPM_BUILD_DIR/enigmail $RPM_BUILD_DIR/thunderbird/mailnews/extensions/
(cd $RPM_BUILD_DIR/thunderbird/mailnews/extensions/enigmail; ./makemake -r; make; make xpi)
%endif
@ -352,7 +350,6 @@ rm -f $RPM_BUILD_ROOT%{progdir}/enigmail*.xpi
#
# remove spurious executable bits
find $RPM_BUILD_ROOT/usr/include/%{progname} -type f -exec chmod a-x {} \;
#find $RPM_BUILD_ROOT%{_libdir}/pkgconfig/* -type f -exec chmod a-x {} \;
find $RPM_BUILD_ROOT%{_libdir}/%{progname} -name "*.js" | xargs chmod a-x
#
for size in 16 22 24 32 48 256; do
@ -361,7 +358,6 @@ for size in 16 22 24 32 48 256; do
done
%suse_update_desktop_file %{name} Network Email GTK
# excluded files
# excluded files
rm -f $RPM_BUILD_ROOT%{progdir}/thunderbird
rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
rm -f $RPM_BUILD_ROOT%{progdir}/updater
@ -419,9 +415,7 @@ exit 0
%dir %{progdir}
%{progdir}/application.ini
%{progdir}/res/
%{progdir}/icons/
%{progdir}/dependentlibs.list
%{progdir}/LICENSE.txt
%{progdir}/README.txt
%{progdir}/libldap60.so
%{progdir}/libprldap60.so
@ -431,7 +425,6 @@ exit 0
%{progdir}/libmozjs.so
%{progdir}/libxpcom_core.so
%{progdir}/libxpcom.so
%{progdir}/license.html
%{progdir}/mozilla-xremote-client
%{progdir}/platform.ini
%{progdir}/run-mozilla.sh

17
create-tar.sh
View File

@ -1,16 +1,19 @@
#!/bin/bash
RELEASE_TAG="THUNDERBIRD_3_0b4_RELEASE"
VERSION="3.0b4"
echo "cloning comm-central..."
hg clone http://hg.mozilla.org/comm-central thunderbird
BRANCH="releases/comm-1.9.1" # comm-central
RELEASE_TAG="THUNDERBIRD_3_0rc2_RELEASE"
VERSION="3.0.0"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH thunderbird
pushd thunderbird
#hg update -r $RELEASE_TAG
hg update -r $RELEASE_TAG
echo "running client.py..."
python client.py checkout --skip-chatzilla --skip-venkman --comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG
[ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG"
python client.py checkout --skip-chatzilla --skip-venkman $_extra
popd
echo "creating archivei..."
echo "creating archive..."
tar cjf thunderbird-$VERSION-source.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS thunderbird
# l10n

3
enigmail-1.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c55b6f008f0a24d5e783d845f6d3534e1279757afcc41ca5c26a9802576ec100
size 838623

3
enigmail-20090813.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8620d4d69826726b0c98d82e58ef76a9f5f3b72eb408e740a6d89447430ff885
size 789423

3
l10n-3.0.0.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1d629c015dc62c47efa22f2d5780889f3fd15dee2ebdda6f063988336bc5acd4
size 19183180

3
l10n-3.0b4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ae866c27789391b89a4e483ead93d3f9899497680c424c5251ee7c43352cbf32
size 15400735

110
mozilla-clipboard.patch Normal file
View File

@ -0,0 +1,110 @@
From: Martin Stránský
Subject: Fix crash in clipboard handling
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=495392
diff --git a/widget/src/gtk2/nsClipboard.cpp b/widget/src/gtk2/nsClipboard.cpp
--- a/widget/src/gtk2/nsClipboard.cpp
+++ b/widget/src/gtk2/nsClipboard.cpp
@@ -440,21 +440,21 @@ nsClipboard::HasDataMatchingFlavors(cons
if (!strcmp(aFlavorList[i], kUnicodeMime) &&
gtk_selection_data_targets_include_text(selection_data)) {
*_retval = PR_TRUE;
break;
}
for (PRInt32 j = 0; j < n_targets; j++) {
gchar *atom_name = gdk_atom_name(targets[j]);
- if (!strcmp(atom_name, aFlavorList[i]))
+ if (!g_strcmp0(atom_name, aFlavorList[i]))
*_retval = PR_TRUE;
// X clipboard wants image/jpeg, not image/jpg
- if (!strcmp(aFlavorList[i], kJPEGImageMime) && !strcmp(atom_name, "image/jpeg"))
+ if (!g_strcmp0(aFlavorList[i], kJPEGImageMime) && !g_strcmp0(atom_name, "image/jpeg"))
*_retval = PR_TRUE;
g_free(atom_name);
if (*_retval)
break;
}
}
diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp
--- a/widget/src/gtk2/nsDragService.cpp
+++ b/widget/src/gtk2/nsDragService.cpp
@@ -796,46 +796,43 @@ nsDragService::IsDataFlavorSupported(con
GList *tmp;
for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) {
/* Bug 331198 */
GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
gchar *name = NULL;
name = gdk_atom_name(atom);
PR_LOG(sDragLm, PR_LOG_DEBUG,
("checking %s against %s\n", name, aDataFlavor));
- if (name && (strcmp(name, aDataFlavor) == 0)) {
+ if (g_strcmp0(name, aDataFlavor) == 0) {
PR_LOG(sDragLm, PR_LOG_DEBUG, ("good!\n"));
*_retval = PR_TRUE;
}
// check for automatic text/uri-list -> text/x-moz-url mapping
if (*_retval == PR_FALSE &&
- name &&
- (strcmp(name, gTextUriListType) == 0) &&
- (strcmp(aDataFlavor, kURLMime) == 0)) {
+ (g_strcmp0(name, gTextUriListType) == 0) &&
+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's text/uri-list and \
we're checking against text/x-moz-url )\n"));
*_retval = PR_TRUE;
}
// check for automatic _NETSCAPE_URL -> text/x-moz-url mapping
if (*_retval == PR_FALSE &&
- name &&
- (strcmp(name, gMozUrlType) == 0) &&
- (strcmp(aDataFlavor, kURLMime) == 0)) {
+ (g_strcmp0(name, gMozUrlType) == 0) &&
+ (g_strcmp0(aDataFlavor, kURLMime) == 0)) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's _NETSCAPE_URL and \
we're checking against text/x-moz-url )\n"));
*_retval = PR_TRUE;
}
// check for auto text/plain -> text/unicode mapping
if (*_retval == PR_FALSE &&
- name &&
- (strcmp(name, kTextMime) == 0) &&
- ((strcmp(aDataFlavor, kUnicodeMime) == 0) ||
- (strcmp(aDataFlavor, kFileMime) == 0))) {
+ (g_strcmp0(name, kTextMime) == 0) &&
+ ((g_strcmp0(aDataFlavor, kUnicodeMime) == 0) ||
+ (g_strcmp0(aDataFlavor, kFileMime) == 0))) {
PR_LOG(sDragLm, PR_LOG_DEBUG,
("good! ( it's text plain and we're checking \
against text/unicode or application/x-moz-file)\n"));
*_retval = PR_TRUE;
}
g_free(name);
}
return NS_OK;
@@ -946,17 +943,17 @@ nsDragService::IsTargetContextList(void)
// walk the list of context targets and see if one of them is a list
// of items.
for (tmp = mTargetDragContext->targets; tmp; tmp = tmp->next) {
/* Bug 331198 */
GdkAtom atom = GDK_POINTER_TO_ATOM(tmp->data);
gchar *name = NULL;
name = gdk_atom_name(atom);
- if (strcmp(name, gMimeListType) == 0)
+ if (g_strcmp0(name, gMimeListType) == 0)
retval = PR_TRUE;
g_free(name);
if (retval)
break;
}
return retval;
}

118
mozilla-helper-app.patch Normal file
View File

@ -0,0 +1,118 @@
From: Wolfgang Rosenauer <wr@rosenauer.org>
Subject: no helper app for application/octet-stream but recognized extensions
References:
https://bugzilla.novell.com/show_bug.cgi?id=406979
https://bugzilla.mozilla.org/show_bug.cgi?id=327323
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@@ -41,16 +41,17 @@
#include <glib.h>
#include <hildon-uri.h>
#endif
#include "nsMIMEInfoUnix.h"
#include "nsGNOMERegistry.h"
#include "nsIGnomeVFSService.h"
+#include "nsAutoPtr.h"
#ifdef MOZ_ENABLE_DBUS
#include "nsDBusHandlerApp.h"
#endif
nsresult
nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
{
@@ -69,23 +70,26 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
#endif
return rv;
}
NS_IMETHODIMP
nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
{
*_retval = PR_FALSE;
- nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (vfs) {
- nsCOMPtr<nsIGnomeVFSMimeApp> app;
- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
- *_retval = PR_TRUE;
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType);
+ if (!mimeInfo) {
+ nsCAutoString ext;
+ GetPrimaryExtension(ext);
+ mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
}
+ if (mimeInfo)
+ *_retval = PR_TRUE;
+
if (*_retval)
return NS_OK;
#ifdef MOZ_PLATFORM_HILDON
HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
if (action) {
*_retval = PR_TRUE;
hildon_uri_action_unref(action);
@@ -104,16 +108,26 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
aFile->GetNativePath(nativePath);
nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (vfs) {
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
+
+ // If we haven't got an app we try to get a valid one by searching for the
+ // extension mapped type
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+ if (mimeInfo) {
+ nsCAutoString type;
+ mimeInfo->GetType(type);
+ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
+ return app->Launch(nativePath);
+ }
}
if (!mDefaultApplication)
return NS_ERROR_FILE_NOT_FOUND;
return LaunchWithIProcess(mDefaultApplication, nativePath);
}
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
+++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
@@ -1641,18 +1641,26 @@ nsOSHelperAppService::GetMIMEInfoFromOS(
NS_ADDREF(retval);
if (!aFileExt.IsEmpty())
retval->AppendExtension(aFileExt);
}
return retval;
}
- // Copy the attributes of retval onto miByExt, to return it
+ // Copy the attributes of retval onto miByExt, to return it but keep
+ // just collected mDefaultAppDescription
+ nsAutoString byExtDefault;
+ miByExt->GetDefaultDescription(byExtDefault);
+ retval->SetDefaultDescription(byExtDefault);
retval->CopyBasicDataTo(miByExt);
+ // But set the extensions primary since CopyBasicDataTo overwrites the
+ // list
+ if (!aFileExt.IsEmpty())
+ miByExt->SetPrimaryExtension(aFileExt);
miByExt.swap(retval);
}
return retval;
}
NS_IMETHODIMP
nsOSHelperAppService::GetProtocolHandlerInfoFromOS(const nsACString &aScheme,

1
suse-default-prefs.js
View File

@ -1,6 +1,5 @@
pref("general.useragent.vendor", "SUSE");
pref("general.useragent.vendorSub", "RPM_VERSION");
pref("app.update.enabled", false);
pref("font.default", "sans-serif");
pref("font.default.x-western", "sans-serif");
pref("font.name.monospace.x-western", "monospace");

3
thunderbird-3.0.0-source.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ce0811dc48058a453fd4d4c647a2fa2029c592b564d12b46806f0f3ab3dcf408
size 60186501

3
thunderbird-3.0b4-source.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:33d28a2847e1b5673c50f8bf63ccf123c96b39dfcbd442dd9966edd952f99f6e
size 59231572

9
thunderbird-cs-smtpauth.patch
View File

@ -1,9 +0,0 @@
--- cs/mail/chrome/messenger/messengercompose/composeMsgs.properties.orig 2009-09-29 13:35:48.000000000 +0200
+++ cs/mail/chrome/messenger/messengercompose/composeMsgs.properties 2009-09-29 13:36:19.000000000 +0200
@@ -347,5 +347,5 @@
## LOCALIZATION NOTE(smtpEnterPasswordPromptWithUsername): Do not translate the
## words %1$S and %2$S. Place the word %1$S where the host name should appear,
## and %2$S where the user name should appear.
-smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %S na %1$S:
+smtpEnterPasswordPromptWithUsername=Zadejte heslo k účtu %2$S na %1$S:
smtpEnterPasswordPromptTitle=SMTP server vyžaduje heslo

28
thunderbird-no-update.patch
View File

@ -1,28 +0,0 @@
diff --git a/mail/base/content/utilityOverlay.js b/mail/base/content/utilityOverlay.js
--- a/mail/base/content/utilityOverlay.js
+++ b/mail/base/content/utilityOverlay.js
@@ -237,7 +237,13 @@ function buildHelpMenu()
// administrator or if we cannot update for some other reason.
var checkForUpdates = document.getElementById("checkForUpdates");
var canUpdate = updates.canUpdate;
+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch);
+ var updateEnabled = prefs.getBoolPref("app.update.enabled", true);
checkForUpdates.setAttribute("disabled", !canUpdate);
+ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled);
+ var updateSeparator = document.getElementById("menu_HelpAfterUpdatesSeparator");
+ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled);
if (!canUpdate)
return;
diff --git a/mail/components/preferences/advanced.js b/mail/components/preferences/advanced.js
--- a/mail/components/preferences/advanced.js
+++ b/mail/components/preferences/advanced.js
@@ -238,6 +238,7 @@ var gAdvancedPane = {
var enableAppUpdate = document.getElementById("enableAppUpdate");
enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked;
+ enableAppUpdate.hidden = !aus.canUpdate || !enabledPref.value;
},
updateAutoItems: function ()

65
thunderbird-shared-nss-db.patch
View File

@ -1,26 +1,21 @@
--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100
+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100
@@ -129,6 +129,7 @@
$(EXTRA_DSO_LIBS) \
$(APP_XPCOM_LIBS) \
$(NSPR_LIBS) \
+ $(NSSHELPER_LIBS) \
$(TK_LIBS) \
$(NULL)
From: Hans Petter Jansson <hpj@copyleft.no>
Wolfgang Rosenauer <wr@rosenauer.org>
Subject: use libnsssharedhelper if available at compile time
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
References:
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ config/autoconf.mk.in
@@ -478,16 +478,20 @@ MOZ_XIE_LIBS = @MOZ_XIE_LIBS@
XT_LIBS = @XT_LIBS@
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.464
diff -u -p -6 -r3.464 autoconf.mk.in
--- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464
+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000
@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
LIBIDL_LIBS = @LIBIDL_LIBS@
STATIC_LIBIDL = @STATIC_LIBIDL@
+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
@ -32,9 +27,17 @@ diff -u -p -6 -r3.464 autoconf.mk.in
LIBS_PATH = @LIBS_PATH@
MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@
--- configure.in.orig 2009-05-11 19:50:11.000000000 +0200
+++ configure.in 2009-05-11 19:49:35.000000000 +0200
@@ -7028,6 +7028,22 @@ QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(L
COMPILER_DEPEND = @COMPILER_DEPEND@
MDDEPDIR := @MDDEPDIR@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ configure.in
@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS)
dnl qcms
dnl ========================================================
QCMS_LIBS='$(DEPTH)/mozilla/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
AC_SUBST(QCMS_LIBS)
dnl ========================================================
@ -52,8 +55,22 @@ diff -u -p -6 -r3.464 autoconf.mk.in
+AC_SUBST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS)
+
+
+dnl ========================================================
dnl disable xul
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xul,
[ --disable-xul Disable XUL],
MOZ_XUL= )
if test "$MOZ_XUL"; then
AC_DEFINE(MOZ_XUL)
fi
--- mail/app/Makefile.in.orig 2009-02-26 11:02:11.000000000 +0100
+++ mail/app/Makefile.in 2009-02-26 11:04:00.000000000 +0100
@@ -129,6 +129,7 @@
$(EXTRA_DSO_LIBS) \
$(APP_XPCOM_LIBS) \
$(NSPR_LIBS) \
+ $(NSSHELPER_LIBS) \
$(TK_LIBS) \
$(NULL)