diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 0ec3618..7bc34e0 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri Jun 15 18:09:28 CDT 2007 - maw@suse.de + +- Merge update to 2.0.0.4 from the build service (thanks, Wolfgang) +- Remove some commented out stuff. + +------------------------------------------------------------------- +Wed Jun 13 23:00:38 CEST 2007 - wr@rosenauer.org + +- update to maintenance release 2.0.0.4 +- update enigmail to 0.95.1 +- adopted patches: + * fixed cups-paper.patch (copied from FF) + * removed obsolete visibility.patch + ------------------------------------------------------------------- Tue Jun 12 11:53:55 CDT 2007 - maw@suse.de diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 43d5cd1..a002845 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaThunderbird (Version 2.0.0.0) +# spec file for package MozillaThunderbird (Version 2.0.0.4) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,7 +13,7 @@ Name: MozillaThunderbird BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL) -Version: 2.0.0.0 +Version: 2.0.0.4 Release: 1 Summary: The Stand-Alone Mozilla Mail Component URL: http://www.mozilla.org/products/thunderbird/ @@ -25,17 +25,15 @@ Source3: mozilla.sh.in Source4: l10n-%{version}.tar.bz2 Source5: mailredirect-0.7.4.xpi Source6: suse-default-prefs.js -Source9: enigmail-0.95.0.tar.gz +Source9: enigmail-0.95.1.tar.gz Source11: enigmail.manifest Patch1: replytolist.patch Patch2: thunderbird-appname.patch -Patch3: visibility.patch Patch4: locale.patch Patch5: abuild.patch Patch6: nspr-prdtoa.patch Patch7: enig-shared.patch Patch8: gcc-undefined-ops.patch -Patch9: thunderbird-no-update.patch Patch10: mips-buildfix.diff Patch11: lightning.patch Patch12: misc.dif @@ -67,13 +65,14 @@ Suggests: %{name}-translations %define pango 1 %endif %if %has_system_nspr +BuildRequires: mozilla-nspr-devel Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) %endif %if %has_system_nss -Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) +BuildRequires: mozilla-nss-devel %endif %define _unpackaged_files_terminate_build 0 -%define releasedate 2006091100 +%define releasedate 2007061300 %define progname thunderbird %define progdir %{_prefix}/%_lib/thunderbird %define my_provides /tmp/my-provides @@ -127,12 +126,10 @@ cd $RPM_BUILD_DIR cd $RPM_BUILD_DIR/mozilla %patch1 %patch2 -%patch3 %patch4 %patch5 %patch6 %patch8 -###%patch9 %patch10 #%patch11 %patch12 @@ -140,23 +137,9 @@ cd $RPM_BUILD_DIR/mozilla %patch14 %patch15 %patch16 -### #%patch17 # temporary disabled -### %if %has_system_nss -### %patch18 -### %endif -### %if %has_system_nspr -### %patch19 -### %endif -### %patch21 %patch22 -### %patch24 %patch25 %patch26 -### %patch27 -### %patch28 -### %patch29 -### %patch30 -### %patch31 -p0 %patch27 -p0 %build @@ -237,9 +220,9 @@ echo %defattr\(-,root,root\) > %{_tmppath}/translations.list #for locale in $(cat mail/locales/all-locales); do for locale in $(awk '{ print $1; }' mail/locales/shipped-locales); do case $locale in - ja-JP-mac) - # broken locales, do not work - ;; + ja-JP-mac|en-US) + # locales not to be included in translations package + ;; *) make -C mail/locales libs-$locale cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \ @@ -290,6 +273,7 @@ mkdir -p $_enig_dir/components/ mkdir -p $_enig_dir/defaults/preferences/ mv -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail.jar $_enig_dir/chrome/ mv -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-skin-tbird.jar $_enig_dir/chrome/ +mv -f $RPM_BUILD_ROOT%{progdir}/chrome/enigmail-locale.jar $_enig_dir/chrome/ mv -f $RPM_BUILD_ROOT%{progdir}/components/enig* $_enig_dir/components/ mv -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so $_enig_dir/components/ mv -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt $_enig_dir/components/ @@ -353,6 +337,7 @@ exit 0 %preun if [ "$1" = "0" ]; then # deinstallation + rm -f %{progdir}/components/myspell/* rm -f %{progdir}/dictionaries/* fi exit 0 @@ -601,6 +586,15 @@ exit 0 %endif %changelog +* Fri Jun 15 2007 - maw@suse.de +- Merge update to 2.0.0.4 from the build service (thanks, Wolfgang) +- Remove some commented out stuff. +* Wed Jun 13 2007 - wr@rosenauer.org +- update to maintenance release 2.0.0.4 +- update enigmail to 0.95.1 +- adopted patches: + * fixed cups-paper.patch (copied from FF) + * removed obsolete visibility.patch * Tue Jun 12 2007 - maw@suse.de - Merge chagnges from the build service (thanks, Wolfgang) - Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2 as diff --git a/cups-paper.patch b/cups-paper.patch index dad2b2c..8a209eb 100644 --- a/cups-paper.patch +++ b/cups-paper.patch @@ -5,13 +5,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=65482 https://bugzilla.mozilla.org/show_bug.cgi?id=324060 -diff -urNU6 gfx/src.old/gtk/nsDeviceContextSpecG.cpp gfx/src/gtk/nsDeviceContextSpecG.cpp ---- gfx/src.old/gtk/nsDeviceContextSpecG.cpp 2004-10-24 20:34:37.000000000 +0200 -+++ gfx/src/gtk/nsDeviceContextSpecG.cpp 2006-04-21 22:58:48.000000000 +0200 -@@ -63,12 +63,13 @@ - #include "xprintutil.h" - #endif /* USE_XPRINT */ - +================================================================================ +--- gfx/src/gtk/nsDeviceContextSpecG.cpp ++++ gfx/src/gtk/nsDeviceContextSpecG.cpp +@@ -66,6 +66,7 @@ #ifdef USE_POSTSCRIPT #include "nsPSPrinters.h" #include "nsPaperPS.h" /* Paper size list */ @@ -19,13 +16,7 @@ diff -urNU6 gfx/src.old/gtk/nsDeviceContextSpecG.cpp gfx/src/gtk/nsDeviceContext #endif /* USE_POSTSCRIPT */ /* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */ - #define MAKE_PR_BOOL(val) ((val)?(PR_TRUE):(PR_FALSE)) - - #ifdef PR_LOGGING -@@ -1207,40 +1208,44 @@ - printerFeatures.SetNumColorspaceRecords(1); - #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ - +@@ -1210,34 +1211,38 @@ #ifdef SET_PRINTER_FEATURES_VIA_PREFS printerFeatures.SetCanChangePaperSize(PR_TRUE); #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ @@ -85,16 +76,9 @@ diff -urNU6 gfx/src.old/gtk/nsDeviceContextSpecG.cpp gfx/src/gtk/nsDeviceContext } PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == - nsPSPrinterList::GetPrinterType(fullPrinterName)); - #ifdef SET_PRINTER_FEATURES_VIA_PREFS - printerFeatures.SetSupportsSpoolerCommandChange(hasSpoolerCmd); -diff -urNU6 gfx/src.old/ps/nsPrintJobPS.cpp gfx/src/ps/nsPrintJobPS.cpp ---- gfx/src.old/ps/nsPrintJobPS.cpp 2005-05-21 17:33:09.000000000 +0200 -+++ gfx/src/ps/nsPrintJobPS.cpp 2006-04-21 22:58:48.000000000 +0200 -@@ -361,12 +361,16 @@ - aSpec->GetPrinterName(&printerName); - NS_ENSURE_TRUE(printerName, NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND); - +--- gfx/src/ps/nsPrintJobPS.cpp ++++ gfx/src/ps/nsPrintJobPS.cpp +@@ -364,6 +364,10 @@ const char *slash = strchr(printerName, '/'); mPrinterName = slash ? slash + 1 : printerName; mJobTitle.SetIsVoid(PR_TRUE); @@ -105,13 +89,7 @@ diff -urNU6 gfx/src.old/ps/nsPrintJobPS.cpp gfx/src/ps/nsPrintJobPS.cpp return NS_OK; } - nsresult - nsPrintJobCUPS::SetNumCopies(int aNumCopies) - { -@@ -442,12 +446,17 @@ - if (dest != NULL) { - if (!mNumCopies.IsEmpty()) - dest->num_options = (mCups.mCupsAddOption)("copies", +@@ -445,6 +449,11 @@ mNumCopies.get(), dest->num_options, &dest->options); @@ -123,16 +101,9 @@ diff -urNU6 gfx/src.old/ps/nsPrintJobPS.cpp gfx/src/ps/nsPrintJobPS.cpp const char *title = mJobTitle.IsVoid() ? "Untitled Document" : mJobTitle.get(); result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(), - GetDestination().get(), title, - dest->num_options, dest->options); - } -diff -urNU6 gfx/src.old/ps/nsPrintJobPS.h gfx/src/ps/nsPrintJobPS.h ---- gfx/src.old/ps/nsPrintJobPS.h 2005-05-21 17:33:09.000000000 +0200 -+++ gfx/src/ps/nsPrintJobPS.h 2006-04-21 22:58:48.000000000 +0200 -@@ -176,11 +176,12 @@ - nsresult Init(nsIDeviceContextSpecPS *); - - private: +--- gfx/src/ps/nsPrintJobPS.h ++++ gfx/src/ps/nsPrintJobPS.h +@@ -179,6 +179,7 @@ nsCUPSShim mCups; nsCString mPrinterName; nsCString mNumCopies; @@ -140,15 +111,9 @@ diff -urNU6 gfx/src.old/ps/nsPrintJobPS.h gfx/src/ps/nsPrintJobPS.h nsCString mJobTitle; // IsVoid() if no title }; #endif /* VMS */ - - #endif /* nsPrintJobPS_h__ */ -diff -urNU6 gfx/src.old/psshared/Makefile.in gfx/src/psshared/Makefile.in ---- gfx/src.old/psshared/Makefile.in 2004-12-15 06:52:36.000000000 +0100 -+++ gfx/src/psshared/Makefile.in 2006-04-21 22:58:48.000000000 +0200 -@@ -54,19 +54,22 @@ - LIBXUL_LIBRARY = 1 - - PACKAGE_FILE = psshared.pkg +--- gfx/src/psshared/Makefile.in ++++ gfx/src/psshared/Makefile.in +@@ -57,13 +57,16 @@ EXPORTS = nsCUPSShim.h \ nsPaperPS.h \ @@ -165,16 +130,9 @@ diff -urNU6 gfx/src.old/psshared/Makefile.in gfx/src/psshared/Makefile.in $(NULL) EXTRA_DSO_LDOPTS = \ - $(MOZ_COMPONENT_LIBS) \ - $(NULL) - -diff -urNU6 gfx/src.old/psshared/nsCUPSShim.cpp gfx/src/psshared/nsCUPSShim.cpp ---- gfx/src.old/psshared/nsCUPSShim.cpp 2005-05-08 17:01:20.000000000 +0200 -+++ gfx/src/psshared/nsCUPSShim.cpp 2006-04-21 22:58:48.000000000 +0200 -@@ -42,19 +42,24 @@ - #include "prlink.h" - - +--- gfx/src/psshared/nsCUPSShim.cpp ++++ gfx/src/psshared/nsCUPSShim.cpp +@@ -45,13 +45,18 @@ // List of symbols to find in libcups. Must match symAddr[] defined in Init(). // Making this an array of arrays instead of pointers allows storing the // whole thing in read-only memory. @@ -194,13 +152,7 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.cpp gfx/src/psshared/nsCUPSShim.cpp }; static const int gSymNameCt = sizeof(gSymName) / sizeof(gSymName[0]); - - PRBool - nsCUPSShim::Init() -@@ -68,12 +73,17 @@ - (void **)&mCupsAddOption, - (void **)&mCupsFreeDests, - (void **)&mCupsGetDest, +@@ -71,6 +76,11 @@ (void **)&mCupsGetDests, (void **)&mCupsPrintFile, (void **)&mCupsTempFd, @@ -212,16 +164,9 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.cpp gfx/src/psshared/nsCUPSShim.cpp }; for (int i = gSymNameCt; i--; ) { - *(symAddr[i]) = PR_FindSymbol(mCupsLib, gSymName[i]); - if (! *(symAddr[i])) { - #ifdef DEBUG -diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h ---- gfx/src.old/psshared/nsCUPSShim.h 2005-05-08 17:01:20.000000000 +0200 -+++ gfx/src/psshared/nsCUPSShim.h 2006-04-21 22:58:48.000000000 +0200 -@@ -59,12 +59,88 @@ - *instance; /* Local instance name or NULL */ - int is_default; /* Is this printer the default? */ - int num_options; /* Number of options */ +--- gfx/src/psshared/nsCUPSShim.h ++++ gfx/src/psshared/nsCUPSShim.h +@@ -62,6 +62,82 @@ cups_option_t *options; /* Options */ } cups_dest_t; @@ -304,13 +249,7 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h typedef cups_dest_t* (PR_CALLBACK *CupsGetDestType)(const char *printer, const char *instance, int num_dests, - cups_dest_t *dests); - typedef int (PR_CALLBACK *CupsGetDestsType)(cups_dest_t **dests); - typedef int (PR_CALLBACK *CupsFreeDestsType)(int num_dests, -@@ -77,12 +153,17 @@ - typedef int (PR_CALLBACK *CupsTempFdType)(char *filename, - int length); - typedef int (PR_CALLBACK *CupsAddOptionType)(const char *name, +@@ -80,6 +156,11 @@ const char *value, int num_options, cups_option_t **options); @@ -322,13 +261,7 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h struct PRLibrary; - class NS_PSSHARED nsCUPSShim { - public: - nsCUPSShim() : mCupsLib(nsnull) { } -@@ -110,12 +191,17 @@ - CupsAddOptionType mCupsAddOption; - CupsFreeDestsType mCupsFreeDests; - CupsGetDestType mCupsGetDest; +@@ -113,6 +194,11 @@ CupsGetDestsType mCupsGetDests; CupsPrintFileType mCupsPrintFile; CupsTempFdType mCupsTempFd; @@ -340,12 +273,8 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h private: PRLibrary *mCupsLib; - }; - - -diff -urNU6 gfx/src.old/psshared/nsIPaperPS.h gfx/src/psshared/nsIPaperPS.h ---- gfx/src.old/psshared/nsIPaperPS.h 1970-01-01 01:00:00.000000000 +0100 -+++ gfx/src/psshared/nsIPaperPS.h 2006-04-21 23:14:50.000000000 +0200 +--- gfx/src/psshared/nsIPaperPS.h ++++ gfx/src/psshared/nsIPaperPS.h @@ -0,0 +1,102 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ @@ -449,9 +378,18 @@ diff -urNU6 gfx/src.old/psshared/nsIPaperPS.h gfx/src/psshared/nsIPaperPS.h +}; + +#endif /* _NSIPAPERPS_H_ */ -diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.cpp gfx/src/psshared/nsPaperFactoryPS.cpp ---- gfx/src.old/psshared/nsPaperFactoryPS.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ gfx/src/psshared/nsPaperFactoryPS.cpp 2006-04-21 23:04:01.000000000 +0200 +--- gfx/src/psshared/nsPSPrinters.h ++++ gfx/src/psshared/nsPSPrinters.h +@@ -44,6 +44,7 @@ + #include "prtypes.h" + #include "nsCUPSShim.h" + #include "psSharedCore.h" ++#include "nsCOMPtr.h" + + class nsIPrefService; + class nsIPrefBranch; +--- gfx/src/psshared/nsPaperFactoryPS.cpp ++++ gfx/src/psshared/nsPaperFactoryPS.cpp @@ -0,0 +1,65 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ @@ -518,9 +456,8 @@ diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.cpp gfx/src/psshared/nsPaperFa + aPaper = newPZ; + return NS_OK; +} -diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.h gfx/src/psshared/nsPaperFactoryPS.h ---- gfx/src.old/psshared/nsPaperFactoryPS.h 1970-01-01 01:00:00.000000000 +0100 -+++ gfx/src/psshared/nsPaperFactoryPS.h 2006-04-21 23:02:28.000000000 +0200 +--- gfx/src/psshared/nsPaperFactoryPS.h ++++ gfx/src/psshared/nsPaperFactoryPS.h @@ -0,0 +1,64 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ @@ -586,13 +523,9 @@ diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.h gfx/src/psshared/nsPaperFact + + +#endif /* nsPaperFactoryPS_h__ */ -diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp ---- gfx/src.old/psshared/nsPaperPS.cpp 2004-09-07 19:51:50.000000000 +0200 -+++ gfx/src/psshared/nsPaperPS.cpp 2006-04-21 23:22:13.000000000 +0200 -@@ -19,12 +19,13 @@ - * The Initial Developer of the Original Code is - * Kenneth Herron . - * Portions created by the Initial Developer are Copyright (C) 2004 +--- gfx/src/psshared/nsPaperPS.cpp ++++ gfx/src/psshared/nsPaperPS.cpp +@@ -22,6 +22,7 @@ * the Initial Developer. All Rights Reserved. * * Contributor(s): @@ -600,13 +533,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or - * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), - * in which case the provisions of the GPL or the LGPL are applicable instead - * of those above. If you wish to allow use of your version of this file only -@@ -34,15 +35,31 @@ - * 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. +@@ -37,9 +38,25 @@ * * ***** END LICENSE BLOCK ***** */ @@ -633,13 +560,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp #define COUNTOF(x) (sizeof(x) / sizeof((x)[0])) - const nsPaperSizePS_ nsPaperSizePS::mList[] = - { - #define SIZE_MM(x) (x) -@@ -54,19 +71,149 @@ - { "Legal", SIZE_INCH(8.5), SIZE_INCH(14), PR_FALSE }, - { "Executive", SIZE_INCH(7.5), SIZE_INCH(10), PR_FALSE }, - #undef SIZE_INCH +@@ -57,7 +74,15 @@ #undef SIZE_MM }; @@ -656,12 +577,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp PRBool nsPaperSizePS::Find(const char *aName) - { - for (int i = mCount; i--; ) { - if (!PL_strcasecmp(aName, mList[i].name)) { - mCurrent = i; - return PR_TRUE; - } +@@ -70,3 +95,125 @@ } return PR_FALSE; } @@ -787,13 +703,9 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp + fabs(fmod(mPPD->sizes[mCurrent].width, HALF_INCH_PT)) > EPSILON || + fabs(fmod(mPPD->sizes[mCurrent].length, HALF_INCH_PT)) > EPSILON; +} -diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h ---- gfx/src.old/psshared/nsPaperPS.h 2004-12-15 06:52:36.000000000 +0100 -+++ gfx/src/psshared/nsPaperPS.h 2006-04-21 23:14:05.000000000 +0200 -@@ -37,30 +37,30 @@ - * ***** END LICENSE BLOCK ***** */ - - +--- gfx/src/psshared/nsPaperPS.h ++++ gfx/src/psshared/nsPaperPS.h +@@ -40,9 +40,9 @@ #ifndef _PAPERPS_H_ #define _PAPERPS_H_ @@ -805,8 +717,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h struct nsPaperSizePS_ { const char *name; - float width_mm; - float height_mm; +@@ -51,13 +51,13 @@ PRBool isMetric; // Present to the user in metric, if possible }; @@ -823,13 +734,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h /** --------------------------------------------------- * @return PR_TRUE if the cursor points past the last item. */ - PRBool AtEnd() { return mCurrent >= mCount; } - - /** --------------------------------------------------- -@@ -82,12 +82,18 @@ - * Point the cursor to the entry with the given paper name. - * @return PR_TRUE if pointing to a valid entry. - */ +@@ -85,6 +85,12 @@ PRBool Find(const char *aName); /** --------------------------------------------------- @@ -842,13 +747,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h * @return a pointer to the name of the current paper size */ const char *Name() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); - return mList[mCurrent].name; - } -@@ -114,15 +120,87 @@ - */ - PRBool IsMetric() { - NS_PRECONDITION(!AtEnd(), "Invalid current item"); +@@ -117,11 +123,83 @@ return mList[mCurrent].isMetric; } @@ -934,14 +833,9 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h }; #endif - -diff -urNU6 gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp gfx/src/xlib/nsDeviceContextSpecXlib.cpp ---- gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp 2004-10-24 20:34:38.000000000 +0200 -+++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp 2006-04-21 22:58:48.000000000 +0200 -@@ -1209,13 +1209,17 @@ - - #ifdef SET_PRINTER_FEATURES_VIA_PREFS - printerFeatures.SetCanChangePaperSize(PR_TRUE); +--- gfx/src/xlib/nsDeviceContextSpecXlib.cpp ++++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp +@@ -1212,7 +1212,11 @@ #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ nsXPIDLCString papername; if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(papername)))) { @@ -954,13 +848,7 @@ diff -urNU6 gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp gfx/src/xlib/nsDeviceCo if (paper.Find(papername)) { DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", - paper.Name(), paper.Width_mm(), paper.Height_mm())); - aPrintSettings->SetPaperSizeUnit(paper.IsMetric() ? - (int)nsIPrintSettings::kPaperSizeMillimeters : -@@ -1235,12 +1239,13 @@ - printerFeatures.SetPaperRecord(count++, paper.Name(), - (int)paper.Width_mm(), (int)paper.Height_mm(), !paper.IsMetric()); - paper.Next(); +@@ -1238,6 +1242,7 @@ } printerFeatures.SetNumPaperSizeRecords(count); #endif /* SET_PRINTER_FEATURES_VIA_PREFS */ @@ -968,31 +856,3 @@ diff -urNU6 gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp gfx/src/xlib/nsDeviceCo } PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS == - nsPSPrinterList::GetPrinterType(fullPrinterName)); - #ifdef SET_PRINTER_FEATURES_VIA_PREFS - printerFeatures.SetSupportsSpoolerCommandChange(hasSpoolerCmd); -Index: mozilla/gfx/src/psshared/nsPSPrinters.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/src/psshared/nsPSPrinters.h,v -retrieving revision 1.3 -diff -U8 -p -r1.3 nsPSPrinters.h ---- mozilla/gfx/src/psshared/nsPSPrinters.h 15 Dec 2004 05:52:36 -0000 1.3 -+++ gfx/src/psshared/nsPSPrinters.h 6 Feb 2006 13:46:54 -0000 -@@ -39,16 +39,17 @@ - #ifndef nsPSPrinters_h___ - #define nsPSPrinters_h___ - - #include "nsString.h" - #include "nsVoidArray.h" - #include "prtypes.h" - #include "nsCUPSShim.h" - #include "psSharedCore.h" -+#include "nsCOMPtr.h" - - class nsIPrefService; - class nsIPrefBranch; - class nsCUPSShim; - - class NS_PSSHARED nsPSPrinterList { - public: - /** diff --git a/enigmail-0.95.0.tar.gz b/enigmail-0.95.0.tar.gz deleted file mode 100644 index 7a6b1d7..0000000 --- a/enigmail-0.95.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dc869191953c3d0797f89223a0ad5e8accc009266f1d2ec3adb2f5814ff33b50 -size 568958 diff --git a/enigmail-0.95.1.tar.gz b/enigmail-0.95.1.tar.gz new file mode 100644 index 0000000..e0fb973 --- /dev/null +++ b/enigmail-0.95.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0da07991a2d2a1d23643adc026e2bd7dde85833b1b36290df74fd2675b80dbbc +size 1045036 diff --git a/l10n-2.0.0.0.tar.bz2 b/l10n-2.0.0.0.tar.bz2 deleted file mode 100644 index ab64c3c..0000000 --- a/l10n-2.0.0.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3883680f592f9c7d069063a2d639f130d6da69ee168c81b1cbff799812781dc9 -size 9373784 diff --git a/l10n-2.0.0.4.tar.bz2 b/l10n-2.0.0.4.tar.bz2 new file mode 100644 index 0000000..e13511a --- /dev/null +++ b/l10n-2.0.0.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60e6cb49369393cdcd2a48d192154bb367050ef3615937b6f4dc3b08684ac8c3 +size 8897145 diff --git a/thunderbird-2.0.0.0-source.tar.bz2 b/thunderbird-2.0.0.0-source.tar.bz2 deleted file mode 100644 index 9f943bf..0000000 --- a/thunderbird-2.0.0.0-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:135f993277d4ef294a171c344547a8867f3cd0ec69b8a95db6b36fd7c56b5f91 -size 37629763 diff --git a/thunderbird-2.0.0.4-source.tar.bz2 b/thunderbird-2.0.0.4-source.tar.bz2 new file mode 100644 index 0000000..831afc2 --- /dev/null +++ b/thunderbird-2.0.0.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8237798c7e508685708e1935470c2d18197677ed5825b6b2195fa1be90ad7565 +size 37776619 diff --git a/thunderbird-no-update.patch b/thunderbird-no-update.patch deleted file mode 100644 index 0b512c5..0000000 --- a/thunderbird-no-update.patch +++ /dev/null @@ -1,111 +0,0 @@ -Index: mail/components/preferences/advanced.js -=================================================================== -RCS file: /cvsroot/mozilla/mail/components/preferences/advanced.js,v -retrieving revision 1.13.2.3 -diff -u -p -r1.13.2.3 advanced.js ---- mail/components/preferences/advanced.js 14 Sep 2005 21:27:50 -0000 1.13.2.3 -+++ mail/components/preferences/advanced.js 25 Oct 2005 04:26:36 -0000 -@@ -121,7 +121,8 @@ var gAdvancedPane = { - var enabledPref = document.getElementById("app.update.enabled"); - var enableAppUpdate = document.getElementById("enableAppUpdate"); - -- enableAppUpdate.disabled = !aus.canUpdate || enabledPref.locked; -+ enableAppUpdate.disabled = true; -+ enableAppUpdate.hidden = true; - }, - - updateAutoItems: function () -Index: mail/base/content/mailWindowOverlay.xul -=================================================================== -RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.xul,v -retrieving revision 1.116.2.8 -diff -u -p -r1.116.2.8 mailWindowOverlay.xul ---- mail/base/content/mailWindowOverlay.xul 24 Oct 2005 04:01:20 -0000 1.116.2.8 -+++ mail/base/content/mailWindowOverlay.xul 25 Oct 2005 04:29:18 -0000 -@@ -1760,10 +1760,8 @@ - #endif - - --#ifndef XP_MACOSX -- --#endif -+ label="&updateCmd.label;" oncommand="checkForUpdates();" -+ hidden="true"/> - -Subject: disable visibility feature -References: -https://bugzilla.novell.com/show_bug.cgi?id=83908 -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297 - -because of a gcc bug it's not possible to build with that -feature at the moment - -Index: configure -=================================================================== -RCS file: /cvsroot/mozilla/configure,v -retrieving revision 1.1443 -diff -u -p -6 -r1.1443 configure ---- configure 2 Jun 2005 04:00:20 -0000 1.1443 -+++ configure 6 Jun 2005 07:34:06 -0000 -@@ -7303,13 +7303,13 @@ else - int foo_default = 1; - EOF - ac_cv_visibility_pragma=no - if ${CC-cc} -Werror -S conftest.c -o conftest.s >/dev/null 2>&1; then - if grep '\.hidden.*foo_hidden' conftest.s >/dev/null; then - if ! grep '\.hidden.*foo_default' conftest.s > /dev/null; then -- ac_cv_visibility_pragma=yes -+ ac_cv_visibility_pragma=no - fi - fi - fi - rm -f conftest.cs - - fi