summaryrefslogtreecommitdiff
path: root/www/firefox
diff options
context:
space:
mode:
Diffstat (limited to 'www/firefox')
-rw-r--r--www/firefox/DESCR4
-rw-r--r--www/firefox/Makefile-firefox.common4
-rw-r--r--www/firefox/distinfo10
-rw-r--r--www/firefox/patches/patch-cn22
4 files changed, 20 insertions, 20 deletions
diff --git a/www/firefox/DESCR b/www/firefox/DESCR
index fe99f48a261..e525773b106 100644
--- a/www/firefox/DESCR
+++ b/www/firefox/DESCR
@@ -9,5 +9,5 @@ can be extended by developers using industry standards such as XML,
CSS, JavaScript, C++, etc. Many extensions are available.
Note: Firefox 1.5.0.x will be maintained with security and stability
-updates until April 24, 2007. All users are encouraged to upgrade to
-Firefox 2 (pkgsrc/www/firefox2 and firefox2-gtk1).
+updates until June 2007. All users are strongly encouraged to upgrade
+to Firefox 2 (will be the default in pkgsrc-2007Q2).
diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common
index 611c5ecd972..d7e37b1cceb 100644
--- a/www/firefox/Makefile-firefox.common
+++ b/www/firefox/Makefile-firefox.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile-firefox.common,v 1.42 2007/03/21 13:33:04 ghen Exp $
+# $NetBSD: Makefile-firefox.common,v 1.42.2.1 2007/06/13 21:32:46 salo Exp $
MOZILLA_BIN= firefox-bin
-MOZ_VER= 1.5.0.11
+MOZ_VER= 1.5.0.12
EXTRACT_SUFX= .tar.bz2
DISTNAME= firefox-${MOZ_VER}-source
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 552634097ee..5750c30f460 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.64 2007/03/21 13:33:04 ghen Exp $
+$NetBSD: distinfo,v 1.64.2.1 2007/06/13 21:32:47 salo Exp $
-SHA1 (firefox-1.5.0.11-source.tar.bz2) = a094ceca09306138828ffa1bce346953ff757ecc
-RMD160 (firefox-1.5.0.11-source.tar.bz2) = 060a6ad81b8312a444568a2609888d2ef1c58bfc
-Size (firefox-1.5.0.11-source.tar.bz2) = 35534921 bytes
+SHA1 (firefox-1.5.0.12-source.tar.bz2) = a75529415052d21af23865616dcf03da0058b602
+RMD160 (firefox-1.5.0.12-source.tar.bz2) = 9e6d0795751cb6d0da743d36659644e6ed6c6344
+Size (firefox-1.5.0.12-source.tar.bz2) = 35642743 bytes
SHA1 (patch-aa) = 5095449d4e979085fc5791b9d0251076b9c969c3
SHA1 (patch-ab) = eda86e19dbf45be392b6be4a40dbb25936c91439
SHA1 (patch-ac) = c0cfa9805d883e0761b5bc63b4015cbf1e951eec
@@ -42,7 +42,7 @@ SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
-SHA1 (patch-cn) = 77a0bbd42f8383b3167494e919e6338218c660e0
+SHA1 (patch-cn) = 5c0273dfed20c0c15d875828579906170e8c97f5
SHA1 (patch-db) = f10187cf9de4466e49a967b79875eb01c5afd69f
SHA1 (patch-dc) = ba7b06f04460d4966e115a9ffdeafc1ebf555972
SHA1 (patch-dd) = de9d705fdc3cb9879a19d58dfd170d104ca379f7
diff --git a/www/firefox/patches/patch-cn b/www/firefox/patches/patch-cn
index f3bd385b188..b1d492c97c8 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,6 +1,6 @@
-$NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
+$NetBSD: patch-cn,v 1.2.6.1 2007/06/13 21:32:49 salo Exp $
---- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig 2006-06-14 05:58:31.000000000 +0900
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig 2007-04-27 03:17:24.000000000 +0200
+++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
@@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
res = (res/i);
@@ -20,16 +20,16 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
nsresult rv = xformsService->GetDaysFromDateTime(date, &result);
if (NS_SUCCEEDED(rv)) {
res = result;
-@@ -222,7 +222,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -211,7 +211,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 index = 0;
- double res = Double::NaN;
+ double res = Double::NaN();
- rv = xformsService->GetRepeatIndex(repeatEle, &index);
+ rv = xformsService->GetRepeatIndexById(mResolverNode, indexId, &index);
NS_ENSURE_SUCCESS(rv, rv);
-@@ -354,7 +354,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -343,7 +343,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
getter_AddRefs(nodes));
NS_ENSURE_SUCCESS(rv, rv);
@@ -38,7 +38,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
PRInt32 i;
for (i = 0; i < nodes->size(); ++i) {
double test;
-@@ -362,7 +362,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -351,7 +351,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
test = Double::toDouble(resultStr);
if (Double::isNaN(test)) {
@@ -47,7 +47,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
break;
}
if (test > res || i == 0) {
-@@ -382,7 +382,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -371,7 +371,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
getter_AddRefs(nodes));
NS_ENSURE_SUCCESS(rv, rv);
@@ -56,7 +56,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
PRInt32 i;
for (i = 0; i < nodes->size(); ++i) {
double test;
-@@ -390,7 +390,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -379,7 +379,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
test = Double::toDouble(resultStr);
if (Double::isNaN(test)) {
@@ -65,7 +65,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
break;
}
if ((test < res) || (i==0)) {
-@@ -413,7 +413,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -402,7 +402,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
NS_ENSURE_SUCCESS(rv, rv);
PRInt32 result = 0;
@@ -74,7 +74,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
nsresult rv = xformsService->GetMonths(duration, &result);
if (NS_SUCCEEDED(rv)) {
res = result;
-@@ -489,7 +489,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -478,7 +478,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
// up the chain
return rv;
}
@@ -83,7 +83,7 @@ $NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
}
return aContext->recycler()->getNumberResult(res, aResult);
-@@ -514,7 +514,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
+@@ -503,7 +503,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
// up the chain
return rv;
}