From eb52d724d23bc8d25be4ec0d168d4ef1c8a61360bcd088fb3526c1ca9ddfd700 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 24 Jul 2010 15:36:48 +0000 Subject: [PATCH] update to 3.1.1 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=88 --- MozillaThunderbird.changes | 13 ++ MozillaThunderbird.spec | 90 ++++++++----- create-tar.sh | 10 +- enigmail-1.0.1.tar.bz2 | 3 - enigmail-1.1.2.tar.bz2 | 3 + l10n-3.0.6.tar.bz2 | 3 - l10n-3.1.1.tar.bz2 | 3 + mozilla-esd.patch | 91 +++++++++++++ mozilla-gtkfilepicker-buttonorder.patch | 46 ------- mozilla-helper-app.patch | 57 ++------ mozilla-path_len.patch | 168 ------------------------ mozilla-shared-nss-db.patch | 86 +++++++++--- mozilla-startup-notification.patch | 58 -------- mozilla-system-hunspell.patch.bz2 | 3 - mozilla-xsmp.patch | 6 +- tb-ssldap.patch | 21 +++ thunderbird-3.0.6-source.tar.bz2 | 3 - thunderbird-3.1.1-source.tar.bz2 | 3 + thunderbird-appname.patch | 20 +-- thunderbird-shared-nss-db.patch | 32 +++-- 20 files changed, 309 insertions(+), 410 deletions(-) delete mode 100644 enigmail-1.0.1.tar.bz2 create mode 100644 enigmail-1.1.2.tar.bz2 delete mode 100644 l10n-3.0.6.tar.bz2 create mode 100644 l10n-3.1.1.tar.bz2 create mode 100644 mozilla-esd.patch delete mode 100644 mozilla-gtkfilepicker-buttonorder.patch delete mode 100644 mozilla-path_len.patch delete mode 100644 mozilla-startup-notification.patch delete mode 100644 mozilla-system-hunspell.patch.bz2 create mode 100644 tb-ssldap.patch delete mode 100644 thunderbird-3.0.6-source.tar.bz2 create mode 100644 thunderbird-3.1.1-source.tar.bz2 diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 0be775b..3a826ef 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Sat Jul 24 17:22:58 CEST 2010 - wr@rosenauer.org + +- update to version 3.1.1 + * based on the Gecko 1.9.2 platform + * Faster Search Results + * Quick Filter Toolbar + * New Migration Assistant + * Saved Files Manager +- update to enigmail 1.1.2 +- enable crashreporter and package buildsymbols +- fixed esd sound output (notifications) (bmo#576365) + ------------------------------------------------------------------- Fri Jul 16 07:19:40 CEST 2010 - wr@rosenauer.org diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index f0fd493..27fa84d 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 3.0.6) +# spec file for package MozillaThunderbird (Version 3.1.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -20,16 +20,12 @@ Name: MozillaThunderbird -BuildRequires: autoconf213 fdupes gcc-c++ libgnomeui-devel libidl-devel python startup-notification-devel unzip update-desktop-files zip -BuildRequires: mozilla-nss-devel >= 3.12.6 -%if %suse_version > 1030 -BuildRequires: hunspell-devel -%endif +BuildRequires: autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel mozilla-nss-devel python startup-notification-devel unzip update-desktop-files zip %if %suse_version > 1100 BuildRequires: nss-shared-helper-devel %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -%define mainversion 3.0.6 +%define mainversion 3.1.1 Version: %{mainversion} Release: 1 %define releasedate 2010071400 @@ -45,22 +41,21 @@ Source4: l10n-%{version}.tar.bz2 Source6: suse-default-prefs.js Source7: find-external-requires.sh Source8: MozillaThunderbird-rpmlintrc -Source9: enigmail-1.0.1.tar.bz2 +Source9: enigmail-1.1.2.tar.bz2 Source10: create-tar.sh +Patch1: mozilla-esd.patch Patch2: thunderbird-appname.patch -Patch3: mozilla-startup-notification.patch -Patch4: mozilla-gtkfilepicker-buttonorder.patch +Patch4: tb-ssldap.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 Patch13: mozilla-xsmp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: coreutils fileutils textutils /bin/sh ### build options %define build_enigmail 1 +%define crashreporter 1 %define has_system_cairo 0 %if %suse_version > 1110 %define has_system_cairo 1 @@ -100,7 +95,7 @@ of MozillaThunderbird. %package translations-other License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Extra translations for MozillaThunderbird -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) +Provides: locale(%{name}:af;be;bg;bn_BD;el;et;eu;fy_NL;ga_IE;he;id;is;lt;nn_NO;pa_IN;ro;si;sk;sl;sq;tr;uk;vi) Group: System/Localization PreReq: %{name} = %{mainversion} Obsoletes: %{name}-translations < %{version}-%{release} @@ -122,11 +117,22 @@ PreReq: %{name} = %{mainversion} Software Development Kit to build plugins/extensions against Thunderbird. -%if %build_enigmail +%if %crashreporter +%package buildsymbols +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Breakpad buildsymbols for %{name} +Group: Development/Debug +%description buildsymbols +This subpackage contains the Breakpad created and compatible debugging +symbols meant for upload to Mozilla's crash collector database. +%endif + + +%if %build_enigmail %package -n enigmail -Version: 1.0.1 -Release: 5 +Version: 1.1.2 +Release: 1 License: GPLv2+ ; MPLv1.1+ Summary: OpenPGP addon for Thunderbird and SeaMonkey Group: Productivity/Networking/Email/Clients @@ -145,27 +151,21 @@ This package contains the Enigmail OpenPGP Addon for Thunderbird and SeaMonkey. %prep %if %build_enigmail %setup -n thunderbird -q -b 4 -b 9 -pushd $RPM_BUILD_DIR -popd %else %setup -n thunderbird -q -b 4 %endif # xulrunner patches pushd mozilla -%patch3 -p1 -%patch4 -p1 +%patch1 -p1 %patch8 -p1 -%patch7 -p1 %patch9 -p1 %patch13 -p1 -pushd extensions -%patch10 -popd popd # comm-central patches -%patch2 +%patch2 -p1 +%patch4 -p1 %patch5 -%patch11 +%patch11 -p1 %build export SUSE_ASNEEDED=0 @@ -176,10 +176,6 @@ export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif -# hopefully only temporary change for gcc 4.3 -%if %suse_version == 1030 -export ac_cv_visibility_hidden="no" -%endif export CXXFLAGS="$CFLAGS" export MOZCONFIG=$RPM_BUILD_DIR/mozconfig # @@ -210,15 +206,20 @@ ac_add_options --enable-system-hunspell ac_add_options --enable-ldap-experimental ac_add_options --disable-installer ac_add_options --disable-mochitest -ac_add_options --disable-crashreporter ac_add_options --enable-startup-notification ac_add_options --enable-official-branding +ac_add_options --disable-necko-wifi EOF %if %has_system_cairo cat << EOF >> $MOZCONFIG ac_add_options --enable-system-cairo EOF %endif +%if ! %crashreporter +cat << EOF >> $MOZCONFIG +ac_add_options --disable-crashreporter +EOF +%endif make -f client.mk build # ### enigmail build @@ -306,6 +307,7 @@ cp -rL mozilla/dist/include/* $RPM_BUILD_ROOT%{_includedir}/%{progname}/ # # install enigmail to extension dir %if %build_enigmail +cp -L mozilla/dist/bin/enigmail-*.xpi $RPM_BUILD_ROOT%{progdir} # Thunderbird location _enig_dir=$RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/\{3550f703-e582-4d05-9a08-453d09bdfdc6\}/\{847b3a00-7ab1-11d4-8f02-006008948af5\} mkdir -p $_enig_dir @@ -354,6 +356,16 @@ rm -f $RPM_BUILD_ROOT%{progdir}/dictionaries/en-US* %fdupes $RPM_BUILD_ROOT%{_libdir}/mozilla %fdupes $RPM_BUILD_ROOT%{_datadir} %fdupes $RPM_BUILD_ROOT%{_includedir} +%if %crashreporter +SYMBOLS_NAME="thunderbird-%{mainversion}-%{release}.%{_arch}-%{suse_version}-symbols" +make buildsymbols \ + SYMBOL_INDEX_NAME="$SYMBOLS_NAME.txt" \ + SYMBOL_ARCHIVE_BASENAME="$SYMBOLS_NAME" +if [ -e mozilla/dist/*symbols.zip ]; then + mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ + cp mozilla/dist/*symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ +fi +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -396,7 +408,6 @@ exit 0 %dir %{progdir} %{progdir}/application.ini %{progdir}/res/ -%{progdir}/dependentlibs.list %{progdir}/README.txt %{progdir}/libldap60.so %{progdir}/libprldap60.so @@ -410,6 +421,12 @@ exit 0 %{progdir}/platform.ini %{progdir}/run-mozilla.sh %{progdir}/thunderbird-bin +# crashreporter files +%if %crashreporter +%{progdir}/crashreporter +%{progdir}/crashreporter.ini +%{progdir}/Throbber-small.gif +%endif %{progdir}/components/ %{progdir}/modules/ %dir %{progdir}/chrome/ @@ -430,8 +447,8 @@ exit 0 %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{progname}.png %{_bindir}/%{progname} -%if %localize +%if %localize %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) @@ -450,11 +467,16 @@ exit 0 %{_includedir}/%{progname}/ %if %build_enigmail - %files -n enigmail %defattr(-,root,root) %dir %{_libdir}/mozilla %{_libdir}/mozilla/extensions/ %endif +%if %crashreporter +%files buildsymbols +%defattr(-,root,root) +%{_datadir}/mozilla/ +%endif + %changelog diff --git a/create-tar.sh b/create-tar.sh index 32cd1b8..178dd95 100644 --- a/create-tar.sh +++ b/create-tar.sh @@ -1,9 +1,9 @@ #!/bin/bash -BRANCH="releases/comm-1.9.1" # comm-central -RELEASE_TAG="THUNDERBIRD_3_0_6_RELEASE" -VERSION="3.0.6" +BRANCH="releases/comm-1.9.2" # comm-central +RELEASE_TAG="THUNDERBIRD_3_1_1_RELEASE" +VERSION="3.1.1" echo "cloning $BRANCH..." hg clone http://hg.mozilla.org/$BRANCH thunderbird @@ -11,6 +11,8 @@ pushd thunderbird hg update -r $RELEASE_TAG echo "running client.py..." [ "$RELEASE_TAG" == "default" ] || _extra="--comm-rev=$RELEASE_TAG --mozilla-rev=$RELEASE_TAG" +# temporary! +_extra="--mozilla-repo=http://hg.mozilla.org/releases/mozilla-1.9.2 $_extra" python client.py checkout --skip-chatzilla --skip-venkman $_extra popd echo "creating archive..." @@ -31,7 +33,7 @@ for locale in $(awk '{ print $1; }' $SHIPPED_LOCALES); do ;; *) echo "fetching $locale ..." - hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.1/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n-mozilla-1.9.2/$locale l10n/$locale hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac diff --git a/enigmail-1.0.1.tar.bz2 b/enigmail-1.0.1.tar.bz2 deleted file mode 100644 index 28139dd..0000000 --- a/enigmail-1.0.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ea9e271bdf52dcd6c538975dc9ba056644d736cf52fd411af0c97a32ae9552dd -size 858106 diff --git a/enigmail-1.1.2.tar.bz2 b/enigmail-1.1.2.tar.bz2 new file mode 100644 index 0000000..045bb22 --- /dev/null +++ b/enigmail-1.1.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:463878db781e019e6687350f2618d0a31331848f2e9aa45f359a4b700d22a82e +size 891190 diff --git a/l10n-3.0.6.tar.bz2 b/l10n-3.0.6.tar.bz2 deleted file mode 100644 index cb621e1..0000000 --- a/l10n-3.0.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3a35b1a06ba2ea19cd9af4422d9893f6af4eedd07c6e5906fec41a0471295fba -size 20149125 diff --git a/l10n-3.1.1.tar.bz2 b/l10n-3.1.1.tar.bz2 new file mode 100644 index 0000000..cebe14f --- /dev/null +++ b/l10n-3.1.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd10591b04f33727374412eb27580b4732e730b3e5d0f38ef6a36d3d2fcbf56d +size 17904338 diff --git a/mozilla-esd.patch b/mozilla-esd.patch new file mode 100644 index 0000000..fb1903d --- /dev/null +++ b/mozilla-esd.patch @@ -0,0 +1,91 @@ +diff --git a/widget/src/gtk2/nsSound.cpp b/widget/src/gtk2/nsSound.cpp +--- a/widget/src/gtk2/nsSound.cpp ++++ b/widget/src/gtk2/nsSound.cpp +@@ -52,36 +52,31 @@ + #include "nsCOMPtr.h" + #include "nsAutoPtr.h" + #include "nsString.h" + + #include + #include + + #include +-/* used with esd_open_sound */ +-static int esdref = -1; + static PRLibrary *elib = nsnull; + static PRLibrary *libcanberra = nsnull; + static PRLibrary* libasound = nsnull; + + // the following from esd.h + + #define ESD_BITS8 (0x0000) + #define ESD_BITS16 (0x0001) + #define ESD_MONO (0x0010) + #define ESD_STEREO (0x0020) + #define ESD_STREAM (0x0000) + #define ESD_PLAY (0x1000) + + #define WAV_MIN_LENGTH 44 + +-typedef int (*EsdOpenSoundType)(const char *host); +-typedef int (*EsdCloseType)(int); +- + /* used to play the sounds from the find symbol call */ + typedef int (*EsdPlayStreamType) (int, int, const char *, const char *); + typedef int (*EsdAudioOpenType) (void); + typedef int (*EsdAudioWriteType) (const void *, int); + typedef void (*EsdAudioCloseType) (void); + + /* used to find and play common system event sounds. + this interfaces with libcanberra. +@@ -126,50 +121,30 @@ NS_IMPL_ISUPPORTS2(nsSound, nsISound, ns + //////////////////////////////////////////////////////////////////////// + nsSound::nsSound() + { + mInited = PR_FALSE; + } + + nsSound::~nsSound() + { +- if (esdref >= 0) { +- EsdCloseType EsdClose = (EsdCloseType) PR_FindFunctionSymbol(elib, "esd_close"); +- if (EsdClose) +- (*EsdClose)(esdref); +- esdref = -1; +- } + } + + NS_IMETHODIMP + nsSound::Init() + { + // This function is designed so that no library is compulsory, and + // one library missing doesn't cause the other(s) to not be used. + if (mInited) + return NS_OK; + + mInited = PR_TRUE; + + if (!elib) { + elib = PR_LoadLibrary("libesd.so.0"); +- if (elib) { +- EsdOpenSoundType EsdOpenSound = +- (EsdOpenSoundType) PR_FindFunctionSymbol(elib, "esd_open_sound"); +- if (!EsdOpenSound) { +- PR_UnloadLibrary(elib); +- elib = nsnull; +- } else { +- esdref = (*EsdOpenSound)("localhost"); +- if (esdref < 0) { +- PR_UnloadLibrary(elib); +- elib = nsnull; +- } +- } +- } + } + + if (!libasound) { + PRFuncPtr func = PR_FindFunctionSymbolAndLibrary("snd_lib_error_set_handler", + &libasound); + if (libasound) { + snd_lib_error_set_handler_fn snd_lib_error_set_handler = + (snd_lib_error_set_handler_fn) func; diff --git a/mozilla-gtkfilepicker-buttonorder.patch b/mozilla-gtkfilepicker-buttonorder.patch deleted file mode 100644 index 04e6fb8..0000000 --- a/mozilla-gtkfilepicker-buttonorder.patch +++ /dev/null @@ -1,46 +0,0 @@ -From: Wolfgang Rosenauer -Subject: Gtk filechooser should support alternative button order (as used in KDE) -References: -http://bugzilla.novell.com/show_bug.cgi?id=527418 - - -diff --git a/widget/src/gtk2/nsFilePicker.cpp b/widget/src/gtk2/nsFilePicker.cpp ---- a/widget/src/gtk2/nsFilePicker.cpp -+++ b/widget/src/gtk2/nsFilePicker.cpp -@@ -95,6 +95,7 @@ typedef GtkWidget* (*_gtk_file_chooser_d - GtkFileChooserAction action, - const gchar *first_button_text, - ...); -+typedef void (*_gtk_dialog_set_alternative_button_order_fn)(GtkDialog *dialog, gint first_response_id, ...); - typedef void (*_gtk_file_chooser_set_select_multiple_fn)(GtkFileChooser* chooser, gboolean truth); - typedef void (*_gtk_file_chooser_set_do_overwrite_confirmation_fn)(GtkFileChooser* chooser, gboolean do_confirm); - typedef void (*_gtk_file_chooser_set_current_name_fn)(GtkFileChooser* chooser, const gchar* name); -@@ -119,6 +120,7 @@ DECL_FUNC_PTR(gtk_file_chooser_get_filen - DECL_FUNC_PTR(gtk_file_chooser_get_uri); - DECL_FUNC_PTR(gtk_file_chooser_get_uris); - DECL_FUNC_PTR(gtk_file_chooser_dialog_new); -+DECL_FUNC_PTR(gtk_dialog_set_alternative_button_order); - DECL_FUNC_PTR(gtk_file_chooser_set_select_multiple); - DECL_FUNC_PTR(gtk_file_chooser_set_do_overwrite_confirmation); - DECL_FUNC_PTR(gtk_file_chooser_set_current_name); -@@ -214,6 +216,7 @@ nsFilePicker::LoadSymbolsGTK24() - GET_LIBGTK_FUNC(gtk_file_chooser_get_uri); - GET_LIBGTK_FUNC(gtk_file_chooser_get_uris); - GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new); -+ GET_LIBGTK_FUNC(gtk_dialog_set_alternative_button_order); - GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple); - GET_LIBGTK_FUNC_OPT(gtk_file_chooser_set_do_overwrite_confirmation); - GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name); -@@ -605,6 +608,12 @@ nsFilePicker::Show(PRInt16 *aReturn) - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - accept_button, GTK_RESPONSE_ACCEPT, - NULL); -+ -+ _gtk_dialog_set_alternative_button_order(GTK_DIALOG(file_chooser), -+ GTK_RESPONSE_ACCEPT, -+ GTK_RESPONSE_CANCEL, -+ -1); -+ - if (mAllowURLs) { - _gtk_file_chooser_set_local_only(GTK_FILE_CHOOSER(file_chooser), FALSE); - } diff --git a/mozilla-helper-app.patch b/mozilla-helper-app.patch index edf164e..3a495a1 100644 --- a/mozilla-helper-app.patch +++ b/mozilla-helper-app.patch @@ -4,16 +4,10 @@ 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 - #include - #endif - - +@@ -47,6 +47,7 @@ #include "nsMIMEInfoUnix.h" #include "nsGNOMERegistry.h" #include "nsIGnomeVFSService.h" @@ -21,17 +15,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler #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 +@@ -74,13 +75,16 @@ NS_IMETHODIMP nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval) { *_retval = PR_FALSE; @@ -53,17 +37,7 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler 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 vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - - if (vfs) { +@@ -113,6 +117,16 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns nsCOMPtr app; if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app) return app->Launch(nativePath); @@ -80,39 +54,24 @@ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler } 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); - } - +@@ -1580,8 +1580,16 @@ nsOSHelperAppService::GetMIMEInfoFromOS( 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 ++ // Copy the attributes of retval (mimeinfo from type) onto miByExt, to ++ // return it ++ // but reset to just collected mDefaultAppDescription (from ext) ++ // and preserve the primary extension as well + 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, diff --git a/mozilla-path_len.patch b/mozilla-path_len.patch deleted file mode 100644 index c8d693d..0000000 --- a/mozilla-path_len.patch +++ /dev/null @@ -1,168 +0,0 @@ -From: upstream -Subject: crashes with Factory's glibc -References: -https://bugzilla.novell.com/show_bug.cgi?id=354150 -https://bugzilla.mozilla.org/show_bug.cgi?id=412610 - ---- mozilla/toolkit/xre/nsAppRunner.h.old 2007-09-25 18:01:56.000000000 +0200 -+++ mozilla/toolkit/xre/nsAppRunner.h 2007-09-25 18:02:23.000000000 +0200 -@@ -48,7 +48,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old mozilla/toolkit/mozapps/update/src/updater/updater.cpp ---- mozilla/toolkit/mozapps/update/src/updater/updater.cpp.old 2007-09-25 18:00:26.000000000 +0200 -+++ mozilla/toolkit/mozapps/update/src/updater/updater.cpp 2007-09-25 18:00:53.000000000 +0200 -@@ -107,7 +107,8 @@ void LaunchChild(int argc, char **argv); - # elif defined(CCHMAXPATH) - # define MAXPATHLEN CCHMAXPATH - # else --# define MAXPATHLEN 1024 -+# include -+# define MAXPATHLEN PATH_MAX - # endif - #endif - -diff -up mozilla/xpcom/io/SpecialSystemDirectory.cpp.old mozilla/xpcom/io/SpecialSystemDirectory.cpp ---- mozilla/xpcom/io/SpecialSystemDirectory.cpp.old 2007-09-25 18:04:25.000000000 +0200 -+++ mozilla/xpcom/io/SpecialSystemDirectory.cpp 2007-09-25 18:04:48.000000000 +0200 -@@ -109,7 +109,8 @@ - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old mozilla/xpcom/obsolete/nsFileSpecUnix.cpp ---- mozilla/xpcom/obsolete/nsFileSpecUnix.cpp.old 2006-11-28 01:18:37.000000000 +0100 -+++ mozilla/xpcom/obsolete/nsFileSpecUnix.cpp 2007-09-25 18:05:49.000000000 +0200 -@@ -79,7 +79,8 @@ - #endif - - #ifndef MAXPATHLEN --#define MAXPATHLEN 1024 /* Guessing this is okay. Works for SCO. */ -+#include -+#define MAXPATHLEN PATH_MAX /* Guessing this is okay. Works for SCO. */ - #endif - - #if defined(__QNX__) -diff -up mozilla/xpcom/build/nsXPCOMPrivate.h.old mozilla/xpcom/build/nsXPCOMPrivate.h ---- mozilla/xpcom/build/nsXPCOMPrivate.h.old 2007-09-25 18:02:58.000000000 +0200 -+++ mozilla/xpcom/build/nsXPCOMPrivate.h 2007-09-25 18:03:15.000000000 +0200 -@@ -252,7 +252,8 @@ NS_GetFrozenFunctions(XPCOMFunctions *en - #elif defined(CCHMAXPATH) - #define MAXPATHLEN CCHMAXPATH - #else --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - #endif - -diff -up mozilla/dbm/include/mcom_db.h.old mozilla/dbm/include/mcom_db.h ---- mozilla/dbm/include/mcom_db.h.old 2007-09-25 17:57:09.000000000 +0200 -+++ mozilla/dbm/include/mcom_db.h 2007-09-25 17:57:49.000000000 +0200 -@@ -214,7 +214,8 @@ - #endif /* __DBINTERFACE_PRIVATE */ - - #ifdef SCO --#define MAXPATHLEN 1024 -+#include -+#define MAXPATHLEN PATH_MAX - #endif - - #include -diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c ---- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old 2007-09-25 18:38:52.000000000 +0200 -+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c 2007-09-25 18:39:17.000000000 +0200 -@@ -44,6 +44,7 @@ - #include "xpidl.h" - #include - #include -+#include - - #ifdef XP_WIN - #include -diff -up mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old mozilla/widget/src/xremoteclient/XRemoteClient.cpp ---- mozilla/widget/src/xremoteclient/XRemoteClient.cpp.old 2007-09-25 18:14:08.000000000 +0200 -+++ mozilla/widget/src/xremoteclient/XRemoteClient.cpp 2007-09-25 18:36:55.000000000 +0200 -@@ -76,7 +76,8 @@ - #endif - - #ifndef MAX_PATH --#define MAX_PATH 1024 -+#include -+#define MAX_PATH PATH_MAX - #endif - - #define ARRAY_LENGTH(array_) (sizeof(array_)/sizeof(array_[0])) -diff -up mozilla/modules/libreg/src/reg.c.old mozilla/modules/libreg/src/reg.c ---- mozilla/modules/libreg/src/reg.c.old 2007-09-25 18:25:02.000000000 +0200 -+++ mozilla/modules/libreg/src/reg.c 2007-09-25 18:27:46.000000000 +0200 -@@ -96,7 +96,8 @@ - #define MAX_PATH PATH_MAX - #elif defined(XP_UNIX) - #ifndef MAX_PATH --#define MAX_PATH 1024 -+#include -+#define MAX_PATH PATH_MAX - #endif - #elif defined(XP_OS2) - #ifndef MAX_PATH -diff -up mozilla/config/pathsub.h.old mozilla/config/pathsub.h ---- mozilla/config/pathsub.h.old 2004-04-18 16:17:25.000000000 +0200 -+++ mozilla/config/pathsub.h 2007-09-25 18:48:13.000000000 +0200 -@@ -46,7 +46,7 @@ - #include - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* -diff -up mozilla/modules/libjar/nsZipArchive.cpp.old mozilla/modules/libjar/nsZipArchive.cpp ---- mozilla/modules/libjar/nsZipArchive.cpp.old 2006-09-13 20:32:37.000000000 +0200 -+++ mozilla/modules/libjar/nsZipArchive.cpp 2007-09-25 18:51:00.000000000 +0200 -@@ -121,7 +121,7 @@ char * strdup(const char *src) - # define S_IFLNK 0120000 - # endif - # ifndef PATH_MAX --# define PATH_MAX 1024 -+# include - # endif - #endif /* XP_UNIX */ - -diff -up mozilla/nsprpub/config/pathsub.h.old mozilla/nsprpub/config/pathsub.h ---- mozilla/nsprpub/config/pathsub.h.old 2004-04-25 17:00:34.000000000 +0200 -+++ mozilla/nsprpub/config/pathsub.h 2007-09-25 18:57:51.000000000 +0200 -@@ -50,7 +50,7 @@ - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* -diff -up mozilla/security/coreconf/nsinstall/pathsub.h.old mozilla/security/coreconf/nsinstall/pathsub.h ---- mozilla/security/coreconf/nsinstall/pathsub.h.old 2004-04-25 17:02:18.000000000 +0200 -+++ mozilla/security/coreconf/nsinstall/pathsub.h 2007-09-25 19:00:35.000000000 +0200 -@@ -49,7 +49,7 @@ - #endif - - #ifndef PATH_MAX --#define PATH_MAX 1024 -+#error "PATH_MAX is not defined!" - #endif - - /* diff --git a/mozilla-shared-nss-db.patch b/mozilla-shared-nss-db.patch index ed1266d..c0b517a 100644 --- a/mozilla-shared-nss-db.patch +++ b/mozilla-shared-nss-db.patch @@ -4,11 +4,15 @@ 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 +++ b/config/autoconf.mk.in -@@ -535,6 +535,10 @@ LIBIDL_LIBS = @LIBIDL_LIBS@ +@@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO + + 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@ @@ -18,16 +22,24 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ - # Used for LD_LIBRARY_PATH + MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ + COMPILER_DEPEND = @COMPILER_DEPEND@ + MDDEPDIR := @MDDEPDIR@ + + MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ + diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -7613,6 +7613,21 @@ dnl ==================================== +@@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) + + dnl qcms + dnl ======================================================== QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' AC_SUBST(QCMS_LIBS) -+ -+dnl ======================================================== + + dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + @@ -41,13 +53,25 @@ diff --git a/configure.in b/configure.in +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) - - dnl ======================================================== ++ ++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) + else diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -137,12 +137,13 @@ DEFINES += -DNSS_ENABLE_ECC +@@ -133,19 +133,20 @@ REQUIRES = nspr \ + $(NULL) + + EXTRA_DEPS = $(NSS_DEP_LIBS) + + DEFINES += -DNSS_ENABLE_ECC # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's @@ -62,31 +86,48 @@ diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Mak $(NSS_LIBS) \ $(NULL) + include $(topsrcdir)/config/rules.mk + diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -43,6 +43,13 @@ +@@ -39,16 +39,23 @@ + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -+ + +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include +#pragma GCC visibility pop +#include "prenv.h" +#endif - ++ #include "nsNSSComponent.h" #include "nsNSSCallbacks.h" -@@ -1602,7 +1609,21 @@ nsNSSComponent::InitializeNSS(PRBool sho + #include "nsNSSIOLayer.h" + #include "nsSSLThread.h" + #include "nsCertVerificationThread.h" + + #include "nsNetUtil.h" + #include "nsAppDirectoryServiceDefs.h" +@@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho + // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, + // but affects only static data. + // If we could assume i18n will not change between profiles, one call per application + // run were sufficient. As I can't predict what happens in the future, let's repeat + // this call for every re-init of NSS. ConfigureInternalPKCS11Token(); - SECStatus init_rv = ::NSS_InitReadWrite(profileStr.get()); + SECStatus init_rv = SECFailure; +#ifdef MOZ_ENABLE_NSSHELPER -+ if (PR_GetEnv("MOZ_TB_NO_NSSHELPER")) { ++ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + init_rv = ::NSS_InitReadWrite(profileStr.get()); + } else { + init_rv = ::nsshelp_open_db ("Thunderbird", profileStr.get(), 0); @@ -102,10 +143,20 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/ if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); + + if (supress_warning_preference) { + which_nss_problem = problem_none; + } + else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -194,7 +194,7 @@ endif +@@ -189,17 +189,17 @@ else + EXTRA_DSO_LDOPTS += \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NULL) + endif DEFINES += -DIMPL_XREAPI @@ -114,3 +165,8 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) + EXTRA_DSO_LDOPTS += \ + -framework SystemConfiguration \ + -framework QuickTime \ + -framework IOKit \ + -lcrypto \ diff --git a/mozilla-startup-notification.patch b/mozilla-startup-notification.patch deleted file mode 100644 index b9316bf..0000000 --- a/mozilla-startup-notification.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Lubos Lunak -Subject: Firefox 3.5 broken startup notification -References: -http://bugzilla.novell.com/show_bug.cgi?id=518603 -https://bugzilla.mozilla.org/show_bug.cgi?id=416053 - - -diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp ---- a/toolkit/xre/nsAppRunner.cpp -+++ b/toolkit/xre/nsAppRunner.cpp -@@ -3168,23 +3168,16 @@ XRE_main(int argc, char* argv[], const n - } - dirProvider.DoStartup(); - - PRBool shuttingDown = PR_FALSE; - appStartup->GetShuttingDown(&shuttingDown); - - nsCOMPtr cmdLine; - --#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -- nsRefPtr toolkit = GetGTKToolkit(); -- if (toolkit && !desktopStartupID.IsEmpty()) { -- toolkit->SetDesktopStartupID(desktopStartupID); -- } --#endif -- - nsCOMPtr workingDir; - rv = NS_GetSpecialDirectory(NS_OS_CURRENT_WORKING_DIR, getter_AddRefs(workingDir)); - NS_ENSURE_SUCCESS(rv, 1); - - if (!shuttingDown) { - cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); - NS_ENSURE_TRUE(cmdLine, 1); - -@@ -3200,16 +3193,23 @@ XRE_main(int argc, char* argv[], const n - chromeObserver->Observe(cmdLine, "command-line-startup", nsnull); - } - - NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); - rv = appStartup->CreateHiddenWindow(); - NS_TIMELINE_LEAVE("appStartup->CreateHiddenWindow"); - NS_ENSURE_SUCCESS(rv, 1); - -+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) -+ nsRefPtr toolkit = GetGTKToolkit(); -+ if (toolkit && !desktopStartupID.IsEmpty()) { -+ toolkit->SetDesktopStartupID(desktopStartupID); -+ } -+#endif -+ - // Extension Compatibility Checking and Startup - if (gAppData->flags & NS_XRE_ENABLE_EXTENSION_MANAGER) { - nsCOMPtr em(do_GetService("@mozilla.org/extensions/manager;1")); - NS_ENSURE_TRUE(em, 1); - - ar = CheckArg("install-global-extension", PR_TRUE); - if (ar == ARG_BAD) { - PR_fprintf(PR_STDERR, "Error: argument -install-global-extension is invalid when argument -osint is specified\n"); diff --git a/mozilla-system-hunspell.patch.bz2 b/mozilla-system-hunspell.patch.bz2 deleted file mode 100644 index ee9d62a..0000000 --- a/mozilla-system-hunspell.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcf32288d607a0b8ebd4d275c1ccfa42390944d4711c24cdf8e6ee4f4953be0a -size 124011 diff --git a/mozilla-xsmp.patch b/mozilla-xsmp.patch index 1b673e3..edf92fb 100644 --- a/mozilla-xsmp.patch +++ b/mozilla-xsmp.patch @@ -7,7 +7,7 @@ https://bugzilla.novell.com/show_bug.cgi?id=528406 diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSupportUnix.cpp --- a/toolkit/xre/nsNativeAppSupportUnix.cpp +++ b/toolkit/xre/nsNativeAppSupportUnix.cpp -@@ -89,108 +89,52 @@ typedef enum { +@@ -94,108 +94,52 @@ typedef enum { GNOME_DIALOG_NORMAL } GnomeDialogType; @@ -126,7 +126,7 @@ diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSup void die_cb(GnomeClient *client, gpointer user_data) { nsCOMPtr appService = -@@ -383,29 +327,59 @@ nsNativeAppSupportUnix::Start(PRBool *aR +@@ -446,29 +390,59 @@ nsNativeAppSupportUnix::Start(PRBool *aR } #endif @@ -188,5 +188,5 @@ diff --git a/toolkit/xre/nsNativeAppSupportUnix.cpp b/toolkit/xre/nsNativeAppSup } NS_IMETHODIMP - nsNativeAppSupportUnix::Stop( PRBool *aResult ) + nsNativeAppSupportUnix::Stop(PRBool *aResult) { diff --git a/tb-ssldap.patch b/tb-ssldap.patch new file mode 100644 index 0000000..f7ab820 --- /dev/null +++ b/tb-ssldap.patch @@ -0,0 +1,21 @@ +diff --git a/mail/installer/package-manifest.in b/mail/installer/package-manifest.in +--- a/mail/installer/package-manifest.in ++++ b/mail/installer/package-manifest.in +@@ -240,16 +240,17 @@ + #ifdef XP_WIN32 + @BINPATH@/nsldap32v60@DLL_SUFFIX@ + @BINPATH@/nsldappr32v60@DLL_SUFFIX@ + @BINPATH@/nsldif32v60@DLL_SUFFIX@ + #else + @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@ + @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@ ++@BINPATH@/@DLL_PREFIX@ssldap60@DLL_SUFFIX@ + #endif + + ; login manager + @BINPATH@/components/loginmgr.xpt + @BINPATH@/components/nsLoginInfo.js + @BINPATH@/components/nsLoginManager.js + @BINPATH@/components/nsLoginManagerPrompter.js + @BINPATH@/components/storage-Legacy.js diff --git a/thunderbird-3.0.6-source.tar.bz2 b/thunderbird-3.0.6-source.tar.bz2 deleted file mode 100644 index 8c3f80e..0000000 --- a/thunderbird-3.0.6-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8484631151f3f6ab512a95768dfad93b1b19717f0bd1fb48d55dd03129c8a454 -size 60713217 diff --git a/thunderbird-3.1.1-source.tar.bz2 b/thunderbird-3.1.1-source.tar.bz2 new file mode 100644 index 0000000..9afca41 --- /dev/null +++ b/thunderbird-3.1.1-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c8a7ab80c8bf3aebbbb45c0c2092f15bd24fc2d8705ffef6b7e47ff81bad352f +size 66169902 diff --git a/thunderbird-appname.patch b/thunderbird-appname.patch index 65412d8..b8fb722 100644 --- a/thunderbird-appname.patch +++ b/thunderbird-appname.patch @@ -1,19 +1,17 @@ -Index: mail/components/shell/nsMailGNOMEIntegration.cpp -=================================================================== -RCS file: /cvsroot/mozilla/mail/components/shell/nsMailGNOMEIntegration.cpp,v -retrieving revision 1.8.2.1 -diff -u -p -6 -r1.8.2.1 nsMailGNOMEIntegration.cpp ---- mail/components/shell/nsMailGNOMEIntegration.cpp 23 Oct 2006 03:32:47 -0000 1.8.2.1 -+++ mail/components/shell/nsMailGNOMEIntegration.cpp 19 Nov 2006 11:54:48 -0000 -@@ -94,12 +94,18 @@ nsMailGNOMEIntegration::Init() +diff --git a/mail/components/shell/nsMailGNOMEIntegration.cpp b/mail/components/shell/nsMailGNOMEIntegration.cpp +--- a/mail/components/shell/nsMailGNOMEIntegration.cpp ++++ b/mail/components/shell/nsMailGNOMEIntegration.cpp +@@ -93,16 +93,22 @@ nsMailGNOMEIntegration::Init() + rv = NS_GetSpecialDirectory(NS_XPCOM_CURRENT_PROCESS_DIR, + getter_AddRefs(appPath)); NS_ENSURE_SUCCESS(rv, rv); - rv = appPath->AppendNative(NS_LITERAL_CSTRING("thunderbird")); + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); NS_ENSURE_SUCCESS(rv, rv); rv = appPath->GetNativePath(mAppPath); + -+ /* This path of thunderbird is hardcoded for the default path setting ++ /* This path of thunderbird is hardcoded for the default path setting + * And the above code is not used. + */ + mAppPath.Assign ("/usr/bin/thunderbird"); @@ -24,3 +22,5 @@ diff -u -p -6 -r1.8.2.1 nsMailGNOMEIntegration.cpp NS_IMPL_ISUPPORTS1(nsMailGNOMEIntegration, nsIShellService) + NS_IMETHODIMP + nsMailGNOMEIntegration::IsDefaultClient(PRBool aStartupCheck, PRUint16 aApps, PRBool * aIsDefaultClient) diff --git a/thunderbird-shared-nss-db.patch b/thunderbird-shared-nss-db.patch index 33d953e..f3f3d24 100644 --- a/thunderbird-shared-nss-db.patch +++ b/thunderbird-shared-nss-db.patch @@ -4,11 +4,10 @@ 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@ ++++ b/config/autoconf.mk.in +@@ -464,16 +464,20 @@ MOZ_PANGO_LIBS = @MOZ_PANGO_LIB XT_LIBS = @XT_LIBS@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ @@ -23,16 +22,16 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ - # Used for LD_LIBRARY_PATH - LIBS_PATH = @LIBS_PATH@ - MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ COMPILER_DEPEND = @COMPILER_DEPEND@ MDDEPDIR := @MDDEPDIR@ + + MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ + diff --git a/configure.in b/configure.in --- a/configure.in -+++ configure.in -@@ -6979,16 +6979,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) ++++ b/configure.in +@@ -6841,16 +6841,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) dnl qcms dnl ======================================================== @@ -64,9 +63,15 @@ diff --git a/configure.in b/configure.in 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 @@ +diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in +--- a/mail/app/Makefile.in ++++ b/mail/app/Makefile.in +@@ -127,16 +127,17 @@ APP_XPCOM_LIBS = $(XPCOM_LIBS) + endif + + LIBS += \ + $(STATIC_COMPONENTS_LINKER_PATH) \ + $(MOZ_JS_LIBS) \ $(EXTRA_DSO_LIBS) \ $(APP_XPCOM_LIBS) \ $(NSPR_LIBS) \ @@ -74,3 +79,8 @@ diff --git a/configure.in b/configure.in $(TK_LIBS) \ $(NULL) + # Add explicit X11 dependency when building against X11 toolkits + ifneq (,$(filter gtk gtk2 xlib,$(MOZ_WIDGET_TOOLKIT))) + LIBS += $(XLDFLAGS) $(XLIBS) + endif +