diff --git a/add-gtkmozembed-10.0.patch b/add-gtkmozembed-11.0.patch similarity index 94% rename from add-gtkmozembed-10.0.patch rename to add-gtkmozembed-11.0.patch index e5816dd..3747ebb 100644 --- a/add-gtkmozembed-10.0.patch +++ b/add-gtkmozembed-11.0.patch @@ -1,6 +1,6 @@ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/Makefile.in ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2012-01-18 16:44:32.465289972 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2012-01-18 16:44:32.465289972 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/Makefile.in +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2012-03-09 15:19:22.248678665 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2012-03-09 15:19:22.248678665 +0100 @@ -0,0 +1,54 @@ +# +# ***** BEGIN LICENSE BLOCK ***** @@ -56,9 +56,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozemb +endif + +include $(topsrcdir)/config/rules.mk -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2012-01-18 16:44:32.466289972 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2012-01-18 16:44:32.466289972 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2012-03-09 15:19:22.248678665 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2012-03-09 15:19:22.248678665 +0100 @@ -0,0 +1,253 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */ @@ -313,9 +313,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates + return NS_OK; +} + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2012-01-18 16:44:32.467289972 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2012-01-18 16:44:32.467289972 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2012-03-09 15:19:22.249678670 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2012-03-09 15:19:22.249678670 +0100 @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 et cindent: */ @@ -401,9 +401,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates + nsCOMPtr mPIPStringBundle; +}; +#endif /* __EmbedCertificates_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2012-01-18 16:44:32.468289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2012-01-19 10:10:40.325459303 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2012-03-09 15:19:22.249678670 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2012-03-09 15:19:22.249678670 +0100 @@ -0,0 +1,156 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -561,9 +561,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListe + return NS_ERROR_NOT_IMPLEMENTED; +} + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2012-01-18 16:44:32.469289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2012-01-18 16:44:32.469289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2012-03-09 15:19:22.250678675 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2012-03-09 15:19:22.250678675 +0100 @@ -0,0 +1,66 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -631,9 +631,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListe +}; + +#endif /* __EmbedContentListener_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2012-01-18 16:44:32.471289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2012-01-18 16:44:32.471289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2012-03-09 15:19:22.251678680 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2012-03-09 15:19:22.251678680 +0100 @@ -0,0 +1,618 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */ @@ -1253,9 +1253,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuI + mEmbedCtxType |= GTK_MOZ_EMBED_CTX_DOCUMENT; + return NS_OK; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2012-01-18 16:44:32.472289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2012-01-18 16:44:32.472289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2012-03-09 15:19:22.251678680 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2012-03-09 15:19:22.251678680 +0100 @@ -0,0 +1,101 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 tw=80 et cindent: */ @@ -1358,9 +1358,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuI + nsString mCtxDocTitle; +}; // class EmbedContextMenuInfo +#endif // EmbedContextMenuInfo_h__ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2012-01-18 16:44:32.473289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2012-01-18 16:44:32.473289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2012-03-09 15:19:22.252678684 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2012-03-09 15:19:22.252678684 +0100 @@ -0,0 +1,280 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -1642,9 +1642,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListene + NS_ERROR("Unexpected event type"); + return NS_OK; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2012-01-18 16:44:32.474289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2012-01-18 16:44:32.474289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2012-03-09 15:19:22.252678684 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2012-03-09 15:19:22.252678684 +0100 @@ -0,0 +1,89 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -1735,9 +1735,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListene +}; + +#endif /* __EmbedEventListener_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2012-01-18 16:44:32.476289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2012-01-18 16:44:32.476289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2012-03-09 15:19:22.252678684 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2012-03-09 15:19:22.253678688 +0100 @@ -0,0 +1,88 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=4 sts=2 tw=80 et cindent: */ @@ -1827,9 +1827,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp + NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE); + return docShell->GetContentViewer(aViewer); +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2012-01-18 16:44:32.476289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2012-01-18 16:44:32.477289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2012-03-09 15:19:22.253678688 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2012-03-09 15:19:22.253678688 +0100 @@ -0,0 +1,67 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim:set ts=2 sw=2 sts=2 et cindent: */ @@ -1898,9 +1898,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.g +GetContentViewer(nsIWebBrowser *webBrowser, nsIContentViewer **aViewer); + +#endif /* __EmbedTools_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2012-01-18 16:44:32.478289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2012-01-19 10:08:33.847456417 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2012-03-09 15:19:22.254678693 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2012-03-09 15:19:22.254678693 +0100 @@ -0,0 +1,1016 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -2918,9 +2918,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp. + gtk_widget_destroy(sOffscreenWindow); + sOffscreenWindow = 0; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2012-01-18 16:44:32.479289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2012-01-18 16:44:32.480289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2012-03-09 15:19:22.255678699 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2012-03-09 15:19:22.255678699 +0100 @@ -0,0 +1,188 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -3110,10 +3110,10 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gt +}; + +#endif /* __EmbedPrivate_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2012-01-18 16:44:32.481289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2012-01-18 16:44:32.481289973 +0100 -@@ -0,0 +1,215 @@ +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2012-03-09 15:19:22.255678699 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2012-03-09 15:48:33.580516368 +0100 +@@ -0,0 +1,216 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * @@ -3253,7 +3253,8 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp +NS_IMETHODIMP +EmbedProgress::OnLocationChange(nsIWebProgress *aWebProgress, + nsIRequest *aRequest, -+ nsIURI *aLocation) ++ nsIURI *aLocation, ++ PRUint32 aFlags) +{ + nsCAutoString newURI; + NS_ENSURE_ARG_POINTER(aLocation); @@ -3329,9 +3330,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp + + uri->GetSpec(aString); +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2012-01-18 16:44:32.483289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2012-01-18 16:44:32.483289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2012-03-09 15:19:22.256678705 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2012-03-09 15:19:22.256678705 +0100 @@ -0,0 +1,66 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -3399,9 +3400,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.g +}; + +#endif /* __EmbedProgress_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2012-01-18 16:44:32.484289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2012-01-19 10:42:07.334502360 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2012-03-09 15:19:22.256678705 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2012-03-09 15:19:22.256678705 +0100 @@ -0,0 +1,411 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: */ @@ -3814,9 +3815,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp + } + } +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2012-01-18 16:44:32.485289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2012-01-19 10:42:24.478502751 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2012-03-09 15:19:22.257678710 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2012-03-09 15:19:22.257678710 +0100 @@ -0,0 +1,113 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: */ @@ -3931,9 +3932,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.g + GtkWidget *mComboBox; + GtkWidget *mCheckBox; +}; -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2012-01-18 16:44:32.487289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2012-01-19 10:09:43.082457998 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2012-03-09 15:19:22.258678715 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2012-03-09 15:19:22.258678715 +0100 @@ -0,0 +1,474 @@ +/* + * vim:ts=2:et:sw=2 @@ -4409,9 +4410,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.g + + return rv; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2012-01-18 16:44:32.488289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2012-01-18 16:44:32.488289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2012-03-09 15:19:22.258678715 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2012-03-09 15:19:22.258678715 +0100 @@ -0,0 +1,106 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -4519,9 +4520,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreato + + return NS_ERROR_FAILURE; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2012-01-18 16:44:32.488289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2012-01-18 16:44:32.488289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2012-03-09 15:19:22.258678715 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2012-03-09 15:19:22.258678715 +0100 @@ -0,0 +1,54 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -4577,9 +4578,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreato +}; + +#endif /* __EmbedWindowCreator_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2012-01-18 16:44:32.489289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2012-01-18 16:44:32.489289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2012-03-09 15:19:22.259678720 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2012-03-09 15:19:22.259678720 +0100 @@ -0,0 +1,101 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -4682,9 +4683,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtk + + +#endif /* __EmbedWindow_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2012-01-18 16:44:32.491289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2012-01-19 10:06:52.015454094 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2012-03-09 15:19:22.260678725 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2012-03-09 15:19:22.260678725 +0100 @@ -0,0 +1,1132 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -5818,9 +5819,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp. + aNewEmbed, aChromeFlags); + +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2012-01-18 16:44:32.493289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2012-01-18 16:44:32.494289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2012-03-09 15:19:22.261678730 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2012-03-09 15:19:22.261678730 +0100 @@ -0,0 +1,116 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -5938,9 +5939,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue. + return XPCOMGlueLoadXULFunctions(GtkSymbolsInternal); +} + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2012-01-18 16:44:32.495289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2012-01-18 16:44:32.495289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2012-03-09 15:19:22.261678730 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2012-03-09 15:19:22.261678730 +0100 @@ -0,0 +1,287 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -6229,9 +6230,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtk +#endif /* __cplusplus */ + +#endif /* gtkmozembed_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2012-01-18 16:44:32.495289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2012-01-18 16:44:32.495289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2012-03-09 15:19:22.262678735 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2012-03-09 15:19:22.262678735 +0100 @@ -0,0 +1,70 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -6303,9 +6304,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_inter + +#endif /* gtkmozembed_internal_h */ + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2012-01-18 16:44:32.496289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2012-01-18 16:44:32.496289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2012-03-09 15:19:22.262678735 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2012-03-09 15:19:22.262678735 +0100 @@ -0,0 +1,34 @@ +BOOL:STRING +BOOL:STRING,STRING @@ -6341,9 +6342,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarsha +BOOL:POINTER +VOID:POINTER +BOOL:STRING,STRING,POINTER -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2012-01-18 16:44:32.498289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2012-01-18 16:44:32.498289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2012-03-09 15:19:22.263678740 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2012-03-09 15:19:22.263678740 +0100 @@ -0,0 +1,91 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -6436,9 +6437,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivat +#endif /* __cplusplus */ + +#endif /* gtkmozembedprivate_h */ -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2012-01-18 16:44:32.499289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2012-01-19 10:43:20.021504018 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2012-03-09 15:19:22.263678740 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2012-03-09 15:19:22.263678740 +0100 @@ -0,0 +1,349 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: */ @@ -6789,9 +6790,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService. + NS_WARNING("Unexpected button flags"); + } +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2012-01-18 16:44:32.500289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2012-01-18 16:44:32.500289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2012-03-09 15:19:22.264678745 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2012-03-09 15:19:22.264678745 +0100 @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* vim:expandtab:shiftwidth=4:tabstop=4: */ @@ -6852,9 +6853,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService. + void GetButtonLabel(PRUint32 aFlags, PRUint32 aPos, + const PRUnichar* aStringValue, nsAString &aLabel); +}; -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2012-01-18 16:44:32.501289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2012-01-18 16:44:32.501289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2012-03-09 15:19:22.264678745 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2012-03-09 15:19:22.264678745 +0100 @@ -0,0 +1,112 @@ +# +# ***** BEGIN LICENSE BLOCK ***** @@ -6968,9 +6969,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmo + +GARBAGE += $(MARSHAL_FILE).h $(MARSHAL_FILE).c + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2012-01-18 16:44:32.502289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2012-01-18 16:44:32.502289973 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2012-03-09 15:19:22.265678750 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2012-03-09 15:19:22.265678750 +0100 @@ -0,0 +1,101 @@ +# +# ***** BEGIN LICENSE BLOCK ***** @@ -7073,9 +7074,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtk +DEFINES += -D_TIME_H=1 +endif +endif -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2012-01-18 16:44:32.504289973 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2012-01-18 16:44:32.716289979 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2012-03-09 15:19:22.265678750 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2012-03-09 15:19:22.265678750 +0100 @@ -0,0 +1,185 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -7262,9 +7263,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChi + gtk_moz_embed_load_url(GTK_MOZ_EMBED(embed), text); + g_free(text); +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2012-01-18 16:44:32.719289978 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2012-01-18 16:44:32.719289978 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2012-03-09 15:19:22.266678755 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2012-03-09 15:19:22.266678755 +0100 @@ -0,0 +1,1145 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -8411,9 +8412,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cp + gtk_widget_set_sensitive(browser->forwardButton, FALSE); + } + -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2012-01-18 16:44:32.789289981 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2012-01-18 16:44:32.789289981 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2012-03-09 15:19:22.267678760 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2012-03-09 15:19:22.267678760 +0100 @@ -0,0 +1,142 @@ +/** simplemdi.c **/ +/* @@ -8557,9 +8558,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI + gtk_main_quit(); + return(0); +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2012-01-18 16:44:32.807289982 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2012-01-18 16:44:32.808289981 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2012-03-09 15:19:22.267678760 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2012-03-09 15:19:22.267678760 +0100 @@ -0,0 +1,86 @@ +#include +#include @@ -8647,9 +8648,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNot + + return 0; +} -diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp ---- xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2012-01-18 16:44:32.808289981 +0100 -+++ xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2012-01-18 16:44:32.808289981 +0100 +diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp +--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2012-03-09 15:19:22.267678760 +0100 ++++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2012-03-09 15:19:22.267678760 +0100 @@ -0,0 +1,109 @@ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -8760,9 +8761,9 @@ diff -up xulrunner-10.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSoc + fprintf(stderr, "Can't fork.\n"); + } +} -diff -up xulrunner-10.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-10.0/mozilla-beta/toolkit/library/Makefile.in ---- xulrunner-10.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2012-01-11 18:15:04.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/toolkit/library/Makefile.in 2012-01-18 16:44:32.809289980 +0100 +diff -up xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in +--- xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2012-03-09 01:40:05.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/toolkit/library/Makefile.in 2012-03-09 15:19:22.268678765 +0100 @@ -73,6 +73,8 @@ CPPSRCS += dlldeps-xul.cpp endif @@ -8772,10 +8773,10 @@ diff -up xulrunner-10.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xul DEFINES += -DMOZ_ENABLE_GTK2 endif -diff -up xulrunner-10.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-10.0/mozilla-beta/toolkit/toolkit-makefiles.sh ---- xulrunner-10.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2012-01-11 18:15:08.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2012-01-18 16:44:32.810289980 +0100 -@@ -554,6 +554,9 @@ MAKEFILES_embedding=" +diff -up xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh +--- xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2012-03-09 01:40:06.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2012-03-09 15:19:22.268678765 +0100 +@@ -438,6 +438,9 @@ MAKEFILES_embedding=" embedding/browser/Makefile embedding/browser/build/Makefile embedding/browser/webBrowser/Makefile @@ -8785,10 +8786,10 @@ diff -up xulrunner-10.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xu embedding/components/Makefile embedding/components/appstartup/src/Makefile embedding/components/build/Makefile -diff -up xulrunner-10.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-10.0/mozilla-beta/toolkit/toolkit-tiers.mk ---- xulrunner-10.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2012-01-11 18:15:08.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/toolkit/toolkit-tiers.mk 2012-01-18 16:44:32.811289981 +0100 -@@ -221,6 +221,12 @@ endif +diff -up xulrunner-11.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-11.0/mozilla-beta/toolkit/toolkit-tiers.mk +--- xulrunner-11.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2012-03-09 01:40:06.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/toolkit/toolkit-tiers.mk 2012-03-09 15:19:22.269678770 +0100 +@@ -220,6 +220,12 @@ endif tier_platform_dirs += services/crypto/component @@ -8801,15 +8802,10 @@ diff -up xulrunner-10.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrun tier_platform_dirs += startupcache tier_platform_dirs += js/ductwork/debugger -@@ -268,4 +274,3 @@ tier_platform_dirs += testing/mochitest - tier_platform_dirs += testing/xpcshell - tier_platform_dirs += testing/tools/screenshot - endif -- -diff -up xulrunner-10.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed xulrunner-10.0/mozilla-beta/xulrunner/installer/Makefile.in ---- xulrunner-10.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed 2012-01-18 16:44:32.403289971 +0100 -+++ xulrunner-10.0/mozilla-beta/xulrunner/installer/Makefile.in 2012-01-18 16:44:32.817289981 +0100 -@@ -78,6 +78,8 @@ pkg_config_files = \ +diff -up xulrunner-11.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed xulrunner-11.0/mozilla-beta/xulrunner/installer/Makefile.in +--- xulrunner-11.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed 2012-03-09 15:19:22.240678626 +0100 ++++ xulrunner-11.0/mozilla-beta/xulrunner/installer/Makefile.in 2012-03-09 15:19:22.275678799 +0100 +@@ -80,6 +80,8 @@ pkg_config_files = \ libxul-embedding.pc \ mozilla-js.pc \ mozilla-plugin.pc \ @@ -8818,9 +8814,9 @@ diff -up xulrunner-10.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed $(NULL) ifdef MOZ_NATIVE_NSPR -diff -up xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed 2012-01-18 16:44:32.812289981 +0100 -+++ xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2012-01-18 16:44:32.812289981 +0100 +diff -up xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in +--- xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed 2012-03-09 15:19:22.270678775 +0100 ++++ xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2012-03-09 15:19:22.270678775 +0100 @@ -0,0 +1,9 @@ +prefix=%prefix% +sdkdir=%sdkdir% @@ -8831,9 +8827,9 @@ diff -up xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-emb +Description: Static version-independent Mozilla Embedding Widget for Gtk+ +Version: %MOZILLA_VERSION% +Requires: libxul-embedding = %MOZILLA_VERSION% -diff -up xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed 2012-01-18 16:44:32.813289981 +0100 -+++ xulrunner-10.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in 2012-01-18 16:44:32.813289981 +0100 +diff -up xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in +--- xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed 2012-03-09 15:19:22.270678775 +0100 ++++ xulrunner-11.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in 2012-03-09 15:19:22.270678775 +0100 @@ -0,0 +1,9 @@ +prefix=%prefix% +sdkdir=%sdkdir% diff --git a/mozilla-682832-proxy.patch b/mozilla-682832-proxy.patch deleted file mode 100644 index 0f643f9..0000000 --- a/mozilla-682832-proxy.patch +++ /dev/null @@ -1,358 +0,0 @@ -diff -up xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp.682832 xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp ---- xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp.682832 2012-01-18 17:25:24.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/toolkit/system/gnome/nsGSettingsService.cpp 2012-01-23 15:40:14.803170842 +0100 -@@ -44,6 +44,8 @@ - #include "nsMemory.h" - #include "prlink.h" - #include "nsComponentManagerUtils.h" -+#include "nsIMutableArray.h" -+#include "nsISupportsPrimitives.h" - - #include - #include -@@ -60,6 +62,7 @@ typedef struct _GVariant GVariant; - # define G_VARIANT_TYPE_STRING ((const GVariantType *) "s") - # define G_VARIANT_TYPE_OBJECT_PATH ((const GVariantType *) "o") - # define G_VARIANT_TYPE_SIGNATURE ((const GVariantType *) "g") -+# define G_VARIANT_TYPE_STRING_ARRAY ((const GVariantType *) "as") - #endif - - #define GSETTINGS_FUNCTIONS \ -@@ -72,6 +75,7 @@ typedef struct _GVariant GVariant; - FUNC(g_variant_get_int32, gint32, (GVariant* variant)) \ - FUNC(g_variant_get_boolean, gboolean, (GVariant* variant)) \ - FUNC(g_variant_get_string, const char *, (GVariant* value, gsize* length)) \ -+ FUNC(g_variant_get_strv, const char **, (GVariant* value, gsize* length)) \ - FUNC(g_variant_is_of_type, gboolean, (GVariant* value, const GVariantType* type)) \ - FUNC(g_variant_new_int32, GVariant *, (gint32 value)) \ - FUNC(g_variant_new_boolean, GVariant *, (gboolean value)) \ -@@ -95,6 +99,7 @@ GSETTINGS_FUNCTIONS - #define g_variant_get_int32 _g_variant_get_int32 - #define g_variant_get_boolean _g_variant_get_boolean - #define g_variant_get_string _g_variant_get_string -+#define g_variant_get_strv _g_variant_get_strv - #define g_variant_is_of_type _g_variant_is_of_type - #define g_variant_new_int32 _g_variant_new_int32 - #define g_variant_new_boolean _g_variant_new_boolean -@@ -267,6 +272,49 @@ nsGSettingsCollection::GetInt(const nsAC - return NS_OK; - } - -+NS_IMETHODIMP -+nsGSettingsCollection::GetStringList(const nsACString& aKey, nsIArray** aResult) -+{ -+ if (!KeyExists(aKey)) -+ return NS_ERROR_INVALID_ARG; -+ -+ nsCOMPtr items(do_CreateInstance(NS_ARRAY_CONTRACTID)); -+ if (!items) { -+ return NS_ERROR_OUT_OF_MEMORY; -+ } -+ -+ GVariant *value = g_settings_get_value(mSettings, -+ PromiseFlatCString(aKey).get()); -+ -+ if (!g_variant_is_of_type(value, G_VARIANT_TYPE_STRING_ARRAY)) { -+ g_variant_unref(value); -+ return NS_ERROR_FAILURE; -+ } -+ -+ const gchar ** gs_strings = g_variant_get_strv(value, NULL); -+ if (!gs_strings) { -+ // empty array -+ NS_ADDREF(*aResult = items); -+ g_variant_unref(value); -+ return NS_OK; -+ } -+ -+ const gchar** p_gs_strings = gs_strings; -+ while (*p_gs_strings != NULL) -+ { -+ nsCOMPtr obj(do_CreateInstance(NS_SUPPORTS_CSTRING_CONTRACTID)); -+ if (obj) { -+ obj->SetData(nsDependentCString(*p_gs_strings)); -+ items->AppendElement(obj, false); -+ } -+ p_gs_strings++; -+ } -+ g_free(gs_strings); -+ NS_ADDREF(*aResult = items); -+ g_variant_unref(value); -+ return NS_OK; -+} -+ - // These types are local to nsGSettingsService::Init, but ISO C++98 doesn't - // allow a template (ArrayLength) to be instantiated based on a local type. - // Boo-urns! -diff -up xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp ---- xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp.682832 2012-01-18 17:25:24.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 2012-01-23 15:39:23.083172529 +0100 -@@ -49,6 +49,7 @@ - #include "nsPrintfCString.h" - #include "nsNetUtil.h" - #include "nsISupportsPrimitives.h" -+#include "nsIGSettingsService.h" - - class nsUnixSystemProxySettings : public nsISystemProxySettings { - public: -@@ -62,9 +63,12 @@ private: - ~nsUnixSystemProxySettings() {} - - nsCOMPtr mGConf; -+ nsCOMPtr mGSettings; - bool IsProxyMode(const char* aMode); - nsresult SetProxyResultFromGConf(const char* aKeyBase, const char* aType, nsACString& aResult); - nsresult GetProxyFromGConf(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); -+ nsresult GetProxyFromGSettings(const nsACString& aScheme, const nsACString& aHost, PRInt32 aPort, nsACString& aResult); -+ nsresult SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, nsACString& aResult); - }; - - NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) -@@ -73,6 +77,7 @@ nsresult - nsUnixSystemProxySettings::Init() - { - mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); -+ mGSettings = do_GetService(NS_GSETTINGSSERVICE_CONTRACTID); - return NS_OK; - } - -@@ -87,14 +92,31 @@ nsUnixSystemProxySettings::IsProxyMode(c - nsresult - nsUnixSystemProxySettings::GetPACURI(nsACString& aResult) - { -- if (!mGConf || !IsProxyMode("auto")) { -- // Return an empty string in this case -- aResult.Truncate(); -- return NS_OK; -+ if (mGSettings) { -+ nsCOMPtr proxy_settings; -+ mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), -+ getter_AddRefs(proxy_settings)); -+ if (proxy_settings) { -+ nsCString proxyMode; -+ // Check if mode is auto -+ nsresult rv = proxy_settings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); -+ if (rv == NS_OK && proxyMode.Equals("auto")) { -+ return proxy_settings->GetString(NS_LITERAL_CSTRING("autoconfig-url"), aResult); -+ } -+ /* The org.gnome.system.proxy schema has been found, but auto mode is not set. -+ * Don't try the GConf and return empty string. */ -+ aResult.Truncate(); -+ return NS_OK; -+ } - } - -- return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"), -- aResult); -+ if (mGConf && IsProxyMode("auto")) { -+ return mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/autoconfig_url"), -+ aResult); -+ } -+ // Return an empty string when auto mode is not set. -+ aResult.Truncate(); -+ return NS_OK; - } - - static bool -@@ -231,7 +253,38 @@ nsUnixSystemProxySettings::SetProxyResul - PRInt32 port; - rv = mGConf->GetInt(portKey, &port); - NS_ENSURE_SUCCESS(rv, rv); -+ -+ /* When port is 0, proxy is not considered as enabled even if host is set. */ -+ if (port == 0) -+ return NS_ERROR_FAILURE; -+ -+ SetProxyResult(aType, host, port, aResult); -+ return NS_OK; -+} -+ -+nsresult -+nsUnixSystemProxySettings::SetProxyResultFromGSettings(const char* aKeyBase, const char* aType, -+ nsACString& aResult) -+{ -+ nsCOMPtr proxy_settings; -+ nsresult rv = mGSettings->GetCollectionForSchema(nsDependentCString(aKeyBase), -+ getter_AddRefs(proxy_settings)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCAutoString host; -+ rv = proxy_settings->GetString(NS_LITERAL_CSTRING("host"), host); -+ NS_ENSURE_SUCCESS(rv, rv); -+ if (host.IsEmpty()) -+ return NS_ERROR_FAILURE; -+ -+ PRInt32 port; -+ rv = proxy_settings->GetInt(NS_LITERAL_CSTRING("port"), &port); -+ NS_ENSURE_SUCCESS(rv, rv); - -+ /* When port is 0, proxy is not considered as enabled even if host is set. */ -+ if (port == 0) -+ return NS_ERROR_FAILURE; -+ - SetProxyResult(aType, host, port, aResult); - return NS_OK; - } -@@ -271,17 +324,17 @@ static bool ConvertToIPV6Addr(const nsAC - PRIPv6Addr* aAddr) - { - PRNetAddr addr; -+ // try to convert hostname to IP - if (PR_StringToNetAddr(PromiseFlatCString(aName).get(), &addr) != PR_SUCCESS) - return false; - -- PRIPv6Addr ipv6; - // convert parsed address to IPv6 - if (addr.raw.family == PR_AF_INET) { - // convert to IPv4-mapped address -- PR_ConvertIPv4AddrToIPv6(addr.inet.ip, &ipv6); -+ PR_ConvertIPv4AddrToIPv6(addr.inet.ip, aAddr); - } else if (addr.raw.family == PR_AF_INET6) { - // copy the address -- memcpy(&ipv6, &addr.ipv6.ip, sizeof(PRIPv6Addr)); -+ memcpy(aAddr, &addr.ipv6.ip, sizeof(PRIPv6Addr)); - } else { - return false; - } -@@ -289,8 +342,8 @@ static bool ConvertToIPV6Addr(const nsAC - return true; - } - --static bool GConfIgnoreHost(const nsACString& aIgnore, -- const nsACString& aHost) -+static bool HostIgnoredByProxy(const nsACString& aIgnore, -+ const nsACString& aHost) - { - if (aIgnore.Equals(aHost, nsCaseInsensitiveCStringComparator())) - return true; -@@ -321,8 +374,9 @@ static bool GConfIgnoreHost(const nsACSt - slash = end; - } - -+ nsDependentCSubstring ignoreStripped(start, slash); - PRIPv6Addr ignoreAddr, hostAddr; -- if (!ConvertToIPV6Addr(aIgnore, &ignoreAddr) || -+ if (!ConvertToIPV6Addr(ignoreStripped, &ignoreAddr) || - !ConvertToIPV6Addr(aHost, &hostAddr)) - return false; - -@@ -355,7 +409,7 @@ nsUnixSystemProxySettings::GetProxyFromG - if (str) { - nsAutoString s; - if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) { -- if (GConfIgnoreHost(NS_ConvertUTF16toUTF8(s), aHost)) { -+ if (HostIgnoredByProxy(NS_ConvertUTF16toUTF8(s), aHost)) { - aResult.AppendLiteral("DIRECT"); - return NS_OK; - } -@@ -392,6 +446,71 @@ nsUnixSystemProxySettings::GetProxyFromG - } - - nsresult -+nsUnixSystemProxySettings::GetProxyFromGSettings(const nsACString& aScheme, -+ const nsACString& aHost, -+ PRInt32 aPort, -+ nsACString& aResult) -+{ -+ nsCOMPtr proxy_settings; -+ nsresult rv; -+ -+ rv = mGSettings->GetCollectionForSchema(NS_LITERAL_CSTRING("org.gnome.system.proxy"), -+ getter_AddRefs(proxy_settings)); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ nsCString proxyMode; -+ rv = proxy_settings->GetString(NS_LITERAL_CSTRING("mode"), proxyMode); -+ NS_ENSURE_SUCCESS(rv, rv); -+ -+ if (!proxyMode.Equals("manual")) { -+ aResult.AppendLiteral("DIRECT"); -+ return NS_OK; -+ } -+ -+ nsCOMPtr ignoreList; -+ if (NS_SUCCEEDED(proxy_settings->GetStringList(NS_LITERAL_CSTRING("ignore-hosts"), -+ getter_AddRefs(ignoreList))) && ignoreList) { -+ PRUint32 len = 0; -+ ignoreList->GetLength(&len); -+ for (PRUint32 i = 0; i < len; ++i) { -+ nsCOMPtr str = do_QueryElementAt(ignoreList, i); -+ if (str) { -+ nsCString s; -+ if (NS_SUCCEEDED(str->GetData(s)) && !s.IsEmpty()) { -+ if (HostIgnoredByProxy(s, aHost)) { -+ aResult.AppendLiteral("DIRECT"); -+ return NS_OK; -+ } -+ } -+ } -+ } -+ } -+ -+ if (aScheme.LowerCaseEqualsLiteral("http")) { -+ rv = SetProxyResultFromGSettings("org.gnome.system.proxy.http", "PROXY", aResult); -+ } else if (aScheme.LowerCaseEqualsLiteral("https")) { -+ rv = SetProxyResultFromGSettings("org.gnome.system.proxy.https", "PROXY", aResult); -+ /* Try to use HTTP proxy when HTTPS proxy is not explicitly defined */ -+ if (rv != NS_OK) -+ rv = SetProxyResultFromGSettings("org.gnome.system.proxy.http", "PROXY", aResult); -+ } else if (aScheme.LowerCaseEqualsLiteral("ftp")) { -+ rv = SetProxyResultFromGSettings("org.gnome.system.proxy.ftp", "PROXY", aResult); -+ } else { -+ rv = NS_ERROR_FAILURE; -+ } -+ if (rv != NS_OK) { -+ /* If proxy for scheme is not specified, use SOCKS proxy for all schemes */ -+ rv = SetProxyResultFromGSettings("org.gnome.system.proxy.socks", "SOCKS", aResult); -+ } -+ -+ if (NS_FAILED(rv)) { -+ aResult.AppendLiteral("DIRECT"); -+ } -+ -+ return NS_OK; -+} -+ -+nsresult - nsUnixSystemProxySettings::GetProxyForURI(nsIURI* aURI, nsACString& aResult) - { - nsCAutoString scheme; -@@ -406,10 +525,15 @@ nsUnixSystemProxySettings::GetProxyForUR - rv = aURI->GetPort(&port); - NS_ENSURE_SUCCESS(rv, rv); - -- if (!mGConf) -- return GetProxyFromEnvironment(scheme, host, port, aResult); -+ if (mGSettings) { -+ rv = GetProxyFromGSettings(scheme, host, port, aResult); -+ if (rv == NS_OK) -+ return rv; -+ } -+ if (mGConf) -+ return GetProxyFromGConf(scheme, host, port, aResult); - -- return GetProxyFromGConf(scheme, host, port, aResult); -+ return GetProxyFromEnvironment(scheme, host, port, aResult); - } - - #define NS_UNIXSYSTEMPROXYSERVICE_CID /* 0fa3158c-d5a7-43de-9181-a285e74cf1d4 */\ -diff -up xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl.682832 xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl ---- xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl.682832 2012-01-18 17:25:28.000000000 +0100 -+++ xulrunner-10.0/mozilla-beta/xpcom/system/nsIGSettingsService.idl 2012-01-23 15:32:29.890186340 +0100 -@@ -39,7 +39,7 @@ - #include "nsISupports.idl" - #include "nsIArray.idl" - --[scriptable, uuid(09637d3c-3c07-40b4-aff9-1d2a0f046f3c)] -+[scriptable, uuid(16d5b0ed-e756-4f1b-a8ce-9132e869acd8)] - interface nsIGSettingsCollection : nsISupports - { - void setString(in AUTF8String key, in AUTF8String value); -@@ -48,6 +48,7 @@ interface nsIGSettingsCollection : nsISu - AUTF8String getString(in AUTF8String key); - boolean getBoolean(in AUTF8String key); - long getInt(in AUTF8String key); -+ nsIArray getStringList(in AUTF8String key); - }; - - [scriptable, uuid(849c088b-57d1-4f24-b7b2-3dc4acb04c0a)] diff --git a/mozilla-696393.patch b/mozilla-696393.patch deleted file mode 100644 index 26c558f..0000000 --- a/mozilla-696393.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp ---- xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 2011-12-07 07:28:08.000000000 +0100 -+++ xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp 2011-12-09 15:07:07.609097348 +0100 -@@ -194,55 +194,22 @@ invoke_copy_to_stack(PRUint32 paramCount - } - } - -+typedef nsresult (*vtable_func)(nsISupports *, PRUint64, PRUint64, PRUint64, PRUint64, double, double, double, double); -+ - EXPORT_XPCOM_API(nsresult) - NS_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, - PRUint32 paramCount, nsXPTCVariant* params) - { -- PRUint64 *vtable = *(PRUint64 **)that; -- PRUint64 method = vtable[methodIndex]; -+ vtable_func *vtable = *reinterpret_cast(that); -+ vtable_func method = vtable[methodIndex]; - PRUint64 overflow = invoke_count_words (paramCount, params); -+ PRUint64 *stack_space = reinterpret_cast(__builtin_alloca((overflow + 8 /* 4 64-bits gpr + 4 64-bits fpr */) * 8)); - PRUint64 result; - -- __asm__ __volatile__ -- ( -- "lgr 7,15\n\t" -- "aghi 7,-64\n\t" -- -- "lgr 3,%3\n\t" -- "sllg 3,3,3\n\t" -- "lcgr 3,3\n\t" -- "lg 2,0(15)\n\t" -- "la 15,0(3,7)\n\t" -- "stg 2,0(15)\n\t" -- -- "lgr 2,%1\n\t" -- "lgr 3,%2\n\t" -- "la 4,160(15)\n\t" -- "lgr 5,%3\n\t" -- "basr 14,%4\n\t" -+ invoke_copy_to_stack(paramCount, params, stack_space, overflow); - -- "lgr 2,%5\n\t" -- "ld 0,192(7)\n\t" -- "ld 2,200(7)\n\t" -- "ld 4,208(7)\n\t" -- "ld 6,216(7)\n\t" -- "lmg 3,6,160(7)\n\t" -- "basr 14,%6\n\t" -+ PRUint64 *d_gpr = stack_space + overflow; -+ double *d_fpr = reinterpret_cast(d_gpr + 4); - -- "la 15,64(7)\n\t" -- -- "lgr %0,2\n\t" -- : "=r" (result) -- : "r" ((PRUint64)paramCount), -- "r" (params), -- "r" (overflow), -- "a" (invoke_copy_to_stack), -- "a" (that), -- "a" (method) -- : "2", "3", "4", "5", "6", "7", "14", "cc", "memory", -- "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7" -- ); -- -- return result; -+ return method(that, d_gpr[0], d_gpr[1], d_gpr[2], d_gpr[3], d_fpr[0], d_fpr[1], d_fpr[2], d_fpr[3]); - } -- diff --git a/mozilla-722127.patch b/mozilla-722127.patch index 63a9e0a..f86fcae 100644 --- a/mozilla-722127.patch +++ b/mozilla-722127.patch @@ -1,12 +1,7 @@ -# HG changeset patch -# Parent 0a6f3638cdaba9d3b5ef2eef73a42b2a167dc52a -# User ojab -Bug 722127 - Build --with-system-libvpx is broken for libvpx-1.0.0 - -diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozilla-beta/configure.in ---- xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 2012-01-24 02:59:49.000000000 -0500 -+++ xulrunner-10.0/mozilla-beta/configure.in 2012-01-30 13:11:22.303053551 -0500 -@@ -5616,20 +5616,20 @@ if test -n "$MOZ_WEBM"; then +diff -up xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure.in +--- xulrunner-11.0/mozilla-beta/configure.in.vpx1.0.0 2012-03-09 01:39:31.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/configure.in 2012-03-09 15:03:51.246031329 +0100 +@@ -5710,20 +5710,20 @@ if test -n "$MOZ_WEBM"; then [MOZ_NATIVE_LIBVPX_DEC_TEST=1], ([--with-system-libvpx requested but symbol vpx_codec_dec_init_ver not found])) if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then @@ -33,7 +28,7 @@ diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozill #error "test failed." #endif ], -@@ -5639,7 +5639,7 @@ if test -n "$MOZ_WEBM"; then +@@ -5734,7 +5734,7 @@ if test -n "$MOZ_WEBM"; then MOZ_LIBVPX_INCLUDES="-I${LIBVPX_DIR}/include" MOZ_LIBVPX_LIBS="-L${LIBVPX_DIR}/lib -lvpx"], [AC_MSG_RESULT([no]) @@ -42,19 +37,19 @@ diff -up xulrunner-10.0/mozilla-beta/configure.in.vpx1.0.0 xulrunner-10.0/mozill fi CFLAGS=$_SAVE_CFLAGS LDFLAGS=$_SAVE_LDFLAGS -diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-beta/configure ---- xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 2012-01-30 13:11:47.805847514 -0500 -+++ xulrunner-10.0/mozilla-beta/configure 2012-01-30 13:14:07.818716354 -0500 -@@ -17727,14 +17727,14 @@ else +diff -up xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 xulrunner-11.0/mozilla-beta/configure +--- xulrunner-11.0/mozilla-beta/configure.vpx1.0.0 2012-03-09 01:58:50.000000000 +0100 ++++ xulrunner-11.0/mozilla-beta/configure 2012-03-09 15:15:42.537585632 +0100 +@@ -17761,14 +17761,14 @@ else fi if test -n "$MOZ_NATIVE_LIBVPX_DEC_TEST" ; then - echo $ac_n "checking for libvpx version >= v0.9.7""... $ac_c" 1>&6 --echo "configure:17732: checking for libvpx version >= v0.9.7" >&5 +-echo "configure:17766: checking for libvpx version >= v0.9.7" >&5 + echo $ac_n "checking for libvpx version >= v1.0.0""... $ac_c" 1>&6 -+echo "configure:17732: checking for libvpx version >= v1.0.0" >&5 ++echo "configure:17766: checking for libvpx version >= v1.0.0" >&5 cat > conftest.$ac_ext < @@ -63,7 +58,7 @@ diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-b #error "test failed." #endif -@@ -17753,7 +17753,7 @@ else +@@ -17791,7 +17791,7 @@ else cat conftest.$ac_ext >&5 rm -rf conftest* echo "$ac_t""no" 1>&6 @@ -72,3 +67,8 @@ diff -up xulrunner-10.0/mozilla-beta/configure.vpx1.0.0 xulrunner-10.0/mozilla-b fi rm -f conftest* fi +@@ -25794,4 +25794,3 @@ if cmp -s config/autoconf.mk config/auto + else + rm -f config/autoconf.mk.orig 2> /dev/null + fi +- diff --git a/mozilla-727401.patch b/mozilla-727401.patch deleted file mode 100644 index df7ff6d..0000000 --- a/mozilla-727401.patch +++ /dev/null @@ -1,38 +0,0 @@ -# HG changeset patch -# User Benjamin Smedberg -# Date 1329314881 18000 -# Node ID 355163c56ea5ad5037ac6da754252aaea67d2217 -# Parent 81f6b9cbb2a92ac08d1ccc0c1b44d6a5c28f6e2a -Bug 727401 - import libpng overflow patch from http://codereview.chromium.org/9363013 - -diff --git a/media/libpng/pngrutil.c b/media/libpng/pngrutil.c ---- a/media/libpng/pngrutil.c -+++ b/media/libpng/pngrutil.c -@@ -396,18 +396,25 @@ png_decompress_chunk(png_structp png_ptr - #if defined(PNG_SET_CHUNK_MALLOC_LIMIT_SUPPORTED) || \ - defined(PNG_USER_CHUNK_MALLOC_MAX) - else - #endif - if (expanded_size > 0) - { - /* Success (maybe) - really uncompress the chunk. */ - png_size_t new_size = 0; -- png_charp text = png_malloc_warn(png_ptr, -- prefix_size + expanded_size + 1); -+ png_charp text = NULL; -+ /* Need to check for both truncation (64-bit platforms) and integer -+ * overflow. -+ */ -+ if (prefix_size + expanded_size > prefix_size && -+ prefix_size + expanded_size < 0xffffffffU) -+ { -+ text = png_malloc_warn(png_ptr, prefix_size + expanded_size + 1); -+ } - - if (text != NULL) - { - png_memcpy(text, png_ptr->chunkdata, prefix_size); - new_size = png_inflate(png_ptr, - (png_bytep)(png_ptr->chunkdata + prefix_size), - chunklength - prefix_size, - (png_bytep)(text + prefix_size), expanded_size); diff --git a/mozilla-build.patch b/mozilla-build.patch index 065ca9f..be1ba4b 100644 --- a/mozilla-build.patch +++ b/mozilla-build.patch @@ -1,7 +1,7 @@ -diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build 2010-08-06 03:09:27.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in 2010-08-16 10:49:10.000000000 +0200 -@@ -181,7 +181,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= +diff -up mozilla-beta/security/manager/Makefile.in.build mozilla-beta/security/manager/Makefile.in +--- mozilla-beta/security/manager/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100 ++++ mozilla-beta/security/manager/Makefile.in 2012-03-09 13:56:28.612328083 +0100 +@@ -174,7 +174,6 @@ DEFAULT_GMAKE_FLAGS += NSPR_INCLUDE_DIR= DEFAULT_GMAKE_FLAGS += NSPR_LIB_DIR=$(NSPR_LIB_DIR) DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1 @@ -9,15 +9,14 @@ diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/Makefile.in.build xu DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)" ifndef MOZ_NATIVE_SQLITE DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3 -diff -up xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in ---- xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in.build 2010-08-06 03:09:17.000000000 +0200 -+++ xulrunner-1.9.3.0/mozilla-central/security/manager/ssl/src/Makefile.in 2010-08-16 10:46:22.000000000 +0200 -@@ -113,8 +113,6 @@ CSRCS += md4.c - +diff -up mozilla-beta/security/manager/ssl/src/Makefile.in.build mozilla-beta/security/manager/ssl/src/Makefile.in +--- mozilla-beta/security/manager/ssl/src/Makefile.in.build 2012-03-09 01:39:56.000000000 +0100 ++++ mozilla-beta/security/manager/ssl/src/Makefile.in 2012-03-09 13:57:37.055657208 +0100 +@@ -116,7 +116,6 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) --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) + DEFINES += \ +- -DNSS_ENABLE_ECC \ + -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ + -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ + $(NULL) diff --git a/xulrunner-9.0-secondary-build-fix.patch b/xulrunner-9.0-secondary-build-fix.patch deleted file mode 100644 index fc1c1db..0000000 --- a/xulrunner-9.0-secondary-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp ---- xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp.orig 2012-01-04 11:06:39.000000000 +0100 -+++ xulrunner-9.0.1/mozilla-release/js/src/jscompartment.cpp 2012-01-04 11:06:43.000000000 +0100 -@@ -50,7 +50,6 @@ - #include "jswatchpoint.h" - #include "jswrapper.h" - #include "assembler/wtf/Platform.h" --#include "assembler/jit/ExecutableAllocator.h" - #include "yarr/BumpPointerAllocator.h" - #include "methodjit/MethodJIT.h" - #include "methodjit/PolyIC.h" diff --git a/xulrunner.spec b/xulrunner.spec index 511187a..b5ef968 100644 --- a/xulrunner.spec +++ b/xulrunner.spec @@ -1,3 +1,6 @@ +# Use system nspr/nss? +%define system_nss 1 + # Use system sqlite? %if 0%{?fedora} <= 15 %define system_sqlite 0 @@ -5,14 +8,20 @@ %define system_sqlite 1 %endif +# Build as a debug package? +%define debug_build 0 + # Minimal required versions -%global nspr_version 4.8.9 -%global nss_version 3.13.1 %global cairo_version 1.10.2 %global freetype_version 2.1.9 %global libnotify_version 0.7.0 %global libvpx_version 1.0.0 +%if %{?system_nss} +%global nspr_version 4.9 +%global nss_version 3.13.3 +%endif + %if %{?system_sqlite} %global sqlite_version 3.7.7.1 # The actual sqlite version (see #480989): @@ -25,11 +34,11 @@ # rc_version should be set to the RC number if using an RC, 0 otherwise %global gecko_dir_ver 2 %global alpha_version 0 -%global beta_version 0 +%global beta_version 7 %global rc_version 0 -%global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver} -%global tarballdir mozilla-release +%global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver} +%global tarballdir mozilla-release # crash reporter work only on x86/x86_64 %ifarch %{ix86} x86_64 @@ -60,8 +69,8 @@ Summary: XUL Runtime for Gecko Applications Name: xulrunner -Version: 10.0.1 -Release: 5%{?pre_tag}%{?dist} +Version: 11.0 +Release: 1%{?pre_tag}%{?dist} URL: http://developer.mozilla.org/En/XULRunner License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -77,9 +86,9 @@ Patch0: xulrunner-version.patch Patch1: mozilla-build.patch Patch14: xulrunner-2.0-chromium-types.patch %if 0%{?fedora} <= 15 -Patch16: add-gtkmozembed-10.0.patch +Patch16: add-gtkmozembed-11.0.patch %endif -Patch17: xulrunner-10.0-gcc47.patch +Patch17: xulrunner-10.0-gcc47.patch # Fedora specific patches @@ -88,25 +97,22 @@ Patch23: wmclass.patch Patch24: crashreporter-remove-static.patch # Upstream patches -Patch38: mozilla-696393.patch # https://bugzilla.mozilla.org/show_bug.cgi?id=707993 Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch -Patch40: mozilla-682832-proxy.patch -# cherry-picked from 13afcd4c097c -Patch41: xulrunner-9.0-secondary-build-fix.patch Patch42: mozilla-706724.patch Patch43: mozilla-file.patch # Needed to detect/use libvpx-1.0.0 # https://bugzilla.mozilla.org/show_bug.cgi?id=722127 -Patch44: mozilla-722127.patch -Patch45: mozilla-727401.patch -Patch46: mozilla-724615.patch -Patch47: mozilla-691898.patch +Patch44: mozilla-722127.patch +Patch46: mozilla-724615.patch +Patch47: mozilla-691898.patch # --------------------------------------------------- +%if %{?system_nss} BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nss-devel >= %{nss_version} +%endif BuildRequires: cairo-devel >= %{cairo_version} BuildRequires: libpng-devel BuildRequires: libjpeg-devel @@ -129,8 +135,10 @@ BuildRequires: libcurl-devel BuildRequires: libvpx-devel >= %{libvpx_version} Requires: mozilla-filesystem +%if %{?system_nss} Requires: nspr >= %{nspr_version} Requires: nss >= %{nss_version} +%endif Provides: gecko-libs = %{gecko_verrel} Provides: gecko-libs%{?_isa} = %{gecko_verrel} Conflicts: firefox < 3.6 @@ -159,8 +167,10 @@ Provides: gecko-devel-unstable = %{gecko_verrel} Provides: gecko-devel-unstable%{?_isa} = %{gecko_verrel} Requires: xulrunner = %{version}-%{release} +%if %{?system_nss} Requires: nspr-devel >= %{nspr_version} Requires: nss-devel >= %{nss_version} +%endif Requires: cairo-devel >= %{cairo_version} Requires: libjpeg-devel Requires: zip @@ -215,7 +225,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \ > version.patch %{__patch} -p1 -b --suffix .version --fuzz=0 < version.patch -%patch1 -p2 -b .build +%patch1 -p1 -b .build %patch14 -p1 -b .chromium-types %if 0%{?fedora} <= 15 %patch16 -p2 -b .gtkmozembed @@ -226,16 +236,12 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \ %patch23 -p1 -b .wmclass %patch24 -p1 -b .static -%patch38 -p2 -b .696393 %patch39 -p1 -b .707993 -%patch40 -p2 -b .682832 -%patch41 -p2 -b .secondary-build %patch42 -p1 -b .706724 %patch43 -p1 -b .file %patch44 -p2 -b .vpx1.0.0 -%patch45 -p1 -b .727401 %patch46 -p1 -b .724615 -%patch47 -p1 -b .691898 +#%patch47 -p1 -b .691898 %{__rm} -f .mozconfig %{__cp} %{SOURCE10} .mozconfig @@ -243,12 +249,28 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \ %{__cat} %{SOURCE11} >> .mozconfig %endif +%if %{?system_nss} +echo "ac_add_options --with-system-nspr" >> .mozconfig +echo "ac_add_options --with-system-nss" >> .mozconfig +%else +echo "ac_add_options --without-system-nspr" >> .mozconfig +echo "ac_add_options --without-system-nss" >> .mozconfig +%endif + %if %{?system_sqlite} echo "ac_add_options --enable-system-sqlite" >> .mozconfig %else echo "ac_add_options --disable-system-sqlite" >> .mozconfig %endif +%if %{?debug_build} +echo "ac_add_options --enable-debug" >> .mozconfig +echo "ac_add_options --disable-optimize" >> .mozconfig +%else +echo "ac_add_options --disable-debug" >> .mozconfig +echo "ac_add_options --enable-optimize" >> .mozconfig +%endif + # s390(x) fails to start with jemalloc enabled %ifarch s390 s390x echo "ac_add_options --disable-jemalloc" >> .mozconfig @@ -304,6 +326,9 @@ cd %{tarballdir} # MOZ_OPT_FLAGS=$(echo "$RPM_OPT_FLAGS -fpermissive" | \ %{__sed} -e 's/-Wall//' -e 's/-fexceptions/-fno-exceptions/g') +%if %{?debug_build} +MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//') +%endif export CFLAGS=$MOZ_OPT_FLAGS export CXXFLAGS=$MOZ_OPT_FLAGS @@ -318,6 +343,7 @@ MOZ_SMP_FLAGS=-j1 RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`" [ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2 [ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4 +[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8 %endif make -f client.mk build STRIP="/bin/true" MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS" MOZ_SERVICES_SYNC="1" @@ -446,7 +472,9 @@ fi %{mozappdir}/dependentlibs.list %{_sysconfdir}/ld.so.conf.d/xulrunner*.conf %{mozappdir}/plugin-container - +%if !%{?system_nss} +%{mozappdir}/*.chk +%endif %if %{enable_mozilla_crashreporter} %{mozappdir}/crashreporter %{mozappdir}/crashreporter.ini @@ -465,6 +493,9 @@ fi #--------------------------------------------------------------------- %changelog +* Fri Mar 9 2012 Martin Stransky - 11.0-1 +- Update to 11.0 Beta 7 + * Fri Mar 09 2012 Dan Horák - 10.0.1-5 - Add fix for secondary arches from mozb#691898