diff options
| author | jlam <jlam@pkgsrc.org> | 2005-09-22 14:14:04 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-09-22 14:14:04 +0000 |
| commit | 630794bdf21e1c69aaf70f6caab517464566ea91 (patch) | |
| tree | 904249f4e609176a24b66806361ba383c18078e1 /www/firefox | |
| parent | aa3d857044552ccf8a99f351598a296327e9902a (diff) | |
| download | pkgsrc-630794bdf21e1c69aaf70f6caab517464566ea91.tar.gz | |
Update www/firefox and www/firefox-gtk1 to version 1.0.7. Changes from
version 1.0.6 include:
* Fix for a potential buffer overflow vulnerability when loading a
hostname with all soft-hyphens
* Fix to prevent URLs passed from external programs from being
parsed by the shell (Linux only)
* Fix to prevent a crash when loading a Proxy Auto-Config (PAC)
script that uses an "eval" statement
* Fix to restore InstallTrigger.getVersion() for Extension authors
* Other stability and security fixes
Approved by taya.
Diffstat (limited to 'www/firefox')
47 files changed, 223 insertions, 251 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b02c7b6ef78..2e6d0f4a44a 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,23 +1,17 @@ -# $NetBSD: Makefile,v 1.20 2005/09/17 02:35:19 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/09/22 14:14:04 jlam Exp $ MOZILLA= firefox EXTRACT_SUFX= .tar.bz2 -PKGREVISION= 3 - COMMENT= Lightweight gecko-based web browser _MOZILLA_USE_GTK2= # defined MOZILLA_USE_XFT= YES -PKGCONFIG_OVERRIDE+= build/unix/firefox-gtkmozembed.pc -PKGCONFIG_OVERRIDE+= build/unix/firefox-js.pc -PKGCONFIG_OVERRIDE+= build/unix/firefox-nspr.pc -PKGCONFIG_OVERRIDE+= build/unix/firefox-nss.pc -PKGCONFIG_OVERRIDE+= build/unix/firefox-plugin.pc -PKGCONFIG_OVERRIDE+= build/unix/firefox-xpcom.pc # Some .pc files are filled in by the build process, so we can't fix the # rpaths until this has happened. +# PKGCONFIG_OVERRIDE_STAGE= post-build +PKGCONFIG_OVERRIDE+= build/unix/*.pc .include "../../www/firefox/Makefile-firefox.common" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index f13327a2675..be7ad7b1aa3 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile-firefox.common,v 1.21 2005/09/17 02:35:19 jlam Exp $ +# $NetBSD: Makefile-firefox.common,v 1.22 2005/09/22 14:14:04 jlam Exp $ MOZILLA_BIN= firefox-bin -MOZ_VER= 1.0.6 +MOZ_VER= 1.0.7 EXTRACT_SUFX= .tar.bz2 DISTNAME= firefox-${MOZ_VER}-source diff --git a/www/firefox/PLIST b/www/firefox/PLIST index b38dbb23c7d..009aa18cda2 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2005/09/17 02:35:19 jlam Exp $ +@comment $NetBSD: PLIST,v 1.18 2005/09/22 14:14:04 jlam Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -2240,6 +2240,7 @@ include/${MOZILLA}/zlib/zlib.h @dirrm lib/${MOZILLA}/res/fonts @dirrm lib/${MOZILLA}/res/entityTables @dirrm lib/${MOZILLA}/res/dtd +@exec ${MKDIR} %D/lib/${MOZILLA}/res/builtin @dirrm lib/${MOZILLA}/res/builtin @dirrm lib/${MOZILLA}/res @exec ${MKDIR} %D/lib/${MOZILLA}/plugins diff --git a/www/firefox/distinfo b/www/firefox/distinfo index 54eb10b1e0f..3a1f8daab66 100644 --- a/www/firefox/distinfo +++ b/www/firefox/distinfo @@ -1,50 +1,50 @@ -$NetBSD: distinfo,v 1.37 2005/09/08 22:03:45 abs Exp $ +$NetBSD: distinfo,v 1.38 2005/09/22 14:14:04 jlam Exp $ -SHA1 (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 56183aa14a0185a27a6ab4337d2ade7d1d45c2a6 -RMD160 (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 8af3fa48fad539f26a5f1b57526efc85b22fca00 -Size (firefox-1.0.6/firefox-1.0.6-source.tar.bz2) = 32782840 bytes -SHA1 (patch-aa) = 9225a7a2c9b4545e800008169d4d88452c85d1a9 +SHA1 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = ac7549f609db8dbea6db33b2ffb3ae546eea64df +RMD160 (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 8afafa2d772cabeacde5bad6dc053f9a0ee9a588 +Size (firefox-1.0.7/firefox-1.0.7-source.tar.bz2) = 32793876 bytes +SHA1 (patch-aa) = 3684fbb59a56c03536686ca51876a01759b6f4b5 SHA1 (patch-ab) = cbc4efd470f4678aee40628b8b95d919d0d15d1f -SHA1 (patch-ac) = 32aa4b92eea19aca07077a292cb759d074026642 -SHA1 (patch-ad) = 19afc8dfaf9f14439d747e42ee2f64a9c1a9dc3d -SHA1 (patch-ae) = 364b91f0bf51e49bb140e13dfb775a89ea38bb28 -SHA1 (patch-af) = 6addfc2bd0b3e3aaefff6cce6836384ca44baf30 -SHA1 (patch-ag) = 40bf4f3eb3b44d3a0d7c26cf955cf47fd6d22893 -SHA1 (patch-ah) = 4cd8e37475af19bcfe4530f910990f86c89ed916 -SHA1 (patch-ai) = 607e2f599ab74d7549930183f160ee9daab523e5 -SHA1 (patch-aj) = 4e7424b078afc0f4dfcf51a3857aba5a66c7c31c -SHA1 (patch-ak) = 6fb6ed901990efbb1a25ca5666470f8f2467fa8a -SHA1 (patch-al) = ece2c5591e3a86f80ce8257b87a802aa2fda6494 -SHA1 (patch-an) = 47bb24afbb0def95d30d466700c1983f18a14641 -SHA1 (patch-ao) = 4162763cc7af61deb1795f85fdbd96e3ef930d4d -SHA1 (patch-ap) = 6ef426340470468f8fb3a73f9d332c970e2ad9e0 -SHA1 (patch-aq) = d1fa4af006ea7486fa04b628379187a7f8e41a91 -SHA1 (patch-aw) = e2968bcf9e1175a660dcc715d68b33cdc221ef81 -SHA1 (patch-ax) = 2421096cf84bd174cfe576db855cca2338615495 -SHA1 (patch-ba) = a0d70d713d2d4746d9128724c382b019f353f5af -SHA1 (patch-bb) = 9ba4bcd86e581496bbc6b40b3a3f062dfd5e416f -SHA1 (patch-bm) = 6bd7bf1262cec43b0324693d43929497c3fb3991 +SHA1 (patch-ac) = cdf3a52f3c5ecd7285c8235a00832bc8b479285a +SHA1 (patch-ad) = 213a9918f5a90e907b4b788c64cc01bfd8e55d3f +SHA1 (patch-ae) = 6d26873efe3e6b2614ce71f784c27a6ce288f2b4 +SHA1 (patch-af) = a2dd473773b2960b3bd38943838139674725849d +SHA1 (patch-ag) = ae4c234979b317ec33ef3a8fb7cd835336764fd2 +SHA1 (patch-ah) = 658e84218316f7db451129b846b869e73f799510 +SHA1 (patch-ai) = 74e87e7bfb098cd598ec30d21e9dc28fb4b99b7e +SHA1 (patch-aj) = ebb3b4f8700dc179dfae31740e35984f58a5b638 +SHA1 (patch-ak) = 6f86b60fbe29db5d984fda06de0eff3ebf4de307 +SHA1 (patch-al) = 9bbbb2e3627a26f7a942d16ce927487bf0c81250 +SHA1 (patch-an) = 0ea10d371226ee8e7c2cbbbf291623ebbb31f1c3 +SHA1 (patch-ao) = 6f4bc48ed8eb507c43005ded5f000df05c21b5c9 +SHA1 (patch-ap) = 2fce6e5036d4e3d84c2767f8aaaaa0c75d5c6927 +SHA1 (patch-aq) = 46481b0974bdf9dc5f797a6f30a019437cc7847f +SHA1 (patch-aw) = cb450d92a994267dc17dc1bc3161b3f8b4bfa9ee +SHA1 (patch-ax) = 901af81169ce26f190594a3ae65ea16e53dcb48e +SHA1 (patch-ba) = 241a37462541c824789c3d7cb732f88c0d2e888a +SHA1 (patch-bb) = 9ff5bc4e799f29eec237d24ea6f8be2e63cbbf5b +SHA1 (patch-bm) = fa85228b45f72e6f04cbf32635de9211dff7c1b9 SHA1 (patch-bo) = 989520d608b6a60169c70bb6f5da3608aa36cf8d -SHA1 (patch-bq) = 3b8a951828b0e6906e4352027b4d36c9b1f8aaae -SHA1 (patch-br) = f4ab1a28c02a862a6fccda811d882ec37f02043b -SHA1 (patch-bs) = 81065130c96bf966b22e6abb767a5b674dcb52cb -SHA1 (patch-bt) = 6e3ceb31866dfb0dba81c93446db2b21e1df9baa -SHA1 (patch-bu) = db33b8651e3cb1fbf9a18dbe78e1e8288cfda0ee -SHA1 (patch-bv) = 4f23dfd885131ea866f31370f1421e7c19706860 -SHA1 (patch-bw) = fc3a518d3762be6e85104a6dc7fffd5ae1a463c8 -SHA1 (patch-bx) = 046e19c9c4b431369411658373b14c1822841d85 -SHA1 (patch-by) = 643185af7a0df7030b2b96447ee4031dc9c82f88 -SHA1 (patch-bz) = 6f854d74a9d1d1174ce8eff7d65f8024a7da4711 -SHA1 (patch-ca) = 479ef14631ae019ae5ca1c08a2f786294f3e972b -SHA1 (patch-cb) = fd0f033d63be066ce5c47057d72c48a085718908 -SHA1 (patch-cc) = cb08d4b7330c9e471d172c11772c840e613ceb76 -SHA1 (patch-cd) = bbe839bce72a1d6816fa0c091172a818fb469981 -SHA1 (patch-ce) = f7db7a46d40b80287774f93d55b05a5ad0c79214 -SHA1 (patch-cf) = 337bc106afe7ce3fa6678fca4c0317714393a977 -SHA1 (patch-cg) = 0b637509a5dfcc1ebe26412899da41dc3d06e6df -SHA1 (patch-ch) = 281dc9957784b4f75170377d09c22735ce7f8500 -SHA1 (patch-ci) = b9868757c31ea577c2df99eb7f41503d55d904f0 -SHA1 (patch-cj) = a17331d248dd0d3ed85c81f6c1095f384d810b0d -SHA1 (patch-ck) = 5db42f8047046e10f388bdaf299c35c415a50f8d -SHA1 (patch-cl) = 1450e99f5e5f31f0e8d01b68bb50494f84eed068 -SHA1 (patch-cm) = 2a347bcf5814816539835caf65dd888f71ceea20 +SHA1 (patch-bq) = 9a62891af626f753f88edb9d0a8dcbd2059de4ce +SHA1 (patch-br) = f3e5b80f1aa6ac3feac1888204421a69a87cec55 +SHA1 (patch-bs) = 764be3a1dbe92711e3c1448cdf31df15a2056663 +SHA1 (patch-bt) = 7663b270c2b4eeb93a42e4a9b4b7691a7d384943 +SHA1 (patch-bu) = e90013f1dd881b26d96db858ec812ae71b867153 +SHA1 (patch-bv) = 70143d3ed461f1069ad7ff1ac95ff32c7eab66ef +SHA1 (patch-bw) = 049625778a89067342ee776bd22874ce1858c586 +SHA1 (patch-bx) = eefa0a911dfbb7b3b156d2b1e604a3cb53e59428 +SHA1 (patch-by) = a4c05a0727488650d3644f532384c679e4d556a8 +SHA1 (patch-bz) = fa6c2340a5b7f43b29a8bd19efd55b6c541e3e5f +SHA1 (patch-ca) = 39f776c2daf9d22b702b7edc888aa095511fe93c +SHA1 (patch-cb) = 6bf3933689eba38f111914083bbffa8fd0abef48 +SHA1 (patch-cc) = ff5363411fce78bab406d86f13fc30e8397e668a +SHA1 (patch-cd) = 42c857b9e4567f25bf6bea4abe958c83525ebbd9 +SHA1 (patch-ce) = 95d6f4adec6a5b9f9aa05635e68ccd3d4ec71f53 +SHA1 (patch-cf) = 380d628e368c9ca0da6f3e41ddaeff9e04f01d62 +SHA1 (patch-cg) = 25c6adff07b120b718d38f7cd6d909688919953b +SHA1 (patch-ch) = bd1c186d2b538ffe1e335e9f6a394fe926925f80 +SHA1 (patch-ci) = 843c875b37707249cba51328f81f5343b7a8769b +SHA1 (patch-cj) = 9f90d4416640ad4a542a63ccdb68bda463b27ad8 +SHA1 (patch-ck) = 14eaaf75d3330d3efda0a1d746d345dca9ad84f6 +SHA1 (patch-cl) = c1c1c9e5c27b3c31ccbd12baa539e30139870b34 +SHA1 (patch-cm) = e8b3571a532e898f1eadfa0f2f1b116b1a590afd diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa index b28c29ecb29..9ca093d7a39 100644 --- a/www/firefox/patches/patch-aa +++ b/www/firefox/patches/patch-aa @@ -1,9 +1,8 @@ -$NetBSD: patch-aa,v 1.1 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-aa,v 1.2 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/config/autoconf.mk.in ./config/autoconf.mk.in ---- ../Orig/mozilla/config/autoconf.mk.in 2004-03-21 11:31:17.000000000 +0900 -+++ ./config/autoconf.mk.in 2004-06-15 23:55:36.000000000 +0900 -@@ -31,13 +31,13 @@ +--- config/autoconf.mk.in.orig 2004-10-31 04:29:54.000000000 +0000 ++++ config/autoconf.mk.in +@@ -32,13 +32,13 @@ MOZ_APP_DISPLAYNAME = @MOZ_APP_DISPLAYNA prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ diff --git a/www/firefox/patches/patch-ac b/www/firefox/patches/patch-ac index adcc121c9b7..cb5c197094c 100644 --- a/www/firefox/patches/patch-ac +++ b/www/firefox/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.4 2004/08/24 16:32:42 aymeric Exp $ +$NetBSD: patch-ac,v 1.5 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2004-04-22 22:50:05.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2005-04-28 16:01:33.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -49,6 +49,9 @@ ifneq (,$(filter FreeBSD NetBSD OpenBSD ifeq (86,$(findstring 86,$(OS_TEST))) diff --git a/www/firefox/patches/patch-ad b/www/firefox/patches/patch-ad index 1d7a1388f0f..635354f2a3d 100644 --- a/www/firefox/patches/patch-ad +++ b/www/firefox/patches/patch-ad @@ -1,9 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ad,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2001-09-29 05:12:51.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp 2004-06-15 23:55:46.000000000 +0900 -@@ -132,6 +132,15 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp.orig 2001-09-28 20:12:51.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp +@@ -132,6 +132,15 @@ extern "C" { } } @@ -19,7 +18,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68 XPTC_PUBLIC_API(nsresult) XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, PRUint32 paramCount, nsXPTCVariant* params) -@@ -139,30 +148,30 @@ +@@ -139,30 +148,30 @@ XPTC_InvokeByIndex(nsISupports* that, PR PRUint32 result; __asm__ __volatile__( diff --git a/www/firefox/patches/patch-ae b/www/firefox/patches/patch-ae index 6c9d46d1abd..9a6e166b0d2 100644 --- a/www/firefox/patches/patch-ae +++ b/www/firefox/patches/patch-ae @@ -1,9 +1,8 @@ -$NetBSD: patch-ae,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ae,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp 2004-06-15 23:55:47.000000000 +0900 -@@ -123,17 +123,27 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp.orig 2001-09-28 20:12:52.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp +@@ -123,17 +123,27 @@ extern "C" { } } diff --git a/www/firefox/patches/patch-af b/www/firefox/patches/patch-af index aa6094ed573..d6a45cac0f9 100644 --- a/www/firefox/patches/patch-af +++ b/www/firefox/patches/patch-af @@ -1,8 +1,7 @@ -$NetBSD: patch-af,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-af,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/freebl/unix_rand.c ---- ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c 2003-05-31 08:31:19.000000000 +0900 -+++ ./security/nss/lib/freebl/unix_rand.c 2004-06-15 23:55:49.000000000 +0900 +--- security/nss/lib/freebl/unix_rand.c.orig 2003-05-30 23:31:19.000000000 +0000 ++++ security/nss/lib/freebl/unix_rand.c @@ -32,6 +32,7 @@ */ @@ -11,7 +10,7 @@ diff -ru ../Orig/mozilla/security/nss/lib/freebl/unix_rand.c ./security/nss/lib/ #include <string.h> #include <signal.h> #include <unistd.h> -@@ -691,7 +692,11 @@ +@@ -691,7 +692,11 @@ safe_popen(char *cmd) /* dup write-side of pipe to stderr and stdout */ if (p[1] != 1) dup2(p[1], 1); if (p[1] != 2) dup2(p[1], 2); diff --git a/www/firefox/patches/patch-ag b/www/firefox/patches/patch-ag index 3c72b087966..a5455a29e36 100644 --- a/www/firefox/patches/patch-ag +++ b/www/firefox/patches/patch-ag @@ -1,8 +1,7 @@ -$NetBSD: patch-ag,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ag,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h ./extensions/transformiix/source/base/ErrorObserver.h ---- ../Orig/mozilla/extensions/transformiix/source/base/ErrorObserver.h 2003-01-17 21:39:36.000000000 +0900 -+++ ./extensions/transformiix/source/base/ErrorObserver.h 2004-06-15 23:55:51.000000000 +0900 +--- extensions/transformiix/source/base/ErrorObserver.h.orig 2003-01-17 12:39:36.000000000 +0000 ++++ extensions/transformiix/source/base/ErrorObserver.h @@ -28,7 +28,8 @@ #include "baseutils.h" diff --git a/www/firefox/patches/patch-ah b/www/firefox/patches/patch-ah index be4c0e6f696..8f5f89ca784 100644 --- a/www/firefox/patches/patch-ah +++ b/www/firefox/patches/patch-ah @@ -1,9 +1,8 @@ -$NetBSD: patch-ah,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ah,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl ---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl 2004-04-16 10:09:33.000000000 +0900 -+++ ./gfx/idl/nsIFreeType2.idl 2004-06-15 23:55:52.000000000 +0900 -@@ -76,10 +76,11 @@ +--- gfx/idl/nsIFreeType2.idl.orig 2004-04-16 01:09:33.000000000 +0000 ++++ gfx/idl/nsIFreeType2.idl +@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer); native FT_Sfnt_Tag(FT_Sfnt_Tag); native FT_Size(FT_Size); @@ -17,7 +16,7 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl native FTC_Manager(FTC_Manager); // #ifdef MOZ_SVG -@@ -99,7 +100,7 @@ +@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports readonly attribute FT_Library library; readonly attribute FTC_Manager FTCacheManager; @@ -26,7 +25,7 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl void doneFace(in FT_Face face); void doneFreeType(in FT_Library lib); -@@ -115,16 +116,16 @@ +@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports void outlineDecompose(in FT_Outline_p outline, in const_FT_Outline_Funcs_p funcs, in voidPtr p); void setCharmap(in FT_Face face, in FT_CharMap charmap); diff --git a/www/firefox/patches/patch-ai b/www/firefox/patches/patch-ai index d8049257d9d..ead13b82750 100644 --- a/www/firefox/patches/patch-ai +++ b/www/firefox/patches/patch-ai @@ -1,9 +1,8 @@ -$NetBSD: patch-ai,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ai,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetricsPS.cpp ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp 2004-02-05 10:57:05.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.cpp 2004-06-15 23:55:54.000000000 +0900 -@@ -1141,10 +1141,10 @@ +--- gfx/src/ps/nsFontMetricsPS.cpp.orig 2004-02-05 01:57:05.000000000 +0000 ++++ gfx/src/ps/nsFontMetricsPS.cpp +@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa mPixelSize = NSToIntRound(app2dev * mFont->size); @@ -18,7 +17,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri nsresult rv; mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv); -@@ -1190,7 +1190,7 @@ +@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich if (!face) return 0; @@ -27,7 +26,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri nsresult rv = mFt2->GetImageCache(&iCache); if (NS_FAILED(rv)) { NS_ERROR("Failed to get Image Cache"); -@@ -1228,8 +1228,8 @@ +@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace() FTC_Manager cManager; mFt2->GetFTCacheManager(&cManager); @@ -38,7 +37,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.cpp ./gfx/src/ps/nsFontMetri NS_ASSERTION(rv==0, "failed to get face/size"); if (rv) return nsnull; -@@ -1622,16 +1622,16 @@ +@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont mEntry->GetFamilyName(fontName); mEntry->GetStyleName(styleName); diff --git a/www/firefox/patches/patch-aj b/www/firefox/patches/patch-aj index fb5064b01d5..4bc7669d9bb 100644 --- a/www/firefox/patches/patch-aj +++ b/www/firefox/patches/patch-aj @@ -1,9 +1,8 @@ -$NetBSD: patch-aj,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-aj,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFreeType.h ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.h 2004-04-17 06:31:42.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.h 2004-06-15 23:55:59.000000000 +0900 -@@ -104,13 +104,13 @@ +--- gfx/src/freetype/nsFreeType.h.orig 2004-04-16 21:31:42.000000000 +0000 ++++ gfx/src/freetype/nsFreeType.h +@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_ typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*); typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap charmap); typedef FT_Error (*FTC_Image_Cache_Lookup_t) @@ -21,7 +20,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree // #ifdef MOZ_SVG typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*); typedef FT_Error (*FT_Get_Kerning_t) -@@ -165,7 +165,7 @@ +@@ -165,7 +165,7 @@ protected: FT_Outline_Decompose_t nsFT_Outline_Decompose; FT_Set_Charmap_t nsFT_Set_Charmap; FTC_Image_Cache_Lookup_t nsFTC_Image_Cache_Lookup; @@ -30,7 +29,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.h ./gfx/src/freetype/nsFree FTC_Manager_Done_t nsFTC_Manager_Done; FTC_Manager_New_t nsFTC_Manager_New; FTC_Image_Cache_New_t nsFTC_Image_Cache_New; -@@ -213,7 +213,7 @@ +@@ -213,7 +213,7 @@ protected: PRLibrary *mSharedLib; FT_Library mFreeTypeLibrary; FTC_Manager mFTCacheManager; diff --git a/www/firefox/patches/patch-ak b/www/firefox/patches/patch-ak index 5dd9e37ee75..4c95e50f99a 100644 --- a/www/firefox/patches/patch-ak +++ b/www/firefox/patches/patch-ak @@ -1,9 +1,8 @@ -$NetBSD: patch-ak,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ak,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFreeType.cpp ---- ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp 2004-02-08 00:22:30.000000000 +0900 -+++ ./gfx/src/freetype/nsFreeType.cpp 2004-06-15 23:56:01.000000000 +0900 -@@ -110,11 +110,11 @@ +--- gfx/src/freetype/nsFreeType.cpp.orig 2004-02-07 15:22:30.000000000 +0000 ++++ gfx/src/freetype/nsFreeType.cpp +@@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = { {"FT_New_Face", NS_FT2_OFFSET(nsFT_New_Face), PR_TRUE}, {"FT_Outline_Decompose", NS_FT2_OFFSET(nsFT_Outline_Decompose), PR_TRUE}, {"FT_Set_Charmap", NS_FT2_OFFSET(nsFT_Set_Charmap), PR_TRUE}, @@ -18,7 +17,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr // #ifdef MOZ_SVG {"FT_Glyph_Transform", NS_FT2_OFFSET(nsFT_Glyph_Transform), PR_TRUE}, {"FT_Get_Kerning", NS_FT2_OFFSET(nsFT_Get_Kerning), PR_TRUE}, -@@ -282,7 +282,7 @@ +@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT } NS_IMETHODIMP @@ -27,7 +26,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr FT_UInt glyphID, FT_Glyph *glyph) { // call the FreeType2 function via the function pointer -@@ -291,11 +291,11 @@ +@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_ } NS_IMETHODIMP @@ -42,7 +41,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr return error ? NS_ERROR_FAILURE : NS_OK; } -@@ -320,7 +320,7 @@ +@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra } NS_IMETHODIMP @@ -51,7 +50,7 @@ diff -ru ../Orig/mozilla/gfx/src/freetype/nsFreeType.cpp ./gfx/src/freetype/nsFr { // call the FreeType2 function via the function pointer FT_Error error = nsFTC_Image_Cache_New(manager, cache); -@@ -389,7 +389,7 @@ +@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res } NS_IMETHODIMP diff --git a/www/firefox/patches/patch-al b/www/firefox/patches/patch-al index 40febc33ca8..0e31e2dc2e1 100644 --- a/www/firefox/patches/patch-al +++ b/www/firefox/patches/patch-al @@ -1,9 +1,8 @@ -$NetBSD: patch-al,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-al,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetricsPS.h ---- ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h 2003-04-23 01:25:09.000000000 +0900 -+++ ./gfx/src/ps/nsFontMetricsPS.h 2004-06-15 23:56:04.000000000 +0900 -@@ -320,7 +320,7 @@ +--- gfx/src/ps/nsFontMetricsPS.h.orig 2003-04-22 16:25:09.000000000 +0000 ++++ gfx/src/ps/nsFontMetricsPS.h +@@ -320,7 +320,7 @@ protected: nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID; nsCOMPtr<nsIFreeType2> mFt2; PRUint16 mPixelSize; @@ -12,7 +11,7 @@ diff -ru ../Orig/mozilla/gfx/src/ps/nsFontMetricsPS.h ./gfx/src/ps/nsFontMetrics static PRBool AddUserPref(nsIAtom *aLang, const nsFont& aFont, -@@ -363,7 +363,7 @@ +@@ -363,7 +363,7 @@ public: protected: nsCOMPtr<nsITrueTypeFontCatalogEntry> mEntry; nsCOMPtr<nsIFreeType2> mFt2; diff --git a/www/firefox/patches/patch-an b/www/firefox/patches/patch-an index 38e5b4fd395..ee000e43a55 100644 --- a/www/firefox/patches/patch-an +++ b/www/firefox/patches/patch-an @@ -1,9 +1,8 @@ -$NetBSD: patch-an,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-an,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h 2003-04-23 01:25:13.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.h 2004-06-15 23:56:10.000000000 +0900 -@@ -110,7 +110,7 @@ +--- gfx/src/x11shared/nsFontFreeType.h.orig 2003-04-22 16:25:13.000000000 +0000 ++++ gfx/src/x11shared/nsFontFreeType.h +@@ -110,7 +110,7 @@ protected: XImage *GetXImage(PRUint32 width, PRUint32 height); nsITrueTypeFontCatalogEntry *mFaceID; PRUint16 mPixelSize; diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao index 9e4bca5a44d..5ee8adeb651 100644 --- a/www/firefox/patches/patch-ao +++ b/www/firefox/patches/patch-ao @@ -1,9 +1,8 @@ -$NetBSD: patch-ao,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ao,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp ---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp 2003-12-25 17:24:52.000000000 +0900 -+++ ./gfx/src/x11shared/nsFontFreeType.cpp 2004-06-15 23:56:14.000000000 +0900 -@@ -177,7 +177,7 @@ +--- gfx/src/x11shared/nsFontFreeType.cpp.orig 2003-12-25 08:24:52.000000000 +0000 ++++ gfx/src/x11shared/nsFontFreeType.cpp +@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace() FTC_Manager mgr; nsresult rv; mFt2->GetFTCacheManager(&mgr); @@ -12,7 +11,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size"); if (NS_FAILED(rv)) return nsnull; -@@ -191,22 +191,15 @@ +@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy PRBool embedded_bimap = PR_FALSE; mFaceID = aFaceID; mPixelSize = aPixelSize; @@ -39,7 +38,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share PRUint32 num_embedded_bitmaps, i; PRInt32* embedded_bitmapheights; mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps, -@@ -218,7 +211,6 @@ +@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy if (embedded_bitmapheights[i] == aPixelSize) { embedded_bimap = PR_TRUE; // unhinted must be set for embedded bitmaps to be used @@ -47,7 +46,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share break; } } -@@ -312,7 +304,7 @@ +@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con if (!face) return NS_ERROR_FAILURE; @@ -56,7 +55,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share mFt2->GetImageCache(&icache); if (!icache) return NS_ERROR_FAILURE; -@@ -401,7 +393,7 @@ +@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar if (!face) return 0; @@ -65,7 +64,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share mFt2->GetImageCache(&icache); if (!icache) return 0; -@@ -723,7 +715,7 @@ +@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2); #endif diff --git a/www/firefox/patches/patch-ap b/www/firefox/patches/patch-ap index cf0434b6ec4..af3365dadd6 100644 --- a/www/firefox/patches/patch-ap +++ b/www/firefox/patches/patch-ap @@ -1,6 +1,6 @@ -$NetBSD: patch-ap,v 1.3 2005/07/25 15:46:51 adam Exp $ +$NetBSD: patch-ap,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- security/coreconf/command.mk.orig 2005-07-25 11:03:35.000000000 +0000 +--- security/coreconf/command.mk.orig 2002-02-15 22:53:12.000000000 +0000 +++ security/coreconf/command.mk @@ -42,7 +42,7 @@ CCF = $(CC) $(CFLAGS) LINK_DLL = $(LINK) $(OS_DLLFLAGS) $(DLLFLAGS) diff --git a/www/firefox/patches/patch-aq b/www/firefox/patches/patch-aq index b5fe35a314e..2dc484cf178 100644 --- a/www/firefox/patches/patch-aq +++ b/www/firefox/patches/patch-aq @@ -1,6 +1,6 @@ -$NetBSD: patch-aq,v 1.1 2005/07/25 15:46:51 adam Exp $ +$NetBSD: patch-aq,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- directory/c-sdk/configure.in.orig 2005-07-23 11:36:39.000000000 +0000 +--- directory/c-sdk/configure.in.orig 2004-09-14 20:59:40.000000000 +0000 +++ directory/c-sdk/configure.in @@ -52,7 +52,7 @@ USE_64= USE_CPLUS= diff --git a/www/firefox/patches/patch-aw b/www/firefox/patches/patch-aw index 64809de5124..b70c1b8ba64 100644 --- a/www/firefox/patches/patch-aw +++ b/www/firefox/patches/patch-aw @@ -1,9 +1,8 @@ -$NetBSD: patch-aw,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-aw,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in ./widget/src/gtksuperwin/Makefile.in ---- ../Orig/mozilla/widget/src/gtksuperwin/Makefile.in 2004-01-07 22:36:54.000000000 +0900 -+++ ./widget/src/gtksuperwin/Makefile.in 2004-06-15 23:56:15.000000000 +0900 -@@ -25,6 +25,7 @@ +--- widget/src/gtksuperwin/Makefile.in.orig 2004-01-07 13:36:54.000000000 +0000 ++++ widget/src/gtksuperwin/Makefile.in +@@ -25,6 +25,7 @@ include $(DEPTH)/config/autoconf.mk MODULE = widget LIBRARY_NAME = gtksuperwin EXPORT_LIBRARY = 1 diff --git a/www/firefox/patches/patch-ax b/www/firefox/patches/patch-ax index 1cc44a26b8b..08d5d0c92cc 100644 --- a/www/firefox/patches/patch-ax +++ b/www/firefox/patches/patch-ax @@ -1,9 +1,8 @@ -$NetBSD: patch-ax,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ax,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/security/coreconf/SunOS5.mk ./security/coreconf/SunOS5.mk ---- ../Orig/mozilla/security/coreconf/SunOS5.mk 2003-05-16 04:12:10.000000000 +0900 -+++ ./security/coreconf/SunOS5.mk 2004-06-15 23:56:19.000000000 +0900 -@@ -165,6 +165,10 @@ +--- security/coreconf/SunOS5.mk.orig 2004-10-15 22:22:17.000000000 +0000 ++++ security/coreconf/SunOS5.mk +@@ -181,6 +181,10 @@ endif DSO_LDOPTS += -G -h $(notdir $@) endif diff --git a/www/firefox/patches/patch-ba b/www/firefox/patches/patch-ba index 62d863cfaba..a8aa3e38cf0 100644 --- a/www/firefox/patches/patch-ba +++ b/www/firefox/patches/patch-ba @@ -1,8 +1,7 @@ -$NetBSD: patch-ba,v 1.3 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-ba,v 1.4 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg ./nsprpub/pr/include/md/_netbsd.cfg ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.cfg 2000-12-02 06:29:17.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.cfg 2004-06-15 23:56:25.000000000 +0900 +--- nsprpub/pr/include/md/_netbsd.cfg.orig 2000-12-01 21:29:17.000000000 +0000 ++++ nsprpub/pr/include/md/_netbsd.cfg @@ -45,7 +45,8 @@ #define PR_AF_INET6 24 /* same as AF_INET6 */ diff --git a/www/firefox/patches/patch-bb b/www/firefox/patches/patch-bb index cc259701b50..cb18f32520a 100644 --- a/www/firefox/patches/patch-bb +++ b/www/firefox/patches/patch-bb @@ -1,8 +1,7 @@ -$NetBSD: patch-bb,v 1.3 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bb,v 1.4 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h ./nsprpub/pr/include/md/_netbsd.h ---- ../Orig/mozilla/nsprpub/pr/include/md/_netbsd.h 2003-09-12 02:24:53.000000000 +0900 -+++ ./nsprpub/pr/include/md/_netbsd.h 2004-06-15 23:56:27.000000000 +0900 +--- nsprpub/pr/include/md/_netbsd.h.orig 2003-09-11 17:24:53.000000000 +0000 ++++ nsprpub/pr/include/md/_netbsd.h @@ -44,16 +44,26 @@ #define _PR_SI_ARCHITECTURE "x86" #elif defined(__alpha__) diff --git a/www/firefox/patches/patch-bm b/www/firefox/patches/patch-bm index 04061d5cb23..5280435c2bb 100644 --- a/www/firefox/patches/patch-bm +++ b/www/firefox/patches/patch-bm @@ -1,9 +1,8 @@ -$NetBSD: patch-bm,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bm,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp 2004-06-15 23:56:36.000000000 +0900 -@@ -118,18 +118,23 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp.orig 2001-09-28 20:12:52.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp +@@ -118,18 +118,23 @@ PrepareAndDispatch(nsXPTCStubBase* self, * so they are contiguous with values passed on the stack, and then calls * PrepareAndDispatch() to do the dirty work. */ diff --git a/www/firefox/patches/patch-bq b/www/firefox/patches/patch-bq index 05746525cfe..9233d11f744 100644 --- a/www/firefox/patches/patch-bq +++ b/www/firefox/patches/patch-bq @@ -1,8 +1,7 @@ -$NetBSD: patch-bq,v 1.3 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bq,v 1.4 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h ./xpcom/io/nsLocalFileUnix.h ---- ../Orig/mozilla/xpcom/io/nsLocalFileUnix.h 2004-01-15 15:14:13.000000000 +0900 -+++ ./xpcom/io/nsLocalFileUnix.h 2004-06-15 23:56:45.000000000 +0900 +--- xpcom/io/nsLocalFileUnix.h.orig 2004-01-15 06:14:13.000000000 +0000 ++++ xpcom/io/nsLocalFileUnix.h @@ -57,7 +57,7 @@ #endif diff --git a/www/firefox/patches/patch-br b/www/firefox/patches/patch-br index d999133b830..575795e2195 100644 --- a/www/firefox/patches/patch-br +++ b/www/firefox/patches/patch-br @@ -1,8 +1,8 @@ -$NetBSD: patch-br,v 1.4 2005/09/08 22:03:45 abs Exp $ +$NetBSD: patch-br,v 1.5 2005/09/22 14:14:04 jlam Exp $ ---- nsprpub/pr/src/misc/prnetdb.c.orig 2004-01-23 09:22:37.000000000 +1100 +--- nsprpub/pr/src/misc/prnetdb.c.orig 2004-09-01 23:07:28.000000000 +0000 +++ nsprpub/pr/src/misc/prnetdb.c -@@ -2094,7 +2094,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf +@@ -2098,7 +2098,17 @@ PR_IMPLEMENT(PRAddrInfo *) PR_GetAddrInf */ hints.ai_socktype = SOCK_STREAM; diff --git a/www/firefox/patches/patch-bs b/www/firefox/patches/patch-bs index e7a743f1b8d..1f4c0417091 100644 --- a/www/firefox/patches/patch-bs +++ b/www/firefox/patches/patch-bs @@ -1,9 +1,8 @@ -$NetBSD: patch-bs,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bs,v 1.3 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/config/mkdepend/imakemdep.h ./config/mkdepend/imakemdep.h ---- ../Orig/mozilla/config/mkdepend/imakemdep.h 1998-09-05 13:22:25.000000000 +0900 -+++ ./config/mkdepend/imakemdep.h 2004-06-15 23:56:48.000000000 +0900 -@@ -277,6 +277,9 @@ +--- config/mkdepend/imakemdep.h.orig 1998-09-05 04:22:25.000000000 +0000 ++++ config/mkdepend/imakemdep.h +@@ -277,6 +277,9 @@ char *cpp_argv[ARGUMENTS] = { # ifdef __i386__ "-D__i386__", # endif diff --git a/www/firefox/patches/patch-bt b/www/firefox/patches/patch-bt index d80dba881b8..7b77e00dbc9 100644 --- a/www/firefox/patches/patch-bt +++ b/www/firefox/patches/patch-bt @@ -1,8 +1,7 @@ -$NetBSD: patch-bt,v 1.3 2004/11/01 18:07:24 kristerw Exp $ +$NetBSD: patch-bt,v 1.4 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/nsprpub/pr/src/io/prprf.c ./nsprpub/pr/src/io/prprf.c ---- ../Orig/mozilla/nsprpub/pr/src/io/prprf.c 2004-03-09 12:18:19.000000000 +0900 -+++ ./nsprpub/pr/src/io/prprf.c 2004-06-15 23:56:50.000000000 +0900 +--- nsprpub/pr/src/io/prprf.c.orig 2004-03-09 03:18:19.000000000 +0000 ++++ nsprpub/pr/src/io/prprf.c @@ -53,6 +53,11 @@ */ #if (defined(LINUX) && defined(__x86_64__)) diff --git a/www/firefox/patches/patch-bu b/www/firefox/patches/patch-bu index c21d212a224..a6f683b6b8d 100644 --- a/www/firefox/patches/patch-bu +++ b/www/firefox/patches/patch-bu @@ -1,7 +1,7 @@ -$NetBSD: patch-bu,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bu,v 1.3 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2004-05-30 21:38:13.000000000 +0900 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp.orig 2005-09-21 22:14:53.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_amd64.cpp @@ -0,0 +1,174 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +// Platform specific code to invoke XPCOM methods on native objects diff --git a/www/firefox/patches/patch-bv b/www/firefox/patches/patch-bv index 155c63cd791..eb5db4e529c 100644 --- a/www/firefox/patches/patch-bv +++ b/www/firefox/patches/patch-bv @@ -1,7 +1,7 @@ -$NetBSD: patch-bv,v 1.2 2004/06/23 16:47:12 taya Exp $ +$NetBSD: patch-bv,v 1.3 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2004-05-30 21:38:22.000000000 +0900 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp 2004-05-30 21:37:22.000000000 +0900 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp.orig 2005-09-21 22:14:53.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_amd64.cpp @@ -0,0 +1,206 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + diff --git a/www/firefox/patches/patch-bw b/www/firefox/patches/patch-bw index c3eff81e6c8..b8d1bd2f2d1 100644 --- a/www/firefox/patches/patch-bw +++ b/www/firefox/patches/patch-bw @@ -1,9 +1,8 @@ -$NetBSD: patch-bw,v 1.3 2004/06/15 23:19:50 reinoud Exp $ +$NetBSD: patch-bw,v 1.4 2005/09/22 14:14:04 jlam Exp $ -diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp ---- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2001-09-29 05:12:52.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp 2004-05-11 16:29:31.000000000 +0900 -@@ -188,6 +188,50 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp.orig 2001-09-28 20:12:52.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp +@@ -188,6 +188,50 @@ __asm__( * nsresult nsXPTCStubBase::Stub##n() * Sets register $1 to "methodIndex" and jumps to SharedStub. */ @@ -54,7 +53,7 @@ diff -ru ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha #define STUB_ENTRY(n) \ __asm__( \ "#### Stub"#n" ####\n" \ -@@ -204,6 +248,7 @@ +@@ -204,6 +248,7 @@ __asm__( \ "br $31,$SharedStub..ng\n\t" \ ".end Stub"#n"__14nsXPTCStubBase" \ ); diff --git a/www/firefox/patches/patch-bx b/www/firefox/patches/patch-bx index 1ee48fcc6bc..af3b53b75dd 100644 --- a/www/firefox/patches/patch-bx +++ b/www/firefox/patches/patch-bx @@ -1,6 +1,6 @@ -$NetBSD: patch-bx,v 1.2 2004/08/24 14:28:33 aymeric Exp $ +$NetBSD: patch-bx,v 1.3 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 22:12:53.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp.orig 2001-09-28 20:12:53.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp @@ -119,8 +119,10 @@ PrepareAndDispatch(nsXPTCStubBase* self, if ((PRUint32) ap & 4) ap++; // doubles are 8-byte aligned on stack diff --git a/www/firefox/patches/patch-by b/www/firefox/patches/patch-by index 1ac283b7b66..268544a8d08 100644 --- a/www/firefox/patches/patch-by +++ b/www/firefox/patches/patch-by @@ -1,9 +1,8 @@ -$NetBSD: patch-by,v 1.2 2004/07/05 14:25:29 taya Exp $ +$NetBSD: patch-by,v 1.3 2005/09/22 14:14:04 jlam 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-07-04 22:59:19.000000000 +0900 -@@ -155,15 +155,15 @@ +--- layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp.orig 2004-03-19 01:36:16.000000000 +0000 ++++ layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsFT.cpp +@@ -155,15 +155,15 @@ void NS_InitSVGLibartGlyphMetricsFTGloba static NS_NAMED_LITERAL_STRING(arial, "arial"); nsSVGLibartGlyphMetricsFT::sFontAliases.Put(NS_LITERAL_STRING("helvetica"), @@ -22,7 +21,7 @@ diff -ru ../Orig/mozilla/layout/svg/renderer/src/libart/nsSVGLibartGlyphMetricsF } void NS_FreeSVGLibartGlyphMetricsFTGlobals() -@@ -440,19 +440,19 @@ +@@ -440,19 +440,19 @@ nsSVGLibartGlyphMetricsFT::InitializeFac return; } diff --git a/www/firefox/patches/patch-bz b/www/firefox/patches/patch-bz index 513edd82a8c..abfe6c91725 100644 --- a/www/firefox/patches/patch-bz +++ b/www/firefox/patches/patch-bz @@ -1,6 +1,6 @@ -$NetBSD: patch-bz,v 1.1 2004/08/24 14:28:33 aymeric Exp $ +$NetBSD: patch-bz,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2001-03-11 18:22:22.000000000 +0100 +--- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s.orig 2001-03-11 17:22:22.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s @@ -1,27 +1,27 @@ -# -*- Mode: Asm -*- diff --git a/www/firefox/patches/patch-ca b/www/firefox/patches/patch-ca index a5d320f47ef..2c5c40f0076 100644 --- a/www/firefox/patches/patch-ca +++ b/www/firefox/patches/patch-ca @@ -1,6 +1,6 @@ -$NetBSD: patch-ca,v 1.1 2004/08/24 14:28:33 aymeric Exp $ +$NetBSD: patch-ca,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2001-03-11 18:22:17.000000000 +0100 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s.orig 2001-03-11 17:22:17.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s @@ -1,27 +1,28 @@ -# -*- Mode: Asm -*- diff --git a/www/firefox/patches/patch-cb b/www/firefox/patches/patch-cb index a46063c0071..479a817caef 100644 --- a/www/firefox/patches/patch-cb +++ b/www/firefox/patches/patch-cb @@ -1,6 +1,6 @@ -$NetBSD: patch-cb,v 1.1 2004/08/24 14:28:33 aymeric Exp $ +$NetBSD: patch-cb,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2001-09-28 22:12:52.000000000 +0200 +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp.orig 2001-09-28 20:12:52.000000000 +0000 +++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp @@ -104,8 +104,10 @@ invoke_copy_to_stack(PRUint32* d, if ((PRUint32) d & 4) d++; // doubles are 8-byte aligned on stack diff --git a/www/firefox/patches/patch-cc b/www/firefox/patches/patch-cc index cbf1e8e9df8..aec53df7634 100644 --- a/www/firefox/patches/patch-cc +++ b/www/firefox/patches/patch-cc @@ -1,8 +1,8 @@ -$NetBSD: patch-cc,v 1.1 2004/09/01 00:01:59 taya Exp $ +$NetBSD: patch-cc,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- /mnt/local/src/mozilla-1.7rc3/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:24:00.000000000 +0900 -+++ ./xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp 2004-08-13 01:23:35.000000000 +0900 -@@ -163,7 +163,11 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp.orig 2001-09-28 20:12:51.000000000 +0000 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp +@@ -163,7 +163,11 @@ __asm__( "bis $16,$16,$1\n\t" /* load "this" */ "ldq $2,16($15)\n\t" /* load "methodIndex" */ "ldq $1,0($1)\n\t" /* load vtable */ diff --git a/www/firefox/patches/patch-cd b/www/firefox/patches/patch-cd index f27a7569d53..5ec1cc84f1b 100644 --- a/www/firefox/patches/patch-cd +++ b/www/firefox/patches/patch-cd @@ -1,7 +1,7 @@ -$NetBSD: patch-cd,v 1.1 2004/10/21 00:55:36 xtraeme Exp $ +$NetBSD: patch-cd,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- modules/plugin/base/public/nptypes.h.orig 2004-10-21 01:07:27.000000000 +0200 -+++ modules/plugin/base/public/nptypes.h 2004-10-21 01:09:38.000000000 +0200 +--- modules/plugin/base/public/nptypes.h.orig 2004-09-01 16:59:55.000000000 +0000 ++++ modules/plugin/base/public/nptypes.h @@ -78,8 +78,10 @@ typedef int bool; #endif diff --git a/www/firefox/patches/patch-ce b/www/firefox/patches/patch-ce index ebd2bb31b09..a2f76330a1a 100644 --- a/www/firefox/patches/patch-ce +++ b/www/firefox/patches/patch-ce @@ -1,6 +1,6 @@ -$NetBSD: patch-ce,v 1.1 2004/10/24 05:41:25 grant Exp $ +$NetBSD: patch-ce,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig 2004-08-27 05:57:00.000000000 +1000 +--- toolkit/mozapps/installer/unix/wizard/Makefile.in.orig 2004-10-25 08:23:28.000000000 +0000 +++ toolkit/mozapps/installer/unix/wizard/Makefile.in @@ -60,6 +60,10 @@ LIBS = \ -lpthread \ diff --git a/www/firefox/patches/patch-cf b/www/firefox/patches/patch-cf index 010623af675..6362bc99e63 100644 --- a/www/firefox/patches/patch-cf +++ b/www/firefox/patches/patch-cf @@ -1,6 +1,6 @@ -$NetBSD: patch-cf,v 1.1 2004/10/24 05:41:25 grant Exp $ +$NetBSD: patch-cf,v 1.2 2005/09/22 14:14:04 jlam Exp $ ---- browser/config/mozconfig.orig 2004-07-07 18:31:10.000000000 +1000 +--- browser/config/mozconfig.orig 2004-07-07 08:31:10.000000000 +0000 +++ browser/config/mozconfig @@ -3,7 +3,8 @@ # . $topsrcdir/browser/config/mozconfig diff --git a/www/firefox/patches/patch-cg b/www/firefox/patches/patch-cg index 23911826632..0ea70534cf9 100644 --- a/www/firefox/patches/patch-cg +++ b/www/firefox/patches/patch-cg @@ -1,7 +1,7 @@ -$NetBSD: patch-cg,v 1.4 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-cg,v 1.5 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 22:23:18.000000000 +0100 -+++ extensions/transformiix/source/base/Double.cpp 2005-06-20 11:26:26.000000000 +0200 +--- extensions/transformiix/source/base/Double.cpp.orig 2004-01-15 21:23:18.000000000 +0000 ++++ extensions/transformiix/source/base/Double.cpp @@ -48,6 +48,38 @@ * Utility class for doubles */ @@ -41,7 +41,7 @@ $NetBSD: patch-cg,v 1.4 2005/06/22 22:05:34 martin Exp $ //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. #ifdef __FreeBSD__ #include <ieeefp.h> -@@ -127,9 +159,20 @@ +@@ -127,9 +159,20 @@ const PRUint32 infMask[2] = {0, TX_DO const PRUint32 negInfMask[2] = {0, TX_DOUBLE_HI32_EXPMASK | TX_DOUBLE_HI32_SIGNBIT}; #endif @@ -65,7 +65,7 @@ $NetBSD: patch-cg,v 1.4 2005/06/22 22:05:34 martin Exp $ /* * Determines whether the given double represents positive or negative -@@ -157,6 +200,7 @@ +@@ -157,6 +200,7 @@ MBool Double::isNeg(double aDbl) { return (TX_DOUBLE_HI32(aDbl) & TX_DOUBLE_HI32_SIGNBIT) != 0; } @@ -73,7 +73,7 @@ $NetBSD: patch-cg,v 1.4 2005/06/22 22:05:34 martin Exp $ /* * Converts the given String to a double, if the String value does not -@@ -244,7 +288,7 @@ +@@ -244,7 +288,7 @@ public: { if (mState == eIllegal || mBuffer.IsEmpty() || (mBuffer.Length() == 1 && mBuffer[0] == '.')) { @@ -82,4 +82,3 @@ $NetBSD: patch-cg,v 1.4 2005/06/22 22:05:34 martin Exp $ } return mSign*PR_strtod(mBuffer.get(), 0); } - diff --git a/www/firefox/patches/patch-ch b/www/firefox/patches/patch-ch index a4b6c4fb3a6..05603afbc8e 100644 --- a/www/firefox/patches/patch-ch +++ b/www/firefox/patches/patch-ch @@ -1,8 +1,8 @@ -$NetBSD: patch-ch,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-ch,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/base/primitives.h.orig 2003-01-17 13:43:05.000000000 +0100 -+++ extensions/transformiix/source/base/primitives.h 2005-06-16 09:46:56.000000000 +0200 -@@ -51,10 +51,9 @@ +--- extensions/transformiix/source/base/primitives.h.orig 2003-01-17 12:43:05.000000000 +0000 ++++ extensions/transformiix/source/base/primitives.h +@@ -51,10 +51,9 @@ public: /* * Usefull constants */ diff --git a/www/firefox/patches/patch-ci b/www/firefox/patches/patch-ci index 483b6dbe4d3..ae46908f973 100644 --- a/www/firefox/patches/patch-ci +++ b/www/firefox/patches/patch-ci @@ -1,8 +1,8 @@ -$NetBSD: patch-ci,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-ci,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/xpath/FunctionCall.cpp.orig 2003-11-04 16:13:03.000000000 +0100 -+++ extensions/transformiix/source/xpath/FunctionCall.cpp 2005-06-16 09:14:19.000000000 +0200 -@@ -92,7 +92,7 @@ +--- extensions/transformiix/source/xpath/FunctionCall.cpp.orig 2003-11-04 15:13:03.000000000 +0000 ++++ extensions/transformiix/source/xpath/FunctionCall.cpp +@@ -92,7 +92,7 @@ double FunctionCall::evaluateToNumber(Ex nsRefPtr<txAExprResult> exprResult; nsresult rv = aExpr->evaluate(aContext, getter_AddRefs(exprResult)); if (NS_FAILED(rv)) diff --git a/www/firefox/patches/patch-cj b/www/firefox/patches/patch-cj index 633d7da8dff..e60c57e185e 100644 --- a/www/firefox/patches/patch-cj +++ b/www/firefox/patches/patch-cj @@ -1,8 +1,8 @@ -$NetBSD: patch-cj,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-cj,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/xpath/MultiplicativeExpr.cpp.orig 2003-11-20 00:06:14.000000000 +0100 -+++ extensions/transformiix/source/xpath/MultiplicativeExpr.cpp 2005-06-16 09:29:24.000000000 +0200 -@@ -71,22 +71,22 @@ +--- extensions/transformiix/source/xpath/MultiplicativeExpr.cpp.orig 2003-11-19 23:06:14.000000000 +0000 ++++ extensions/transformiix/source/xpath/MultiplicativeExpr.cpp +@@ -71,22 +71,22 @@ MultiplicativeExpr::evaluate(txIEvalCont #if defined(XP_WIN) /* XXX MSVC miscompiles such that (NaN == 0) */ if (Double::isNaN(rightDbl)) diff --git a/www/firefox/patches/patch-ck b/www/firefox/patches/patch-ck index deef2325ac1..f253c9592cb 100644 --- a/www/firefox/patches/patch-ck +++ b/www/firefox/patches/patch-ck @@ -1,8 +1,8 @@ -$NetBSD: patch-ck,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-ck,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp.orig 2003-06-17 00:31:17.000000000 +0200 -+++ extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp 2005-06-16 10:06:22.000000000 +0200 -@@ -112,12 +112,12 @@ +--- extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp.orig 2003-06-16 22:31:17.000000000 +0000 ++++ extensions/transformiix/source/xslt/functions/txFormatNumberFunctionCall.cpp +@@ -112,12 +112,12 @@ txFormatNumberFunctionCall::evaluate(txI return aContext->recycler()->getStringResult(format->mNaN, aResult); } diff --git a/www/firefox/patches/patch-cl b/www/firefox/patches/patch-cl index 47126ab77e2..0a955c3dd44 100644 --- a/www/firefox/patches/patch-cl +++ b/www/firefox/patches/patch-cl @@ -1,8 +1,8 @@ -$NetBSD: patch-cl,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-cl,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp.orig 2004-01-29 23:04:29.000000000 +0100 -+++ extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp 2005-06-16 09:18:13.000000000 +0200 -@@ -258,7 +258,7 @@ +--- extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp.orig 2004-01-29 22:04:29.000000000 +0000 ++++ extensions/transformiix/source/xslt/txStylesheetCompileHandlers.cpp +@@ -258,7 +258,7 @@ getNumberAttr(txStylesheetAttr* aAttribu txStylesheetCompilerState& aState, double& aNumber) { @@ -11,7 +11,7 @@ $NetBSD: patch-cl,v 1.3 2005/06/22 22:05:34 martin Exp $ txStylesheetAttr* attr = nsnull; nsresult rv = getStyleAttr(aAttributes, aAttrCount, kNameSpaceID_None, aName, aRequired, &attr); -@@ -479,7 +479,7 @@ +@@ -479,7 +479,7 @@ txFnStartLREStylesheet(PRInt32 aNamespac NS_ENSURE_SUCCESS(rv, rv); txExpandedName nullExpr; @@ -20,7 +20,7 @@ $NetBSD: patch-cl,v 1.3 2005/06/22 22:05:34 martin Exp $ nsAutoPtr<txPattern> match(new txRootPattern(MB_TRUE)); NS_ENSURE_TRUE(match, NS_ERROR_OUT_OF_MEMORY); -@@ -1038,7 +1038,7 @@ +@@ -1038,7 +1038,7 @@ txFnStartTemplate(PRInt32 aNamespaceID, aState, mode); NS_ENSURE_SUCCESS(rv, rv); diff --git a/www/firefox/patches/patch-cm b/www/firefox/patches/patch-cm index 844a46f0c1c..b42b25ce8be 100644 --- a/www/firefox/patches/patch-cm +++ b/www/firefox/patches/patch-cm @@ -1,8 +1,8 @@ -$NetBSD: patch-cm,v 1.3 2005/06/22 22:05:34 martin Exp $ +$NetBSD: patch-cm,v 1.4 2005/09/22 14:14:04 jlam Exp $ ---- extensions/transformiix/source/xslt/txXSLTPatterns.cpp.orig 2003-11-18 23:56:46.000000000 +0100 -+++ extensions/transformiix/source/xslt/txXSLTPatterns.cpp 2005-06-16 09:17:00.000000000 +0200 -@@ -99,7 +99,7 @@ +--- extensions/transformiix/source/xslt/txXSLTPatterns.cpp.orig 2003-11-18 22:56:46.000000000 +0000 ++++ extensions/transformiix/source/xslt/txXSLTPatterns.cpp +@@ -99,7 +99,7 @@ nsresult txUnionPattern::addPattern(txPa double txUnionPattern::getDefaultPriority() { NS_ASSERTION(0, "Don't call getDefaultPriority on txUnionPattern"); |