[xulrunner/f15: 3/3] Updated to 9.0 Beta 5
Martin Stransky
stransky at fedoraproject.org
Fri Dec 9 14:25:02 UTC 2011
commit f6111dd58d4392f05ca7ff454544ae43d58773e0
Author: Martin Stransky <stransky at anakreon.cz>
Date: Fri Dec 9 15:20:30 2011 +0100
Updated to 9.0 Beta 5
...mozembed-8.0.patch => add-gtkmozembed-9.0.patch | 280 +++++++++++---------
mozilla-193-pkgconfig.patch | 20 --
mozilla-670719.patch | 53 ----
mozilla-686280.patch | 25 --
mozilla-696393.patch | 58 ++---
...-ipc.patch => xulrunner-9.0-secondary-ipc.patch | 32 ++--
xulrunner.spec | 23 +-
7 files changed, 210 insertions(+), 281 deletions(-)
---
diff --git a/add-gtkmozembed-8.0.patch b/add-gtkmozembed-9.0.patch
similarity index 94%
rename from add-gtkmozembed-8.0.patch
rename to add-gtkmozembed-9.0.patch
index 090f132..1ba11e4 100644
--- a/add-gtkmozembed-8.0.patch
+++ b/add-gtkmozembed-9.0.patch
@@ -1,6 +1,6 @@
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-10-11 15:32:56.211500043 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2011-10-11 15:32:56.211500043 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/Makefile.in
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-12-09 14:55:38.370423755 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2011-12-09 14:55:38.370423755 +0100
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -56,9 +56,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembe
+endif
+
+include $(topsrcdir)/config/rules.mk
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-10-11 15:32:56.212500050 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-10-11 15:32:56.212500050 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-12-09 14:55:38.370423755 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-12-09 14:55:38.371423759 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.
+ return NS_OK;
+}
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-10-11 15:32:56.213500057 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2011-10-11 15:32:56.213500057 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-12-09 14:55:38.371423759 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2011-12-09 14:55:38.371423759 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.
+ nsCOMPtr<nsIStringBundle> mPIPStringBundle;
+};
+#endif /* __EmbedCertificates_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-10-11 15:32:56.214500063 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-10-11 15:32:56.214500063 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-12-09 14:55:38.371423759 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-12-09 14:55:38.371423759 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListen
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-10-11 15:32:56.217500082 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2011-10-11 15:32:56.217500082 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-12-09 14:55:38.371423759 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2011-12-09 14:55:38.372423763 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListen
+};
+
+#endif /* __EmbedContentListener_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-10-11 15:32:56.219500096 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-10-11 15:32:56.219500096 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-12-09 14:55:38.372423763 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-12-09 14:55:38.372423763 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuIn
+ mEmbedCtxType |= GTK_MOZ_EMBED_CTX_DOCUMENT;
+ return NS_OK;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-10-11 15:32:56.222500116 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-10-11 15:32:56.222500116 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-12-09 14:55:38.372423763 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-12-09 14:55:38.372423763 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuIn
+ nsString mCtxDocTitle;
+}; // class EmbedContextMenuInfo
+#endif // EmbedContextMenuInfo_h__
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-10-11 15:32:56.223500122 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-10-11 19:12:12.742427564 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-12-09 14:55:38.373423767 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-12-09 14:55:38.373423767 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+ NS_ERROR("Unexpected event type");
+ return NS_OK;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-10-11 15:32:56.225500136 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2011-10-11 16:13:11.417521103 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-12-09 14:55:38.373423767 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2011-12-09 14:55:38.373423767 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener
+};
+
+#endif /* __EmbedEventListener_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-10-11 15:32:56.226500143 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-10-11 15:32:56.226500143 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-12-09 14:55:38.374423771 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-12-09 14:55:38.374423771 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.
+ NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
+ return docShell->GetContentViewer(aViewer);
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-10-11 15:32:56.227500150 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2011-10-11 15:32:56.227500150 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-12-09 14:55:38.375423775 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2011-12-09 14:55:38.375423775 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gt
+GetContentViewer(nsIWebBrowser *webBrowser, nsIContentViewer **aViewer);
+
+#endif /* __EmbedTools_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-10-11 15:32:56.230500171 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-10-11 19:01:06.189128684 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-12-09 14:55:38.375423775 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-12-09 14:55:38.375423775 +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-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.g
+ gtk_widget_destroy(sOffscreenWindow);
+ sOffscreenWindow = 0;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-10-11 15:32:56.233500190 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2011-10-11 15:32:56.233500190 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-12-09 14:55:38.376423779 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2011-12-09 14:55:38.376423779 +0100
@@ -0,0 +1,188 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3110,9 +3110,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtk
+};
+
+#endif /* __EmbedPrivate_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-10-11 15:32:56.234500196 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2011-10-11 15:32:56.235500203 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-12-09 14:55:38.376423779 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2011-12-09 14:55:38.376423779 +0100
@@ -0,0 +1,215 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3329,9 +3329,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.
+
+ uri->GetSpec(aString);
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-10-11 15:32:56.235500203 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2011-10-11 15:32:56.235500203 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-12-09 14:55:38.376423779 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2011-12-09 14:55:38.376423779 +0100
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3399,9 +3399,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gt
+};
+
+#endif /* __EmbedProgress_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-10-11 15:32:56.237500217 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-10-11 15:32:56.237500217 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-12-09 14:55:38.377423783 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-12-09 14:55:38.377423783 +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 +3814,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.
+ }
+ }
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-10-11 15:32:56.238500224 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2011-10-11 15:32:56.238500224 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-12-09 14:55:38.377423783 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2011-12-09 14:55:38.377423783 +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 +3931,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gt
+ GtkWidget *mComboBox;
+ GtkWidget *mCheckBox;
+};
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-10-11 15:32:56.243500258 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2011-10-11 15:32:56.243500258 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-12-09 14:55:38.377423783 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2011-12-09 14:55:38.377423783 +0100
@@ -0,0 +1,474 @@
+/*
+ * vim:ts=2:et:sw=2
@@ -4409,9 +4409,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gt
+
+ return rv;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-10-11 15:32:56.245500270 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-10-11 15:32:56.245500270 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-12-09 14:55:38.378423787 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-12-09 14:55:38.378423787 +0100
@@ -0,0 +1,106 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4519,9 +4519,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator
+
+ return NS_ERROR_FAILURE;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-10-11 15:32:56.246500277 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-10-11 15:32:56.246500277 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-12-09 14:55:38.378423787 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-12-09 14:55:38.378423787 +0100
@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4577,9 +4577,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator
+};
+
+#endif /* __EmbedWindowCreator_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-10-11 15:32:56.248500291 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2011-10-11 15:32:56.248500291 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-12-09 14:55:38.378423787 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2011-12-09 14:55:38.378423787 +0100
@@ -0,0 +1,101 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4682,9 +4682,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkm
+
+
+#endif /* __EmbedWindow_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-10-11 15:32:56.250500305 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-10-11 15:32:56.250500305 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-12-09 14:55:38.379423791 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-12-09 14:55:38.379423791 +0100
@@ -0,0 +1,1132 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5818,9 +5818,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.g
+ aNewEmbed, aChromeFlags);
+
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-10-11 15:32:56.253500325 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-10-11 15:32:56.253500325 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-12-09 14:55:38.379423791 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-12-09 14:55:38.379423791 +0100
@@ -0,0 +1,116 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5938,9 +5938,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.c
+ return XPCOMGlueLoadXULFunctions(GtkSymbolsInternal);
+}
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-10-11 15:32:56.255500339 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2011-10-11 15:32:56.255500339 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-12-09 14:55:38.380423795 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2011-12-09 14:55:38.380423795 +0100
@@ -0,0 +1,287 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6229,9 +6229,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkm
+#endif /* __cplusplus */
+
+#endif /* gtkmozembed_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-10-11 15:32:56.256500346 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-10-11 15:32:56.256500346 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-12-09 14:55:38.380423795 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-12-09 14:55:38.380423795 +0100
@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6303,9 +6303,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_intern
+
+#endif /* gtkmozembed_internal_h */
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-10-11 15:32:56.259500366 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-10-11 15:32:56.259500366 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-12-09 14:55:38.380423795 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-12-09 14:55:38.380423795 +0100
@@ -0,0 +1,34 @@
+BOOL:STRING
+BOOL:STRING,STRING
@@ -6341,9 +6341,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal
+BOOL:POINTER
+VOID:POINTER
+BOOL:STRING,STRING,POINTER
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-10-11 15:32:56.262500386 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-10-11 15:32:56.262500386 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-12-09 14:55:38.380423795 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-12-09 14:55:38.381423799 +0100
@@ -0,0 +1,91 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6436,9 +6436,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate
+#endif /* __cplusplus */
+
+#endif /* gtkmozembedprivate_h */
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-10-11 15:32:56.264500398 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2011-10-11 15:32:56.264500398 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-12-09 14:55:38.381423799 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2011-12-09 14:55:38.381423799 +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 +6789,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.c
+ NS_WARNING("Unexpected button flags");
+ }
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-10-11 15:32:56.265500405 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2011-10-11 15:32:56.265500405 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-12-09 14:55:38.381423799 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2011-12-09 14:55:38.381423799 +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 +6852,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+ void GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,
+ const PRUnichar* aStringValue, nsAString &aLabel);
+};
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-10-11 15:32:56.268500426 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2011-10-11 15:32:56.268500426 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-12-09 14:55:38.381423799 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2011-12-09 14:55:38.381423799 +0100
@@ -0,0 +1,112 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -6968,9 +6968,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmoz
+
+GARBAGE += $(MARSHAL_FILE).h $(MARSHAL_FILE).c
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-10-11 15:32:56.269500433 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2011-10-11 15:32:56.269500433 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-12-09 14:55:38.382423803 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2011-12-09 14:55:38.382423803 +0100
@@ -0,0 +1,101 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -7073,9 +7073,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkm
+DEFINES += -D_TIME_H=1
+endif
+endif
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-10-11 15:32:56.270500440 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-10-11 15:32:56.270500440 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-12-09 14:55:38.382423803 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-12-09 14:55:38.382423803 +0100
@@ -0,0 +1,185 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -7262,9 +7262,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChil
+ gtk_moz_embed_load_url(GTK_MOZ_EMBED(embed), text);
+ g_free(text);
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-10-11 15:32:56.275500472 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-10-11 15:32:56.275500472 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-12-09 14:55:38.383423807 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-12-09 14:55:38.383423807 +0100
@@ -0,0 +1,1145 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8411,9 +8411,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+ gtk_widget_set_sensitive(browser->forwardButton, FALSE);
+ }
+
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-10-11 15:32:56.276500479 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-10-11 15:32:56.276500479 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-12-09 14:55:38.383423807 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-12-09 14:55:38.383423807 +0100
@@ -0,0 +1,142 @@
+/** simplemdi.c **/
+/*
@@ -8557,9 +8557,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.
+ gtk_main_quit();
+ return(0);
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-10-11 15:32:56.277500486 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-10-11 15:32:56.277500486 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-12-09 14:55:38.384423811 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-12-09 14:55:38.384423811 +0100
@@ -0,0 +1,86 @@
+#include <gtk/gtk.h>
+#include <gtkmozembed.h>
@@ -8647,9 +8647,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNote
+
+ return 0;
+}
-diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
---- xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-10-11 15:32:56.279500500 +0200
-+++ xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-10-11 15:32:56.279500500 +0200
+diff -up xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
+--- xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-12-09 14:55:38.385423815 +0100
++++ xulrunner-9.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-12-09 14:55:38.385423815 +0100
@@ -0,0 +1,109 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8760,9 +8760,9 @@ diff -up xulrunner-8.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSock
+ fprintf(stderr, "Can't fork.\n");
+ }
+}
-diff -up xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in
---- xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2011-10-07 02:59:21.000000000 +0200
-+++ xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in 2011-10-11 15:32:56.281500514 +0200
+diff -up xulrunner-9.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-9.0/mozilla-beta/toolkit/library/Makefile.in
+--- xulrunner-9.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2011-12-07 07:28:06.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/toolkit/library/Makefile.in 2011-12-09 14:55:38.385423815 +0100
@@ -75,6 +75,8 @@ CPPSRCS += dlldeps-xul.cpp
endif
@@ -8772,10 +8772,10 @@ diff -up xulrunner-8.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulr
DEFINES += -DMOZ_ENABLE_GTK2
endif
-diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh
---- xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-10-07 02:59:24.000000000 +0200
-+++ xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2011-10-11 15:32:56.283500528 +0200
-@@ -561,6 +561,9 @@ MAKEFILES_embedding="
+diff -up xulrunner-9.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-9.0/mozilla-beta/toolkit/toolkit-makefiles.sh
+--- xulrunner-9.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-12-07 07:28:07.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2011-12-09 14:55:38.385423815 +0100
+@@ -555,6 +555,9 @@ MAKEFILES_embedding="
embedding/browser/Makefile
embedding/browser/build/Makefile
embedding/browser/webBrowser/Makefile
@@ -8785,10 +8785,10 @@ diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xul
embedding/components/Makefile
embedding/components/appstartup/Makefile
embedding/components/appstartup/src/Makefile
-diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk
---- xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2011-10-07 02:59:24.000000000 +0200
-+++ xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk 2011-10-11 15:32:56.284500534 +0200
-@@ -223,6 +223,12 @@ endif
+diff -up xulrunner-9.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-9.0/mozilla-beta/toolkit/toolkit-tiers.mk
+--- xulrunner-9.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2011-12-07 07:28:07.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/toolkit/toolkit-tiers.mk 2011-12-09 14:55:38.386423819 +0100
+@@ -220,6 +220,12 @@ endif
tier_platform_dirs += services/crypto/component
@@ -8800,9 +8800,47 @@ diff -up xulrunner-8.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunn
+
tier_platform_dirs += startupcache
- ifdef APP_LIBXUL_STATICDIRS
-@@ -269,4 +275,3 @@ tier_platform_dirs += testing/xpcshell
+ tier_platform_dirs += js/ductwork
+@@ -268,4 +274,3 @@ tier_platform_dirs += testing/xpcshell
tier_platform_dirs += testing/mozmill
tier_platform_dirs += testing/tools/screenshot
endif
-
+diff -up xulrunner-9.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed xulrunner-9.0/mozilla-beta/xulrunner/installer/Makefile.in
+--- xulrunner-9.0/mozilla-beta/xulrunner/installer/Makefile.in.gtkmozembed 2011-12-09 14:55:38.366423739 +0100
++++ xulrunner-9.0/mozilla-beta/xulrunner/installer/Makefile.in 2011-12-09 14:55:38.386423819 +0100
+@@ -78,6 +78,8 @@ pkg_config_files = \
+ libxul-embedding.pc \
+ mozilla-js.pc \
+ mozilla-plugin.pc \
++ mozilla-gtkmozembed.pc \
++ mozilla-gtkmozembed-embedding.pc \
+ $(NULL)
+
+ ifdef MOZ_NATIVE_NSPR
+diff -up xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
+--- xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.gtkmozembed 2011-12-09 14:55:38.386423819 +0100
++++ xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2011-12-09 14:56:32.550629518 +0100
+@@ -0,0 +1,9 @@
++prefix=%prefix%
++sdkdir=%sdkdir%
++includedir=%includedir%
++libdir=%libdir%
++
++Name: mozilla-gtkembedmoz
++Description: Static version-independent Mozilla Embedding Widget for Gtk+
++Version: %MOZILLA_VERSION%
++Requires: libxul-embedding = %MOZILLA_VERSION%
+diff -up xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in
+--- xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in.gtkmozembed 2011-12-09 14:55:38.387423823 +0100
++++ xulrunner-9.0/mozilla-beta/xulrunner/installer/mozilla-gtkmozembed.pc.in 2011-12-09 14:56:25.270603216 +0100
+@@ -0,0 +1,9 @@
++prefix=%prefix%
++sdkdir=%sdkdir%
++includedir=%includedir%
++libdir=%libdir%
++
++Name: mozilla-gtkembedmoz
++Description: Mozilla Embedding Widget for Gtk+
++Version: %MOZILLA_VERSION%
++Requires: libxul = %MOZILLA_VERSION%
diff --git a/mozilla-193-pkgconfig.patch b/mozilla-193-pkgconfig.patch
index c17c89b..a867f22 100644
--- a/mozilla-193-pkgconfig.patch
+++ b/mozilla-193-pkgconfig.patch
@@ -51,23 +51,3 @@ diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/Makefile.in.pk xu
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
-+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-08-16 11:07:52.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
-
- Name: mozilla-gtkembedmoz
-diff -up xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in
---- xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in.pk 2010-08-06 03:09:24.000000000 +0200
-+++ xulrunner-1.9.3.0/mozilla-central/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-08-16 11:07:52.000000000 +0200
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
-
- Name: mozilla-gtkembedmoz
diff --git a/mozilla-696393.patch b/mozilla-696393.patch
index 66614ac..8859d97 100644
--- a/mozilla-696393.patch
+++ b/mozilla-696393.patch
@@ -1,7 +1,7 @@
-diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
---- mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 2011-11-04 17:34:23.000000000 -0400
-+++ mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp 2011-12-01 12:25:09.947558444 -0500
-@@ -200,56 +200,22 @@ invoke_copy_to_stack(PRUint32 paramCount
+diff -up xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
+--- xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp.696393 2011-12-07 07:28:08.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp 2011-12-09 15:06:10.584998410 +0100
+@@ -200,52 +200,21 @@ invoke_copy_to_stack(PRUint32 paramCount
}
}
@@ -12,22 +12,12 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
PRUint32 paramCount, nsXPTCVariant* params)
{
- PRUint32 *vtable = *(PRUint32 **)that;
--#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
- PRUint32 method = vtable[methodIndex];
--#else /* not G++ V3 ABI */
-- PRUint32 method = vtable[methodIndex + 2];
--#endif /* G++ V3 ABI */
+ vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+ vtable_func method = vtable[methodIndex];
PRUint32 overflow = invoke_count_words (paramCount, params);
- PRUint32 result;
-+ PRUint32 *stack_space = reinterpret_cast<PRUint32 *>(__builtin_alloca((overflow + 8 /* 4 32-bits gpr + 2 64-bits fpr */) * 4));
-+
-+ invoke_copy_to_stack(paramCount, params, stack_space, overflow);
-+
-+ PRUint32 *d_gpr = stack_space + overflow;
-+ double *d_fpr = reinterpret_cast<double *>(d_gpr + 4);
-
+-
- __asm__ __volatile__
- (
- "lr 7,15\n\t"
@@ -39,19 +29,23 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
- "l 2,0(15)\n\t"
- "la 15,0(3,7)\n\t"
- "st 2,0(15)\n\t"
--
++ PRUint32 *stack_space = reinterpret_cast<PRUint32 *>(__builtin_alloca((overflow + 8 /* 4 32-bits gpr + 2 64-bits fpr */) * 4));
+
- "lr 2,%1\n\t"
- "lr 3,%2\n\t"
- "la 4,96(15)\n\t"
- "lr 5,%3\n\t"
- "basr 14,%4\n\t"
--
++ invoke_copy_to_stack(paramCount, params, stack_space, overflow);
+
- "lr 2,%5\n\t"
- "ld 0,112(7)\n\t"
- "ld 2,120(7)\n\t"
- "lm 3,6,96(7)\n\t"
- "basr 14,%6\n\t"
--
++ PRUint32 *d_gpr = stack_space + overflow;
++ double *d_fpr = reinterpret_cast<double *>(d_gpr + 4);
+
- "la 15,32(7)\n\t"
-
- "lr %0,2\n\t"
@@ -68,11 +62,11 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
- return result;
+ return method(that, d_gpr[0], d_gpr[1], d_gpr[2], d_gpr[3], d_fpr[0], d_fpr[1]);
}
-
-diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp
---- mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp.696393 2011-11-04 17:34:23.000000000 -0400
-+++ mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp 2011-12-02 09:33:06.717556519 -0500
-@@ -194,59 +194,23 @@ invoke_copy_to_stack(PRUint32 paramCount
+-
+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
}
}
@@ -83,11 +77,7 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
PRUint32 paramCount, nsXPTCVariant* params)
{
- PRUint64 *vtable = *(PRUint64 **)that;
--#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */
- PRUint64 method = vtable[methodIndex];
--#else /* not G++ V3 ABI */
-- PRUint64 method = vtable[methodIndex + 2];
--#endif /* G++ V3 ABI */
+ vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
+ vtable_func method = vtable[methodIndex];
PRUint64 overflow = invoke_count_words (paramCount, params);
@@ -111,7 +101,8 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
- "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"
@@ -119,7 +110,9 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
- "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<double *>(d_gpr + 4);
+
- "la 15,64(7)\n\t"
-
- "lgr %0,2\n\t"
@@ -135,11 +128,6 @@ diff -up mozilla-release/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390
- );
-
- return result;
-+ invoke_copy_to_stack(paramCount, params, stack_space, overflow);
-+
-+ PRUint64 *d_gpr = stack_space + overflow;
-+ double *d_fpr = reinterpret_cast<double *>(d_gpr + 4);
-+
+ 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/xulrunner-6.0-secondary-ipc.patch b/xulrunner-9.0-secondary-ipc.patch
similarity index 53%
rename from xulrunner-6.0-secondary-ipc.patch
rename to xulrunner-9.0-secondary-ipc.patch
index ed09f25..062094b 100644
--- a/xulrunner-6.0-secondary-ipc.patch
+++ b/xulrunner-9.0-secondary-ipc.patch
@@ -1,6 +1,6 @@
-diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc
---- xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc 2011-08-16 10:05:26.325449386 +0200
+diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/base/data_pack.cc 2011-12-09 14:35:50.397220865 +0100
@@ -91,14 +91,7 @@ bool DataPack::Load(const FilePath& path
bool DataPack::Get(uint32_t resource_id, StringPiece* data) {
// It won't be hard to make this endian-agnostic, but it's not worth
@@ -17,10 +17,10 @@ diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/base/data_pack.cc.second
DataPackEntry* target = reinterpret_cast<DataPackEntry*>(
bsearch(&resource_id, mmap_->data() + kHeaderLength, resource_count_,
-diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h
---- xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h 2011-08-16 10:07:23.093899409 +0200
-@@ -57,9 +57,24 @@
+diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/build/build_config.h 2011-12-09 14:39:44.922231601 +0100
+@@ -59,11 +59,23 @@
#define ARCH_CPU_ARMEL 1
#define ARCH_CPU_32_BITS 1
#define WCHAR_T_IS_UNSIGNED 1
@@ -30,6 +30,7 @@ diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.sec
#elif defined(__ppc__) || defined(__powerpc__)
#define ARCH_CPU_PPC 1
#define ARCH_CPU_32_BITS 1
+-#elif defined(__sparc64__)
+#elif defined(__s390x__)
+#define ARCH_CPU_S390X 1
+#define ARCH_CPU_64_BITS 1
@@ -37,22 +38,21 @@ diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/build/build_config.h.sec
+#define ARCH_CPU_S390 1
+#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc__) && !defined(__arch64)
-+#define ARCH_CPU_SPARC 1
+ #define ARCH_CPU_SPARC 1
+#define ARCH_CPU_32_BITS 1
+#elif defined(__sparc__) && defined(__arch64)
+#define ARCH_CPU_SPARC64 1
-+#define ARCH_CPU_64_BITS 1
+ #define ARCH_CPU_64_BITS 1
#else
#error Please add support for your architecture in build/build_config.h
- #endif
-diff -up xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h
---- xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-08-11 23:41:01.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-08-16 10:05:26.326449206 +0200
-@@ -219,7 +219,8 @@ struct ParamTraits<unsigned long> {
- }
+diff -up xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h
+--- xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h.secondary-ipc 2011-12-07 07:27:43.000000000 +0100
++++ xulrunner-9.0/mozilla-beta/ipc/chromium/src/chrome/common/ipc_message_utils.h 2011-12-09 14:40:59.602679278 +0100
+@@ -195,7 +195,8 @@ struct ParamTraits<unsigned long long> {
};
+ #endif
--#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
+-#if !(defined(OS_MACOSX) || defined(OS_OPENBSD) || defined(OS_WIN) || (defined(OS_LINUX) && defined(ARCH_CPU_64_BITS)))
+// Although s390 is a 32-bit system it defines size_t as unsigned long
+#if !(defined(OS_MACOSX) || defined(OS_WIN) || (defined(CHROMIUM_MOZILLA_BUILD) && defined(OS_LINUX) && (defined(ARCH_CPU_64_BITS) || defined(ARCH_CPU_S390))))
// There size_t is a synonym for |unsigned long| ...
diff --git a/xulrunner.spec b/xulrunner.spec
index 60c051d..43b0eec 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -12,11 +12,10 @@
# 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 5
%global rc_version 0
%global mozappdir %{_libdir}/%{name}-%{gecko_dir_ver}
-%global tarballdir mozilla-release
# crash reporter work only on x86/x86_64
%ifarch %{ix86} x86_64
@@ -31,14 +30,17 @@
%if %{alpha_version} > 0
%global pre_version a%{alpha_version}
%global pre_name alpha%{alpha_version}
+%global tarballdir mozilla-beta
%endif
%if %{beta_version} > 0
%global pre_version b%{beta_version}
%global pre_name beta%{beta_version}
+%global tarballdir mozilla-beta
%endif
%if %{rc_version} > 0
%global pre_version rc%{rc_version}
%global pre_name rc%{rc_version}
+%global tarballdir mozilla-release
%endif
%if %{defined pre_version}
%global gecko_verrel %{expand:%%{version}}-%{pre_name}
@@ -49,8 +51,8 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
-Version: 8.0
-Release: 5%{?pre_tag}%{?dist}
+Version: 9.0
+Release: 1%{?pre_tag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -66,9 +68,9 @@ Patch0: xulrunner-version.patch
Patch1: mozilla-build.patch
Patch14: xulrunner-2.0-chromium-types.patch
%if 0%{?fedora} <= 15
-Patch16: add-gtkmozembed-8.0.patch
+Patch16: add-gtkmozembed-9.0.patch
%endif
-Patch18: xulrunner-6.0-secondary-ipc.patch
+Patch18: xulrunner-9.0-secondary-ipc.patch
# Fedora specific patches
Patch20: mozilla-193-pkgconfig.patch
@@ -79,8 +81,6 @@ Patch24: crashreporter-remove-static.patch
# Upstream patches
Patch34: xulrunner-2.0-network-link-service.patch
Patch35: xulrunner-2.0-NetworkManager09.patch
-Patch36: mozilla-670719.patch
-Patch37: mozilla-686280.patch
Patch38: mozilla-696393.patch
# https://bugzilla.mozilla.org/show_bug.cgi?id=707993
Patch39: xulrunner-8.0-fix-maemo-checks-in-npapi.patch
@@ -207,9 +207,7 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{gecko_dir_ver}/' %{P:%%PATCH0} \
%patch34 -p1 -b .network-link-service
%patch35 -p1 -b .NetworkManager09
-%patch36 -p1 -b .670719
-%patch37 -p1 -b .686280
-%patch38 -p1 -b .696393
+%patch38 -p2 -b .696393
%patch39 -p1 -b .707993
%patch40 -p1 -b .682832
@@ -456,6 +454,9 @@ fi
#---------------------------------------------------------------------
%changelog
+* Fri Dec 9 2011 Martin Stransky <stransky at redhat.com> 9.0-1.beta5
+- Updated to 9.0 Beta 5
+
* Wed Dec 7 2011 Jan Horak <jhorak at redhat.com> - 8.0-5
- Gnome 3 proxy settings are now honoured (mozbz#682832)
More information about the scm-commits
mailing list