[xulrunner] Fixed patch and removed unpacked files
Jan Horak
xhorak at fedoraproject.org
Tue Sep 27 15:13:22 UTC 2011
commit 9265c14f36f4b6f7ec90e3e976e0976ff37ab86d
Author: Jan Horak <jhorak at redhat.com>
Date: Tue Sep 27 17:13:03 2011 +0200
Fixed patch and removed unpacked files
add-gtkmozembed.patch | 240 ++++++++++++++++++++++++------------------------
xulrunner.spec | 2 -
2 files changed, 120 insertions(+), 122 deletions(-)
---
diff --git a/add-gtkmozembed.patch b/add-gtkmozembed.patch
index f27f498..388cc4f 100644
--- a/add-gtkmozembed.patch
+++ b/add-gtkmozembed.patch
@@ -1,6 +1,6 @@
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/Makefile.in
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-08-16 23:07:13.197298375 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/Makefile.in 2011-08-16 23:07:13.197298375 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/Makefile.in 2011-09-02 14:32:09.591292225 +0200
@@ -0,0 +1,54 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -56,9 +56,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/Makefile.in.gtkmoze
+endif
+
+include $(topsrcdir)/config/rules.mk
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-08-16 23:07:13.198298357 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-08-16 23:07:13.198298357 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.cpp 2011-09-02 14:32:09.591292225 +0200
@@ -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-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificat
+ return NS_OK;
+}
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-08-16 23:07:13.199298339 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificates.h 2011-08-16 23:07:13.199298339 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h.gtkmozembed 2011-09-02 14:32:09.591292225 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedCertificates.h 2011-09-02 14:32:09.591292225 +0200
@@ -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-6.0/mozilla-release/embedding/browser/gtk/src/EmbedCertificat
+ nsCOMPtr<nsIStringBundle> mPIPStringBundle;
+};
+#endif /* __EmbedCertificates_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-08-16 23:07:13.200298320 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-08-16 23:07:13.200298320 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp.gtkmozembed 2011-09-02 14:32:09.592292230 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.cpp 2011-09-02 14:32:09.592292230 +0200
@@ -0,0 +1,156 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -561,9 +561,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentLis
+ return NS_ERROR_NOT_IMPLEMENTED;
+}
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-08-16 23:07:13.202298284 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentListener.h 2011-08-16 23:07:13.202298284 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h.gtkmozembed 2011-09-02 14:32:09.593292235 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContentListener.h 2011-09-02 14:32:09.593292235 +0200
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -631,9 +631,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContentLis
+};
+
+#endif /* __EmbedContentListener_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-08-16 23:07:13.203298265 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-08-16 23:07:13.203298265 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp.gtkmozembed 2011-09-02 14:32:09.594292240 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.cpp 2011-09-02 14:32:09.594292240 +0200
@@ -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-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMen
+ mEmbedCtxType |= GTK_MOZ_EMBED_CTX_DOCUMENT;
+ return NS_OK;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-08-16 23:07:13.204298246 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-08-16 23:07:13.204298246 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h.gtkmozembed 2011-09-02 14:32:09.595292245 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedContextMenuInfo.h 2011-09-02 14:32:09.595292245 +0200
@@ -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-6.0/mozilla-release/embedding/browser/gtk/src/EmbedContextMen
+ nsString mCtxDocTitle;
+}; // class EmbedContextMenuInfo
+#endif // EmbedContextMenuInfo_h__
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-08-16 23:07:13.205298228 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-08-16 23:07:13.206298211 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp.gtkmozembed 2011-09-02 14:32:09.596292250 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.cpp 2011-09-02 14:32:09.596292250 +0200
@@ -0,0 +1,304 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1666,9 +1666,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListe
+ }
+ return NS_OK;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-08-16 23:07:13.206298211 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListener.h 2011-08-16 23:07:13.206298211 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h.gtkmozembed 2011-09-02 14:32:09.596292250 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedEventListener.h 2011-09-02 14:32:09.596292250 +0200
@@ -0,0 +1,90 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -1760,9 +1760,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedEventListe
+};
+
+#endif /* __EmbedEventListener_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-08-16 23:07:13.207298194 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-08-16 23:07:13.207298194 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp.gtkmozembed 2011-09-02 14:32:09.597292255 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.cpp 2011-09-02 14:32:09.597292255 +0200
@@ -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: */
@@ -1852,9 +1852,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.c
+ NS_ENSURE_TRUE(docShell, NS_ERROR_FAILURE);
+ return docShell->GetContentViewer(aViewer);
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-08-16 23:07:13.208298176 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h 2011-08-16 23:07:13.208298176 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h.gtkmozembed 2011-09-02 14:32:09.597292255 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedGtkTools.h 2011-09-02 14:32:09.597292255 +0200
@@ -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: */
@@ -1923,9 +1923,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedGtkTools.h
+GetContentViewer(nsIWebBrowser *webBrowser, nsIContentViewer **aViewer);
+
+#endif /* __EmbedTools_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-08-16 23:07:13.210298139 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-08-16 23:07:13.210298139 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.gtkmozembed 2011-09-02 14:32:09.598292260 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp 2011-09-02 14:32:09.598292260 +0200
@@ -0,0 +1,983 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2910,9 +2910,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.cp
+ gtk_widget_destroy(sOffscreenWindow);
+ sOffscreenWindow = 0;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-08-16 23:07:13.211298121 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h 2011-08-16 23:07:13.211298121 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gtkmozembed 2011-09-02 14:32:09.598292260 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h 2011-09-02 15:25:27.671352254 +0200
@@ -0,0 +1,188 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -2962,7 +2962,7 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.
+// object.
+#include "nsIWebBrowserChrome.h"
+#include "nsIAppShell.h"
-+#include "nsPIDOMEventTarget.h"
++#include "nsIDOMEventTarget.h"
+#include "nsTArray.h"
+
+#include "gtkmozembedprivate.h"
@@ -3102,9 +3102,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrivate.h.
+};
+
+#endif /* __EmbedPrivate_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-08-16 23:07:13.212298103 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.cpp 2011-08-16 23:07:13.212298103 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.cpp 2011-09-02 14:32:09.599292265 +0200
@@ -0,0 +1,215 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3321,9 +3321,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.c
+
+ uri->GetSpec(aString);
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-08-16 23:07:13.214298067 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h 2011-08-16 23:07:13.214298067 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedProgress.h 2011-09-02 14:32:09.599292265 +0200
@@ -0,0 +1,66 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -3391,9 +3391,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedProgress.h
+};
+
+#endif /* __EmbedProgress_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-08-16 23:07:13.216298029 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-08-16 23:07:13.216298029 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp.gtkmozembed 2011-09-02 14:32:09.599292265 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.cpp 2011-09-02 14:32:09.599292265 +0200
@@ -0,0 +1,411 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3806,9 +3806,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.c
+ }
+ }
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-08-16 23:07:13.217298011 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h 2011-08-16 23:07:13.217298011 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.gtkmozembed 2011-09-02 14:32:09.600292270 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h 2011-09-02 14:32:09.600292270 +0200
@@ -0,0 +1,113 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -3923,9 +3923,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedPrompter.h
+ GtkWidget *mComboBox;
+ GtkWidget *mCheckBox;
+};
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-08-16 23:07:13.218297994 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp 2011-08-16 23:07:13.218297994 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2011-09-02 14:32:09.600292270 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2011-09-02 14:32:09.600292270 +0200
@@ -0,0 +1,474 @@
+/*
+ * vim:ts=2:et:sw=2
@@ -4401,9 +4401,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.cpp
+
+ return rv;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-08-16 23:07:13.219297976 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-08-16 23:07:13.219297976 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2011-09-02 14:32:09.601292274 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2011-09-02 14:32:09.601292274 +0200
@@ -0,0 +1,106 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4511,9 +4511,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCrea
+
+ return NS_ERROR_FAILURE;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-08-16 23:07:13.220297958 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-08-16 23:07:13.220297958 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h.gtkmozembed 2011-09-02 14:32:09.601292274 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.h 2011-09-02 14:32:09.601292274 +0200
@@ -0,0 +1,54 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4569,9 +4569,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindowCrea
+};
+
+#endif /* __EmbedWindowCreator_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-08-16 23:07:13.221297940 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h 2011-08-16 23:07:13.221297940 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h.gtkmozembed 2011-09-02 14:32:09.602292278 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.h 2011-09-02 14:32:09.602292278 +0200
@@ -0,0 +1,101 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -4674,9 +4674,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/EmbedWindow.h.g
+
+
+#endif /* __EmbedWindow_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-08-16 23:07:13.223297904 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-08-16 23:07:13.224297886 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp.gtkmozembed 2011-09-02 14:32:09.603292283 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed2.cpp 2011-09-02 14:32:09.603292283 +0200
@@ -0,0 +1,1132 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5810,9 +5810,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed2.cp
+ aNewEmbed, aChromeFlags);
+
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-08-16 23:07:13.225297868 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-08-16 23:07:13.225297868 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp.gtkmozembed 2011-09-02 14:32:09.604292288 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_glue.cpp 2011-09-02 14:32:09.604292288 +0200
@@ -0,0 +1,116 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -5930,9 +5930,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_glu
+ return XPCOMGlueLoadXULFunctions(GtkSymbolsInternal);
+}
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-08-16 23:07:13.226297850 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h 2011-08-16 23:07:13.226297850 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h.gtkmozembed 2011-09-02 14:32:09.604292288 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed.h 2011-09-02 14:32:09.604292288 +0200
@@ -0,0 +1,287 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6221,9 +6221,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed.h.g
+#endif /* __cplusplus */
+
+#endif /* gtkmozembed_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-08-16 23:07:13.227297831 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-08-16 23:07:13.227297831 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h.gtkmozembed 2011-09-02 14:32:09.605292293 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembed_internal.h 2011-09-02 14:32:09.605292293 +0200
@@ -0,0 +1,70 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6295,9 +6295,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembed_int
+
+#endif /* gtkmozembed_internal_h */
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-08-16 23:07:13.228297813 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-08-16 23:07:13.228297813 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list.gtkmozembed 2011-09-02 14:32:09.605292293 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedmarshal.list 2011-09-02 14:32:09.605292293 +0200
@@ -0,0 +1,34 @@
+BOOL:STRING
+BOOL:STRING,STRING
@@ -6333,9 +6333,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedmars
+BOOL:POINTER
+VOID:POINTER
+BOOL:STRING,STRING,POINTER
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-08-16 23:07:13.229297795 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-08-16 23:07:13.229297795 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h.gtkmozembed 2011-09-02 14:32:09.606292298 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/gtkmozembedprivate.h 2011-09-02 14:32:09.606292298 +0200
@@ -0,0 +1,91 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -6428,9 +6428,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/gtkmozembedpriv
+#endif /* __cplusplus */
+
+#endif /* gtkmozembedprivate_h */
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-08-16 23:07:13.230297777 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.cpp 2011-08-16 23:07:13.230297777 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp.gtkmozembed 2011-09-02 14:32:09.606292298 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.cpp 2011-09-02 14:32:09.606292298 +0200
@@ -0,0 +1,349 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6781,9 +6781,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptServic
+ NS_WARNING("Unexpected button flags");
+ }
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-08-16 23:07:13.231297759 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptService.h 2011-08-16 23:07:13.231297759 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/GtkPromptService.h 2011-09-02 14:32:09.607292303 +0200
@@ -0,0 +1,59 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* vim:expandtab:shiftwidth=4:tabstop=4: */
@@ -6844,9 +6844,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/GtkPromptServic
+ void GetButtonLabel(PRUint32 aFlags, PRUint32 aPos,
+ const PRUnichar* aStringValue, nsAString &aLabel);
+};
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/Makefile.in
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-08-16 23:07:13.232297741 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/Makefile.in 2011-08-16 23:07:13.232297741 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/src/Makefile.in 2011-09-02 14:32:09.607292303 +0200
@@ -0,0 +1,112 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -6960,9 +6960,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/src/Makefile.in.gtk
+
+GARBAGE += $(MARSHAL_FILE).h $(MARSHAL_FILE).c
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-08-16 23:07:13.233297723 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in 2011-08-16 23:07:13.233297723 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in.gtkmozembed 2011-09-02 14:32:09.607292303 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/Makefile.in 2011-09-02 14:32:09.607292303 +0200
@@ -0,0 +1,101 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
@@ -7065,9 +7065,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/Makefile.in.g
+DEFINES += -D_TIME_H=1
+endif
+endif
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-08-16 23:07:13.234297704 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-08-16 23:07:13.234297704 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp.gtkmozembed 2011-09-02 14:32:09.608292308 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedChild.cpp 2011-09-02 14:32:09.608292308 +0200
@@ -0,0 +1,185 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -7254,9 +7254,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedC
+ gtk_moz_embed_load_url(GTK_MOZ_EMBED(embed), text);
+ g_free(text);
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-08-16 23:07:13.237297649 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-08-16 23:07:13.238297631 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp.gtkmozembed 2011-09-02 14:32:09.608292308 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbed.cpp 2011-09-02 14:32:09.608292308 +0200
@@ -0,0 +1,1145 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8403,9 +8403,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbed.
+ gtk_widget_set_sensitive(browser->forwardButton, FALSE);
+ }
+
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-08-16 23:07:13.239297613 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-08-16 23:07:13.239297613 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedMDI.cpp 2011-09-02 14:32:09.609292313 +0200
@@ -0,0 +1,142 @@
+/** simplemdi.c **/
+/*
@@ -8549,9 +8549,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedM
+ gtk_main_quit();
+ return(0);
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-08-16 23:07:13.239297613 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-08-16 23:07:13.239297613 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedNotebook.cpp 2011-09-02 14:32:09.609292313 +0200
@@ -0,0 +1,86 @@
+#include <gtk/gtk.h>
+#include <gtkmozembed.h>
@@ -8639,9 +8639,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedN
+
+ return 0;
+}
-diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
---- xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-08-16 23:07:13.240297595 +0200
-+++ xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-08-16 23:07:13.240297595 +0200
+diff -up xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp
+--- xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp.gtkmozembed 2011-09-02 14:32:09.609292313 +0200
++++ xulrunner-7.0/mozilla-beta/embedding/browser/gtk/tests/TestGtkEmbedSocket.cpp 2011-09-02 14:32:09.609292313 +0200
@@ -0,0 +1,109 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -8752,9 +8752,9 @@ diff -up xulrunner-6.0/mozilla-release/embedding/browser/gtk/tests/TestGtkEmbedS
+ fprintf(stderr, "Can't fork.\n");
+ }
+}
-diff -up xulrunner-6.0/mozilla-release/toolkit/library/Makefile.in.gtkmozembed xulrunner-6.0/mozilla-release/toolkit/library/Makefile.in
---- xulrunner-6.0/mozilla-release/toolkit/library/Makefile.in.gtkmozembed 2011-08-11 23:41:30.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/toolkit/library/Makefile.in 2011-08-16 23:07:13.241297577 +0200
+diff -up xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in
+--- xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in.gtkmozembed 2011-08-31 21:16:33.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/library/Makefile.in 2011-09-02 14:32:09.610292318 +0200
@@ -75,6 +75,8 @@ CPPSRCS += dlldeps-xul.cpp
endif
@@ -8764,11 +8764,11 @@ diff -up xulrunner-6.0/mozilla-release/toolkit/library/Makefile.in.gtkmozembed x
DEFINES += -DMOZ_ENABLE_GTK2
endif
-diff -up xulrunner-6.0/mozilla-release/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-6.0/mozilla-release/toolkit/toolkit-makefiles.sh
---- xulrunner-6.0/mozilla-release/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-08-11 23:41:31.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/toolkit/toolkit-makefiles.sh 2011-08-16 23:07:13.243297541 +0200
-@@ -552,6 +552,9 @@ MAKEFILES_embedding="
- embedding/browser/activex/src/plugin/Makefile
+diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh
+--- xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh.gtkmozembed 2011-08-31 21:16:37.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-makefiles.sh 2011-09-02 14:32:09.610292318 +0200
+@@ -560,6 +560,9 @@ MAKEFILES_embedding="
+ embedding/browser/Makefile
embedding/browser/build/Makefile
embedding/browser/webBrowser/Makefile
+ embedding/browser/gtk/Makefile
@@ -8777,9 +8777,9 @@ diff -up xulrunner-6.0/mozilla-release/toolkit/toolkit-makefiles.sh.gtkmozembed
embedding/components/Makefile
embedding/components/appstartup/Makefile
embedding/components/appstartup/src/Makefile
-diff -up xulrunner-6.0/mozilla-release/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-6.0/mozilla-release/toolkit/toolkit-tiers.mk
---- xulrunner-6.0/mozilla-release/toolkit/toolkit-tiers.mk.gtkmozembed 2011-08-11 23:41:31.000000000 +0200
-+++ xulrunner-6.0/mozilla-release/toolkit/toolkit-tiers.mk 2011-08-16 23:22:29.002407174 +0200
+diff -up xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk
+--- xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk.gtkmozembed 2011-08-31 21:16:37.000000000 +0200
++++ xulrunner-7.0/mozilla-beta/toolkit/toolkit-tiers.mk 2011-09-02 14:32:09.611292323 +0200
@@ -226,6 +226,12 @@ endif
tier_platform_dirs += services/crypto/component
diff --git a/xulrunner.spec b/xulrunner.spec
index e31a3ee..23a5962 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -434,8 +434,6 @@ fi
%ghost %{mozappdir}/components/xpti.dat
%{mozappdir}/components/*.so
%{mozappdir}/components/*.manifest
-%dir %{mozappdir}/icons
-%attr(644, root, root) %{mozappdir}/icons/*
%{mozappdir}/omni.jar
%{mozappdir}/plugins
%{mozappdir}/*.so
More information about the scm-commits
mailing list