diff options
Diffstat (limited to 'www/mozilla-devel/files')
4 files changed, 8 insertions, 112 deletions
diff --git a/www/mozilla-devel/files/patch-Makefile.in b/www/mozilla-devel/files/patch-Makefile.in index f65ae1be8d13..43fa34684782 100644 --- a/www/mozilla-devel/files/patch-Makefile.in +++ b/www/mozilla-devel/files/patch-Makefile.in @@ -1,25 +1,22 @@ - -$FreeBSD$ - ---- Makefile.in 2001/12/25 21:00:23 1.1 -+++ Makefile.in 2001/12/26 06:40:16 -@@ -64,8 +64,7 @@ - DIRS = $(NSPRPUB_DIR) \ +--- Makefile.in.orig Thu May 30 20:39:07 2002 ++++ Makefile.in Wed Aug 28 13:55:32 2002 +@@ -70,8 +70,7 @@ $(tier_0_dirs) \ $(tier_1_dirs) \ + $(tier_2_dirs) \ - $(tier_9_dirs) \ - $(NULL) + $(tier_9_dirs) - ifdef MOZ_LDAP_XPCOM - DIRS += directory/c-sdk/ldap -@@ -81,7 +80,8 @@ + ifdef GC_LEAK_DETECTOR + DIRS += gc/boehm +@@ -90,7 +89,8 @@ DIRS += $(tier_98_dirs) endif -DIRS += $(tier_99_dirs) +DIRS += $(tier_99_dirs) \ -+ $(NULL) ++ $(NULL) # # tier 0 - base build config dirs diff --git a/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp b/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp deleted file mode 100644 index 3bab909b5a89..000000000000 --- a/www/mozilla-devel/files/patch-nsFontMetricsGTK.cpp +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - -As reported by Mikko Rapeli and Tom Vogt at -http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and -http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can -abort when Mozilla requests a huge (scalable) font. This is also -likely to happen to the X font server, or to Xvnc. - -This patch is from -http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view -. - ---- gfx/src/gtk/nsFontMetricsGTK.cpp Mon Jun 10 01:02:08 2002 -+++ gfx/src/gtk/nsFontMetricsGTK.cpp Thu Jun 13 00:06:33 2002 -@@ -87,6 +87,12 @@ - #undef USER_DEFINED - #define USER_DEFINED "x-user-def" - -+// This is the scaling factor that we keep fonts limited to against -+// the display size. If a pixel size is requested that is more than -+// this factor larger than the height of the display, it's clamped to -+// that value instead of the requested size. -+#define FONT_MAX_FONT_SCALE 2 -+ - #undef NOISY_FONTS - #undef REALLY_NOISY_FONTS - -@@ -1276,7 +1282,12 @@ - - float app2dev; - mDeviceContext->GetAppUnitsToDevUnits(app2dev); -+ - mPixelSize = NSToIntRound(app2dev * mFont->size); -+ // Make sure to clamp the pixel size to something reasonable so we -+ // don't make the X server blow up. -+ mPixelSize = PR_MIN(gdk_screen_height() * FONT_MAX_FONT_SCALE, mPixelSize); -+ - mStretchIndex = 4; // normal - mStyleIndex = mFont->style; - diff --git a/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp b/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp deleted file mode 100644 index fd470f66d234..000000000000 --- a/www/mozilla-devel/files/patch-nsFontMetricsXlib.cpp +++ /dev/null @@ -1,40 +0,0 @@ -$FreeBSD$ - -As reported by Mikko Rapeli and Tom Vogt at -http://bugzilla.mozilla.org/show_bug.cgi?id=115788 and -http://bugzilla.mozilla.org/show_bug.cgi?id=150339 the X server can -abort when Mozilla requests a huge (scalable) font. This is also -likely to happen to the X font server, or to Xvnc. - -This patch is from -http://bugzilla.mozilla.org/attachment.cgi?id=87432&action=view -. - ---- gfx/src/xlib/nsFontMetricsXlib.cpp Tue Jun 11 16:20:31 2002 -+++ gfx/src/xlib/nsFontMetricsXlib.cpp Thu Jun 13 00:05:47 2002 -@@ -99,6 +99,12 @@ - #undef USER_DEFINED - #define USER_DEFINED "x-user-def" - -+// This is the scaling factor that we keep fonts limited to against -+// the display size. If a pixel size is requested that is more than -+// this factor larger than the height of the display, it's clamped to -+// that value instead of the requested size. -+#define FONT_MAX_FONT_SCALE 2 -+ - #undef NOISY_FONTS - #undef REALLY_NOISY_FONTS - -@@ -1480,7 +1486,12 @@ - - float app2dev; - mDeviceContext->GetAppUnitsToDevUnits(app2dev); -+ - mPixelSize = NSToIntRound(app2dev * mFont->size); -+ // Make sure to clamp the pixel size to something reasonable so we -+ // don't make the X server blow up. -+ mPixelSize = PR_MIN(XHeightOfScreen(xxlib_rgb_get_screen(gXlibRgbHandle)) * FONT_MAX_FONT_SCALE, mPixelSize); -+ - mStretchIndex = 4; // Normal - mStyleIndex = mFont->style; - diff --git a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h b/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h deleted file mode 100644 index 2224e67cc95b..000000000000 --- a/www/mozilla-devel/files/patch-xpcom_reflect_xptcall_src_md_unix_xptc_platforms_unixish_x86.h +++ /dev/null @@ -1,21 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h.orig Fri Jun 21 01:12:40 2002 -+++ xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h Fri Jun 21 01:41:51 2002 -@@ -94,8 +94,16 @@ - * gcc is that the system gcc defines __FreeBSD_cc_version. This variable - * can also identify the period of time that 4.0-CURRENT used thunks. - */ --#if defined(__FreeBSD_cc_version) && \ -- (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) -+ -+/* It seems we need to use thunks in FreeBSD -CURRENT after gcc-3.1 was merged. -+ * This solves a problem wherein regxpcom and/or regchrome would seg fault -+ * after running for a while. This problem has also exhibited itself on -+ * the alpha platform. Therefore, use thunks on all versions of -+ * -CURRENT that are using gcc-3.1. -+ */ -+#if defined(__FreeBSD_cc_version) && \ -+ (__FreeBSD_cc_version < 400002 || __FreeBSD_cc_version > 400003) && \ -+ (__FreeBSD_cc_version < 500003) - #define CFRONT_STYLE_THIS_ADJUST - #else - #define THUNK_BASED_THIS_ADJUST |