This commit is contained in:
parent
8b3b549046
commit
af103b6bd4
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 8 15:56:56 CET 2007 - meissner@suse.de
|
||||
|
||||
- Upgraded to 1.5.0.10 security release.
|
||||
- Upgraded to enigmail 0.94.2.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 30 10:50:51 CST 2007 - maw@suse.de
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package MozillaThunderbird (Version 1.5.0.8)
|
||||
# spec file for package MozillaThunderbird (Version 1.5.0.10)
|
||||
#
|
||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# This file and all modifications and additions to the pristine
|
||||
@ -13,8 +13,8 @@
|
||||
Name: MozillaThunderbird
|
||||
BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel update-desktop-files zip
|
||||
License: GNU General Public License (GPL), GNU Library General Public License v. 2.0 and 2.1 (LGPL)
|
||||
Version: 1.5.0.8
|
||||
Release: 5
|
||||
Version: 1.5.0.10
|
||||
Release: 1
|
||||
Summary: The Stand-Alone Mozilla Mail Component
|
||||
URL: http://www.mozilla.org/products/thunderbird/
|
||||
Group: Productivity/Networking/Email/Clients
|
||||
@ -25,7 +25,7 @@ Source3: mozilla.sh.in
|
||||
Source4: l10n.tar.bz2
|
||||
Source5: mailredirect-0.7.4.xpi
|
||||
Source6: suse-default-prefs.js
|
||||
Source9: enigmail-0.94.1.tar.gz
|
||||
Source9: enigmail-0.94.2.tar.gz
|
||||
Source11: enigmail.manifest
|
||||
Patch1: pango-cairo.patch
|
||||
Patch2: thunderbird-appname.patch
|
||||
@ -46,10 +46,8 @@ Patch16: xul-picker.patch
|
||||
Patch17: remote.patch
|
||||
Patch18: system-nss.patch
|
||||
Patch19: system-nspr.patch
|
||||
Patch20: file-saver.patch
|
||||
Patch21: ppc64.patch
|
||||
#Patch21: ppc64.patch
|
||||
Patch22: cjk-postscript-fonts.dif
|
||||
Patch23: home-download.patch
|
||||
Patch24: multi-replyto.patch
|
||||
Patch25: postscript.patch
|
||||
Patch26: cups-paper.patch
|
||||
@ -159,12 +157,8 @@ cd $RPM_BUILD_DIR/mozilla
|
||||
%if %has_system_nspr
|
||||
%patch19
|
||||
%endif
|
||||
%if %suse_version >= 1000
|
||||
%patch20
|
||||
%endif
|
||||
%patch21 -p1
|
||||
#%patch21
|
||||
%patch22
|
||||
%patch23
|
||||
%patch24
|
||||
%patch25
|
||||
%patch26
|
||||
@ -589,7 +583,10 @@ exit 0
|
||||
%defattr(-,root,root)
|
||||
%endif
|
||||
|
||||
%changelog -n MozillaThunderbird
|
||||
%changelog
|
||||
* Thu Mar 08 2007 - meissner@suse.de
|
||||
- Upgraded to 1.5.0.10 security release.
|
||||
- Upgraded to enigmail 0.94.2.
|
||||
* Tue Jan 30 2007 - maw@suse.de
|
||||
- Add thunderbird-1.5.0.8-uninitalized-vars-232305.patch (#232305).
|
||||
* Thu Jan 18 2007 - maw@suse.de
|
||||
|
86
abuild.patch
86
abuild.patch
@ -41,70 +41,6 @@ Problematic file(s) and their linenumbers:
|
||||
}
|
||||
|
||||
#ifdef MOZ_ENABLE_XFT
|
||||
Index: security/nss/lib/pki/certificate.c
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/pki/certificate.c,v
|
||||
retrieving revision 1.53
|
||||
diff -u -p -6 -r1.53 certificate.c
|
||||
--- security/nss/lib/pki/certificate.c 20 Jan 2005 02:25:48 -0000 1.53
|
||||
+++ security/nss/lib/pki/certificate.c 7 Jun 2005 07:11:39 -0000
|
||||
@@ -478,13 +478,13 @@ nssCertificate_BuildChain (
|
||||
NSSTrustDomain *td,
|
||||
NSSCryptoContext *cc
|
||||
)
|
||||
{
|
||||
NSSCertificate **rvChain = NULL;
|
||||
NSSUsage issuerUsage = *usage;
|
||||
- nssPKIObjectCollection *collection;
|
||||
+ nssPKIObjectCollection *collection = NULL;
|
||||
PRUint32 rvCount = 0;
|
||||
PRStatus st;
|
||||
PRStatus ret = PR_SUCCESS;
|
||||
|
||||
if (!td)
|
||||
td = NSSCertificate_GetTrustDomain(c);
|
||||
Index: intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp,v
|
||||
retrieving revision 1.10
|
||||
diff -u -p -6 -r1.10 nsUnicodeToJamoTTF.cpp
|
||||
--- intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 19 Feb 2005 07:27:54 -0000 1.10
|
||||
+++ intl/uconv/ucvko/nsUnicodeToJamoTTF.cpp 7 Jun 2005 07:21:10 -0000
|
||||
@@ -842,12 +842,13 @@ PRInt16 JamoSrchReplace (const JamoNormM
|
||||
// we don't need a separate range check here because the one in
|
||||
// for-loop is sufficient.
|
||||
for (PRInt32 i = start; i <= end - clusterLen; i++)
|
||||
{
|
||||
const JamoNormMap *match;
|
||||
JamoNormMap key;
|
||||
+ key.liga = 0;
|
||||
|
||||
// cluster array is made up of PRUint8's to save memory
|
||||
// and we have to subtract aOffset from the input before looking it up.
|
||||
key.seq[0] = aIn[i] - aOffset;
|
||||
key.seq[1] = aIn[i + 1] - aOffset;
|
||||
key.seq[2] = clusterLen == 3 ? (aIn[i + 2] - aOffset) : 0;
|
||||
Index: layout/generic/nsObjectFrame.cpp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/layout/generic/nsObjectFrame.cpp,v
|
||||
retrieving revision 1.505
|
||||
diff -u -p -6 -r1.505 nsObjectFrame.cpp
|
||||
--- layout/generic/nsObjectFrame.cpp 6 May 2005 03:14:31 -0000 1.505
|
||||
+++ layout/generic/nsObjectFrame.cpp 7 Jun 2005 07:23:27 -0000
|
||||
@@ -1850,12 +1850,13 @@ nsObjectFrame::Paint(nsPresContext*
|
||||
// now we need to setup the correct location for printing
|
||||
nsresult rv;
|
||||
nsPluginWindow window;
|
||||
nsPoint origin;
|
||||
float t2p;
|
||||
window.window = nsnull;
|
||||
+ window.ws_info = nsnull;
|
||||
|
||||
// prepare embedded mode printing struct
|
||||
nsPluginPrint npprint;
|
||||
npprint.mode = nsPluginMode_Embedded;
|
||||
|
||||
// we need to find out if we are windowless or not
|
||||
Index: docshell/base/nsWebShell.cpp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/docshell/base/nsWebShell.cpp,v
|
||||
@ -126,25 +62,3 @@ diff -u -p -6 -r1.656.2.1 nsWebShell.cpp
|
||||
nsWebShell::OnOverLink(nsIContent* aContent,
|
||||
nsIURI* aURI,
|
||||
const PRUnichar* aTargetSpec)
|
||||
Index: layout/generic/nsFrame.cpp
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/layout/generic/nsFrame.cpp,v
|
||||
retrieving revision 3.574.2.4
|
||||
diff -u -p -6 -r3.574.2.4 nsFrame.cpp
|
||||
--- layout/generic/nsFrame.cpp 20 Sep 2005 06:32:09 -0000 3.574.2.4
|
||||
+++ layout/generic/nsFrame.cpp 22 Sep 2005 06:31:42 -0000
|
||||
@@ -3528,13 +3528,13 @@ nsresult
|
||||
nsFrame::PeekOffsetParagraph(nsPresContext* aPresContext,
|
||||
nsPeekOffsetStruct *aPos)
|
||||
{
|
||||
#ifdef DEBUG_paragraph
|
||||
printf("Selecting paragraph\n");
|
||||
#endif
|
||||
- nsIFrame* blockFrame;
|
||||
+ nsIFrame* blockFrame = NULL;
|
||||
nsCOMPtr<nsILineIterator> iter (getter_AddRefs(GetBlockFrameAndLineIter(this, &blockFrame)));
|
||||
if (!blockFrame || !iter)
|
||||
return NS_ERROR_UNEXPECTED;
|
||||
|
||||
PRInt32 thisLine;
|
||||
nsresult result = iter->FindLineContaining(this, &thisLine);
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3584329e4f51e43fbb9028cf47101de8c74651e7607de80cb1f61349424133c1
|
||||
size 513084
|
3
enigmail-0.94.2.tar.gz
Normal file
3
enigmail-0.94.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2263ec2c9bf3317472f33bed46b9cb6f91d64a766314167678125b4f3b6376b8
|
||||
size 514823
|
135
file-saver.patch
135
file-saver.patch
@ -1,135 +0,0 @@
|
||||
From: Robert O'Callahan <rocallahan@novell.com>
|
||||
Subject: overwrite confirmation behaves strange (we need at least GTK2.8 for this)
|
||||
References:
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=179531
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=341218
|
||||
|
||||
Index: widget/src/gtk2/nsFilePicker.cpp
|
||||
===================================================================
|
||||
RCS file: /home/rocallahan/mozilla-cvs-mirror/mozilla/widget/src/gtk2/nsFilePicker.cpp,v
|
||||
retrieving revision 1.11
|
||||
diff -u -t -p -1 -2 -r1.11 nsFilePicker.cpp
|
||||
--- widget/src/gtk2/nsFilePicker.cpp 17 Aug 2005 13:41:44 -0000 1.11
|
||||
+++ widget/src/gtk2/nsFilePicker.cpp 12 Jun 2006 08:02:15 -0000
|
||||
@@ -81,39 +81,41 @@ typedef enum
|
||||
GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER
|
||||
} GtkFileChooserAction;
|
||||
|
||||
|
||||
typedef gchar* (*_gtk_file_chooser_get_filename_fn)(GtkFileChooser *chooser);
|
||||
typedef GSList* (*_gtk_file_chooser_get_filenames_fn)(GtkFileChooser *chooser);
|
||||
typedef GtkWidget* (*_gtk_file_chooser_dialog_new_fn)(const gchar *title,
|
||||
GtkWindow *parent,
|
||||
GtkFileChooserAction action,
|
||||
const gchar *first_button_text,
|
||||
...);
|
||||
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);
|
||||
typedef void (*_gtk_file_chooser_set_current_folder_fn)(GtkFileChooser* chooser, const gchar* folder);
|
||||
typedef void (*_gtk_file_chooser_add_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
|
||||
typedef void (*_gtk_file_chooser_set_filter_fn)(GtkFileChooser* chooser, GtkFileFilter* filter);
|
||||
typedef GtkFileFilter* (*_gtk_file_chooser_get_filter_fn)(GtkFileChooser* chooser);
|
||||
typedef GSList* (*_gtk_file_chooser_list_filters_fn)(GtkFileChooser* chooser);
|
||||
typedef GtkFileFilter* (*_gtk_file_filter_new_fn)();
|
||||
typedef void (*_gtk_file_filter_add_pattern_fn)(GtkFileFilter* filter, const gchar* pattern);
|
||||
typedef void (*_gtk_file_filter_set_name_fn)(GtkFileFilter* filter, const gchar* name);
|
||||
|
||||
|
||||
DECL_FUNC_PTR(gtk_file_chooser_get_filename);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_get_filenames);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_dialog_new);
|
||||
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);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_set_current_folder);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_add_filter);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_set_filter);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_get_filter);
|
||||
DECL_FUNC_PTR(gtk_file_chooser_list_filters);
|
||||
DECL_FUNC_PTR(gtk_file_filter_new);
|
||||
DECL_FUNC_PTR(gtk_file_filter_add_pattern);
|
||||
DECL_FUNC_PTR(gtk_file_filter_set_name);
|
||||
|
||||
static GtkWindow *
|
||||
get_gtk_window_for_nsiwidget(nsIWidget *widget)
|
||||
@@ -175,24 +177,25 @@ nsFilePicker::LoadSymbolsGTK24()
|
||||
} else {
|
||||
// XXX hmm, this seems to fail when gtk 2.4 is already loaded...
|
||||
mGTK24 = LoadVersionedLibrary("gtk-2", ".4");
|
||||
if (!mGTK24) {
|
||||
return NS_ERROR_NOT_AVAILABLE;
|
||||
}
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_get_filename);
|
||||
}
|
||||
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_get_filenames);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_dialog_new);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_set_select_multiple);
|
||||
+ GET_LIBGTK_FUNC(gtk_file_chooser_set_do_overwrite_confirmation);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_name);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_set_current_folder);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_add_filter);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_set_filter);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_get_filter);
|
||||
GET_LIBGTK_FUNC(gtk_file_chooser_list_filters);
|
||||
GET_LIBGTK_FUNC(gtk_file_filter_new);
|
||||
GET_LIBGTK_FUNC(gtk_file_filter_add_pattern);
|
||||
GET_LIBGTK_FUNC(gtk_file_filter_set_name);
|
||||
|
||||
// Woot.
|
||||
return NS_OK;
|
||||
@@ -555,43 +558,51 @@ nsFilePicker::Show(PRInt16 *aReturn)
|
||||
const char *filter_pattern = mFilters[i]->get();
|
||||
_gtk_file_filter_set_name (filter, filter_pattern);
|
||||
}
|
||||
|
||||
_gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (file_chooser), filter);
|
||||
|
||||
// Set the initially selected filter
|
||||
if (mSelectedType == i) {
|
||||
_gtk_file_chooser_set_filter (GTK_FILE_CHOOSER(file_chooser), filter);
|
||||
}
|
||||
}
|
||||
|
||||
+ PRBool manualConfirm = PR_TRUE;
|
||||
+ if (_gtk_file_chooser_set_do_overwrite_confirmation) {
|
||||
+ manualConfirm = PR_FALSE;
|
||||
+ // Only available in GTK 2.8
|
||||
+ _gtk_file_chooser_set_do_overwrite_confirmation(GTK_FILE_CHOOSER(file_chooser), PR_TRUE);
|
||||
+ }
|
||||
+
|
||||
gint response = gtk_dialog_run (GTK_DIALOG (file_chooser));
|
||||
|
||||
switch (response) {
|
||||
case GTK_RESPONSE_ACCEPT:
|
||||
ReadValuesFromFileChooser(file_chooser);
|
||||
*aReturn = nsIFilePicker::returnOK;
|
||||
if (mMode == nsIFilePicker::modeSave) {
|
||||
nsCOMPtr<nsILocalFile> file;
|
||||
GetFile(getter_AddRefs(file));
|
||||
if (file) {
|
||||
PRBool exists = PR_FALSE;
|
||||
file->Exists(&exists);
|
||||
if (exists) {
|
||||
- PRBool overwrite = confirm_overwrite_file (file_chooser, file);
|
||||
+ PRBool overwrite = !manualConfirm ||
|
||||
+ confirm_overwrite_file (file_chooser, file);
|
||||
|
||||
if (overwrite) {
|
||||
*aReturn = nsIFilePicker::returnReplace;
|
||||
} else {
|
||||
- *aReturn = nsIFilePicker::returnCancel;
|
||||
+ *aReturn = nsIFilePicker::returnCancel;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case GTK_RESPONSE_CANCEL:
|
||||
case GTK_RESPONSE_CLOSE:
|
||||
case GTK_RESPONSE_DELETE_EVENT:
|
||||
*aReturn = nsIFilePicker::returnCancel;
|
||||
break;
|
||||
|
@ -1,91 +0,0 @@
|
||||
From: Wolfgang Rosenauer <stark@suse.de>
|
||||
Subject: Firefox won't allow me to save downloaded files in my home directory
|
||||
References:
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=144894
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=300856
|
||||
|
||||
Index: mail/components/preferences/downloads.js
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/mail/components/preferences/downloads.js,v
|
||||
retrieving revision 1.5
|
||||
diff -u -p -6 -r1.5 downloads.js
|
||||
--- mail/components/preferences/downloads.js 13 Sep 2005 18:39:27 -0000 1.5
|
||||
+++ mail/components/preferences/downloads.js 1 Feb 2006 15:58:51 -0000
|
||||
@@ -91,22 +91,27 @@ var gDownloadsPane = {
|
||||
var customDirPref = document.getElementById("browser.download.dir");
|
||||
return customDirPref.value;
|
||||
},
|
||||
|
||||
_getSpecialFolderKey: function (aFolderType)
|
||||
{
|
||||
+ if (aFolderType == "Desktop")
|
||||
+ return "Desk";
|
||||
+
|
||||
+ if (aFolderType != "Downloads")
|
||||
+ throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
|
||||
+
|
||||
#ifdef XP_WIN
|
||||
- return aFolderType == "Desktop" ? "DeskP" : "Pers";
|
||||
-#endif
|
||||
+ return "Pers";
|
||||
+#else
|
||||
#ifdef XP_MACOSX
|
||||
- return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs";
|
||||
+ return "UsrDocs";
|
||||
+#else
|
||||
+ return "Home";
|
||||
#endif
|
||||
-#ifdef XP_OS2
|
||||
- return aFolderType == "Desktop" ? "Desk" : "Home";
|
||||
#endif
|
||||
- return "Home";
|
||||
},
|
||||
|
||||
_getDownloadsFolder: function (aFolder)
|
||||
{
|
||||
var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
|
||||
.getService(Components.interfaces.nsIProperties);
|
||||
Index: toolkit/mozapps/downloads/content/downloads.js
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/toolkit/mozapps/downloads/content/downloads.js,v
|
||||
retrieving revision 1.53
|
||||
diff -u -p -6 -r1.53 downloads.js
|
||||
--- toolkit/mozapps/downloads/content/downloads.js 9 Jan 2006 20:36:45 -0000 1.53
|
||||
+++ toolkit/mozapps/downloads/content/downloads.js 1 Feb 2006 15:59:07 -0000
|
||||
@@ -775,25 +775,27 @@ function initAutoDownloadDisplay()
|
||||
autodownloadInfo.hidden = false;
|
||||
var autodownloadSpring = document.getElementById("autodownloadSpring");
|
||||
autodownloadSpring.hidden = true;
|
||||
|
||||
function getSpecialFolderKey(aFolderType)
|
||||
{
|
||||
+ if (aFolderType == "Desktop")
|
||||
+ return "Desk";
|
||||
+
|
||||
+ if (aFolderType != "Downloads")
|
||||
+ throw "ASSERTION FAILED: folder type should be 'Desktop' or 'Downloads'";
|
||||
+
|
||||
#ifdef XP_WIN
|
||||
- return aFolderType == "Desktop" ? "DeskP" : "Pers";
|
||||
-#endif
|
||||
+ return "Pers";
|
||||
+#else
|
||||
#ifdef XP_MACOSX
|
||||
- return aFolderType == "Desktop" ? "UsrDsk" : "UsrDocs";
|
||||
-#endif
|
||||
-#ifdef XP_OS2
|
||||
- return aFolderType == "Desktop" ? "Desk" : "Home";
|
||||
+ return "UsrDocs";
|
||||
+#else
|
||||
+ return "Home";
|
||||
#endif
|
||||
-#ifdef XP_BEOS
|
||||
- return aFolderType == "Desktop" ? "Desk" : "Home";
|
||||
#endif
|
||||
- return "Home";
|
||||
}
|
||||
|
||||
function getDownloadsFolder(aFolder)
|
||||
{
|
||||
var fileLocator = Components.classes["@mozilla.org/file/directory_service;1"]
|
||||
.getService(Components.interfaces.nsIProperties);
|
23
ppc64.patch
23
ppc64.patch
@ -1,23 +0,0 @@
|
||||
--- mozilla/security/coreconf/Linux.mk.foo 2003-10-01 13:06:30.000000000 -0400
|
||||
+++ mozilla/security/coreconf/Linux.mk 2003-10-01 13:07:22.000000000 -0400
|
||||
@@ -53,7 +53,11 @@
|
||||
ifeq ($(OS_TEST),m68k)
|
||||
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
|
||||
CPU_ARCH = m68k
|
||||
-else
|
||||
+else
|
||||
+ifeq ($(OS_TEST),ppc64)
|
||||
+ OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
|
||||
+ CPU_ARCH = ppc64
|
||||
+else
|
||||
ifeq ($(OS_TEST),ppc)
|
||||
OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE
|
||||
CPU_ARCH = ppc
|
||||
@@ -112,6 +116,7 @@
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
+endif
|
||||
|
||||
|
||||
LIBC_TAG = _glibc
|
@ -1,11 +1,15 @@
|
||||
From: Wolfgang Rosenauer <stark@suse.de>
|
||||
Subject: fixes for build --with-system-nspr
|
||||
References:
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=296819
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=290923
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=288647
|
||||
|
||||
Index: security/coreconf/location.mk
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
|
||||
retrieving revision 1.9
|
||||
diff -u -r1.9 location.mk
|
||||
--- security/coreconf/location.mk 25 Apr 2004 15:02:17 -0000 1.9
|
||||
+++ security/coreconf/location.mk 11 Apr 2005 20:21:57 -0000
|
||||
@@ -61,6 +61,8 @@
|
||||
--- security/coreconf/location.mk.orig
|
||||
+++ security/coreconf/location.mk
|
||||
@@ -61,6 +61,8 @@ endif
|
||||
|
||||
DIST = $(SOURCE_PREFIX)/$(PLATFORM)
|
||||
|
||||
@ -14,94 +18,17 @@ diff -u -r1.9 location.mk
|
||||
ifdef BUILD_DEBUG_GC
|
||||
DEFINES += -DDEBUG_GC
|
||||
endif
|
||||
Index: security/nss/lib/ckfw/builtins/Makefile
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
|
||||
retrieving revision 1.14
|
||||
diff -u -r1.14 Makefile
|
||||
--- security/nss/lib/ckfw/builtins/Makefile 20 Jan 2005 02:25:46 -0000 1.14
|
||||
+++ security/nss/lib/ckfw/builtins/Makefile 11 Apr 2005 20:21:57 -0000
|
||||
@@ -53,23 +53,23 @@
|
||||
# This is merely an expedient hack and not the right solution.
|
||||
ifdef NS_USE_GCC
|
||||
EXTRA_LIBS += \
|
||||
- -L$(DIST)/lib \
|
||||
+ -L$(NSPR_LIBDIR) \
|
||||
-lplc4 \
|
||||
-lplds4 \
|
||||
-lnspr4 \
|
||||
$(NULL)
|
||||
else
|
||||
EXTRA_LIBS += \
|
||||
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
$(NULL)
|
||||
endif
|
||||
|
||||
else
|
||||
|
||||
EXTRA_LIBS += \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
+ $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
+ $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
Index: security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
|
||||
retrieving revision 1.18
|
||||
diff -u -r1.18 Makefile
|
||||
--- security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 25 Apr 2004 15:03:08 -0000 1.18
|
||||
+++ security/nss/lib/fortcrypt/swfort/pkcs11/Makefile 11 Apr 2005 20:21:57 -0000
|
||||
@@ -63,7 +63,7 @@
|
||||
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
|
||||
$(CRYPTO_LIB) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
- -L$(DIST)/lib \
|
||||
+ -L$(NSPR_LIBDIR) \
|
||||
-lplc4 \
|
||||
-lplds4 \
|
||||
-lnspr4 \
|
||||
@@ -76,8 +76,8 @@
|
||||
$(DIST)/lib/softokn.lib \
|
||||
$(CRYPTO_LIB) \
|
||||
$(DIST)/lib/secutil.lib \
|
||||
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
- $(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
|
||||
+ $(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
|
||||
wsock32.lib \
|
||||
winmm.lib \
|
||||
$(NULL)
|
||||
@@ -98,8 +98,8 @@
|
||||
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
|
||||
$(CRYPTO_LIB) \
|
||||
$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
- $(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
+ $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
|
||||
+ $(NSPR_LIBDIR)/nspr/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
|
||||
$(NULL)
|
||||
|
||||
endif
|
||||
Index: security/manager/Makefile.in
|
||||
===================================================================
|
||||
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
|
||||
retrieving revision 1.57
|
||||
diff -u -p -6 -r1.57 Makefile.in
|
||||
--- security/manager/Makefile.in 2 Jun 2005 02:03:05 -0000 1.57
|
||||
+++ security/manager/Makefile.in 6 Jun 2005 12:56:44 -0000
|
||||
@@ -73,18 +73,29 @@ FREEBL_PURE32_CHK = libfreebl_pure32_3.c
|
||||
FREEBL_HYBRID_MODULE = libfreebl_hybrid_3$(DLL_SUFFIX)
|
||||
FREEBL_HYBRID_CHK = libfreebl_hybrid_3.chk
|
||||
--- security/manager/Makefile.in.orig
|
||||
+++ security/manager/Makefile.in
|
||||
@@ -114,13 +114,25 @@ FREEBL_64INT_CHK = libfreebl_64int_3.chk
|
||||
FREEBL_64FPU_LIB = libfreebl_64fpu_3$(DLL_SUFFIX)
|
||||
FREEBL_64FPU_CHK = libfreebl_64fpu_3.chk
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
-
|
||||
+
|
||||
+# Hmm, hope this is ok.
|
||||
+ABS_DIST := $(shell cd $(DIST) && pwd)
|
||||
+ifeq ($(OS_ARCH),WINNT)
|
||||
+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
|
||||
@ -125,6 +52,3 @@ diff -u -p -6 -r1.57 Makefile.in
|
||||
DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
|
||||
DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
|
||||
ABS_topsrcdir := $(shell cd $(topsrcdir); pwd)
|
||||
ifneq ($(ABS_topsrcdir),$(MOZ_BUILD_ROOT))
|
||||
DEFAULT_GMAKE_FLAGS += BUILD_TREE=$(MOZ_BUILD_ROOT)
|
||||
endif
|
||||
|
3
thunderbird-1.5.0.10-source.tar.bz2
Normal file
3
thunderbird-1.5.0.10-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9b6a5a2b893594180863d4cb412a6920c698d68d8ea047c0eb38c9794e74338d
|
||||
size 36159990
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:dbe85085d627875f44984529f160bd53e9b7667a134b42c295cba2e6d4691bcb
|
||||
size 35984263
|
Loading…
Reference in New Issue
Block a user