rpms/galeon/devel galeon-2.0.7-moz192.patch, NONE, 1.1 galeon-2.0.7-nojavaconsole.patch, NONE, 1.1 galeon.spec, 1.68, 1.69

[Yanko Kaneti]

Author: yaneti

Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24453

Modified Files:
	galeon.spec 
Added Files:
	galeon-2.0.7-moz192.patch galeon-2.0.7-nojavaconsole.patch 
Log Message:
- Add patches so that it actually builds against newer gecko


galeon-2.0.7-moz192.patch:
 EphyXULAppInfo.cpp          |    9 +++++++++
 ExternalProtocolService.cpp |    9 +++++++++
 2 files changed, 18 insertions(+)

--- NEW FILE galeon-2.0.7-moz192.patch ---
diff --git a/mozilla/EphyXULAppInfo.cpp b/mozilla/EphyXULAppInfo.cpp
index 1319431..299cbbf 100644
--- a/mozilla/EphyXULAppInfo.cpp
+++ b/mozilla/EphyXULAppInfo.cpp
@@ -128,3 +128,12 @@ EphyXULAppInfo::GetXPCOMABI(nsACString & aXPCOMABI)
   aXPCOMABI.Assign (EPHY_HOST_CPU "-gcc3");
   return NS_OK;
 }
+
+/* readonly attribute AUTF8String WidgetToolkit; */
+NS_IMETHODIMP
+EphyXULAppInfo::GetWidgetToolkit(nsACString & aWidgetToolkit)
+{
+  aWidgetToolkit.Assign ("gtk");
+  return NS_OK;
+}
+
diff --git a/mozilla/ExternalProtocolService.cpp b/mozilla/ExternalProtocolService.cpp
index 4554998..85ba677 100644
--- a/mozilla/ExternalProtocolService.cpp
+++ b/mozilla/ExternalProtocolService.cpp
@@ -185,3 +185,12 @@ NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfo(const nsACString
 	return NS_ERROR_NOT_IMPLEMENTED;
 }
 #endif
+
+NS_IMETHODIMP GExternalProtocolService::GetProtocolHandlerInfoFromOS(const nsACString & aProtocolScheme, PRBool*, nsIHandlerInfo**)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}
+NS_IMETHODIMP GExternalProtocolService::SetProtocolHandlerDefaults(nsIHandlerInfo*, int)
+{
+	return NS_ERROR_NOT_IMPLEMENTED;
+}

galeon-2.0.7-nojavaconsole.patch:
 mozilla/mozilla-embed-shell.cpp |    8 --------
 ui/galeon-egg-ui.xml            |    2 --
 2 files changed, 10 deletions(-)

--- NEW FILE galeon-2.0.7-nojavaconsole.patch ---
diff -ur galeon-2.0.7.nojsconsole/mozilla/mozilla-embed-shell.cpp galeon-2.0.7.nojavaconsole/mozilla/mozilla-embed-shell.cpp
--- galeon-2.0.7.nojsconsole/mozilla/mozilla-embed-shell.cpp	2009-11-20 12:48:12.000000000 +0200
+++ galeon-2.0.7.nojavaconsole/mozilla/mozilla-embed-shell.cpp	2009-11-20 12:49:51.000000000 +0200
@@ -62,7 +62,6 @@
 #include <nsCOMPtr.h>
 #include <nsNetCID.h>
 #include <nsIIOService.h>
-#include <nsIJVMManager.h>
 #include <nsIFontEnumerator.h>
 #include <nsISupportsPrimitives.h>
 #include <nsIPermissionManager.h>
@@ -118,8 +117,6 @@
 	MozillaEncodings *encodings;
 };
 
-static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID);
-
 G_DEFINE_TYPE (MozillaEmbedShell, mozilla_embed_shell, GALEON_TYPE_EMBED_SHELL);
 
 static gboolean
@@ -514,11 +511,6 @@
 static void
 impl_show_java_console (GaleonEmbedShell *shell)
 {
-        nsCOMPtr<nsIJVMManager> JVMManager = do_GetService (kJVMManagerCID);
-	if (JVMManager)
-	{
-		JVMManager->ShowJavaConsole ();
-	}
 }
 
 static GaleonEncodings *
diff -ur galeon-2.0.7.nojsconsole/ui/galeon-egg-ui.xml galeon-2.0.7.nojavaconsole/ui/galeon-egg-ui.xml
--- galeon-2.0.7.nojsconsole/ui/galeon-egg-ui.xml	2009-11-20 12:48:12.000000000 +0200
+++ galeon-2.0.7.nojavaconsole/ui/galeon-egg-ui.xml	2009-11-20 12:49:59.000000000 +0200
@@ -76,8 +76,6 @@
     	<separator name="WSep3" />
     	<menuitem name="WebAllowJava" action="WebAllowJavaAction" />
     	<menuitem name="WebAllowJS" action="WebAllowJSAction" />
-    	<separator name="WSep4" />
-    	<menuitem name="WebJSConsole" action="WebJSConsoleAction" />
     </menu>
     <menu name="Go" action="GoMenuAction">
 	<menuitem name="GoBack" action="GoBack" />


Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- galeon.spec	26 Nov 2009 08:51:28 -0000	1.68
+++ galeon.spec	7 Dec 2009 08:34:44 -0000	1.69
@@ -3,7 +3,7 @@
 Summary:	GNOME2 Web browser based on Mozilla
 Name:		galeon
 Version:	2.0.7
-Release:	20%{?dist}
+Release:	21%{?dist}
 License:	GPLv2+
 Group:		Applications/Internet
 URL:		http://galeon.sourceforge.net/
@@ -18,6 +18,8 @@ Patch6:		galeon-2.0.7-jsconsole.patch
 Patch7:         galeon-2.0.7-fix-str-fmt.patch
 Patch8:         galeon-1.3.2-home.patch
 Patch9:         galeon-2.0.7-dockcrash.patch
+Patch10:        galeon-2.0.7-moz192.patch
+Patch12:        galeon-2.0.7-nojavaconsole.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	gettext desktop-file-utils
@@ -59,6 +61,8 @@ makes sense. Galeon was written to do ju
 %patch7 -p0 -b .fixfmt
 %patch8 -p1 -b .home
 %patch9 -p1 -b .dock
+%patch10 -p1 -b .moz192
+%patch12 -p1 -b .nojavaconsole
 
 
 %build
@@ -133,6 +137,9 @@ update-desktop-database > /dev/null 2>&1
 
 
 %changelog
+* Mon Dec  7 2009 Yanko Kaneti <yaneti at declera.com> - 2.0.7-21
+- Add patches so that it actually builds against newer gecko
+
 * Thu Nov 26 2009 Jan Horak <jhorak at redhat.com> - 2.0.7-20
 - Rebuild against newer gecko