rpms/epiphany/devel epiphany-2.25-moz191.patch, NONE, 1.1 epiphany.spec, 1.215, 1.216 epiphany-2.24-moz191.patch, 1.3, NONE

Christopher Aillon caillon at fedoraproject.org
Sat Feb 7 18:52:56 UTC 2009


Author: caillon

Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25047

Modified Files:
	epiphany.spec 
Added Files:
	epiphany-2.25-moz191.patch 
Removed Files:
	epiphany-2.24-moz191.patch 
Log Message:
update the moz191 patch again, with some fixes from today's svn commits

epiphany-2.25-moz191.patch:

--- NEW FILE epiphany-2.25-moz191.patch ---
diff -up epiphany-2.25.5/configure.moz191 epiphany-2.25.5/configure
--- epiphany-2.25.5/configure.moz191	2009-02-07 13:34:12.000000000 -0500
+++ epiphany-2.25.5/configure	2009-02-07 13:34:40.000000000 -0500
@@ -19801,7 +19801,7 @@ else
 	gecko_cv_have_gecko_1_9_1=no
 fi
 
-if test "gecko_cv_have_gecko_1_9_1" = "yes"; then
+if test "$gecko_cv_have_gecko_1_9_1" = "yes"; then
 
 cat >>confdefs.h <<\_ACEOF
 #define HAVE_GECKO_1_9_1 1
diff -up epiphany-2.25.5/embed/mozilla/EventContext.cpp.moz191 epiphany-2.25.5/embed/mozilla/EventContext.cpp
--- epiphany-2.25.5/embed/mozilla/EventContext.cpp.moz191	2008-12-27 07:08:59.000000000 -0500
+++ epiphany-2.25.5/embed/mozilla/EventContext.cpp	2009-02-07 13:29:02.000000000 -0500
@@ -685,9 +685,9 @@ nsresult EventContext::GetTargetCoords (
 	{
 		PRInt32 val;
 #ifdef HAVE_GECKO_1_9_1
-		elem->GetOffsetTop(&val);	y += val;
+		htmlElem->GetOffsetTop(&val);	y += val;
 		elem->GetScrollTop(&val);	y -= val;
-		elem->GetOffsetLeft(&val);	x += val;
+		htmlElem->GetOffsetLeft(&val);	x += val;
 		elem->GetScrollLeft(&val);	x -= val;
 #else
 		htmlElem->GetOffsetTop(&val);	y += val;
diff -up epiphany-2.25.5/m4/gecko.m4.moz191 epiphany-2.25.5/m4/gecko.m4
--- epiphany-2.25.5/m4/gecko.m4.moz191	2009-02-07 13:33:31.000000000 -0500
+++ epiphany-2.25.5/m4/gecko.m4	2009-02-07 13:34:02.000000000 -0500
@@ -352,7 +352,7 @@ else
 	gecko_cv_have_gecko_1_9_1=no
 fi
 
-if test "gecko_cv_have_gecko_1_9_1" = "yes"; then
+if test "$gecko_cv_have_gecko_1_9_1" = "yes"; then
         AC_DEFINE([HAVE_GECKO_1_9_1],[1],[Define if we have gecko 1.9.1])
 fi
 
diff -up epiphany-2.25.5/plugins/desktop-file/plugin.cpp.moz191 epiphany-2.25.5/plugins/desktop-file/plugin.cpp
--- epiphany-2.25.5/plugins/desktop-file/plugin.cpp.moz191	2008-08-03 08:23:09.000000000 -0400
+++ epiphany-2.25.5/plugins/desktop-file/plugin.cpp	2009-02-07 13:29:02.000000000 -0500
@@ -34,7 +34,8 @@
 
 #include "ephy-stock-icons.h"
 
-#include <npupp.h>
+#include <npapi.h>
+#include <npfunctions.h>
 #include <nsCOMPtr.h>
 #include <nsIDOMWindow.h>
 #include "../../embed/mozilla/EphyUtils.h"
@@ -528,20 +529,20 @@ NP_Initialize (NPNetscapeFuncs *moz_func
 
 	plugin_funcs->size = sizeof (NPPluginFuncs);
 	plugin_funcs->version = (NP_VERSION_MAJOR << 8) + NP_VERSION_MINOR;
-	plugin_funcs->newp = NewNPP_NewProc (plugin_new_instance);
-	plugin_funcs->destroy = NewNPP_DestroyProc (plugin_destroy_instance);
-	plugin_funcs->setwindow = NewNPP_SetWindowProc (NULL);
-	plugin_funcs->newstream = NewNPP_NewStreamProc (plugin_new_stream);
-	plugin_funcs->destroystream = NewNPP_DestroyStreamProc (plugin_destroy_stream);
-	plugin_funcs->asfile = NewNPP_StreamAsFileProc (plugin_stream_as_file);
-	plugin_funcs->writeready = NewNPP_WriteReadyProc (plugin_write_ready);
-	plugin_funcs->write = NewNPP_WriteProc (plugin_write);
-	plugin_funcs->print = NewNPP_PrintProc (NULL);
-	plugin_funcs->event = NewNPP_HandleEventProc (NULL);
-	plugin_funcs->urlnotify = NewNPP_URLNotifyProc (NULL);
+	plugin_funcs->newp = NPP_NewProcPtr (plugin_new_instance);
+	plugin_funcs->destroy = NPP_DestroyProcPtr (plugin_destroy_instance);
+	plugin_funcs->setwindow = NPP_SetWindowProcPtr (NULL);
+	plugin_funcs->newstream = NPP_NewStreamProcPtr (plugin_new_stream);
+	plugin_funcs->destroystream = NPP_DestroyStreamProcPtr (plugin_destroy_stream);
+	plugin_funcs->asfile = NPP_StreamAsFileProcPtr (plugin_stream_as_file);
+	plugin_funcs->writeready = NPP_WriteReadyProcPtr (plugin_write_ready);
+	plugin_funcs->write = NPP_WriteProcPtr (plugin_write);
+	plugin_funcs->print = NPP_PrintProcPtr (NULL);
+	plugin_funcs->event = NPP_HandleEventProcPtr (NULL);
+	plugin_funcs->urlnotify = NPP_URLNotifyProcPtr (NULL);
 	plugin_funcs->javaClass = NULL;
-	plugin_funcs->getvalue = NewNPP_GetValueProc (plugin_get_value);
-	plugin_funcs->setvalue = NewNPP_SetValueProc (NULL);
+	plugin_funcs->getvalue = NPP_GetValueProcPtr (plugin_get_value);
+	plugin_funcs->setvalue = NPP_SetValueProcPtr (NULL);
 
 	return NPERR_NO_ERROR;
 }


Index: epiphany.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany/devel/epiphany.spec,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- epiphany.spec	7 Feb 2009 17:25:53 -0000	1.215
+++ epiphany.spec	7 Feb 2009 18:52:26 -0000	1.216
@@ -53,7 +53,7 @@
 Patch2: epiphany-2.18.1-default-bookmarks.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=334751
 Patch3: epiphany-2.20.1-wrapped-plugins.patch
-Patch4: epiphany-2.24-moz191.patch
+Patch4: epiphany-2.25-moz191.patch
 
 %description
 Epiphany is the web browser for the GNOME desktop. Its goal is to be


--- epiphany-2.24-moz191.patch DELETED ---




More information about the fedora-extras-commits mailing list