From 7a42bf6522485c3bb434033b5be98f2db7ee19ca Mon Sep 17 00:00:00 2001
From: taya <taya>
Date: Mon, 5 Jul 2004 14:22:42 +0000
Subject: fix compilation problem on NetBSD-1.6.2 bump PKGREVISION fix PR 26125

---
 www/mozilla/Makefile         |  3 ++-
 www/mozilla/distinfo         |  4 ++--
 www/mozilla/patches/patch-by | 23 +++++++++++++++++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'www')

diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 7f4399239a7..d07a9624608 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.134 2004/06/21 14:14:00 taya Exp $
+# $NetBSD: Makefile,v 1.135 2004/07/05 14:22:42 taya Exp $
 
 MOZILLA=	mozilla
 MOZILLA_BIN=	mozilla-bin
 MOZ_VER=	1.7
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.bz2
 
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo
index 2d61221a473..d9510f21a5a 100644
--- a/www/mozilla/distinfo
+++ b/www/mozilla/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.58 2004/06/21 14:14:00 taya Exp $
+$NetBSD: distinfo,v 1.59 2004/07/05 14:22:42 taya Exp $
 
 SHA1 (mozilla-source-1.7.tar.bz2) = 52b8ab9248a8f4ed5763d7715f4fa18bda8123cf
 Size (mozilla-source-1.7.tar.bz2) = 35174502 bytes
@@ -31,4 +31,4 @@ SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
 SHA1 (patch-bx) = 7b07b7e3f5199c44e82a6be21ecc0d4f8942b05a
-SHA1 (patch-by) = fdd1cd83b40125a8c06d39fc8fdee8573f36c02c
+SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
diff --git a/www/mozilla/patches/patch-by b/www/mozilla/patches/patch-by
index b17dc06bcc8..84392bd4acd 100644
--- a/www/mozilla/patches/patch-by
+++ b/www/mozilla/patches/patch-by
@@ -1,8 +1,27 @@
-$NetBSD: patch-by,v 1.1 2004/06/21 14:14:01 taya Exp $
+$NetBSD: patch-by,v 1.2 2004/07/05 14:22:42 taya Exp $
 
 diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp
 --- ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-03-19 10:36:16.000000000 +0900
-+++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-06-12 01:39:02.000000000 +0900
++++ ./layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp	2004-07-04 22:59:19.000000000 +0900
+@@ -155,15 +155,15 @@
+ 
+   static NS_NAMED_LITERAL_STRING(arial, "arial");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"),
+-                                              &arial);
++                                              (nsDependentString *)&arial);
+ 
+   static NS_NAMED_LITERAL_STRING(courier, "courier new");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("courier"),
+-                                              &courier);
++                                              (nsDependentString *)&courier);
+ 
+   static NS_NAMED_LITERAL_STRING(times, "times new roman");
+   nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("times"),
+-                                              &times);
++                                              (nsDependentString *)&times);
+ }
+ 
+ void NS_FreeSVGLibartGlyphMetricsFTGlobals()
 @@ -440,19 +440,19 @@
      return;
    }
-- 
cgit v1.2.3