Mailinglist Archive: opensuse-commit (1130 mails)
| < Previous | Next > |
commit seamonkey for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 16 Aug 2011 14:28:58 +0200
- Message-id: <20110816122858.D105720230@hilbert.suse.de>
Hello community,
here is the log from the commit of package seamonkey for openSUSE:Factory
checked in at Tue Aug 16 14:28:58 CEST 2011.
--------
--- seamonkey/seamonkey.changes 2011-07-08 13:35:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/seamonkey/seamonkey.changes 2011-08-15
13:32:47.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Aug 15 10:17:55 UTC 2011 - wr@xxxxxxxxxxxxx
+
+- update to version 2.3 (bnc#711954)
+ * Gecko 6
+ * removed obsolete mozilla-gio.patch
+ including security fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
l10n-2.2.tar.bz2
mozilla-gio.patch
seamonkey-2.2-source.tar.bz2
New:
----
l10n-2.3.tar.bz2
seamonkey-2.3-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ seamonkey.spec ++++++
--- /var/tmp/diff_new_pack.6V00dK/_old 2011-08-16 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.6V00dK/_new 2011-08-16 14:28:31.000000000 +0200
@@ -23,9 +23,9 @@
BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel
libgnomeui-devel libidl-devel libiw-devel libnotify-devel libproxy-devel
nss-shared-helper-devel python startup-notification-devel unzip
update-desktop-files yasm zip
License: MPLv1.1 or GPLv2+ or LGPLv2+
Provides: web_browser
-Version: 2.2
+Version: 2.3
Release: 1
-%define releasedate 2011070800
+%define releasedate 2011081500
Summary: The successor of the Mozilla Application Suite
Url: http://www.mozilla.org/projects/seamonkey
Group: Productivity/Networking/Web/Browsers
@@ -45,7 +45,6 @@
Patch3: mozilla-shared-nss-db.patch
Patch4: mozilla-cairo-lcd.patch
Patch5: mozilla-language.patch
-Patch6: mozilla-gio.patch
Patch7: mozilla-cairo-return.patch
Patch8: mozilla-ntlm-full-path.patch
Patch10: mozilla-ua-locale.patch
@@ -149,7 +148,6 @@
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch10 -p1
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.6V00dK/_old 2011-08-16 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.6V00dK/_new 2011-08-16 14:28:31.000000000 +0200
@@ -1,8 +1,8 @@
#!/bin/bash
BRANCH="releases/comm-release"
-RELEASE_TAG="SEAMONKEY_2_2_RELEASE"
-VERSION="2.2"
+RELEASE_TAG="SEAMONKEY_2_3_RELEASE"
+VERSION="2.3"
echo "cloning $BRANCH..."
hg clone http://hg.mozilla.org/$BRANCH seamonkey
++++++ l10n-2.2.tar.bz2 -> l10n-2.3.tar.bz2 ++++++
seamonkey/l10n-2.2.tar.bz2
/mounts/work_src_done/STABLE/seamonkey/l10n-2.3.tar.bz2 differ: char 11, line 1
++++++ mozilla-prefer_plugin_pref.patch ++++++
--- /var/tmp/diff_new_pack.6V00dK/_old 2011-08-16 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.6V00dK/_new 2011-08-16 14:28:31.000000000 +0200
@@ -1,54 +1,55 @@
From: Ubuntu
Subject: introduce a pref to prefer certain plugins for mime-types
-diff --git a/modules/plugin/base/src/nsPluginHost.cpp
b/modules/plugin/base/src/nsPluginHost.cpp
---- a/modules/plugin/base/src/nsPluginHost.cpp
-+++ b/modules/plugin/base/src/nsPluginHost.cpp
-@@ -1620,17 +1620,47 @@ nsPluginHost::FindPluginForType(const ch
- nsPluginTag *plugins = nsnull;
- PRInt32 variants, cnt;
+diff --git a/dom/plugins/base/nsPluginHost.cpp
b/dom/plugins/base/nsPluginHost.cpp
+--- a/dom/plugins/base/nsPluginHost.cpp
++++ b/dom/plugins/base/nsPluginHost.cpp
+@@ -1637,17 +1637,48 @@ nsPluginHost::FindPluginForType(const ch
+ PRBool aCheckEnabled)
+ {
+ if (!aMimeType) {
+ return nsnull;
+ }
LoadPlugins();
- // if we have a mimetype passed in, search the mPlugins
- // linked list for a match
- if (aMimeType) {
-+ nsresult res;
-+ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService));
++ nsresult res;
++ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService));
+
-+ char *preferredPluginPath = NULL;
-+ nsCAutoString mimetypePrefString ("modules.plugins.mimetype.");
-+ mimetypePrefString.Append(aMimeType);
-+ const char *mimetypePrefChar = mimetypePrefString.get();
-+ res = prefB->GetCharPref(mimetypePrefChar, &preferredPluginPath);
++ char *preferredPluginPath = NULL;
++ nsCAutoString mimetypePrefString ("modules.plugins.mimetype.");
++ mimetypePrefString.Append(aMimeType);
++ const char *mimetypePrefChar = mimetypePrefString.get();
++ res = prefB->GetCharPref(mimetypePrefChar, &preferredPluginPath);
+
-+ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL;
++ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL;
+
- plugins = mPlugins;
-+ if(preferredPluginPath) {
-+ while (nsnull != plugins) {
-+ if (0 == PL_strcasecmp(plugins->mFileName.get(), preferredPluginPath)
||
-+ 0 == PL_strcasecmp(plugins->mFullPath.get(),
preferredPluginPath)) {
-+ return plugins;
-+ }
-+ plugins = plugins->mNext;
+ nsPluginTag *plugin = mPlugins;
++ if(preferredPluginPath) {
++ while (nsnull != plugin) {
++ if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) ||
++ 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) {
++ return plugin;
+ }
++ plugin = plugin->mNext;
++ }
+
-+ // now lets search for substrings
-+ plugins=mPlugins;
-+ while (nsnull != plugins) {
-+ if (nsnull != PL_strstr(plugins->mFileName.get(),
preferredPluginPath) ||
-+ nsnull != PL_strstr(plugins->mFullPath.get(),
preferredPluginPath)) {
-+ return plugins;
-+ }
-+ plugins = plugins->mNext;
++ // now lets search for substrings
++ plugin = mPlugins;
++ while (nsnull != plugin) {
++ if (nsnull != PL_strstr(plugin->mFileName.get(), preferredPluginPath) ||
++ nsnull != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) {
++ return plugin;
+ }
++ plugin = plugin->mNext;
+ }
-
- while (plugins) {
- variants = plugins->mVariants;
- for (cnt = 0; cnt < variants; cnt++) {
- if ((!aCheckEnabled || plugins->IsEnabled()) &&
- plugins->mMimeTypeArray[cnt] &&
- (0 == PL_strcasecmp(plugins->mMimeTypeArray[cnt], aMimeType))) {
- return plugins;
++ }
++
+ while (plugin) {
+ if (!aCheckEnabled || plugin->IsEnabled()) {
+ PRInt32 mimeCount = plugin->mMimeTypes.Length();
+ for (PRInt32 i = 0; i < mimeCount; i++) {
+ if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) {
+ return plugin;
+ }
+ }
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.6V00dK/_old 2011-08-16 14:28:31.000000000 +0200
+++ /var/tmp/diff_new_pack.6V00dK/_new 2011-08-16 14:28:32.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
-@@ -571,16 +571,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
+@@ -582,16 +582,20 @@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
@@ -31,7 +31,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -8610,16 +8610,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8507,16 +8507,31 @@ AC_SUBST(QCMS_LIBS)
dnl ========================================================
dnl HarfBuzz
@@ -66,7 +66,7 @@
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
-@@ -117,19 +117,20 @@ CSRCS += md4.c
+@@ -114,19 +114,20 @@ CSRCS += md4.c
EXTRA_DEPS = $(NSS_DEP_LIBS)
@@ -115,7 +115,7 @@
#include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h"
-@@ -1658,18 +1665,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
+@@ -1733,18 +1740,34 @@ nsNSSComponent::InitializeNSS(PRBool sho
ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@@ -132,7 +132,7 @@
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
+ SECMOD_DB, init_flags);
+ } else {
-+ init_rv = ::nsshelp_open_db ("SeaMonkey", profileStr.get(), init_flags);
++ init_rv = ::nsshelp_open_db ("seamonkey", profileStr.get(), init_flags);
+
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using
nsshelp_open_db in %s\n", profileStr.get()));
@@ -155,13 +155,13 @@
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
-@@ -169,17 +169,17 @@ ifndef MOZ_ENABLE_LIBXUL
- EXTRA_DSO_LDOPTS += \
- $(MOZ_COMPONENT_LIBS) \
- $(MOZ_JS_LIBS) \
- $(NULL)
+@@ -139,17 +139,17 @@ ifdef MOZ_DEBUG
+ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
+ endif
endif
+ EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)
+
DEFINES += -DIMPL_XREAPI
-EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB)
++++++ seamonkey-2.2-source.tar.bz2 -> seamonkey-2.3-source.tar.bz2 ++++++
seamonkey/seamonkey-2.2-source.tar.bz2
/mounts/work_src_done/STABLE/seamonkey/seamonkey-2.3-source.tar.bz2 differ:
char 11, line 1
++++++ seamonkey-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.6V00dK/_old 2011-08-16 14:28:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6V00dK/_new 2011-08-16 14:28:32.000000000 +0200
@@ -32,7 +32,7 @@
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
-@@ -6770,16 +6770,30 @@ fi
+@@ -6761,16 +6761,30 @@ fi
AC_SUBST(MOZ_CAIRO_LIBS)
dnl qcms
@@ -66,9 +66,9 @@
diff --git a/suite/app/Makefile.in b/suite/app/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
-@@ -110,16 +110,17 @@ MOZILLA_INTERNAL_API = 1
- APP_XPCOM_LIBS = $(XPCOM_LIBS)
- endif
+@@ -105,16 +105,17 @@ endif
+
+ APP_XPCOM_LIBS = $(XPCOM_GLUE_LDOPTS)
LIBS += \
$(STATIC_COMPONENTS_LINKER_PATH) \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |