rpm/MozillaThunderbird
SHA256
1
0
Fork 0
forked from pool/MozillaThunderbird
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaThunderbird?expand=0&rev=9

Browse Source
This commit is contained in:
OBS User unknown 2007-06-16 23:31:40 +00:00 committed by Git OBS Bridge
parent 7e85d3c170
commit bf0fbacce0
11 changed files with 100 additions and 373 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MozillaThunderbird.changes
View File

@ -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 Tue Jun 12 11:53:55 CDT 2007 - maw@suse.de

44
MozillaThunderbird.spec
View File

@ -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. # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
@ -13,7 +13,7 @@
Name: MozillaThunderbird Name: MozillaThunderbird
BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel unzip update-desktop-files zip 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) 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 Release: 1
Summary: The Stand-Alone Mozilla Mail Component Summary: The Stand-Alone Mozilla Mail Component
URL: http://www.mozilla.org/products/thunderbird/ URL: http://www.mozilla.org/products/thunderbird/
@ -25,17 +25,15 @@ Source3: mozilla.sh.in
Source4: l10n-%{version}.tar.bz2 Source4: l10n-%{version}.tar.bz2
Source5: mailredirect-0.7.4.xpi Source5: mailredirect-0.7.4.xpi
Source6: suse-default-prefs.js Source6: suse-default-prefs.js
Source9: enigmail-0.95.0.tar.gz Source9: enigmail-0.95.1.tar.gz
Source11: enigmail.manifest Source11: enigmail.manifest
Patch1: replytolist.patch Patch1: replytolist.patch
Patch2: thunderbird-appname.patch Patch2: thunderbird-appname.patch
Patch3: visibility.patch
Patch4: locale.patch Patch4: locale.patch
Patch5: abuild.patch Patch5: abuild.patch
Patch6: nspr-prdtoa.patch Patch6: nspr-prdtoa.patch
Patch7: enig-shared.patch Patch7: enig-shared.patch
Patch8: gcc-undefined-ops.patch Patch8: gcc-undefined-ops.patch
Patch9: thunderbird-no-update.patch
Patch10: mips-buildfix.diff Patch10: mips-buildfix.diff
Patch11: lightning.patch Patch11: lightning.patch
Patch12: misc.dif Patch12: misc.dif
@ -67,13 +65,14 @@ Suggests: %{name}-translations
%define pango 1 %define pango 1
%endif %endif
%if %has_system_nspr %if %has_system_nspr
BuildRequires: mozilla-nspr-devel
Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`) Requires: mozilla-nspr >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nspr`)
%endif %endif
%if %has_system_nss %if %has_system_nss
Requires: mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozilla-nss`) BuildRequires: mozilla-nss-devel
%endif %endif
%define _unpackaged_files_terminate_build 0 %define _unpackaged_files_terminate_build 0
%define releasedate 2006091100 %define releasedate 2007061300
%define progname thunderbird %define progname thunderbird
%define progdir %{_prefix}/%_lib/thunderbird %define progdir %{_prefix}/%_lib/thunderbird
%define my_provides /tmp/my-provides %define my_provides /tmp/my-provides
@ -127,12 +126,10 @@ cd $RPM_BUILD_DIR
cd $RPM_BUILD_DIR/mozilla cd $RPM_BUILD_DIR/mozilla
%patch1 %patch1
%patch2 %patch2
%patch3
%patch4 %patch4
%patch5 %patch5
%patch6 %patch6
%patch8 %patch8
###%patch9
%patch10 %patch10
#%patch11 #%patch11
%patch12 %patch12
@ -140,23 +137,9 @@ cd $RPM_BUILD_DIR/mozilla
%patch14 %patch14
%patch15 %patch15
%patch16 %patch16
### #%patch17 # temporary disabled
### %if %has_system_nss
### %patch18
### %endif
### %if %has_system_nspr
### %patch19
### %endif
### %patch21
%patch22 %patch22
### %patch24
%patch25 %patch25
%patch26 %patch26
### %patch27
### %patch28
### %patch29
### %patch30
### %patch31 -p0
%patch27 -p0 %patch27 -p0
%build %build
@ -237,8 +220,8 @@ echo %defattr\(-,root,root\) > %{_tmppath}/translations.list
#for locale in $(cat mail/locales/all-locales); do #for locale in $(cat mail/locales/all-locales); do
for locale in $(awk '{ print $1; }' mail/locales/shipped-locales); do for locale in $(awk '{ print $1; }' mail/locales/shipped-locales); do
case $locale in case $locale in
ja-JP-mac) ja-JP-mac|en-US)
# broken locales, do not work # locales not to be included in translations package
;; ;;
*) *)
make -C mail/locales libs-$locale make -C mail/locales libs-$locale
@ -290,6 +273,7 @@ mkdir -p $_enig_dir/components/
mkdir -p $_enig_dir/defaults/preferences/ 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.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-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/enig* $_enig_dir/components/
mv -f $RPM_BUILD_ROOT%{progdir}/components/libenigmime.so $_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/ mv -f $RPM_BUILD_ROOT%{progdir}/components/ipc.xpt $_enig_dir/components/
@ -353,6 +337,7 @@ exit 0
%preun %preun
if [ "$1" = "0" ]; then # deinstallation if [ "$1" = "0" ]; then # deinstallation
rm -f %{progdir}/components/myspell/*
rm -f %{progdir}/dictionaries/* rm -f %{progdir}/dictionaries/*
fi fi
exit 0 exit 0
@ -601,6 +586,15 @@ exit 0
%endif %endif
%changelog %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 * Tue Jun 12 2007 - maw@suse.de
- Merge chagnges from the build service (thanks, Wolfgang) - Merge chagnges from the build service (thanks, Wolfgang)
- Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2 as - Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2 as

252
cups-paper.patch
View File

@ -5,13 +5,10 @@ https://bugzilla.novell.com/show_bug.cgi?id=65482
https://bugzilla.mozilla.org/show_bug.cgi?id=324060 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
+++ gfx/src/gtk/nsDeviceContextSpecG.cpp 2006-04-21 22:58:48.000000000 +0200 +++ gfx/src/gtk/nsDeviceContextSpecG.cpp
@@ -63,12 +63,13 @@ @@ -66,6 +66,7 @@
#include "xprintutil.h"
#endif /* USE_XPRINT */
#ifdef USE_POSTSCRIPT #ifdef USE_POSTSCRIPT
#include "nsPSPrinters.h" #include "nsPSPrinters.h"
#include "nsPaperPS.h" /* Paper size list */ #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 */ #endif /* USE_POSTSCRIPT */
/* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */ /* Ensure that the result is always equal to either PR_TRUE or PR_FALSE */
#define MAKE_PR_BOOL(val) ((val)?(PR_TRUE):(PR_FALSE)) @@ -1210,34 +1211,38 @@
#ifdef PR_LOGGING
@@ -1207,40 +1208,44 @@
printerFeatures.SetNumColorspaceRecords(1);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */
#ifdef SET_PRINTER_FEATURES_VIA_PREFS #ifdef SET_PRINTER_FEATURES_VIA_PREFS
printerFeatures.SetCanChangePaperSize(PR_TRUE); printerFeatures.SetCanChangePaperSize(PR_TRUE);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */ #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 == PRBool hasSpoolerCmd = (nsPSPrinterList::kTypePS ==
nsPSPrinterList::GetPrinterType(fullPrinterName)); --- gfx/src/ps/nsPrintJobPS.cpp
#ifdef SET_PRINTER_FEATURES_VIA_PREFS +++ gfx/src/ps/nsPrintJobPS.cpp
printerFeatures.SetSupportsSpoolerCommandChange(hasSpoolerCmd); @@ -364,6 +364,10 @@
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);
const char *slash = strchr(printerName, '/'); const char *slash = strchr(printerName, '/');
mPrinterName = slash ? slash + 1 : printerName; mPrinterName = slash ? slash + 1 : printerName;
mJobTitle.SetIsVoid(PR_TRUE); mJobTitle.SetIsVoid(PR_TRUE);
@ -105,13 +89,7 @@ diff -urNU6 gfx/src.old/ps/nsPrintJobPS.cpp gfx/src/ps/nsPrintJobPS.cpp
return NS_OK; return NS_OK;
} }
nsresult @@ -445,6 +449,11 @@
nsPrintJobCUPS::SetNumCopies(int aNumCopies)
{
@@ -442,12 +446,17 @@
if (dest != NULL) {
if (!mNumCopies.IsEmpty())
dest->num_options = (mCups.mCupsAddOption)("copies",
mNumCopies.get(), mNumCopies.get(),
dest->num_options, dest->num_options,
&dest->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() ? const char *title = mJobTitle.IsVoid() ?
"Untitled Document" : mJobTitle.get(); "Untitled Document" : mJobTitle.get();
result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(), result = (mCups.mCupsPrintFile)(printer.CStringAt(0)->get(),
GetDestination().get(), title, --- gfx/src/ps/nsPrintJobPS.h
dest->num_options, dest->options); +++ gfx/src/ps/nsPrintJobPS.h
} @@ -179,6 +179,7 @@
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:
nsCUPSShim mCups; nsCUPSShim mCups;
nsCString mPrinterName; nsCString mPrinterName;
nsCString mNumCopies; 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 nsCString mJobTitle; // IsVoid() if no title
}; };
#endif /* VMS */ #endif /* VMS */
--- gfx/src/psshared/Makefile.in
#endif /* nsPrintJobPS_h__ */ +++ gfx/src/psshared/Makefile.in
diff -urNU6 gfx/src.old/psshared/Makefile.in gfx/src/psshared/Makefile.in @@ -57,13 +57,16 @@
--- 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
EXPORTS = nsCUPSShim.h \ EXPORTS = nsCUPSShim.h \
nsPaperPS.h \ nsPaperPS.h \
@ -165,16 +130,9 @@ diff -urNU6 gfx/src.old/psshared/Makefile.in gfx/src/psshared/Makefile.in
$(NULL) $(NULL)
EXTRA_DSO_LDOPTS = \ EXTRA_DSO_LDOPTS = \
$(MOZ_COMPONENT_LIBS) \ --- gfx/src/psshared/nsCUPSShim.cpp
$(NULL) +++ gfx/src/psshared/nsCUPSShim.cpp
@@ -45,13 +45,18 @@
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"
// List of symbols to find in libcups. Must match symAddr[] defined in Init(). // 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 // Making this an array of arrays instead of pointers allows storing the
// whole thing in read-only memory. // 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]); static const int gSymNameCt = sizeof(gSymName) / sizeof(gSymName[0]);
@@ -71,6 +76,11 @@
PRBool
nsCUPSShim::Init()
@@ -68,12 +73,17 @@
(void **)&mCupsAddOption,
(void **)&mCupsFreeDests,
(void **)&mCupsGetDest,
(void **)&mCupsGetDests, (void **)&mCupsGetDests,
(void **)&mCupsPrintFile, (void **)&mCupsPrintFile,
(void **)&mCupsTempFd, (void **)&mCupsTempFd,
@ -212,16 +164,9 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.cpp gfx/src/psshared/nsCUPSShim.cpp
}; };
for (int i = gSymNameCt; i--; ) { for (int i = gSymNameCt; i--; ) {
*(symAddr[i]) = PR_FindSymbol(mCupsLib, gSymName[i]); --- gfx/src/psshared/nsCUPSShim.h
if (! *(symAddr[i])) { +++ gfx/src/psshared/nsCUPSShim.h
#ifdef DEBUG @@ -62,6 +62,82 @@
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 */
cups_option_t *options; /* Options */ cups_option_t *options; /* Options */
} cups_dest_t; } 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, typedef cups_dest_t* (PR_CALLBACK *CupsGetDestType)(const char *printer,
const char *instance, const char *instance,
int num_dests, int num_dests,
cups_dest_t *dests); @@ -80,6 +156,11 @@
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,
const char *value, const char *value,
int num_options, int num_options,
cups_option_t **options); cups_option_t **options);
@ -322,13 +261,7 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h
struct PRLibrary; struct PRLibrary;
class NS_PSSHARED nsCUPSShim { @@ -113,6 +194,11 @@
public:
nsCUPSShim() : mCupsLib(nsnull) { }
@@ -110,12 +191,17 @@
CupsAddOptionType mCupsAddOption;
CupsFreeDestsType mCupsFreeDests;
CupsGetDestType mCupsGetDest;
CupsGetDestsType mCupsGetDests; CupsGetDestsType mCupsGetDests;
CupsPrintFileType mCupsPrintFile; CupsPrintFileType mCupsPrintFile;
CupsTempFdType mCupsTempFd; CupsTempFdType mCupsTempFd;
@ -340,12 +273,8 @@ diff -urNU6 gfx/src.old/psshared/nsCUPSShim.h gfx/src/psshared/nsCUPSShim.h
private: private:
PRLibrary *mCupsLib; PRLibrary *mCupsLib;
}; --- gfx/src/psshared/nsIPaperPS.h
+++ gfx/src/psshared/nsIPaperPS.h
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
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ +/* 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_ */ +#endif /* _NSIPAPERPS_H_ */
diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.cpp gfx/src/psshared/nsPaperFactoryPS.cpp --- gfx/src/psshared/nsPSPrinters.h
--- gfx/src.old/psshared/nsPaperFactoryPS.cpp 1970-01-01 01:00:00.000000000 +0100 +++ gfx/src/psshared/nsPSPrinters.h
+++ gfx/src/psshared/nsPaperFactoryPS.cpp 2006-04-21 23:04:01.000000000 +0200 @@ -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 @@ @@ -0,0 +1,65 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ +/* 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; + aPaper = newPZ;
+ return NS_OK; + return NS_OK;
+} +}
diff -urNU6 gfx/src.old/psshared/nsPaperFactoryPS.h gfx/src/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
+++ gfx/src/psshared/nsPaperFactoryPS.h 2006-04-21 23:02:28.000000000 +0200
@@ -0,0 +1,64 @@ @@ -0,0 +1,64 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* ex: set tabstop=8 softtabstop=4 shiftwidth=4 expandtab: */ +/* 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__ */ +#endif /* nsPaperFactoryPS_h__ */
diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/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
+++ gfx/src/psshared/nsPaperPS.cpp 2006-04-21 23:22:13.000000000 +0200 @@ -22,6 +22,7 @@
@@ -19,12 +19,13 @@
* The Initial Developer of the Original Code is
* Kenneth Herron <kherron@newsguy.com>.
* Portions created by the Initial Developer are Copyright (C) 2004
* the Initial Developer. All Rights Reserved. * the Initial Developer. All Rights Reserved.
* *
* Contributor(s): * 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 * 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 * 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"), @@ -37,9 +38,25 @@
* 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.
* *
* ***** END LICENSE BLOCK ***** */ * ***** 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])) #define COUNTOF(x) (sizeof(x) / sizeof((x)[0]))
const nsPaperSizePS_ nsPaperSizePS::mList[] = @@ -57,7 +74,15 @@
{
#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
#undef SIZE_MM #undef SIZE_MM
}; };
@ -656,12 +577,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.cpp gfx/src/psshared/nsPaperPS.cpp
PRBool PRBool
nsPaperSizePS::Find(const char *aName) nsPaperSizePS::Find(const char *aName)
{ @@ -70,3 +95,125 @@
for (int i = mCount; i--; ) {
if (!PL_strcasecmp(aName, mList[i].name)) {
mCurrent = i;
return PR_TRUE;
}
} }
return PR_FALSE; 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].width, HALF_INCH_PT)) > EPSILON ||
+ fabs(fmod(mPPD->sizes[mCurrent].length, 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/psshared/nsPaperPS.h
--- gfx/src.old/psshared/nsPaperPS.h 2004-12-15 06:52:36.000000000 +0100 +++ gfx/src/psshared/nsPaperPS.h
+++ gfx/src/psshared/nsPaperPS.h 2006-04-21 23:14:05.000000000 +0200 @@ -40,9 +40,9 @@
@@ -37,30 +37,30 @@
* ***** END LICENSE BLOCK ***** */
#ifndef _PAPERPS_H_ #ifndef _PAPERPS_H_
#define _PAPERPS_H_ #define _PAPERPS_H_
@ -805,8 +717,7 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h
struct nsPaperSizePS_ { struct nsPaperSizePS_ {
const char *name; const char *name;
float width_mm; @@ -51,13 +51,13 @@
float height_mm;
PRBool isMetric; // Present to the user in metric, if possible 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. * @return PR_TRUE if the cursor points past the last item.
*/ */
PRBool AtEnd() { return mCurrent >= mCount; } @@ -85,6 +85,12 @@
/** ---------------------------------------------------
@@ -82,12 +82,18 @@
* Point the cursor to the entry with the given paper name.
* @return PR_TRUE if pointing to a valid entry.
*/
PRBool Find(const char *aName); 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 * @return a pointer to the name of the current paper size
*/ */
const char *Name() { const char *Name() {
NS_PRECONDITION(!AtEnd(), "Invalid current item"); @@ -117,11 +123,83 @@
return mList[mCurrent].name;
}
@@ -114,15 +120,87 @@
*/
PRBool IsMetric() {
NS_PRECONDITION(!AtEnd(), "Invalid current item");
return mList[mCurrent].isMetric; return mList[mCurrent].isMetric;
} }
@ -934,14 +833,9 @@ diff -urNU6 gfx/src.old/psshared/nsPaperPS.h gfx/src/psshared/nsPaperPS.h
}; };
#endif #endif
--- gfx/src/xlib/nsDeviceContextSpecXlib.cpp
diff -urNU6 gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp gfx/src/xlib/nsDeviceContextSpecXlib.cpp +++ gfx/src/xlib/nsDeviceContextSpecXlib.cpp
--- gfx/src.old/xlib/nsDeviceContextSpecXlib.cpp 2004-10-24 20:34:38.000000000 +0200 @@ -1212,7 +1212,11 @@
+++ 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);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */ #endif /* SET_PRINTER_FEATURES_VIA_PREFS */
nsXPIDLCString papername; nsXPIDLCString papername;
if (NS_SUCCEEDED(CopyPrinterCharPref(pPrefs, "postscript", printerName, "paper_size", getter_Copies(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)) { if (paper.Find(papername)) {
DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n", DO_PR_DEBUG_LOG(("setting default paper size to '%s' (%g mm/%g mm)\n",
paper.Name(), paper.Width_mm(), paper.Height_mm())); @@ -1238,6 +1242,7 @@
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();
} }
printerFeatures.SetNumPaperSizeRecords(count); printerFeatures.SetNumPaperSizeRecords(count);
#endif /* SET_PRINTER_FEATURES_VIA_PREFS */ #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 == 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:
/**

3
enigmail-0.95.0.tar.gz
View File

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

3
enigmail-0.95.1.tar.gz Normal file
View File

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

3
l10n-2.0.0.0.tar.bz2
View File

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

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

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

3
thunderbird-2.0.0.0-source.tar.bz2
View File

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

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

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

111
thunderbird-no-update.patch
View File

@ -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
<menuseparator id="menu_HelpAboutSeparator"/>
<menuitem id="checkForUpdates" accesskey="&updateCmd.accesskey;" class="menuitem-iconic"
- label="&updateCmd.label;" oncommand="checkForUpdates();"/>
-#ifndef XP_MACOSX
- <menuseparator/>
-#endif
+ label="&updateCmd.label;" oncommand="checkForUpdates();"
+ hidden="true"/>
<menuitem id="aboutName" accesskey="&aboutCmd.accesskey;"
label="&aboutCmd.label;"
#ifdef XP_MACOSX
Index: mail/app/profile/all-thunderbird.js
===================================================================
RCS file: /cvsroot/mozilla/mail/app/profile/all-thunderbird.js,v
retrieving revision 1.44.2.10
diff -u -p -r1.44.2.10 all-thunderbird.js
--- mail/app/profile/all-thunderbird.js 4 Nov 2005 18:44:59 -0000 1.44.2.10
+++ mail/app/profile/all-thunderbird.js 11 Nov 2005 05:59:54 -0000
@@ -45,66 +45,6 @@ pref("browser.chromeURL", "chrome://mess
pref("mail.biff.animate_dock_icon", false);
#endif
-pref("update.app.enabled", true); // Whether or not app updates are enabled
-pref("update.app.url", "chrome://mozapps/locale/update/update.properties");
-pref("update.extensions.enabled", true);
-
-// App-specific update preferences
-
-// Whether or not app updates are enabled
-pref("app.update.enabled", true);
-
-// This preference turns on app.update.mode and allows automatic download and
-// install to take place. We use a separate boolean toggle for this to make
-// the UI easier to construct.
-pref("app.update.auto", true);
-
-// Defines how the Application Update Service notifies the user about updates:
-//
-// AUM Set to: Minor Releases: Major Releases:
-// 0 download no prompt download no prompt
-// 1 download no prompt download no prompt if no incompatibilities
-// 2 download no prompt prompt
-//
-// See chart in nsUpdateService.js.in for more details
-//
-pref("app.update.mode", 1);
-// If set to true, the Update Service will present no UI for any event.
-pref("app.update.silent", false);
-
-// Update service URL:
-pref("app.update.url", "https://aus2.mozilla.org/update/1/%PRODUCT%/%VERSION%/%BUILD_ID%/%BUILD_TARGET%/%LOCALE%/%CHANNEL%/update.xml");
-pref("app.update.vendorName.override", "Mozilla");
-
-// URL user can browse to manually if for some reason all update installation
-// attempts fail. TODO: Change this URL
-pref("app.update.url.manual", "http://www.mozilla.org/products/thunderbird/");
-// A default value for the "More information about this update" link
-// supplied in the "An update is available" page of the update wizard.
-pref("app.update.url.details", "chrome://messenger-region/locale/region.properties");
-// User-settable override to app.update.url for testing purposes.
-//pref("app.update.url.override", "");
-
-// Interval: Time between checks for a new version (in seconds)
-// default=1 day
-pref("app.update.interval", 86400);
-// Interval: Time before prompting the user to download a new version that
-// is available (in seconds) default=1 day
-pref("app.update.nagTimer.download", 86400);
-// Interval: Time before prompting the user to restart to install the latest
-// download (in seconds) default=30 minutes
-pref("app.update.nagTimer.restart", 1800);
-// Interval: When all registered timers should be checked (in milliseconds)
-// default=5 seconds
-pref("app.update.timer", 600000);
-
-// Whether or not we show a dialog box informing the user that the update was
-// successfully applied. This is off in Firefox by default since we show a
-// upgrade start page instead! Other apps may wish to show this UI, and supply
-// a whatsNewURL field in their brand.properties that contains a link to a page
-// which tells users what's new in this new update.
-pref("app.update.showInstalledUI", false);
-
// Developers can set this to |true| if they are constantly changing files in their
// extensions directory so that the extension system does not constantly think that
// their extensions are being updated and thus reregistered every time the app is started

31
visibility.patch
View File

@ -1,31 +0,0 @@
From: Wolfgang Rosenauer <stark@suse.de>
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