Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory
checked in at Sat Jul 11 17:53:18 CEST 2009.
--------
--- seamonkey/seamonkey.changes 2009-04-11 20:53:33.000000000 +0200
+++ seamonkey/seamonkey.changes 2009-07-09 11:23:53.000000000 +0200
@@ -1,0 +2,20 @@
+Thu Jul 9 11:22:15 CEST 2009 - @rosenauer.org
+
+- update to 2.0a3-20090707 snapshot
+- define MOZ_APP_LAUNCHER for session management (bmo#453689)
+ (mozilla-app-launcher.patch and mozilla.sh.in)
+- move intl.locale.matchOS to distribution specific prefs
+ (removed locale.patch)
+- moved openSUSE specific prefs from greprefs to app prefs
+- added mozilla-jemalloc_deepbind.patch to fix various possible
+ crashes (bnc#503151, bmo#493541)
+- added seamonkey-no-update.patch to hide the update menu item
+
+-------------------------------------------------------------------
+Wed Jun 17 23:53:24 CEST 2009 - wr@rosenauer.org
+
+- major update to 2.0a3-20090617
+ * based on Gecko 1.9.1
+ * ported to Mozilla's toolkit
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
LEOPlugin_MN.zip
README.installed-chrome
abuild.patch
addon-certs.txt
autoconf.dif
canvas-xlibs.patch
cjk-postscript-fonts.dif
cups-paper.patch
disable-gconf.patch
freetype.dif
gnome-vfs.patch
list-replyto-clobber.patch
mips.patch
misc.dif
mozex.jar
mozilla-bookmarks.diff
mozilla-default-plugin-less-annoying.patch
mozilla-gcc4.3-fixes.patch
mozilla-make-package.pl
nss-opt.patch
packages-unix.patch
postscript.patch
prdtoa.patch
prefs.patch
rebuild-databases.sh.in
replytolist.patch
seamonkey-shared-nssdb.patch
seamonkey-source-1.1.16.tar.bz2
unused-includes.patch
xremote.patch
New:
----
find-external-requires.sh
mozilla-app-launcher.patch
mozilla-helper-app.patch
mozilla-jemalloc_deepbind.patch
mozilla-nongnome-proxies.patch
mozilla-restart-cmd.patch
mozilla-shared-nss-db.patch
mozilla-system-hunspell.patch.bz2
seamonkey-2.0a3-source.tar.bz2
seamonkey-no-update.patch
seamonkey-rpmlintrc
seamonkey-shared-nss-db.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
++++ 846 lines (skipped)
++++ between seamonkey/seamonkey.spec
++++ and seamonkey/seamonkey.spec
++++++ add-plugins.sh.in ++++++
--- /var/tmp/diff_new_pack.FBjPeK/_old 2009-07-11 17:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.FBjPeK/_new 2009-07-11 17:40:35.000000000 +0200
@@ -1,7 +1,5 @@
#! /bin/sh
-# Copyright (c) 2001 SuSE GmbH Nuernberg, Germany. All rights reserved.
-# 2002-2004 SuSE Linux AG, Nuernberg, Germany
-# 2005 SUSE LINUX Products GmbH, Nuernberg, Germany
+# Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved.
#
# check if we are started as root
@@ -12,10 +10,8 @@
fi
PREFIX="%PROGDIR"
-MOZ_APP="%APPNAME"
-
-# MySPELL
+# dictionaries
MYSPELL=/usr/share/myspell
MOZ_SPELL=$PREFIX/dictionaries
if [ -d $MOZ_SPELL ] ; then
++++++ find-external-requires.sh ++++++
#!/bin/sh
# Finds requirements provided outside of the current file set
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
provides=`echo "$filelist" | /usr/lib/rpm/find-provides`
{
for f in $filelist ; do
echo $f | /usr/lib/rpm/find-requires | while read req ; do
found=0
for p in $provides ; do
if [ "$req" = "$p" ]; then
found=1
fi
done
if [ "$found" = "0" ]; then
echo $req
fi
done
done
} | sort -u
++++++ mozilla-app-launcher.patch ++++++
From: mozilla-central
Subject: make it possible to define MOZILLA_APP_LAUNCHER to control which
app should be used for session management
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=453689
--- mozilla-1.9.1/toolkit/xre/nsNativeAppSupportUnix.cpp 2009-04-27 09:23:29.000000000 +0200
+++ mozilla-central/toolkit/xre/nsNativeAppSupportUnix.cpp 2009-07-07 12:55:10.000000000 +0200
@@ -155,31 +155,37 @@ gboolean save_yourself_cb(GnomeClient *c
interact_cb, nsnull);
return TRUE;
}
-
- // Tell GNOME the command for restarting us so that we can be part of XSMP session restore
- NS_ASSERTION(gDirServiceProvider, "gDirServiceProvider is NULL! This shouldn't happen!");
- nsCOMPtr<nsIFile> executablePath;
- nsresult rv;
-
- PRBool dummy;
- rv = gDirServiceProvider->GetFile(XRE_EXECUTABLE_FILE, &dummy, getter_AddRefs(executablePath));
-
- if (NS_SUCCEEDED(rv)) {
- nsCAutoString path;
- char* argv[1];
-
- // Strip off the -bin suffix to get the shell script we should run; this is what Breakpad does
- nsCAutoString leafName;
- rv = executablePath->GetNativeLeafName(leafName);
- if (NS_SUCCEEDED(rv) && StringEndsWith(leafName, NS_LITERAL_CSTRING("-bin"))) {
- leafName.SetLength(leafName.Length() - strlen("-bin"));
- executablePath->SetNativeLeafName(leafName);
+
+ // Is there a request to suppress default binary launcher?
+ char* argv1 = getenv("MOZ_APP_LAUNCHER");
+
+ if(!argv1) {
+ // Tell GNOME the command for restarting us so that we can be part of XSMP session restore
+ NS_ASSERTION(gDirServiceProvider, "gDirServiceProvider is NULL! This shouldn't happen!");
+ nsCOMPtr<nsIFile> executablePath;
+ nsresult rv;
+
+ PRBool dummy;
+ rv = gDirServiceProvider->GetFile(XRE_EXECUTABLE_FILE, &dummy, getter_AddRefs(executablePath));
+
+ if (NS_SUCCEEDED(rv)) {
+ nsCAutoString path;
+
+ // Strip off the -bin suffix to get the shell script we should run; this is what Breakpad does
+ nsCAutoString leafName;
+ rv = executablePath->GetNativeLeafName(leafName);
+ if (NS_SUCCEEDED(rv) && StringEndsWith(leafName, NS_LITERAL_CSTRING("-bin"))) {
+ leafName.SetLength(leafName.Length() - strlen("-bin"));
+ executablePath->SetNativeLeafName(leafName);
+ }
+
+ executablePath->GetNativePath(path);
+ argv1 = (char*)(path.get());
}
+ }
- executablePath->GetNativePath(path);
- argv[0] = (char*)(path.get());
-
- gnome_client_set_restart_command(client, 1, argv);
+ if(argv1) {
+ gnome_client_set_restart_command(client, 1, &argv1);
}
return TRUE;
++++++ mozilla-helper-app.patch ++++++
From: Wolfgang Rosenauer
Subject: no helper app for application/octet-stream but recognized extensions
References:
https://bugzilla.novell.com/show_bug.cgi?id=406979
https://bugzilla.mozilla.org/show_bug.cgi?id=327323
Index: uriloader/exthandler/nsMIMEInfoImpl.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/nsMIMEInfoImpl.cpp,v
retrieving revision 1.69
diff -u -p -6 -r1.69 nsMIMEInfoImpl.cpp
--- uriloader/exthandler/nsMIMEInfoImpl.cpp 19 Oct 2007 04:15:43 -0000 1.69
+++ uriloader/exthandler/nsMIMEInfoImpl.cpp 20 Aug 2008 15:45:32 -0000
@@ -408,13 +408,13 @@ nsMIMEInfoBase::LaunchWithURI(nsIURI* aU
}
void
nsMIMEInfoBase::CopyBasicDataTo(nsMIMEInfoBase* aOther)
{
aOther->mType = mType;
- aOther->mDefaultAppDescription = mDefaultAppDescription;
+ //aOther->mDefaultAppDescription = mDefaultAppDescription;
aOther->mExtensions = mExtensions;
aOther->mMacType = mMacType;
aOther->mMacCreator = mMacCreator;
}
Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
retrieving revision 1.74
diff -u -p -6 -r1.74 nsOSHelperAppService.cpp
--- uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Feb 2008 06:10:33 -0000 1.74
+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp 20 Aug 2008 15:45:33 -0000
@@ -1621,12 +1621,16 @@ nsOSHelperAppService::GetMIMEInfoFromOS(
return retval;
}
// Copy the attributes of retval onto miByExt, to return it
retval->CopyBasicDataTo(miByExt);
+ // But set the extensions primary since CopyBasicDataTo overwrites the
+ // list
+ if (!aFileExt.IsEmpty())
+ retval->SetPrimaryExtension(aFileExt);
miByExt.swap(retval);
}
return retval;
}
--- uriloader/exthandler/unix/nsMIMEInfoUnix.cpp.orig 2008-10-01 00:19:35.000000000 +0200
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp 2008-10-01 00:22:16.000000000 +0200
@@ -46,12 +46,13 @@
#include "nsMIMEInfoUnix.h"
#include "nsGNOMERegistry.h"
#include "nsIGnomeVFSService.h"
#ifdef MOZ_ENABLE_DBUS
#include "nsDBusHandlerApp.h"
#endif
+#include "nsAutoPtr.h"
nsresult
nsMIMEInfoUnix::LoadUriInternal(nsIURI * aURI)
{
nsresult rv = nsGNOMERegistry::LoadURL(aURI);
@@ -71,19 +72,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
}
NS_IMETHODIMP
nsMIMEInfoUnix::GetHasDefaultHandler(PRBool *_retval)
{
*_retval = PR_FALSE;
- nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (vfs) {
- nsCOMPtr<nsIGnomeVFSMimeApp> app;
- if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
- *_retval = PR_TRUE;
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromType(mType);
+ if (!mimeInfo) {
+ nsCAutoString ext;
+ GetPrimaryExtension(ext);
+ mimeInfo = nsGNOMERegistry::GetFromExtension(ext);
}
+ if (mimeInfo)
+ *_retval = PR_TRUE;
+
if (*_retval)
return NS_OK;
#ifdef MOZ_PLATFORM_HILDON
HildonURIAction *action = hildon_uri_get_default_action(mType.get(), nsnull);
if (action) {
@@ -106,12 +110,22 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
nsCOMPtr<nsIGnomeVFSService> vfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (vfs) {
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(vfs->GetAppForMimeType(mType, getter_AddRefs(app))) && app)
return app->Launch(nativePath);
+
+ // If we haven't got an app we try to get a valid one by searching for the
+ // extension mapped type
+ nsRefPtr<nsMIMEInfoBase> mimeInfo = nsGNOMERegistry::GetFromExtension(nativePath);
+ if (mimeInfo) {
+ nsCAutoString type;
+ mimeInfo->GetType(type);
+ if (NS_SUCCEEDED(vfs->GetAppForMimeType(type, getter_AddRefs(app))) && app)
+ return app->Launch(nativePath);
+ }
}
if (!mDefaultApplication)
return NS_ERROR_FILE_NOT_FOUND;
return LaunchWithIProcess(mDefaultApplication, nativePath);
++++++ mozilla-jemalloc_deepbind.patch ++++++
From: Karl Tomlinson
Subject: jemalloc integration cause crashes when libraries or plugins dlopen with RTLD_DEEPBIND
References:
https://bugzilla.mozilla.org/show_bug.cgi?id=493541
https://bugzilla.novell.com/show_bug.cgi?id=503151
diff --git a/memory/jemalloc/jemalloc.c b/memory/jemalloc/jemalloc.c
--- a/memory/jemalloc/jemalloc.c
+++ b/memory/jemalloc/jemalloc.c
@@ -7225,8 +7225,37 @@ jemalloc_darwin_init(void)
* default zone.
*/
assert(malloc_num_zones > 1);
memmove(&malloc_zones[1], &malloc_zones[0],
sizeof(malloc_zone_t *) * (malloc_num_zones - 1));
malloc_zones[0] = &zone;
}
#endif
+
+#ifdef HAVE_LIBDL
+# include
+/*
+ * glibc provides the RTLD_DEEPBIND flag for dlopen which can make it possible
+ * to inconsistently reference libc's malloc(3)-compatible functions
+ * (bug 493541).
+ *
+ * XXX On systems that support RTLD_GROUP or DF_1_GROUP, do their
+ * implementations permit similar inconsistencies? Should STV_SINGLETON
+ * visibility be used for interposition where available?
+ */
+# ifdef RTLD_DEEPBIND
+# if defined(__GLIBC__) && !defined(__UCLIBC__)
+
+/*
+ * These interpose hooks in glibc. They are actually passed an extra
+ * argument for the caller return address, which will be ignored.
+ */
+void (*__free_hook)(void *ptr) = free;
+void *(*__malloc_hook)(size_t size) = malloc;
+void *(*__realloc_hook)(void *ptr, size_t size) = realloc;
+void *(*__memalign_hook)(size_t alignment, size_t size) = memalign;
+
+# elif !defined(malloc)
+# error "Interposing malloc is unsafe on this system without libc malloc hooks."
+# endif
+# endif
+#endif
++++++ mozilla-nongnome-proxies.patch ++++++
Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v
retrieving revision 1.1
diff -u -p -6 -r1.1 nsUnixSystemProxySettings.cpp
--- toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 29 Jan 2008 15:58:41 -0000 1.1
+++ toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000
@@ -69,13 +69,19 @@ private:
NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings)
nsresult
nsUnixSystemProxySettings::Init()
{
- mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+ // If this is a GNOME session, load gconf and try to use its preferences.
+ // If gconf is not available (which would be stupid) we'll proceed as if
+ // this was not a GNOME session, using *_PROXY environment variables.
+ const char* sessionType = PR_GetEnv("DESKTOP_SESSION");
+ if (sessionType && !strcmp(sessionType, "gnome")) {
+ mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
+ }
return NS_OK;
}
PRBool
nsUnixSystemProxySettings::IsProxyMode(const char* aMode)
{
++++++ mozilla-path_len.patch ++++++
--- /var/tmp/diff_new_pack.FBjPeK/_old 2009-07-11 17:40:35.000000000 +0200
+++ /var/tmp/diff_new_pack.FBjPeK/_new 2009-07-11 17:40:35.000000000 +0200
@@ -81,19 +81,6 @@
#endif
#include
-diff -up mozilla/js/src/jsfile.c.old mozilla/js/src/jsfile.c
---- mozilla/js/src/jsfile.c.old 2006-07-26 20:55:08.000000000 +0200
-+++ mozilla/js/src/jsfile.c 2007-09-25 18:22:52.000000000 +0200
-@@ -105,7 +105,8 @@
- #define utfstring "binary"
- #define unicodestring "unicode"
-
--#define MAX_PATH_LENGTH 1024
-+#include
-+#define MAX_PATH_LENGTH PATH_MAX
- #define MODE_SIZE 256
- #define NUMBER_SIZE 32
- #define MAX_LINE_LENGTH 256
diff -up mozilla/xpcom/typelib/xpidl/xpidl_java.c.old mozilla/xpcom/typelib/xpidl/xpidl_java.c
--- mozilla/xpcom/typelib/xpidl/xpidl_java.c.old 2007-09-25 18:38:52.000000000 +0200
+++ mozilla/xpcom/typelib/xpidl/xpidl_java.c 2007-09-25 18:39:17.000000000 +0200
++++++ mozilla-restart-cmd.patch ++++++
From: Wolfgang Rosenauer
Subject: Set the correct restart command for session managers
References:
https://bugzilla.novell.com/show_bug.cgi?id=396552
Index: toolkit/xre/nsNativeAppSupportUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp,v
retrieving revision 1.5
diff -u -p -6 -r1.5 nsNativeAppSupportUnix.cpp
--- toolkit/xre/nsNativeAppSupportUnix.cpp 21 Feb 2008 10:55:06 -0000 1.5
+++ toolkit/xre/nsNativeAppSupportUnix.cpp 4 Jun 2008 16:04:51 -0000
@@ -156,18 +156,32 @@ gboolean save_yourself_cb(GnomeClient *c
rv = gDirServiceProvider->GetFile(XRE_EXECUTABLE_FILE, &dummy, getter_AddRefs(executablePath));
if (NS_SUCCEEDED(rv)) {
nsCAutoString path;
char* argv[1];
- // Strip off the -bin suffix to get the shell script we should run; this is what Breakpad does
nsCAutoString leafName;
rv = executablePath->GetNativeLeafName(leafName);
- if (NS_SUCCEEDED(rv) && StringEndsWith(leafName, NS_LITERAL_CSTRING("-bin"))) {
- leafName.SetLength(leafName.Length() - strlen("-bin"));
- executablePath->SetNativeLeafName(leafName);
+ if (NS_SUCCEEDED(rv)) {
+ if (StringEndsWith(leafName, NS_LITERAL_CSTRING("-bin"))) {
+ // Strip off the -bin suffix to get the shell script we should run; this is what Breakpad does
+ leafName.SetLength(leafName.Length() - strlen("-bin"));
+ executablePath->SetNativeLeafName(leafName);
+ } else {
+ // It's most likely a xulapp so check if leafName.sh is executable
+ // and use that instead of plain xulrunner stub
+ PRBool exec;
+ nsCOMPtr<nsIFile> tempPath;
+ executablePath->Clone(getter_AddRefs(tempPath));
+ leafName.Append(NS_LITERAL_CSTRING(".sh"));
+ tempPath->SetNativeLeafName(leafName);
+ tempPath->IsExecutable(&exec);
+ if (exec) {
+ executablePath->SetNativeLeafName(leafName);
+ }
+ }
}
executablePath->GetNativePath(path);
argv[0] = (char*)(path.get());
gnome_client_set_restart_command(client, 1, argv);
++++++ mozilla-shared-nss-db.patch ++++++
From: Hans Petter Jansson
Wolfgang Rosenauer
Subject: use libnsssharedhelper if available at compile time
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
References:
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -535,6 +535,10 @@ LIBIDL_LIBS = @LIBIDL_LIBS@
LIBIDL_LIBS = @LIBIDL_LIBS@
STATIC_LIBIDL = @STATIC_LIBIDL@
+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
+NSSHELPER_LIBS = @NSSHELPER_LIBS@
+
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
# Used for LD_LIBRARY_PATH
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -7613,6 +7613,21 @@ dnl ====================================
QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)'
AC_SUBST(QCMS_LIBS)
+
+dnl ========================================================
+dnl Check for nss-shared-helper
+dnl ========================================================
+
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
+ [MOZ_ENABLE_NSSHELPER=1],
+ [MOZ_ENABLE_NSSHELPER=])
+
+if test "$MOZ_ENABLE_NSSHELPER"; then
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER)
+fi
+AC_SUBST(MOZ_ENABLE_NSSHELPER)
+AC_SUBST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS)
dnl ========================================================
dnl disable xul
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in
@@ -137,12 +137,13 @@ DEFINES += -DNSS_ENABLE_ECC
# Use local includes because they are inserted before INCLUDES
# so that Mozilla's nss.h is used, not glibc's
-LOCAL_INCLUDES += $(NSS_CFLAGS)
+LOCAL_INCLUDES += $(NSS_CFLAGS) $(NSSHELPER_CFLAGS)
EXTRA_DSO_LDOPTS += \
$(MOZ_UNICHARUTIL_LIBS) \
$(MOZ_COMPONENT_LIBS) \
$(MOZ_JS_LIBS) \
+ $(NSSHELPER_LIBS) \
$(NSS_LIBS) \
$(NULL)
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
--- a/security/manager/ssl/src/nsNSSComponent.cpp
+++ b/security/manager/ssl/src/nsNSSComponent.cpp
@@ -43,6 +43,13 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
+
+#ifdef MOZ_ENABLE_NSSHELPER
+#pragma GCC visibility push(default)
+#include
+#pragma GCC visibility pop
+#include "prenv.h"
+#endif
#include "nsNSSComponent.h"
#include "nsNSSCallbacks.h"
@@ -1602,7 +1609,21 @@ nsNSSComponent::InitializeNSS(PRBool sho
ConfigureInternalPKCS11Token();
- SECStatus init_rv = ::NSS_InitReadWrite(profileStr.get());
+ SECStatus init_rv = SECFailure;
+#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_SM_NO_NSSHELPER")) {
+ init_rv = ::NSS_InitReadWrite(profileStr.get());
+ } else {
+ init_rv = ::nsshelp_open_db ("SeaMonkey", profileStr.get(), 0);
+
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
+ init_rv = ::NSS_InitReadWrite(profileStr.get());
+ }
+ }
+#else
+ init_rv = ::NSS_InitReadWrite(profileStr.get());
+#endif
if (init_rv != SECSuccess) {
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get()));
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -194,7 +194,7 @@ endif
DEFINES += -DIMPL_XREAPI
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS)
+EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(NSSHELPER_LIBS)
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CXXFLAGS += $(TK_CFLAGS)
++++++ mozilla-system-hunspell.patch.bz2 ++++++
++++ 36980 lines (skipped)
++++++ mozilla.sh.in ++++++
--- /var/tmp/diff_new_pack.FBjPeK/_old 2009-07-11 17:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.FBjPeK/_new 2009-07-11 17:40:36.000000000 +0200
@@ -1,30 +1,47 @@
#!/bin/sh
#
-# The contents of this file are subject to the Netscape Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/NPL/
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
#
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation. Portions created by Netscape are
-# Copyright (C) 1998 Netscape Communications Corporation. All
-# Rights Reserved.
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org Code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1998
+# the Initial Developer. All Rights Reserved.
#
# Contributor(s):
# Wolfgang Rosenauer
+#
#
+# 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
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
##
## Usage:
##
-## $ mozilla
+## $ mozilla [args]
##
## This script is meant to run a mozilla program from the mozilla
## rpm installation.
@@ -40,9 +57,9 @@
MOZ_DIST_BIN="%PREFIX"
MOZ_DIST_LIB="%PROGDIR"
MOZ_APPNAME="%APPNAME"
-MOZ_PROFILE="%PROFILE"
MOZ_PROGRAM="$MOZ_DIST_LIB/$MOZ_APPNAME-bin"
-MOZ_CLIENT_PROGRAM="$MOZ_DIST_LIB/mozilla-xremote-client -a $MOZ_APPNAME"
+
+export MOZ_APP_LAUNCHER="$MOZ_DIST_LIB/$MOZ_APPNAME.sh"
mozilla_lib=`file $MOZ_PROGRAM`
LIB=lib
@@ -50,19 +67,13 @@
BROWSER_PLUGIN_DIR=/usr/$LIB/browser-plugins
if [ ! -d $BROWSER_PLUGIN_DIR ]; then
- BROWSER_PLUGIN_DIR=/opt/netscape/plugins
+ BROWSER_PLUGIN_DIR=/opt/netscape/plugins
fi
-# AOSS
-AOSS=$(which aoss)
-
-# enigmail should honor env
-export ENIGMAIL_PASS_ENV=http_proxy
-
-# Force use of GTK+ 2.0 for Flash player to get better performance
-# (no impact when using mozilla gtk1 build
-#
-export FLASH_GTK_LIBRARY=libgtk-x11-2.0.so.0
+MOZILLA_FIVE_HOME="$MOZ_DIST_LIB"
+export MOZILLA_FIVE_HOME
+LD_LIBRARY_PATH=$MOZ_DIST_LIB:$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH
# ignore composite extension (needed for Flash)
export XLIB_SKIP_ARGB_VISUALS=1
@@ -70,48 +81,9 @@
# needed for SUN Java under Xorg >= 7.2
export LIBXCB_ALLOW_SLOPPY_LOCK=1
-# Pango support
-if [ -z "$MOZ_ENABLE_PANGO" -a -z "$MOZ_DISABLE_PANGO" ]; then
- case "${LC_ALL-${LC_CTYPE-${LANG-en_US}}}" in
- bn*|gu*|hi*|ja*|km*|kn*|ml*|mr*|pa*|ta*|te*) # list of languages which need pango
- ;;
- *)
- export MOZ_DISABLE_PANGO=1 # disable by default
- ;;
- esac
-fi
-
-if [ -z "$MOZ_DEBUG" ]; then
- DEBUG=0
-else
- DEBUG=$MOZ_DEBUG
-fi
-
-##
-## Set MOZILLA_FIVE_HOME
-##
-MOZILLA_FIVE_HOME="$MOZ_DIST_LIB"
-export MOZILLA_FIVE_HOME
-
-##
-## Set LD_LIBRARY_PATH
-##
-if [ "$LD_LIBRARY_PATH" ]
-then
- LD_LIBRARY_PATH=$MOZ_DIST_LIB/plugins:$MOZ_DIST_LIB:$LD_LIBRARY_PATH
-else
- LD_LIBRARY_PATH=$MOZ_DIST_LIB/plugins:$MOZ_DIST_LIB
-fi
-export LD_LIBRARY_PATH
-
-## Make sure that we set the plugin path for backwards compatibility
-## Set MOZ_PLUGIN_PATH to $HOME/.mozilla/plugins if not set
##
if [ -z "$MOZ_PLUGIN_PATH" ]; then
- export MOZ_PLUGIN_PATH=$MOZILLA_FIVE_HOME/plugins:$BROWSER_PLUGIN_DIR
- if [ "$HOME" ] ; then
- export MOZ_PLUGIN_PATH=$HOME/$MOZ_PROFILE/plugins:$MOZ_PLUGIN_PATH
- fi
+ export MOZ_PLUGIN_PATH=$BROWSER_PLUGIN_DIR
else
# make sure that BROWSER_PLUGIN_DIR is in MOZ_PLUGIN_PATH
echo "$MOZ_PLUGIN_PATH" | grep "$BROWSER_PLUGIN_DIR" 2>&1 >/dev/null
@@ -121,210 +93,41 @@
fi
fi
-##
-## Autodetect UI language
-##
-grep -q $HOME/$MOZ_PROFILE $HOME/$MOZ_PROFILE/appreg > /dev/null 2>/dev/null
-SET_LANG=$?
-if [ "$HOME" -a "$LANG" -a "$SET_LANG" != "0" -a -r "$MOZILLA_FIVE_HOME/chrome/locale.alias" ]; then
- MOZ_LANG=`grep -E "^$LANG[[:space:]]" $MOZILLA_FIVE_HOME/chrome/locale.alias | tr -s "[:blank:]" | cut -d' ' -f 2`
- MOZ_LOC=${MOZ_LANG#*-}
- for i in "$@";do
- [ "$i" = "-UILocale" ] && MOZ_LANG=""
- done
- if [ "$MOZ_LANG" -a -r "$MOZILLA_FIVE_HOME/chrome/$MOZ_LANG.jar" ]; then
- MOZ_LANG="-UILocale $MOZ_LANG -ContentLocale $MOZ_LOC"
- else
- unset MOZ_LANG
- fi
-fi
-
-bail ()
-{
- ## Stop addon scripts
- moz_pis_startstop_scripts "stop"
- exit "$1"
-}
-
-
-function check_running() {
- # this should only check for instances on the same display
- # as long a --display is not used
- RETURN_VAL=2
- if [ -n "$X_DISPLAY" -o ${DISPLAY:0:1} = ":" ] ; then
- $MOZ_CLIENT_PROGRAM $X_DISPLAY 'ping()' 2>/dev/null >/dev/null
- RETURN_VAL=$?
- fi
-
- if [ $RETURN_VAL -eq 2 ]; then
- # not running
- echo 0
- return 0
- elif [ $RETURN_VAL -eq 1 ]; then
- # DISPLAY unusable
- echo 2
- return 2
- else
- # running
- echo 1
- return 1
- fi
-}
-
-function open_mail() {
- if [ ${ALREADY_RUNNING} -eq 1 ]; then
- $MOZ_CLIENT_PROGRAM $X_DISPLAY 'xfeDoCommand(openInbox)'
- bail $?
- else
- $AOSS $MOZ_PROGRAM $MOZ_LANG "$@"
- bail $?
- fi
-}
-
-function open_compose() {
- if [ ${ALREADY_RUNNING} -eq 1 ]; then
- MAILTO=`echo $2 | awk 'BEGIN{FS=":"} $1 ~ /mailto/ {print $2}'`
- $MOZ_CLIENT_PROGRAM $X_DISPLAY "mailto($MAILTO)"
- bail $?
- else
- $AOSS $MOZ_PROGRAM $MOZ_LANG "$@"
- bail $?
- fi
-}
-
-moz_pis_startstop_scripts()
-{
- MOZ_USER_DIR="$MOZ_PROFILE"
- # MOZ_PIS_ is the name space for "Mozilla Plugable Init Scripts"
- # These variables and there meaning are specified in
- # mozilla/xpfe/bootstrap/init.d/README
- MOZ_PIS_API=2
- MOZ_PIS_MOZBINDIR="$MOZ_DIST_LIB"
- MOZ_PIS_SESSION_PID="$$"
- MOZ_PIS_USER_DIR="${MOZ_USER_DIR}"
- export MOZ_PIS_API MOZ_PIS_MOZBINDIR MOZ_PIS_SESSION_PID MOZ_PIS_USER_DIR
-
- case "${1}" in
- "start")
- for curr_pis in "$MOZ_DIST_LIB/init.d"/S* "${HOME}/${MOZ_USER_DIR}/init.d"/S* ; do
- if [ -x "${curr_pis}" ] ; then
- case "${curr_pis}" in
- *.sh) . "${curr_pis}" ;;
- *) "${curr_pis}" "start" ;;
- esac
- fi
- done
- ;;
- "stop")
- for curr_pis in "${HOME}/${MOZ_USER_DIR}/init.d"/K* "$MOZ_DIST_LIB/init.d"/K* ; do
- if [ -x "${curr_pis}" ] ; then
- case "${curr_pis}" in
- *.sh) . "${curr_pis}" ;;
- *) "${curr_pis}" "stop" ;;
- esac
- fi
- done
+moz_debug=0
+script_args=""
+pass_arg_count=0
+while [ $# -gt $pass_arg_count ]
+do
+ case "$1" in
+ -d | --debugger)
+ moz_debugger=$2;
+ if [ "${moz_debugger}" != "" ]; then
+ shift 2
+ moz_debug=1
+ else
+ echo "-d requires an argument"
+ exit 1
+ fi
;;
*)
- echo 1>&2 "$0: Internal error in moz_pis_startstop_scripts."
- exit 1
+ # Move the unrecognized argument to the end of the list.
+ arg="$1"
+ shift
+ set -- "$@" "$arg"
+ pass_arg_count=`expr $pass_arg_count + 1`
;;
esac
-}
-
-# check if there is any --display parameter in commandline
-[ "$1" = "--display" ] && X_DISPLAY="--display $2"
-[ "$1" = "-display" ] && X_DISPLAY="--display $2"
-
-# check to see if there's an already running instance or not
-ALREADY_RUNNING=`check_running`
-
-if [ ${ALREADY_RUNNING} -eq 2 ]; then
- echo "DISPLAY empty or unusable"
- echo "DISPLAY=$DISPLAY"
- exit 1
-fi
-
-# debugging output
-if [ $DEBUG -ne 0 ]; then
- echo "DEBUG:"
- echo " MOZ_APPNAME=$MOZ_APPNAME"
- echo " MOZ_PROFILE=$MOZ_PROFILE"
- echo "MOZILLA_FIVE_HOME=$MOZILLA_FIVE_HOME"
- echo " LD_LIBRARY_PATH=$LD_LIBRARY_PATH"
- echo " DISPLAY=$DISPLAY"
- echo " FONTCONFIG_PATH=$FONTCONFIG_PATH"
- echo " MOZ_LANG=$MOZ_LANG"
- [ ${ALREADY_RUNNING} -eq 1 ] && \
- echo "could use an already running Mozilla"
-fi
-
-## Start addon scripts
-moz_pis_startstop_scripts "start"
+done
-# If there is no command line argument at all then try to open a new
-# window in an already running instance.
-if [ ${ALREADY_RUNNING} -eq 1 ] && [ -z "$1" ]; then
- $MOZ_CLIENT_PROGRAM $X_DISPLAY "xfeDoCommand(openBrowser)"
- bail $?
-fi
-
-# if there's no command line argument and there's not a running
-# instance then just fire up a new copy of the browser
-if [ -z "$1" ]; then
- $AOSS $MOZ_PROGRAM $MOZ_LANG
- bail $?
-fi
-
-unset RETURN_VAL
-
-# If there's a command line argument but it doesn't begin with a -
-# it's probably a url. Try to send it to a running instance.
-
-USE_EXIST=0
-opt="$1"
-case "$opt" in
- -mail)
- open_mail ${1+"$@"}
- ;;
- -compose)
- open_compose ${1+"$@"}
- ;;
- -*) ;;
- *) USE_EXIST=1 ;;
-esac
-
-if [ ${USE_EXIST} -eq 1 ] && [ ${ALREADY_RUNNING} -eq 1 ]; then
- # check to make sure that the command contains at least a :/ in it.
- echo $opt | grep -e ':/' 2>/dev/null > /dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -eq 1 ]; then
- # if it doesn't begin with a '/' and it exists when the pwd is
- # prepended to it then append the full path
- echo $opt | grep -e '^/' 2>/dev/null > /dev/null
- RETURN_VAL=$?
- if [ ${RETURN_VAL} -ne 0 ] && [ -e "`pwd`/$opt" ]; then
- opt="`pwd`/$opt"
- fi
- fi
- $MOZ_CLIENT_PROGRAM $X_DISPLAY "openurl($opt)" || \
- $AOSS $MOZ_PROGRAM $MOZ_LANG "$opt"
- bail $?
-fi
-
-if [ ${USE_EXIST} -eq 1 ]; then
- echo $opt | grep -e ':/' 2>/dev/null > /dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -eq 1 ]; then
- echo $opt | grep -e '^/' 2>/dev/null > /dev/null
- RETURN_VAL=$?
- if [ $RETURN_VAL -ne 0 ] && [ -e "`pwd`/$opt" ]; then
- opt="`pwd`/$opt"
- fi
- fi
- $AOSS $MOZ_PROGRAM $MOZ_LANG "$opt"
- bail $?
+if [ $moz_debug -eq 1 ]; then
+ tmpfile=`mktemp /tmp/mozargs.XXXXXX` || { echo "Cannot create temporary file" >&2; exit 1; }
+ trap " [ -f \"$tmpfile\" ] && /bin/rm -f -- \"$tmpfile\"" 0 1 2 3 13 15
+ echo -e "set args ${1+"$@"}\nrun" > $tmpfile
+ echo "$moz_debugger $MOZ_PROGRAM -x $tmpfile"
+ $moz_debugger "$MOZ_PROGRAM" -x $tmpfile
else
- $MOZ_PROGRAM $MOZ_LANG ${1+"$@"}
- bail $?
+ $MOZ_PROGRAM "$@"
fi
+exitcode=$?
+
+exit $exitcode
++++++ seamonkey-desktop.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seamonkey-composer.desktop new/seamonkey-composer.desktop
--- old/seamonkey-composer.desktop 2006-03-16 13:42:57.000000000 +0100
+++ new/seamonkey-composer.desktop 2009-06-17 23:58:14.000000000 +0200
@@ -1,9 +1,8 @@
[Desktop Entry]
Name=SeaMonkey Composer
GenericName=Web Page Creation
-Comment=Compose a Mail Message with SeaMonkey
+Comment=Create web pages with SeaMonkey
Exec=seamonkey -edit
-#Icon=seamonkey-composer
Icon=seamonkey
-Terminal=0
+Terminal=false
Type=Application
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/seamonkey-mail.desktop new/seamonkey-mail.desktop
--- old/seamonkey-mail.desktop 2006-03-16 13:42:45.000000000 +0100
+++ new/seamonkey-mail.desktop 2009-06-17 23:58:42.000000000 +0200
@@ -3,7 +3,6 @@
GenericName=Mail Client
Comment=Read Mail with SeaMonkey
Exec=seamonkey -mail
-#Icon=seamonkey-mail
Icon=seamonkey
-Terminal=0
+Terminal=false
Type=Application
++++++ seamonkey-no-update.patch ++++++
diff --git a/suite/common/utilityOverlay.js b/suite/common/utilityOverlay.js
--- a/suite/common/utilityOverlay.js
+++ b/suite/common/utilityOverlay.js
@@ -671,7 +671,13 @@ function updateCheckUpdatesItem()
// administrator or if we cannot update for some other reason.
var checkForUpdates = document.getElementById("checkForUpdates");
var canUpdate = updates.canUpdate;
+ var prefs = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch);
+ var updateEnabled = prefs.getBoolPref("app.update.enabled", true);
checkForUpdates.setAttribute("disabled", !canUpdate);
+ checkForUpdates.setAttribute("hidden", !canUpdate || !updateEnabled);
+ var updateSeparator = document.getElementById("menu_HelpUpdatesSeparator");
+ updateSeparator.setAttribute("hidden", !canUpdate || !updateEnabled);
if (!canUpdate)
return;
++++++ seamonkey-rpmlintrc ++++++
addFilter("no-jar-manifest")
++++++ seamonkey-shared-nss-db.patch ++++++
From: Hans Petter Jansson
Wolfgang Rosenauer
Subject: use libnsssharedhelper if available at compile time
(can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1)
References:
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.464
diff -u -p -6 -r3.464 autoconf.mk.in
--- config/autoconf.mk.in 18 Sep 2008 22:00:51 -0000 3.464
+++ config/autoconf.mk.in 19 Nov 2008 10:12:46 -0000
@@ -532,12 +532,16 @@ GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@
LIBIDL_CFLAGS = @LIBIDL_CFLAGS@
LIBIDL_LIBS = @LIBIDL_LIBS@
STATIC_LIBIDL = @STATIC_LIBIDL@
+MOZ_ENABLE_NSSHELPER = @MOZ_ENABLE_NSSHELPER@
+NSSHELPER_CFLAGS = @NSSHELPER_CFLAGS@
+NSSHELPER_LIBS = @NSSHELPER_LIBS@
+
MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@
# Used for LD_LIBRARY_PATH
LIBS_PATH = @LIBS_PATH@
MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@
--- suite/app/Makefile.in.orig 2009-02-26 11:46:49.000000000 +0100
+++ suite/app/Makefile.in 2009-02-26 11:47:05.000000000 +0100
@@ -106,6 +106,7 @@
$(EXTRA_DSO_LIBS) \
$(APP_XPCOM_LIBS) \
$(NSPR_LIBS) \
+ $(NSSHELPER_LIBS) \
$(TK_LIBS) \
$(NULL)
--- configure.in.orig 2009-05-13 16:11:10.000000000 +0200
+++ configure.in 2009-05-13 16:22:54.000000000 +0200
@@ -7028,6 +7028,21 @@
AC_SUBST(QCMS_LIBS)
dnl ========================================================
+dnl Check for nss-shared-helper
+dnl ========================================================
+
+ PKG_CHECK_MODULES(NSSHELPER, nss-shared-helper,
+ [MOZ_ENABLE_NSSHELPER=1],
+ [MOZ_ENABLE_NSSHELPER=])
+
+if test "$MOZ_ENABLE_NSSHELPER"; then
+ AC_DEFINE(MOZ_ENABLE_NSSHELPER)
+fi
+AC_SUBST(MOZ_ENABLE_NSSHELPER)
+AC_SUBST(NSSHELPER_CFLAGS)
+AC_SUBST(NSSHELPER_LIBS)
+
+dnl ========================================================
dnl disable xul
dnl ========================================================
MOZ_ARG_DISABLE_BOOL(xul,
++++++ suse-default-prefs.js ++++++
--- /var/tmp/diff_new_pack.FBjPeK/_old 2009-07-11 17:40:36.000000000 +0200
+++ /var/tmp/diff_new_pack.FBjPeK/_new 2009-07-11 17:40:36.000000000 +0200
@@ -1,12 +1,13 @@
pref("general.useragent.vendor", "SUSE");
pref("general.useragent.vendorSub", "RPM_VERSION");
+pref("app.update.enabled", false);
pref("browser.display.use_system_colors", true);
pref("browser.startup.homepage_override.mstone", "ignore");
pref("general.smoothScroll", true);
-pref("network.protocol-handler.app.rtsp", "/usr/bin/realplay");
pref("font.default", "sans-serif");
pref("network.negotiate-auth.gsslib", "GSSAPI");
pref("print.print_edge_top", 14); // 1/100 of an inch
pref("print.print_edge_left", 16); // 1/100 of an inch
pref("print.print_edge_right", 16); // 1/100 of an inch
pref("print.print_edge_bottom", 14); // 1/100 of an inch
+pref("intl.locale.matchOS", true);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org