From 667082aeec7ad79541502d23fc6aa0e0a2668b33 Mon Sep 17 00:00:00 2001
From: taya <taya>
Date: Mon, 5 Jul 2004 14:25:29 +0000
Subject: - correct MESSAGE - add patch to fix compilation problem on
 NetBSD-1.6.2 - bump PKGREVISION

---
 www/firefox/MESSAGE          |  9 ++++-----
 www/firefox/Makefile         |  3 ++-
 www/firefox/distinfo         |  4 ++--
 www/firefox/patches/patch-by | 23 +++++++++++++++++++++--
 4 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'www/firefox')

diff --git a/www/firefox/MESSAGE b/www/firefox/MESSAGE
index 2fc1a92c850..d1938554320 100644
--- a/www/firefox/MESSAGE
+++ b/www/firefox/MESSAGE
@@ -1,5 +1,4 @@
-Firefox must be run by a user with access to the installed location
-first, so that all initial startup files are generated. There may be
-issues still where if a restricted-access user is the first to run the
-app, these files may not be generated properly and Firefox may enter
-an infinite restart loop. This will be fixed in a future release.
+If you have ever run another version of firefox or firefox-gtk2, you
+must remove compreg.dat under your firefox profile before you run firefox.
+
+     e.g. rm ~/.mozilla/firefox/*/compreg.dat
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index df849b70f32..d906352e20c 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.9 2004/07/03 04:00:12 taya Exp $
+# $NetBSD: Makefile,v 1.10 2004/07/05 14:25:29 taya Exp $
 
 MOZILLA=	firefox
 MOZILLA_BIN=	firefox-bin
 MOZCONFDIR=	.mozilla
 MOZ_VER=	0.9.1
+PKGREVISION=	1
 EXTRACT_SUFX=	.tar.bz2
 DISTNAME=	${MOZILLA}-${MOZ_VER}-source
 MASTER_SITES=	http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${MOZ_VER}/ \
diff --git a/www/firefox/distinfo b/www/firefox/distinfo
index 2fbc3d50420..6647158f68f 100644
--- a/www/firefox/distinfo
+++ b/www/firefox/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2004/07/03 04:00:12 taya Exp $
+$NetBSD: distinfo,v 1.10 2004/07/05 14:25:29 taya Exp $
 
 SHA1 (firefox-0.9.1-source.tar.bz2) = 34053c9d8c42abbaba295cb1b0129ac5e3456e30
 Size (firefox-0.9.1-source.tar.bz2) = 33960883 bytes
@@ -31,4 +31,4 @@ SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee
 SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860
 SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8
 SHA1 (patch-bx) = 721c58f89c829ec3dfd72a311d49c211833b107c
-SHA1 (patch-by) = 5c226fb01508decdf13c0db505066623d7636a0f
+SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88
diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by
index a232c4196f6..1ac283b7b66 100644
--- a/www/firefox/patches/patch-by
+++ b/www/firefox/patches/patch-by
@@ -1,8 +1,27 @@
-$NetBSD: patch-by,v 1.1 2004/06/23 16:47:12 taya Exp $
+$NetBSD: patch-by,v 1.2 2004/07/05 14:25:29 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-15 23:57: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