packages: xulrunner/xulrunner-gtkmozembed.patch, xulrunner/xulrunner.spec -...
arekm
arekm at pld-linux.org
Wed Dec 21 20:57:57 CET 2011
Author: arekm Date: Wed Dec 21 19:57:57 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 9.0
---- Files affected:
packages/xulrunner:
xulrunner-gtkmozembed.patch (1.6 -> 1.7) , xulrunner.spec (1.202 -> 1.203)
---- Diffs:
================================================================
Index: packages/xulrunner/xulrunner-gtkmozembed.patch
diff -u packages/xulrunner/xulrunner-gtkmozembed.patch:1.6 packages/xulrunner/xulrunner-gtkmozembed.patch:1.7
--- packages/xulrunner/xulrunner-gtkmozembed.patch:1.6 Sat Nov 12 08:00:45 2011
+++ packages/xulrunner/xulrunner-gtkmozembed.patch Wed Dec 21 20:57:52 2011
@@ -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 @@
+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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+};
+
+#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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+};
+
+#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 @@
+ 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 @@
+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 @@
+ 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 @@
+};
+
+#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 @@
+
+ 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 @@
+};
+
+#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.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 @@
+ 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 @@
+
+ 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 @@
+
+ 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 @@
+};
+
+#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 @@
+
+
+#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 @@
+ 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 @@
+ 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 @@
+#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 @@
+
+#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 @@
+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 @@
+#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 @@
+ 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 @@
+ 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 @@
+
+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 @@
+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 @@
+ 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 @@
+ 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 @@
+ 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 @@
+
+ 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 @@
+ 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 @@
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 @@
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 @@
+
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%
================================================================
Index: packages/xulrunner/xulrunner.spec
diff -u packages/xulrunner/xulrunner.spec:1.202 packages/xulrunner/xulrunner.spec:1.203
--- packages/xulrunner/xulrunner.spec:1.202 Tue Dec 20 20:42:45 2011
+++ packages/xulrunner/xulrunner.spec Wed Dec 21 20:57:52 2011
@@ -23,15 +23,15 @@
Summary: XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
Summary(pl.UTF-8): XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
Name: xulrunner
-Version: 8.0.1
-Release: 4
+Version: 9.0
+Release: 1
Epoch: 2
License: MPL v1.1 or GPL v2+ or LGPL v2.1+
Group: X11/Applications
# Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
# instead of waiting for mozilla to copy file on ftp.
Source0: http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5: b7d09b082e88a74860a51a8e04e29333
+# Source0-md5: d8d0c8c79660752b02d9e9ab69a68f94
Patch0: %{name}-install.patch
Patch1: %{name}-rpath.patch
Patch3: %{name}-nss_cflags.patch
@@ -40,6 +40,7 @@
Patch6: %{name}-prefs.patch
Patch7: %{name}-ssl_oldapi.patch
Patch8: %{name}-ppc.patch
+# http://pkgs.fedoraproject.org/gitweb/?p=xulrunner.git;a=tree
Patch9: %{name}-gtkmozembed.patch
Patch10: %{name}-linux3.patch
URL: https://developer.mozilla.org/en/XULRunner
@@ -187,6 +188,10 @@
%patch9 -p2
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner-gtkmozembed.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xulrunner/xulrunner.spec?r1=1.202&r2=1.203&f=u
More information about the pld-cvs-commit
mailing list