Update to 1.2.7.

This commit is contained in:
Joe Marcus Clarke 2004-08-02 00:32:42 +00:00
parent 458fde86c7
commit c8769b9911
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=115226
7 changed files with 16 additions and 89 deletions

View file

@ -6,8 +6,7 @@
#
PORTNAME= epiphany
PORTVERSION= 1.2.6
PORTREVISION= 2
PORTVERSION= 1.2.7
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.2
@ -19,8 +18,6 @@ COMMENT= An extremely lightweight and simple web browser for GNOME 2
BUILD_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
RUN_DEPENDS= ${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.7"
MOZILLA= mozilla
HEADERS_SUFX=
@ -31,7 +28,6 @@ HEADERS_SUFX=
.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
MOZILLA= mozilla-devel
HEADERS_SUFX= -devel
MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a2"
.else
MOZILLA= mozilla
HEADERS_SUFX=
@ -46,8 +42,7 @@ USE_LIBTOOL_VER=15
USE_GMAKE= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
${MOZ_CONFIGURE_ARGS}
--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"

View file

@ -1,2 +1,2 @@
MD5 (gnome2/epiphany-1.2.6.tar.bz2) = 6dedf570ddb9106ecd6be624f009a35a
SIZE (gnome2/epiphany-1.2.6.tar.bz2) = 2807440
MD5 (gnome2/epiphany-1.2.7.tar.bz2) = d839a1fb1acbf4d7b129cfdb4276de44
SIZE (gnome2/epiphany-1.2.7.tar.bz2) = 2979301

View file

@ -1,43 +0,0 @@
--- embed/mozilla/EphyBrowser.cpp.orig Sat May 15 12:20:12 2004
+++ embed/mozilla/EphyBrowser.cpp Sun Jul 18 19:12:01 2004
@@ -249,11 +249,13 @@
nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface(domWindow));
NS_ENSURE_TRUE (piWin, NS_ERROR_FAILURE);
+#if MOZILLA_SNAPSHOT < 18
nsCOMPtr<nsIChromeEventHandler> chromeHandler;
piWin->GetChromeEventHandler(getter_AddRefs(chromeHandler));
mEventReceiver = do_QueryInterface(chromeHandler);
NS_ENSURE_TRUE (mEventReceiver, NS_ERROR_FAILURE);
+#endif
return NS_OK;
}
@@ -574,7 +576,7 @@
return NS_OK;
}
-nsresult EphyBrowser::GetSHUrlAtIndex (PRInt32 index, nsCString &url)
+nsresult EphyBrowser::GetSHUrlAtIndex (PRInt32 index, nsACString &url)
{
NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);
@@ -642,7 +644,7 @@
return NS_OK;
}
-nsresult EphyBrowser::GetDocumentUrl (nsCString &url)
+nsresult EphyBrowser::GetDocumentUrl (nsACString &url)
{
NS_ENSURE_TRUE (mDOMWindow, NS_ERROR_FAILURE);
@@ -668,7 +670,7 @@
return uri->GetSpec (url);
}
-nsresult EphyBrowser::GetTargetDocumentUrl (nsCString &url)
+nsresult EphyBrowser::GetTargetDocumentUrl (nsACString &url)
{
NS_ENSURE_TRUE (mWebBrowser, NS_ERROR_FAILURE);

View file

@ -1,22 +0,0 @@
--- embed/mozilla/EphyBrowser.h.orig Sun Jul 18 19:11:02 2004
+++ embed/mozilla/EphyBrowser.h Sun Jul 18 19:11:34 2004
@@ -104,7 +104,7 @@
nsresult GetSHInfo (PRInt32 *count, PRInt32 *index);
nsresult GetSHTitleAtIndex (PRInt32 index, PRUnichar **title);
- nsresult GetSHUrlAtIndex (PRInt32 index, nsCString &url);
+ nsresult GetSHUrlAtIndex (PRInt32 index, nsACString &url);
nsresult GoToHistoryIndex (PRInt16 index);
nsresult ForceEncoding (const char *encoding);
@@ -116,8 +116,8 @@
nsresult GetDocument (nsIDOMDocument **aDOMDocument);
nsresult GetTargetDocument (nsIDOMDocument **aDOMDocument);
- nsresult GetDocumentUrl (nsCString &url);
- nsresult GetTargetDocumentUrl (nsCString &url);
+ nsresult GetDocumentUrl (nsACString &url);
+ nsresult GetTargetDocumentUrl (nsACString &url);
nsresult GetHasModifiedForms (PRBool *modified);

View file

@ -1,14 +0,0 @@
--- embed/mozilla/mozilla-embed-single.cpp.orig Sun Jul 18 20:12:02 2004
+++ embed/mozilla/mozilla-embed-single.cpp Sun Jul 18 20:22:34 2004
@@ -557,7 +557,11 @@
do_GetService ("@mozilla.org/network/protocol-proxy-service;1");
if (!pps) return;
+#if MOZILLA_SNAPSHOT >= 19
+ pps->ConfigureFromPAC (NS_LITERAL_CSTRING (url));
+#else
pps->ConfigureFromPAC (url);
+#endif
}
static GList *

View file

@ -0,0 +1,11 @@
--- src/ephy-nautilus-view.c.orig Sun Aug 1 20:12:36 2004
+++ src/ephy-nautilus-view.c Sun Aug 1 20:13:49 2004
@@ -546,7 +546,7 @@
EphyDialog *dialog;
EphyNautilusViewPrivate *p = view->priv;
- dialog = ephy_print_dialog_new (NULL, p->embed, FALSE);
+ dialog = ephy_print_dialog_new (NULL, p->embed);
ephy_dialog_set_modal (dialog, TRUE);
ephy_dialog_run (dialog);

View file

@ -46,7 +46,6 @@ libdata/pkgconfig/epiphany-1.2.pc
%%DOCSDIR%%/index.sgml
%%DOCSDIR%%/left.png
%%DOCSDIR%%/right.png
%%DOCSDIR%%/style.css
%%DOCSDIR%%/up.png
share/gnome/application-registry/epiphany.applications
share/gnome/applications/bme.desktop
@ -118,6 +117,7 @@ share/locale/fi/LC_MESSAGES/epiphany.mo
share/locale/fr/LC_MESSAGES/epiphany.mo
share/locale/ga/LC_MESSAGES/epiphany.mo
share/locale/gu/LC_MESSAGES/epiphany.mo
share/locale/he/LC_MESSAGES/epiphany.mo
share/locale/hi/LC_MESSAGES/epiphany.mo
share/locale/hr/LC_MESSAGES/epiphany.mo
share/locale/hu/LC_MESSAGES/epiphany.mo