Hello community,
here is the log from the commit of package seamonkey
checked in at Fri Jun 2 13:20:04 CEST 2006.
--------
--- seamonkey/seamonkey.changes 2006-04-25 11:38:31.000000000 +0200
+++ seamonkey/seamonkey.changes 2006-06-02 12:21:06.000000000 +0200
@@ -1,0 +2,12 @@
+Fri Jun 2 12:20:24 CEST 2006 - stark@suse.de
+
+- update to security/stability release 1.0.2 (#179011)
+ (http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonke...)
+
+-------------------------------------------------------------------
+Sun May 14 21:00:33 CEST 2006 - stark@suse.de
+
+- update to version 1.0.1+
+- save printer settings properly (#174082, bmo #324072)
+
+-------------------------------------------------------------------
Old:
----
backports-20060425.patch
imgRequest.patch
seamonkey-1.0.1.patch.bz2
seamonkey-source-1.0.tar.bz2
New:
----
print-properties.patch
seamonkey-source-1.0.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:20.000000000 +0200
+++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:20.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package seamonkey (Version 1.0)
+# spec file for package seamonkey (Version 1.0.2)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -13,8 +13,8 @@
BuildRequires: gcc-c++ libgnomeui-devel libidl-devel mozilla-nss-devel orbit-devel update-desktop-files zip
License: MPL, GPL
Provides: web_browser
-Version: 1.0
-Release: 23
+Version: 1.0.2
+Release: 1
Summary: The successor of the Mozilla Application Suite
URL: http://www.mozilla.org/projects/seamonkey
Group: Productivity/Networking/Web/Browsers
@@ -35,7 +35,6 @@
Source12: README.installed-chrome
Source13: mozilla-make-package.pl
Source14: mozex.jar
-Patch0: seamonkey-1.0.1.patch.bz2
Patch1: system-nspr.patch
Patch2: prefs.patch
Patch3: pango-cairo.patch
@@ -53,7 +52,6 @@
Patch15: autoconf.dif
Patch16: system-nss.patch
Patch17: mozilla-default-plugin-less-annoying.patch
-Patch18: imgRequest.patch
Patch19: mail-alert.patch
Patch20: js-libm.patch
Patch21: ppc64.patch
@@ -63,12 +61,12 @@
Patch25: xul-picker.patch
Patch26: localize.patch
Patch27: postscript.patch
-Patch28: cups-paper.patch
-Patch29: backports-20060425.patch
+Patch29: cups-paper.patch
+Patch30: print-properties.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: libstdc++ fileutils textutils /bin/sh
%define _unpackaged_files_terminate_build 0
-%define releasedate 2006031600
+%define releasedate 2006053000
%define progname seamonkey
%define prefix /usr
%define progdir %_libdir/%{progname}
@@ -220,7 +218,6 @@
%prep
%setup -n mozilla -b 1 -b 9 -q
-%patch0 -p1
%if %suse_version > 930
%patch1
%patch3
@@ -242,7 +239,6 @@
%patch16
%endif
%patch17 -p2
-%patch18
%patch19
%patch20
%patch21 -p1
@@ -252,8 +248,8 @@
%patch25
%patch26
%patch27
-%patch28
%patch29
+%patch30
# additional CA certificates
cd $RPM_BUILD_DIR/mozilla/security/nss/lib/ckfw/builtins
cat %{SOURCE8} >> certdata.txt
@@ -754,6 +750,12 @@
%dir %{progdir}/components/myspell
%changelog -n seamonkey
+* Fri Jun 02 2006 - stark@suse.de
+- update to security/stability release 1.0.2 (#179011)
+ (http://www.mozilla.org/projects/security/known-vulnerabilities.html#SeaMonke...)
+* Sun May 14 2006 - stark@suse.de
+- update to version 1.0.1+
+- save printer settings properly (#174082, bmo #324072)
* Tue Apr 25 2006 - stark@suse.de
- added patch for iframe crash (#169039, bmo #334515)
- improved postscript output (bmo #334485)
++++++ cups-paper.patch ++++++
--- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:21.000000000 +0200
+++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:21.000000000 +0200
@@ -1,3 +1,10 @@
+From: Wolfgang Rosenauer , Arne John Glenstrup
+Subject: get paper sizes from CUPS
+References:
+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
++++++ postscript.patch ++++++
--- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:23.000000000 +0200
+++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:23.000000000 +0200
@@ -29,7 +29,7 @@
" setpagedevice\n" // Install settings
- "} if\n",
+ "} if\n"
-+ "%%%%EndFeature: *PageSize\n",
++ "%%%%EndFeature\n",
+ mPrintSetup->paper_name,
fpCString(NSTwipsToFloatPoints(paper_width)).get(),
fpCString(NSTwipsToFloatPoints(paper_height)).get());
++++++ print-properties.patch ++++++
Subject: Printer properties are not saved and displayed correctly
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=324072
https://bugzilla.novell.com/show_bug.cgi?id=174082
diff -p -u -d -8 -r1.4 nsIPrintSettingsService.idl
--- gfx/idl/nsIPrintSettingsService.idl 4 Mar 2006 16:37:11 -0000 1.4
+++ gfx/idl/nsIPrintSettingsService.idl 2 May 2006 22:59:39 -0000
@@ -67,17 +67,17 @@ interface nsIPrintSettingsService : nsIS
* then it should use "globalPrintSettings"
*
* Initializes the newPrintSettings from the default printer
*
*/
readonly attribute nsIPrintSettings newPrintSettings;
/**
- * The name of the default printer
+ * The name of the last printer used, or else the system default printer.
*/
readonly attribute wstring defaultPrinterName;
/**
* Initializes certain settings from the native printer into the PrintSettings
* if aPrinterName is null then it uses the default printer name if it can
* These settings include, but are not limited to:
* Page Orientation
@@ -85,28 +85,31 @@ interface nsIPrintSettingsService : nsIS
* Number of Copies
*/
void initPrintSettingsFromPrinter(in wstring aPrinterName, in nsIPrintSettings aPrintSettings);
/**
* Reads PrintSettings values from Prefs,
* the values to be read are indicated by the "flags" arg.
*
- * First it reads in the "generic" set of PrintSetings not associated with any printer
- * then it uses the PrinterName in the PrinterSettings to read any settings that were saved
+ * aPrintSettings should be initialized with the name of a printer. First
+ * it reads in the PrintSettings from the last print job. Then it uses the
+ * PrinterName in the PrinterSettings to read any settings that were saved
* just for that printer.
*
* aPS - PrintSettings to have its settings read
* aUsePrinterNamePrefix - indicates whether to use the printer name as a prefix
- * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the const values.
+ * aFlags - indicates which prefs to read, see nsIPrintSettings.idl for the
+ * const values.
*
* Items not read:
* startPageRange, endPageRange, scaling, printRange, title
* docURL, howToEnableFrameUI, isCancelled, printFrameTypeUsage
- * printFrameType, printSilent, shrinkToFit, numCopies
+ * printFrameType, printSilent, shrinkToFit, numCopies,
+ * printerName
*
*/
void initPrintSettingsFromPrefs(in nsIPrintSettings aPrintSettings, in boolean aUsePrinterNamePrefix, in unsigned long aFlags);
/**
* Writes PrintSettings values to Prefs,
* the values to be written are indicated by the "flags" arg.
*
Index: gfx/src/nsPrintOptionsImpl.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/Attic/nsPrintOptionsImpl.cpp,v
retrieving revision 1.76
diff -u -p -6 -r1.76 nsPrintOptionsImpl.cpp
--- gfx/src/nsPrintOptionsImpl.cpp 9 Aug 2005 01:35:48 -0000 1.76
+++ gfx/src/nsPrintOptionsImpl.cpp 10 May 2006 06:22:28 -0000
@@ -599,19 +599,12 @@ nsPrintOptions::ReadPrefs(nsIPrintSettin
if (GETSTRPREF(kPrintCommand, str)) {
aPS->SetPrintCommand(str.get());
DUMP_STR(kReadStr, kPrintCommand, str.get());
}
}
- if (aFlags & nsIPrintSettings::kInitSavePrinterName) {
- if (GETSTRPREF(kPrinterName, str)) {
- aPS->SetPrinterName(str.get());
- DUMP_STR(kReadStr, kPrinterName, str.get());
- }
- }
-
if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
if (GETBOOLPREF(kPrintToFile, &b)) {
aPS->SetPrintToFile(b);
DUMP_BOOL(kReadStr, kPrintToFile, b);
}
}
@@ -867,16 +860,18 @@ nsPrintOptions::WritePrefs(nsIPrintSetti
if (NS_SUCCEEDED(aPS->GetPrintCommand(&uStr))) {
DUMP_STR(kWriteStr, kPrintCommand, uStr);
WritePrefString(uStr, GetPrefName(kPrintCommand, aPrinterName));
}
}
- if (aFlags & nsIPrintSettings::kInitSavePrinterName) {
+ // Only the general version of this pref is saved
+ if ((aFlags & nsIPrintSettings::kInitSavePrinterName)
+ && aPrinterName.IsEmpty()) {
if (NS_SUCCEEDED(aPS->GetPrinterName(&uStr))) {
DUMP_STR(kWriteStr, kPrinterName, uStr);
- WritePrefString(uStr, GetPrefName(kPrinterName, aPrinterName));
+ WritePrefString(uStr, kPrinterName);
}
}
if (aFlags & nsIPrintSettings::kInitSavePrintToFile) {
if (NS_SUCCEEDED(aPS->GetPrintToFile(&b))) {
DUMP_BOOL(kWriteStr, kPrintToFile, b);
@@ -967,12 +962,18 @@ nsresult nsPrintOptions::_CreatePrintSet
{
// does not initially ref count
nsPrintSettings * printSettings = new nsPrintSettings();
NS_ENSURE_TRUE(printSettings, NS_ERROR_OUT_OF_MEMORY);
NS_ADDREF(*_retval = printSettings); // ref count
+
+ nsXPIDLString printerName;
+ nsresult rv = GetDefaultPrinterName(getter_Copies(printerName));
+ NS_ENSURE_SUCCESS(rv, rv);
+ (*_retval)->SetPrinterName(printerName.get());
+
(void)InitPrintSettingsFromPrefs(*_retval, PR_FALSE,
nsIPrintSettings::kInitSaveAll);
return NS_OK;
}
@@ -1005,12 +1006,38 @@ nsPrintOptions::GetDefaultPrinterName(PR
{
nsresult rv;
nsCOMPtr<nsIPrinterEnumerator> prtEnum = do_GetService(kPrinterEnumeratorCID,
&rv);
NS_ENSURE_SUCCESS(rv, rv);
+ // Look up the printer from the last print job
+ nsAutoString lastPrinterName;
+ ReadPrefString(kPrinterName, lastPrinterName);
+ if (!lastPrinterName.IsEmpty()) {
+ // Verify it's still a valid printer
+ PRUnichar **printers;
+ PRUint32 ctPrinters;
+ rv = prtEnum->EnumeratePrinters(&ctPrinters, &printers);
+ if (NS_SUCCEEDED(rv)) {
+ PRBool isValid = PR_FALSE;
+ for (PRUint32 ii = ctPrinters - 1; ii >= 0; --ii) {
+ if (lastPrinterName.Equals(printers[ii])) {
+ isValid = PR_TRUE;
+ break;
+ }
+ }
+ NS_FREE_XPCOM_ALLOCATED_POINTER_ARRAY(ctPrinters, printers);
+ if (isValid) {
+ *aDefaultPrinterName = ToNewUnicode(lastPrinterName);
+ return NS_OK;
+ }
+ }
+ }
+
+ // There is no last printer preference, or it doesn't name a valid printer.
+ // Return the default from the printer enumeration.
return prtEnum->GetDefaultPrinterName(aDefaultPrinterName);
}
NS_IMETHODIMP
nsPrintOptions::InitPrintSettingsFromPrinter(const PRUnichar *aPrinterName,
nsIPrintSettings *aPrintSettings)
@@ -1126,15 +1153,20 @@ nsPrintOptions::InitPrintSettingsFromPre
// with empty printer name
nsresult rv = ReadPrefs(aPS, prtName, aFlags);
NS_ENSURE_SUCCESS(rv, rv);
// Get the Printer Name from the PrintSettings
// to use as a prefix for Pref Names
- GetAdjustedPrinterName(aPS, aUsePNP, prtName);
- NS_ENSURE_FALSE(prtName.IsEmpty(), NS_OK);
+ rv = GetAdjustedPrinterName(aPS, aUsePNP, prtName);
+ NS_ENSURE_SUCCESS(rv, rv);
+ if (prtName.IsEmpty()) {
+ NS_WARNING("Caller should supply a printer name.");
+ return NS_OK;
+ }
+
// Now read any printer specific prefs
rv = ReadPrefs(aPS, prtName, aFlags);
if (NS_SUCCEEDED(rv))
aPS->SetIsInitializedFromPrefs(PR_TRUE);
return NS_OK;
++++++ seamonkey-source-1.0.tar.bz2 -> seamonkey-source-1.0.2.tar.bz2 ++++++
seamonkey/seamonkey-source-1.0.tar.bz2 seamonkey/seamonkey-source-1.0.2.tar.bz2 differ: char 11, line 1
++++++ system-nss.patch ++++++
++++ 5402 lines (skipped)
++++ between seamonkey/system-nss.patch
++++ and seamonkey/system-nss.patch
++++++ xul-picker.patch ++++++
--- /var/tmp/diff_new_pack.SZo2NK/_old 2006-06-02 13:18:24.000000000 +0200
+++ /var/tmp/diff_new_pack.SZo2NK/_new 2006-06-02 13:18:24.000000000 +0200
@@ -12,8 +12,8 @@
}
nsCOMPtr<nsIFilePicker> picker;
-- if (gtk_check_version(2,4,0) == NULL) {
-+ if ( (gtk_check_version(2,4,0) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) {
+- if (gtk_check_version(2,6,3) == NULL) {
++ if ( (gtk_check_version(2,6,3) == NULL) && !PR_GetEnv("MOZ_XUL_PICKER") ) {
picker = new nsFilePicker;
} else {
picker = do_CreateInstance(kXULFilePickerCID);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit-help@opensuse.org