aboutsummaryrefslogtreecommitdiff
path: root/www/epiphany-extensions
diff options
context:
space:
mode:
authorAdam Weinberger <adamw@FreeBSD.org>2004-07-20 00:36:24 +0000
committerAdam Weinberger <adamw@FreeBSD.org>2004-07-20 00:36:24 +0000
commit4ec8273dcb5455c5581b64838d451911dfdaca94 (patch)
treec5bc971dc2092a3bbcd7d2a0f2dbcbf4ad81e75d /www/epiphany-extensions
parentba6f3865e87967c7e410ccff56a91f88758a4d06 (diff)
downloadports-4ec8273dcb5455c5581b64838d451911dfdaca94.tar.gz
ports-4ec8273dcb5455c5581b64838d451911dfdaca94.zip
Notes
Diffstat (limited to 'www/epiphany-extensions')
-rw-r--r--www/epiphany-extensions/Makefile2
-rw-r--r--www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp16
2 files changed, 15 insertions, 3 deletions
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 389b7f60b398..c7c53512d8ce 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -35,7 +35,7 @@ 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.8a"
+MOZ_CONFIGURE_ARGS= --with-mozilla-snapshot="1.8a2"
.else
MOZILLA= mozilla
HEADERS_SUFX=
diff --git a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp
index 1ac27b214e9d..ffc2b645db0f 100644
--- a/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp
+++ b/www/epiphany-extensions/files/patch-extensions_popup-blocker_mozilla_mozilla-helpers.cpp
@@ -1,5 +1,5 @@
---- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Wed Jul 7 15:55:52 2004
-+++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Wed Jul 7 15:57:58 2004
+--- extensions/popup-blocker/mozilla/mozilla-helpers.cpp.orig Mon Mar 15 17:07:05 2004
++++ extensions/popup-blocker/mozilla/mozilla-helpers.cpp Mon Jul 19 20:33:33 2004
@@ -65,12 +65,16 @@
nsCOMPtr<nsPIDOMWindow> piWin(do_QueryInterface (domWindow, &rv));
NS_ENSURE_SUCCESS (rv, NULL);
@@ -17,3 +17,15 @@
NS_ENSURE_SUCCESS (rv, NULL);
nsCOMPtr<nsIDOMEventTarget> target;
+@@ -181,7 +185,11 @@
+ g_free (script);
+
+ PRBool isUndefined;
++#if MOZILLA_SNAPSHOT < 18
+ nsAutoString ret;
++#else
++ nsAString *ret;
++#endif
+ context->EvaluateString (aScript, nsnull, nsnull, nsnull, 0,
+ nsnull, ret, &isUndefined);
+