[packages/xulrunner: 5/6] - merge missed-api-in-embedding.patch updates into xulrunner-gtkmozembed.patch
baggins
baggins at pld-linux.org
Wed Oct 24 08:25:01 CEST 2012
commit 9e4b6f92c023a01d3aa81e69e893a928319791f5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Oct 24 08:23:53 2012 +0200
- merge missed-api-in-embedding.patch updates into xulrunner-gtkmozembed.patch
missed-api-in-embedding.patch | 55 -------------------------------------------
xulrunner-gtkmozembed.patch | 18 ++++++++++----
2 files changed, 13 insertions(+), 60 deletions(-)
---
diff --git a/missed-api-in-embedding.patch b/missed-api-in-embedding.patch
deleted file mode 100644
index 27b5142..0000000
--- a/missed-api-in-embedding.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedPrivate.h~ 2012-10-23 21:47:20.819022685 +0200
-+++ xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedPrivate.h 2012-10-23 23:22:14.899108295 +0200
-@@ -147,7 +147,7 @@
- // the list of all open windows
- static nsTArray<EmbedPrivate*> *sWindowList;
- // what is our profile path?
-- static nsILocalFile *sProfileDir;
-+ static nsIFile *sProfileDir;
- static nsISupports *sProfileLock;
-
- static nsIDirectoryServiceProvider * sAppFileLocProvider;
---- xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp~ 2012-10-23 21:47:20.819022685 +0200
-+++ xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp 2012-10-23 23:22:40.842440716 +0200
-@@ -89,7 +89,7 @@
- char *EmbedPrivate::sPath = nsnull;
- char *EmbedPrivate::sCompPath = nsnull;
- nsTArray<EmbedPrivate*> *EmbedPrivate::sWindowList = nsnull;
--nsILocalFile *EmbedPrivate::sProfileDir = nsnull;
-+nsIFile *EmbedPrivate::sProfileDir = nsnull;
- nsISupports *EmbedPrivate::sProfileLock = nsnull;
- GtkWidget *EmbedPrivate::sOffscreenWindow = 0;
- GtkWidget *EmbedPrivate::sOffscreenFixed = 0;
-@@ -507,7 +507,7 @@
- if (sWidgetCount == 1) {
- nsresult rv;
-
-- nsCOMPtr<nsILocalFile> binDir;
-+ nsCOMPtr<nsIFile> binDir;
- if (sCompPath) {
- rv = NS_NewNativeLocalFile(nsDependentCString(sCompPath), 1, getter_AddRefs(binDir));
- if (NS_FAILED(rv))
-@@ -522,7 +522,7 @@
- if (!grePath)
- return;
-
-- nsCOMPtr<nsILocalFile> greDir;
-+ nsCOMPtr<nsIFile> greDir;
- rv = NS_NewNativeLocalFile(nsDependentCString(grePath), PR_TRUE,
- getter_AddRefs(greDir));
- if (NS_FAILED(rv))
---- xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp~ 2012-10-23 21:47:20.819022685 +0200
-+++ xulrunner-16.0.1/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp 2012-10-23 23:51:30.099046377 +0200
-@@ -472,3 +472,12 @@
-
- return rv;
- }
-+
-+NS_IMETHODIMP
-+EmbedWindow::Blur()
-+{
-+ NS_NOTREACHED("EmbedWindow::Blur not supported in EmbedWindow");
-+
-+ return NS_ERROR_NOT_IMPLEMENTED;
-+}
-+
diff --git a/xulrunner-gtkmozembed.patch b/xulrunner-gtkmozembed.patch
index 400739d..5a4d0f9 100644
--- a/xulrunner-gtkmozembed.patch
+++ b/xulrunner-gtkmozembed.patch
@@ -1993,7 +1993,7 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.
+char *EmbedPrivate::sPath = nsnull;
+char *EmbedPrivate::sCompPath = nsnull;
+nsTArray<EmbedPrivate*> *EmbedPrivate::sWindowList = nsnull;
-+nsILocalFile *EmbedPrivate::sProfileDir = nsnull;
++nsIFile *EmbedPrivate::sProfileDir = nsnull;
+nsISupports *EmbedPrivate::sProfileLock = nsnull;
+GtkWidget *EmbedPrivate::sOffscreenWindow = 0;
+GtkWidget *EmbedPrivate::sOffscreenFixed = 0;
@@ -2411,7 +2411,7 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.
+ if (sWidgetCount == 1) {
+ nsresult rv;
+
-+ nsCOMPtr<nsILocalFile> binDir;
++ nsCOMPtr<nsIFile> binDir;
+ if (sCompPath) {
+ rv = NS_NewNativeLocalFile(nsDependentCString(sCompPath), 1, getter_AddRefs(binDir));
+ if (NS_FAILED(rv))
@@ -2426,7 +2426,7 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.cpp.
+ if (!grePath)
+ return;
+
-+ nsCOMPtr<nsILocalFile> greDir;
++ nsCOMPtr<nsIFile> greDir;
+ rv = NS_NewNativeLocalFile(nsDependentCString(grePath), PR_TRUE,
+ getter_AddRefs(greDir));
+ if (NS_FAILED(rv))
@@ -3071,7 +3071,7 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrivate.h.gt
+ // the list of all open windows
+ static nsTArray<EmbedPrivate*> *sWindowList;
+ // what is our profile path?
-+ static nsILocalFile *sProfileDir;
++ static nsIFile *sProfileDir;
+ static nsISupports *sProfileLock;
+
+ static nsIDirectoryServiceProvider * sAppFileLocProvider;
@@ -3935,7 +3935,7 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedPrompter.h.g
diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp
--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.gtkmozembed 2012-03-09 15:19:22.258678715 +0100
+++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp 2012-03-09 15:19:22.258678715 +0100
-@@ -0,0 +1,474 @@
+@@ -0,0 +1,482 @@
+/*
+ * vim:ts=2:et:sw=2
+ *
@@ -4410,6 +4410,14 @@ diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindow.cpp.g
+
+ return rv;
+}
++
++NS_IMETHODIMP
++EmbedWindow::Blur()
++{
++ NS_NOTREACHED("EmbedWindow::Blur not supported in EmbedWindow");
++
++ return NS_ERROR_NOT_IMPLEMENTED;
++}
diff -up xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp
--- xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp.gtkmozembed 2012-03-09 15:19:22.258678715 +0100
+++ xulrunner-11.0/mozilla-beta/embedding/browser/gtk/src/EmbedWindowCreator.cpp 2012-03-09 15:19:22.258678715 +0100
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/2e75ae9bfdc08420f2131f7661634b3669a44804
More information about the pld-cvs-commit
mailing list