Fix build.

(Don't bump because this must have never been built since 1.5.0.5 update.)

2 files changed, 23 insertions, 15 deletions

diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 145bd3401f3..9b9ec8ada93 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.51 2006/07/28 14:22:29 perry Exp $
+$NetBSD: distinfo,v 1.52 2006/07/28 17:40:50 uebayasi Exp $
 
 SHA1 (firefox-1.5.0.5/firefox-1.5.0.5-source.tar.bz2) = e4a5d4fb1a2fd5ee8f65fff1e39f2871bc0113ef
 RMD160 (firefox-1.5.0.5/firefox-1.5.0.5-source.tar.bz2) = d3a086cddfeeba8b857f2fa1b83f0aabffe66a96
@@ -41,7 +41,7 @@ SHA1 (patch-cj) = 3ae48c9a906f47cf32706a1d2b3b6b44918e99f4
 SHA1 (patch-ck) = 18e6c412399c8b5b89941d818cf2589711f35472
 SHA1 (patch-cl) = a08ba37aa7ac7806123aa21b6ff8055c6ded6449
 SHA1 (patch-cm) = 7da6e9da803407b25bf4b707562777e8429a37a4
-SHA1 (patch-cn) = 56e346b892c475d8b8e5c7521a34700338186437
+SHA1 (patch-cn) = 77a0bbd42f8383b3167494e919e6338218c660e0
 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 d0834bda32e..f3bd385b188 100644
--- a/www/firefox/patches/patch-cn
+++ b/www/firefox/patches/patch-cn
@@ -1,9 +1,8 @@
-$NetBSD: patch-cn,v 1.1 2005/12/10 13:47:22 taya Exp $
+$NetBSD: patch-cn,v 1.2 2006/07/28 17:40:50 uebayasi Exp $
 
-diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
---- ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCall.cpp	2005-08-05 06:15:37.000000000 +0900
-+++ ./extensions/transformiix/source/xpath/XFormsFunctionCall.cpp	2005-12-04 21:35:33.000000000 +0900
-@@ -104,7 +104,7 @@
+--- extensions/transformiix/source/xpath/XFormsFunctionCall.cpp.orig	2006-06-14 05:58:31.000000000 +0900
++++ extensions/transformiix/source/xpath/XFormsFunctionCall.cpp
+@@ -104,7 +104,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          res = (res/i);
        }
        else {
@@ -12,7 +11,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        }
        return aContext->recycler()->getNumberResult(res, aResult);
      }
-@@ -159,7 +159,7 @@
+@@ -159,7 +159,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 result = 0;
@@ -21,7 +20,16 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        nsresult rv = xformsService->GetDaysFromDateTime(date, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -345,7 +345,7 @@
+@@ -222,7 +222,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);
+       NS_ENSURE_SUCCESS(rv, rv);
+ 
+@@ -354,7 +354,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -30,7 +38,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -353,7 +353,7 @@
+@@ -362,7 +362,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -39,7 +47,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
            break;
          }
          if (test > res || i == 0) {
-@@ -373,7 +373,7 @@
+@@ -382,7 +382,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
                                        getter_AddRefs(nodes));
        NS_ENSURE_SUCCESS(rv, rv);
     
@@ -48,7 +56,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        PRInt32 i;
        for (i = 0; i < nodes->size(); ++i) {
          double test;
-@@ -381,7 +381,7 @@
+@@ -390,7 +390,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
          txXPathNodeUtils::appendNodeValue(nodes->get(i), resultStr);
          test = Double::toDouble(resultStr);
          if (Double::isNaN(test)) {
@@ -57,7 +65,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
            break;
          }
          if ((test < res) || (i==0)) {
-@@ -404,7 +404,7 @@
+@@ -413,7 +413,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
        NS_ENSURE_SUCCESS(rv, rv);
  
        PRInt32 result = 0;
@@ -66,7 +74,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        nsresult rv = xformsService->GetMonths(duration, &result);
        if (NS_SUCCEEDED(rv)) {
          res = result;
-@@ -480,7 +480,7 @@
+@@ -489,7 +489,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }
@@ -75,7 +83,7 @@ diff -ruN ../Orig/mozilla/extensions/transformiix/source/xpath/XFormsFunctionCal
        }
  
        return aContext->recycler()->getNumberResult(res, aResult);
-@@ -505,7 +505,7 @@
+@@ -514,7 +514,7 @@ XFormsFunctionCall::evaluate(txIEvalCont
            // up the chain
            return rv;
          }