rpms/epiphany/devel epiphany-2.24-moz191.patch, NONE, 1.1 epiphany.spec, 1.210, 1.211
Christopher Aillon
caillon at fedoraproject.org
Tue Jan 6 19:00:43 UTC 2009
Author: caillon
Update of /cvs/extras/rpms/epiphany/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27660
Modified Files:
epiphany.spec
Added Files:
epiphany-2.24-moz191.patch
Log Message:
* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-4
- Rebuild against newer gecko
epiphany-2.24-moz191.patch:
--- NEW FILE epiphany-2.24-moz191.patch ---
diff -up epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp
--- epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp.moz191 2008-10-20 17:10:43.000000000 -0400
+++ epiphany-2.24.2.1/embed/mozilla/EphyBrowser.cpp 2009-01-06 13:49:11.000000000 -0500
@@ -66,7 +66,6 @@
#include <nsIDOMWindow2.h>
#include <nsIDOMXMLDocument.h>
#include <nsIDOMLocation.h>
-#include <nsIDOMNSLocation.h>
#include <nsIHistoryEntry.h>
#include <nsIInterfaceRequestor.h>
#include <nsIInterfaceRequestorUtils.h>
@@ -700,9 +699,6 @@ EphyCommandEventListener::HandleEvent (n
if (NS_FAILED (rv))
return NS_OK;
- nsCOMPtr<nsIDOMNSLocation> domNSLocation (do_QueryInterface (domLocation));
- NS_ENSURE_TRUE (domNSLocation, NS_OK);
-
nsString locationHref;
domLocation->GetHref (locationHref);
@@ -736,7 +732,7 @@ EphyCommandEventListener::HandleEvent (n
params->GetExceptionAdded (&exceptionAdded);
g_print ("exceptionAdded %d\n", exceptionAdded);
if (exceptionAdded)
- return domNSLocation->Reload ();
+ return domLocation->Reload (PR_FALSE);
return NS_OK;
diff -up epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191 epiphany-2.24.2.1/embed/mozilla/EventContext.cpp
--- epiphany-2.24.2.1/embed/mozilla/EventContext.cpp.moz191 2008-05-23 17:12:06.000000000 -0400
+++ epiphany-2.24.2.1/embed/mozilla/EventContext.cpp 2009-01-06 13:49:11.000000000 -0500
@@ -67,6 +67,7 @@
#ifdef ALLOW_PRIVATE_API
#include <nsIDOMNSEvent.h>
+#include <nsIDOMNSElement.h>
#include <nsIDOMNSHTMLElement.h>
#include <nsIDOMViewCSS.h>
#include <nsIDOMViewCSS.h>
@@ -666,20 +667,21 @@ nsresult EventContext::GetCSSBackground
nsresult EventContext::GetTargetCoords (nsIDOMEventTarget *aTarget, PRInt32 *aX, PRInt32 *aY)
{
/* Calculate the node coordinates relative to the widget origin */
- nsCOMPtr<nsIDOMNSHTMLElement> elem (do_QueryInterface(aTarget));
+ nsCOMPtr<nsIDOMNSHTMLElement> nsHTMLElem (do_QueryInterface(aTarget));
PRInt32 x = 0, y = 0;
- while (elem)
+ while (nsHTMLElem)
{
PRInt32 val;
- elem->GetOffsetTop(&val); y += val;
- elem->GetScrollTop(&val); y -= val;
- elem->GetOffsetLeft(&val); x += val;
- elem->GetScrollLeft(&val); x -= val;
+ nsCOMPtr<nsIDOMNSElement> nsElem (do_QueryInterface(nsHTMLElem));
+ nsHTMLElem->GetOffsetTop(&val); y += val;
+ nsElem->GetScrollTop(&val); y -= val;
+ nsHTMLElem->GetOffsetLeft(&val); x += val;
+ nsElem->GetScrollLeft(&val); x -= val;
nsCOMPtr<nsIDOMElement> parent;
- elem->GetOffsetParent (getter_AddRefs (parent));
- elem = do_QueryInterface(parent);
+ nsHTMLElem->GetOffsetParent (getter_AddRefs (parent));
+ nsHTMLElem = do_QueryInterface(parent);
}
*aX = x;
diff -up epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191 epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp
--- epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp.moz191 2008-08-03 08:23:09.000000000 -0400
+++ epiphany-2.24.2.1/plugins/desktop-file/plugin.cpp 2009-01-06 13:51:23.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.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- epiphany.spec 23 Dec 2008 05:31:08 -0000 1.210
+++ epiphany.spec 6 Jan 2009 19:00:12 -0000 1.211
@@ -1,4 +1,4 @@
-%define gecko_ver 1.9.0.5
+%define gecko_ver 1.9.1
%define desktop_file_utils_version 0.9
%define glib2_devel_ver 2.15.2
%define gtk2_devel_ver 2.12.0
@@ -8,7 +8,7 @@
Summary: Web browser for GNOME
Name: epiphany
Version: 2.24.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
License: GPLv2+ and GFDL
Group: Applications/Internet
URL: http://www.gnome.org/projects/epiphany/
@@ -51,6 +51,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
%description
Epiphany is the web browser for the GNOME desktop. Its goal is to be
@@ -98,6 +99,7 @@
%patch1 -p1 -b .use-pango
%patch2 -p1 -b .default-bookmarks
%patch3 -p1 -b .wrapped-plugins
+%patch4 -p1 -b .moz191
# Fedora Epiphany version
cat >> data/default-prefs-common.js << EOF
pref("general.useragent.vendor", "Fedora");
@@ -246,6 +248,9 @@
%{_datadir}/pygtk/2.0/defs/epiphany.defs
%changelog
+* Tue Jan 06 2009 Christopher Aillon <caillon at redhat.com> - 2.24.2.1-4
+- Rebuild against newer gecko
+
* Tue Dec 23 2008 Matthias Clasen <mclasen at redhat.com> - 2.24.2.1-3
- Rebuild against newer gecko
More information about the fedora-extras-commits
mailing list