Hello community,
here is the log from the commit of package mozilla-xulrunner20 for
openSUSE:Factory
checked in at Thu Mar 31 09:53:11 CEST 2011.
--------
--- mozilla-xulrunner20/mozilla-xulrunner20.changes 2011-02-23
10:07:39.000000000 +0100
+++
/mounts/work_src_done/STABLE/mozilla-xulrunner20/mozilla-xulrunner20.changes
2011-03-29 13:55:53.000000000 +0200
@@ -1,0 +2,31 @@
+Tue Mar 29 11:55:53 UTC 2011 - [email protected]
+
+- license update: MPLv1.1 or GPLv2+ or LGPLv2+
+ Sync licenses with Fedora. MPL does not state ^or later^
+
+-------------------------------------------------------------------
+Mon Mar 28 19:21:46 UTC 2011 - [email protected]
+
+- Add mozilla-gcc46.patch: fix compilation with gcc 4.6
+ See the following bug reports:
+ https://bugzilla.mozilla.org/show_bug.cgi?id=623116
+ https://bugzilla.mozilla.org/show_bug.cgi?id=623123
+ https://bugzilla.mozilla.org/show_bug.cgi?id=623126
+ https://bugzilla.mozilla.org/show_bug.cgi?id=628371
+
+-------------------------------------------------------------------
+Mon Mar 28 16:25:25 UTC 2011 - [email protected]
+
+- fix 'save as' with KDE integration (bnc#557598)
+
+-------------------------------------------------------------------
+Fri Mar 18 08:48:12 UTC 2011 - [email protected]
+
+- update to 2.0 (rc2)
+ * removed upstreamed mozilla-gio-launch-uri.patch
+ * updated supported locale list
+- set useragent buildid to branded Firefox default
+- apply mozilla-cairo-lcd.patch for internal cairo to fix
+ font smoothing in combination with freetype
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
l10n-2.0b12.tar.bz2
mozilla-gio-launch-uri.patch
xulrunner-source-2.0b12.tar.bz2
New:
----
l10n-2.0.0.tar.bz2
mozilla-cairo-lcd.patch
mozilla-gcc46.patch
mozilla-gecko-version.patch
xulrunner-source-2.0.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mozilla-xulrunner20.spec ++++++
--- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:40.000000000 +0200
+++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:40.000000000 +0200
@@ -29,13 +29,13 @@
%else
BuildRequires: wireless-tools
%endif
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version: 2.0b12
+License: MPLv1.1 or GPLv2+ or LGPLv2+
+Version: 2.0.0
Release: 1
-%define releasedate 2011022200
-%define version_internal 2.0b12
+%define releasedate 2011031700
+%define version_internal 2.0.0
%define apiversion 2.0
-%define uaweight 199900
+%define uaweight 200000
Summary: Mozilla Runtime Environment 2.0
Url: http://www.mozilla.org
Group: Productivity/Other
@@ -64,17 +64,19 @@
Patch5: mozilla-prefer_plugin_pref.patch
Patch6: mozilla-shared-nss-db.patch
Patch7: mozilla-kde.patch
+Patch8: mozilla-cairo-lcd.patch
# PATCH-FEATURE-SLED FATE#302023, FATE#302024
-Patch8: mozilla-gconf-backend.patch
-Patch9: gecko-lockdown.patch
-Patch10: toolkit-ui-lockdown.patch
+Patch9: mozilla-gconf-backend.patch
+Patch10: gecko-lockdown.patch
+Patch11: toolkit-ui-lockdown.patch
# ---
-Patch11: mozilla-cpuid.patch
-Patch12: mozilla-language.patch
-Patch13: mozilla-gio.patch
-Patch14: mozilla-cairo-return.patch
-Patch15: mozilla-gio-launch-uri.patch
+Patch12: mozilla-cpuid.patch
+Patch13: mozilla-language.patch
+Patch14: mozilla-gio.patch
+Patch15: mozilla-cairo-return.patch
Patch16: mozilla-ntlm-full-path.patch
+Patch17: mozilla-gecko-version.patch
+Patch18: mozilla-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js20 = %{version}
Requires(post): update-alternatives coreutils
@@ -101,7 +103,7 @@
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}'
mozilla-nspr)
%endif
%if %has_system_nss
-BuildRequires: mozilla-nss-devel >= 3.12.6
+BuildRequires: mozilla-nss-devel >= 3.12.8
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss)
%endif
Recommends: %{name}-gnome
@@ -113,7 +115,7 @@
%package -n mozilla-js20
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Mozilla JS 1.8.5 engine
Group: Productivity/Other
@@ -125,7 +127,7 @@
%package devel
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: XULRunner/Gecko SDK 2.0
Group: Development/Libraries/Other
%if %has_system_nspr
@@ -142,7 +144,7 @@
%if %localize
%package translations-common
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Common translations for XULRunner 2.0
Group: System/Localization
Requires: %{name} = %{version}
@@ -159,11 +161,11 @@
%package translations-other
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Extra translations for XULRunner 2.0
Group: System/Localization
Requires: %{name} = %{version}
-Provides:
locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu)
+Provides:
locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;zu)
Obsoletes: %{name}-translations < %{version}-%{release}
%description translations-other
@@ -175,23 +177,23 @@
%endif
%package gnome
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: XULRunner components depending on gnome-vfs
Group: Productivity/Other
Requires: %{name} = %{version}-%{release}
Requires(post): coreutils
%description gnome
-This subpackage contains the Necko Gnome-VFS and Gnome components which
-rely on the gnome-vfs subsystem to be installed. They are recommended
-for full desktop integration but not mandatory for small disk footprint
+This subpackage contains the Gnome components which rely on certain
+Gnome subsystems to be installed. They are recommended for full
+desktop integration but not mandatory for small disk footprint
KDE installations for example.
%if %crashreporter
%package buildsymbols
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Breakpad buildsymbols for %{name}
Group: Development/Debug
@@ -209,17 +211,19 @@
%patch5 -p1
%patch6 -p1
%patch7 -p1
-#%patch8 -p1
+%patch8 -p1
#%patch9 -p1
#%patch10 -p1
-%if %suse_version < 1120
#%patch11 -p1
+%if %suse_version < 1120
+#%patch12 -p1
%endif
-%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16 -p1
+%patch17 -p1
+%patch18 -p1
%build
kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define
KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3)
@@ -227,6 +231,9 @@
echo fix kde helper version in the .spec file
exit 1
fi
+source other-licenses/branding/firefox/configure.sh
+unset MOZ_APP_DISPLAYNAME
+export MOZ_UA_BUILDID
MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal}
export MOZ_BUILD_DATE=%{releasedate}
export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing"
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:40.000000000 +0200
+++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:40.000000000 +0200
@@ -1,8 +1,8 @@
#!/bin/bash
-BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b12_RELEASE"
-VERSION="2.0b12"
+BRANCH="releases/mozilla-2.0"
+RELEASE_TAG="FIREFOX_4_0rc2_RELEASE"
+VERSION="2.0.0"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
@@ -18,7 +18,7 @@
ja-JP-mac|en-US)
;;
*)
- hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
+ hg clone http://hg.mozilla.org/releases/l10n-mozilla-2.0/$locale
l10n/$locale
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r
$RELEASE_TAG
;;
esac
++++++ l10n-2.0b12.tar.bz2 -> l10n-2.0.0.tar.bz2 ++++++
mozilla-xulrunner20/l10n-2.0b12.tar.bz2
/mounts/work_src_done/STABLE/mozilla-xulrunner20/l10n-2.0.0.tar.bz2 differ:
char 11, line 1
++++++ mozilla-cairo-lcd.patch ++++++
++++ 1333 lines (skipped)
++++++ mozilla-gcc46.patch ++++++
See the following bug reports;
https://bugzilla.mozilla.org/show_bug.cgi?id=623116
https://bugzilla.mozilla.org/show_bug.cgi?id=623123
https://bugzilla.mozilla.org/show_bug.cgi?id=623126
https://bugzilla.mozilla.org/show_bug.cgi?id=628371
diff --git a/xpcom/base/nsDebugImpl.h b/xpcom/base/nsDebugImpl.h
--- a/xpcom/base/nsDebugImpl.h
+++ b/xpcom/base/nsDebugImpl.h
@@ -40,6 +40,7 @@
class nsDebugImpl : public nsIDebug2
{
public:
+ nsDebugImpl() {}
NS_DECL_ISUPPORTS
NS_DECL_NSIDEBUG
NS_DECL_NSIDEBUG2
diff --git a/xpcom/base/nsTraceRefcntImpl.h b/xpcom/base/nsTraceRefcntImpl.h
--- a/xpcom/base/nsTraceRefcntImpl.h
+++ b/xpcom/base/nsTraceRefcntImpl.h
@@ -44,6 +44,7 @@
class nsTraceRefcntImpl : public nsITraceRefcnt
{
public:
+ nsTraceRefcntImpl() {}
NS_DECL_ISUPPORTS
NS_DECL_NSITRACEREFCNT
diff --git a/xpcom/glue/nsEnumeratorUtils.cpp b/xpcom/glue/nsEnumeratorUtils.cpp
--- a/xpcom/glue/nsEnumeratorUtils.cpp
+++ b/xpcom/glue/nsEnumeratorUtils.cpp
@@ -52,6 +52,7 @@ class EmptyEnumeratorImpl : public nsISi
public nsIStringEnumerator
{
public:
+ EmptyEnumeratorImpl() {}
// nsISupports interface
NS_DECL_ISUPPORTS_INHERITED // not really inherited, but no mRefCnt
diff --git a/xpcom/io/nsUnicharInputStream.h b/xpcom/io/nsUnicharInputStream.h
--- a/xpcom/io/nsUnicharInputStream.h
+++ b/xpcom/io/nsUnicharInputStream.h
@@ -51,6 +51,7 @@ class nsSimpleUnicharStreamFactory :
private nsISimpleUnicharStreamFactory
{
public:
+ nsSimpleUnicharStreamFactory() {}
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIFACTORY
NS_DECL_NSISIMPLEUNICHARSTREAMFACTORY
diff --git a/intl/unicharutil/util/nsUnicharUtils.h
b/intl/unicharutil/util/nsUnicharUtils.h
--- a/intl/unicharutil/util/nsUnicharUtils.h
+++ b/intl/unicharutil/util/nsUnicharUtils.h
@@ -103,6 +103,7 @@ public:
class nsASCIICaseInsensitiveStringComparator : public nsStringComparator
{
public:
+ nsASCIICaseInsensitiveStringComparator() {}
virtual int operator() (const PRUnichar*,
const PRUnichar*,
PRUint32,
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -616,6 +616,7 @@ class nsXULAppInfo : public nsIXULAppInf
{
public:
+ nsXULAppInfo() {}
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIXULAPPINFO
NS_DECL_NSIXULRUNTIME
diff --git a/embedding/browser/gtk/src/EmbedPrivate.cpp
b/embedding/browser/gtk/src/EmbedPrivate.cpp
index 57fd9b1..0052ca7 100644
--- a/embedding/browser/gtk/src/EmbedPrivate.cpp
+++ b/embedding/browser/gtk/src/EmbedPrivate.cpp
@@ -99,6 +99,7 @@ nsIDirectoryServiceProvider
*EmbedPrivate::sAppFileLocProvider = nsnull;
class GTKEmbedDirectoryProvider : public nsIDirectoryServiceProvider2
{
public:
+ GTKEmbedDirectoryProvider() {}
NS_DECL_ISUPPORTS_INHERITED
NS_DECL_NSIDIRECTORYSERVICEPROVIDER
NS_DECL_NSIDIRECTORYSERVICEPROVIDER2
++++++ mozilla-gecko-version.patch ++++++
# HG changeset patch
# Parent 7d3dc831fb0c3282bda0e5da3f7965e6422ee294
diff --git a/config/milestone.txt b/config/milestone.txt
--- a/config/milestone.txt
+++ b/config/milestone.txt
@@ -5,9 +5,9 @@
# x.x.x.x
# x.x.x+
#
# Referenced by milestone.pl.
# Hopefully I'll be able to automate replacement of *all*
# hardcoded milestones in the tree from these two files.
#--------------------------------------------------------
-2.0
+2.0.0
++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.N83xQ2/_old 2011-03-31 09:47:41.000000000 +0200
+++ /var/tmp/diff_new_pack.N83xQ2/_new 2011-03-31 09:47:41.000000000 +0200
@@ -2158,7 +2158,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/xre/nsKDEUtils.cpp
-@@ -0,0 +1,334 @@
+@@ -0,0 +1,328 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
*/
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2359,12 +2359,6 @@
+ {
+ if( !startHelper())
+ return false;
-+ // if Gtk has meanwhile gotten a grab (bnc#555202, somehow the file dialog
-+ // is called with a delay), then do not do anything, as this app would
keep
-+ // the grabs but block waiting for the helper, which would be unable to do
-+ // anything because of the grab
-+ if( blockUi && gdk_pointer_is_grabbed())
-+ return false;
+ feedCommand( command );
+ // do not store the data in 'this' but in extra structure, just in case
there
+ // is reentrancy (can there be? the event loop is re-entered)
@@ -2945,7 +2939,7 @@
diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -50,28 +50,31 @@
+@@ -50,30 +50,33 @@
#include <QString>
#if (MOZ_ENABLE_CONTENTACTION)
#include <contentaction/contentaction.h>
@@ -2957,6 +2951,8 @@
-#include "nsGNOMERegistry.h"
+#include "nsCommonRegistry.h"
#include "nsIGIOService.h"
+ #include "nsNetCID.h"
+ #include "nsIIOService.h"
#include "nsIGnomeVFSService.h"
#include "nsAutoPtr.h"
#ifdef MOZ_ENABLE_DBUS
@@ -2979,7 +2975,7 @@
nsCAutoString spec;
aURI->GetAsciiSpec(spec);
if (hildon_uri_open(spec.get(), action, nsnull))
-@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
+@@ -95,22 +98,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
return rv;
}
@@ -3004,7 +3000,7 @@
if (*_retval)
return NS_OK;
-@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -153,16 +156,33 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
ContentAction::Action::defaultActionForFile(uri,
QString(mSchemeOrType.get()));
if (action.isValid()) {
action.trigger();
@@ -3031,12 +3027,14 @@
+ }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs =
do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
+ nsCAutoString uriSpec;
if (giovfs) {
- nsCOMPtr<nsIGIOMimeApp> app;
- if (NS_SUCCEEDED(giovfs->GetAppForMimeType(mSchemeOrType,
getter_AddRefs(app))) && app)
- return app->Launch(nativePath);
- } else if (gnomevfs) {
+ // nsGIOMimeApp->Launch wants a URI string instead of local file
+ nsresult rv;
+ nsCOMPtr<nsIIOService> ioservice = do_GetService(NS_IOSERVICE_CONTRACTID,
&rv);
+ NS_ENSURE_SUCCESS(rv, rv);
+ nsCOMPtr<nsIURI> uri;
+@@ -180,17 +200,17 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
/* Fallback to GnomeVFS */
nsCOMPtr<nsIGnomeVFSMimeApp> app;
if (NS_SUCCEEDED(gnomevfs->GetAppForMimeType(mSchemeOrType,
getter_AddRefs(app))) && app)
@@ -3053,7 +3051,7 @@
if (giovfs) {
nsCOMPtr<nsIGIOMimeApp> app;
if (NS_SUCCEEDED(giovfs->GetAppForMimeType(type, getter_AddRefs(app)))
&& app)
- return app->Launch(nativePath);
+ return app->Launch(uriSpec);
} else if (gnomevfs) {
diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
--- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
++++++ xulrunner-source-2.0b12.tar.bz2 -> xulrunner-source-2.0.0.tar.bz2 ++++++
mozilla-xulrunner20/xulrunner-source-2.0b12.tar.bz2
/mounts/work_src_done/STABLE/mozilla-xulrunner20/xulrunner-source-2.0.0.tar.bz2
differ: char 11, line 1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
