[packages/xulrunner/DEVEL] - fixed borkage caused by api change

[baggins]

commit 73729f7494fe7295a3d4fdaf7a7b57ee8914a0b7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue Oct 23 23:59:21 2012 +0200

    - fixed borkage caused by api change

 missed-api-in-embedding.patch | 55 +++++++++++++++++++++++++++++++++++++++++++
 xulrunner.spec                |  6 +++--
 2 files changed, 59 insertions(+), 2 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 8aa2905..31c93da 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -34,7 +34,7 @@ Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}
 # Source0-md5:	78e641c67dc4a40cb3f48fce3e782d41
 Patch0:		%{name}-install.patch
 Patch1:		%{name}-rpath.patch
-#Patch4:		%{name}-paths.patch
+Patch4:		%{name}-paths.patch
 Patch5:		%{name}-pc.patch
 Patch6:		%{name}-prefs.patch
 Patch7:		system-cairo.patch
@@ -43,6 +43,7 @@ Patch9:		%{name}-gtkmozembed.patch
 Patch11:	idl-parser.patch
 # Edit patch below and restore --system-site-packages when system virtualenv gets 1.7 upgrade
 Patch12:	system-virtualenv.patch
+Patch13:	missed-api-in-embedding.patch
 URL:		https://developer.mozilla.org/en/XULRunner
 %{!?with_qt:BuildRequires:	GConf2-devel >= 1.2.1}
 BuildRequires:	alsa-lib-devel
@@ -187,13 +188,14 @@ echo 'LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS)' >> extensions/spellcheck/src/Mak
 
 %patch0 -p2
 %patch1 -p1
-#%patch4 -p1
+%patch4 -p2
 %patch5 -p1
 %patch6 -p1
 %patch7 -p2
 %patch9 -p2
 %patch11 -p2
 %patch12 -p2
+%patch13 -p2
 
 # config/rules.mk is patched by us and js/src/config/rules.mk
 # is supposed to be exact copy
diff --git a/missed-api-in-embedding.patch b/missed-api-in-embedding.patch
new file mode 100644
index 0000000..27b5142
--- /dev/null
+++ b/missed-api-in-embedding.patch
@@ -0,0 +1,55 @@
+--- 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;
++}
++
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/73729f7494fe7295a3d4fdaf7a7b57ee8914a0b7