Update to 0.7.90. The popup-blocker patch is from Adam Hooper from

http://bugzilla.gnome.org/show_bug.cgi?id=136512.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1973 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 47 insertions, 4 deletions

diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 49bf4578f..2ba0ff0de 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	epiphany
-PORTVERSION=	0.7.2
+PORTVERSION=	0.7.90
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}${PKGNAMESUFFIX}/0.7
@@ -50,7 +50,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_C
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-extensions="all" \
 		${MOZ_CONFIGURE_ARGS}
-	
+
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 .undef WITHOUT_OPENSP
 WITH_OPENSP=	yes
diff --git a/www/epiphany-extensions/distinfo b/www/epiphany-extensions/distinfo
index e8d988912..49ae27529 100644
--- a/www/epiphany-extensions/distinfo
+++ b/www/epiphany-extensions/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/epiphany-extensions-0.7.2.tar.bz2) = dea443b9ddb4f8f11f3d7419d20524e8
-SIZE (gnome2/epiphany-extensions-0.7.2.tar.bz2) = 351226
+MD5 (gnome2/epiphany-extensions-0.7.90.tar.bz2) = 06d44384009607e078628965090d55ba
+SIZE (gnome2/epiphany-extensions-0.7.90.tar.bz2) = 366645
diff --git a/www/epiphany-extensions/files/patch-extensions_error-viewer_link-checker.c b/www/epiphany-extensions/files/patch-extensions_error-viewer_link-checker.c
new file mode 100644
index 000000000..4ba1036be
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_error-viewer_link-checker.c
@@ -0,0 +1,15 @@
+--- extensions/error-viewer/link-checker.c.orig	Sun Mar  7 20:04:15 2004
++++ extensions/error-viewer/link-checker.c	Sun Mar  7 20:04:39 2004
+@@ -111,10 +111,10 @@
+ static gboolean
+ link_checker_append_internal (gpointer data)
+ {
++	LinkCheckerAppendCBData *append_data;
+ 	g_return_if_fail (data != NULL);
+ 
+-	LinkCheckerAppendCBData *append_data =
+-		(LinkCheckerAppendCBData *) data;
++	append_data = (LinkCheckerAppendCBData *) data;
+ 
+ 	g_return_if_fail (IS_LINK_CHECKER (append_data->checker));
+ 	g_return_if_fail (IS_ERROR_VIEWER
diff --git a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_PopupBlockerListener.cpp b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_PopupBlockerListener.cpp
new file mode 100644
index 000000000..2e62f2492
--- /dev/null
+++ b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_PopupBlockerListener.cpp
@@ -0,0 +1,21 @@
+--- extensions/popup-blocker/mozilla/PopupBlockerListener.cpp.orig	Sun Mar  7 20:06:38 2004
++++ extensions/popup-blocker/mozilla/PopupBlockerListener.cpp	Mon Mar  8 01:36:08 2004
+@@ -62,6 +62,7 @@
+ 	rv = popupWindowURI->GetSpec (popupWindowURIString);
+ 	NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+ 
++#if MOZILLA_SNAPSHOT >= 14
+ 	nsAutoString popupWindowFeatures;
+ 	rv = popupEvent->GetPopupWindowFeatures (popupWindowFeatures);
+ 	NS_ENSURE_SUCCESS (rv, NS_ERROR_FAILURE);
+@@ -69,6 +70,10 @@
+ 	ephy_popup_blocker_extension_block (mOwner,
+ 					    popupWindowURIString.get (),
+ 					    NS_ConvertUCS2toUTF8 (popupWindowFeatures).get ());
++#else
++	ephy_popup_blocker_extension_block (mOwner, popupWindowURIString.get (),
++		NULL);
++#endif
+ }
+ 
+ nsresult
diff --git a/www/epiphany-extensions/pkg-plist b/www/epiphany-extensions/pkg-plist
index 31662a3f2..d5f65d366 100644
--- a/www/epiphany-extensions/pkg-plist
+++ b/www/epiphany-extensions/pkg-plist
@@ -18,17 +18,24 @@ lib/epiphany/extensions/libtabsmenuextension.so
 lib/epiphany/extensions/libtabsmenuextension.so.0
 share/gnome/epiphany-extensions/ephy-gestures.xml
 share/gnome/epiphany-extensions/glade/error-viewer.glade
+share/gnome/epiphany-extensions/icons/popup-blocker.svg
 share/locale/cs/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/da/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/de/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/el/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/en_GB/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/es/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/fr/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/hr/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/hu/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/ja/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/lt/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/nl/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/no/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/pa/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/pt/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/sk/LC_MESSAGES/epiphany-extensions-1.0.mo
+share/locale/sq/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/sr/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/sr@Latn/LC_MESSAGES/epiphany-extensions-1.0.mo
 share/locale/sv/LC_MESSAGES/epiphany-extensions-1.0.mo