mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-24 04:33:24 +00:00
Update to 1.0.1. This is a massive bugfix release, and all Mozilla 1.0 users
are suggested to upgrade. The full set of release notes can be found at: http://www.mozilla.org/releases/mozilla1.0.1/
This commit is contained in:
parent
c49aebe5f3
commit
a06e8343c6
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=66171
@ -195,6 +195,7 @@ include/mozilla/content/nsIDocument.h
|
||||
include/mozilla/content/nsIDocumentContainer.h
|
||||
include/mozilla/content/nsIDocumentEncoder.h
|
||||
include/mozilla/content/nsIDocumentObserver.h
|
||||
include/mozilla/content/nsIDocumentTransformer.h
|
||||
include/mozilla/content/nsIDocumentViewer.h
|
||||
include/mozilla/content/nsIDragDropHandler.h
|
||||
include/mozilla/content/nsIDragDropOverride.h
|
||||
@ -249,6 +250,8 @@ include/mozilla/content/nsIStyledContent.h
|
||||
include/mozilla/content/nsITextAreaElement.h
|
||||
include/mozilla/content/nsITextContent.h
|
||||
include/mozilla/content/nsITextControlElement.h
|
||||
include/mozilla/content/nsITransformMediator.h
|
||||
include/mozilla/content/nsITransformObserver.h
|
||||
include/mozilla/content/nsIWyciwygChannel.h
|
||||
include/mozilla/content/nsIXBLBinding.h
|
||||
include/mozilla/content/nsIXBLBindingAttachedHandler.h
|
||||
@ -276,8 +279,6 @@ include/mozilla/content/nsXBLAtomList.h
|
||||
include/mozilla/content/nsXBLAtoms.h
|
||||
include/mozilla/content/nsXULAtomList.h
|
||||
include/mozilla/content/nsXULAtoms.h
|
||||
include/mozilla/content_xsl/nsIDocumentTransformer.h
|
||||
include/mozilla/content_xsl/nsITransformMediator.h
|
||||
include/mozilla/cookie/nsCCookie.h
|
||||
include/mozilla/cookie/nsCCookieManager.h
|
||||
include/mozilla/cookie/nsCookieHTTPNotify.h
|
||||
@ -589,6 +590,7 @@ include/mozilla/editor/nsIURIRefObject.h
|
||||
include/mozilla/editor/nsPIEditorTransaction.h
|
||||
include/mozilla/embed_base/nsEmbedAPI.h
|
||||
include/mozilla/embed_base/nsIWindowCreator.h
|
||||
include/mozilla/embed_base/nsIWindowCreator2.h
|
||||
include/mozilla/embedcomponents/nsIAppStartupNotifier.h
|
||||
include/mozilla/expat/xmlparse.h
|
||||
include/mozilla/exthandler/nsCExternalHandlerService.h
|
||||
@ -628,7 +630,9 @@ include/mozilla/gfx/nsIFontMetrics.h
|
||||
include/mozilla/gfx/nsIGraphics.h
|
||||
include/mozilla/gfx/nsIImage.h
|
||||
include/mozilla/gfx/nsIPrintOptions.h
|
||||
include/mozilla/gfx/nsIPrintSession.h
|
||||
include/mozilla/gfx/nsIPrintSettings.h
|
||||
include/mozilla/gfx/nsIPrintSettingsService.h
|
||||
include/mozilla/gfx/nsIRegion.h
|
||||
include/mozilla/gfx/nsIRenderingContext.h
|
||||
include/mozilla/gfx/nsIScreen.h
|
||||
@ -788,6 +792,7 @@ include/mozilla/jsurl/nsJSProtocolHandler.h
|
||||
include/mozilla/layout/nsBidi.h
|
||||
include/mozilla/layout/nsBidiFrames.h
|
||||
include/mozilla/layout/nsBidiPresUtils.h
|
||||
include/mozilla/layout/nsCompatibility.h
|
||||
include/mozilla/layout/nsFrameList.h
|
||||
include/mozilla/layout/nsFrameTraversal.h
|
||||
include/mozilla/layout/nsGrid.h
|
||||
@ -999,6 +1004,7 @@ include/mozilla/mng/libmng_types.h
|
||||
include/mozilla/mork/mdb.h
|
||||
include/mozilla/mork/nsIMdbFactoryFactory.h
|
||||
include/mozilla/mork/nsMorkCID.h
|
||||
include/mozilla/mozldap/nsILDAPBERValue.h
|
||||
include/mozilla/mozldap/nsILDAPConnection.h
|
||||
include/mozilla/mozldap/nsILDAPErrors.h
|
||||
include/mozilla/mozldap/nsILDAPMessage.h
|
||||
@ -1273,6 +1279,8 @@ include/mozilla/msgnews/nsNewsUtils.h
|
||||
include/mozilla/msgnews/nsNntpIncomingServer.h
|
||||
include/mozilla/msgnews/nsNntpService.h
|
||||
include/mozilla/msgnews/nsNntpUrl.h
|
||||
include/mozilla/msgsmime/nsEncryptedSMIMEURIsService.h
|
||||
include/mozilla/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
|
||||
include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
|
||||
include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
|
||||
include/mozilla/msgsmime/nsISMimeJSHelper.h
|
||||
@ -1754,6 +1762,8 @@ include/mozilla/webbrwsr/nsICommandHandler.h
|
||||
include/mozilla/webbrwsr/nsIContextMenuListener.h
|
||||
include/mozilla/webbrwsr/nsIEmbeddingSiteWindow.h
|
||||
include/mozilla/webbrwsr/nsIEmbeddingSiteWindow2.h
|
||||
include/mozilla/webbrwsr/nsIPrintingPrompt.h
|
||||
include/mozilla/webbrwsr/nsIPrintingPromptService.h
|
||||
include/mozilla/webbrwsr/nsITooltipListener.h
|
||||
include/mozilla/webbrwsr/nsITooltipTextProvider.h
|
||||
include/mozilla/webbrwsr/nsIWebBrowser.h
|
||||
@ -1954,6 +1964,7 @@ include/mozilla/xpcom/nsIProperties.h
|
||||
include/mozilla/xpcom/nsIPropertyBag.h
|
||||
include/mozilla/xpcom/nsIProxyCreateInstance.h
|
||||
include/mozilla/xpcom/nsIProxyObjectManager.h
|
||||
include/mozilla/xpcom/nsProxyRelease.h
|
||||
include/mozilla/xpcom/nsIRegistry.h
|
||||
include/mozilla/xpcom/nsIRegistryUtils.h
|
||||
include/mozilla/xpcom/nsIRunnable.h
|
||||
@ -2182,7 +2193,6 @@ include/mozilla/zlib/zlib.h
|
||||
@dirrm include/mozilla/docshell
|
||||
@dirrm include/mozilla/dbm
|
||||
@dirrm include/mozilla/cookie
|
||||
@dirrm include/mozilla/content_xsl
|
||||
@dirrm include/mozilla/content
|
||||
@dirrm include/mozilla/composer
|
||||
@dirrm include/mozilla/commandhandler
|
||||
|
@ -195,6 +195,7 @@ include/mozilla/content/nsIDocument.h
|
||||
include/mozilla/content/nsIDocumentContainer.h
|
||||
include/mozilla/content/nsIDocumentEncoder.h
|
||||
include/mozilla/content/nsIDocumentObserver.h
|
||||
include/mozilla/content/nsIDocumentTransformer.h
|
||||
include/mozilla/content/nsIDocumentViewer.h
|
||||
include/mozilla/content/nsIDragDropHandler.h
|
||||
include/mozilla/content/nsIDragDropOverride.h
|
||||
@ -249,6 +250,8 @@ include/mozilla/content/nsIStyledContent.h
|
||||
include/mozilla/content/nsITextAreaElement.h
|
||||
include/mozilla/content/nsITextContent.h
|
||||
include/mozilla/content/nsITextControlElement.h
|
||||
include/mozilla/content/nsITransformMediator.h
|
||||
include/mozilla/content/nsITransformObserver.h
|
||||
include/mozilla/content/nsIWyciwygChannel.h
|
||||
include/mozilla/content/nsIXBLBinding.h
|
||||
include/mozilla/content/nsIXBLBindingAttachedHandler.h
|
||||
@ -276,8 +279,6 @@ include/mozilla/content/nsXBLAtomList.h
|
||||
include/mozilla/content/nsXBLAtoms.h
|
||||
include/mozilla/content/nsXULAtomList.h
|
||||
include/mozilla/content/nsXULAtoms.h
|
||||
include/mozilla/content_xsl/nsIDocumentTransformer.h
|
||||
include/mozilla/content_xsl/nsITransformMediator.h
|
||||
include/mozilla/cookie/nsCCookie.h
|
||||
include/mozilla/cookie/nsCCookieManager.h
|
||||
include/mozilla/cookie/nsCookieHTTPNotify.h
|
||||
@ -589,6 +590,7 @@ include/mozilla/editor/nsIURIRefObject.h
|
||||
include/mozilla/editor/nsPIEditorTransaction.h
|
||||
include/mozilla/embed_base/nsEmbedAPI.h
|
||||
include/mozilla/embed_base/nsIWindowCreator.h
|
||||
include/mozilla/embed_base/nsIWindowCreator2.h
|
||||
include/mozilla/embedcomponents/nsIAppStartupNotifier.h
|
||||
include/mozilla/expat/xmlparse.h
|
||||
include/mozilla/exthandler/nsCExternalHandlerService.h
|
||||
@ -628,7 +630,9 @@ include/mozilla/gfx/nsIFontMetrics.h
|
||||
include/mozilla/gfx/nsIGraphics.h
|
||||
include/mozilla/gfx/nsIImage.h
|
||||
include/mozilla/gfx/nsIPrintOptions.h
|
||||
include/mozilla/gfx/nsIPrintSession.h
|
||||
include/mozilla/gfx/nsIPrintSettings.h
|
||||
include/mozilla/gfx/nsIPrintSettingsService.h
|
||||
include/mozilla/gfx/nsIRegion.h
|
||||
include/mozilla/gfx/nsIRenderingContext.h
|
||||
include/mozilla/gfx/nsIScreen.h
|
||||
@ -788,6 +792,7 @@ include/mozilla/jsurl/nsJSProtocolHandler.h
|
||||
include/mozilla/layout/nsBidi.h
|
||||
include/mozilla/layout/nsBidiFrames.h
|
||||
include/mozilla/layout/nsBidiPresUtils.h
|
||||
include/mozilla/layout/nsCompatibility.h
|
||||
include/mozilla/layout/nsFrameList.h
|
||||
include/mozilla/layout/nsFrameTraversal.h
|
||||
include/mozilla/layout/nsGrid.h
|
||||
@ -999,6 +1004,7 @@ include/mozilla/mng/libmng_types.h
|
||||
include/mozilla/mork/mdb.h
|
||||
include/mozilla/mork/nsIMdbFactoryFactory.h
|
||||
include/mozilla/mork/nsMorkCID.h
|
||||
include/mozilla/mozldap/nsILDAPBERValue.h
|
||||
include/mozilla/mozldap/nsILDAPConnection.h
|
||||
include/mozilla/mozldap/nsILDAPErrors.h
|
||||
include/mozilla/mozldap/nsILDAPMessage.h
|
||||
@ -1273,6 +1279,8 @@ include/mozilla/msgnews/nsNewsUtils.h
|
||||
include/mozilla/msgnews/nsNntpIncomingServer.h
|
||||
include/mozilla/msgnews/nsNntpService.h
|
||||
include/mozilla/msgnews/nsNntpUrl.h
|
||||
include/mozilla/msgsmime/nsEncryptedSMIMEURIsService.h
|
||||
include/mozilla/msgsmime/nsIEncryptedSMIMEURIsSrvc.h
|
||||
include/mozilla/msgsmime/nsIMsgSMIMECompFields.h
|
||||
include/mozilla/msgsmime/nsIMsgSMIMEHeaderSink.h
|
||||
include/mozilla/msgsmime/nsISMimeJSHelper.h
|
||||
@ -1754,6 +1762,8 @@ include/mozilla/webbrwsr/nsICommandHandler.h
|
||||
include/mozilla/webbrwsr/nsIContextMenuListener.h
|
||||
include/mozilla/webbrwsr/nsIEmbeddingSiteWindow.h
|
||||
include/mozilla/webbrwsr/nsIEmbeddingSiteWindow2.h
|
||||
include/mozilla/webbrwsr/nsIPrintingPrompt.h
|
||||
include/mozilla/webbrwsr/nsIPrintingPromptService.h
|
||||
include/mozilla/webbrwsr/nsITooltipListener.h
|
||||
include/mozilla/webbrwsr/nsITooltipTextProvider.h
|
||||
include/mozilla/webbrwsr/nsIWebBrowser.h
|
||||
@ -1954,6 +1964,7 @@ include/mozilla/xpcom/nsIProperties.h
|
||||
include/mozilla/xpcom/nsIPropertyBag.h
|
||||
include/mozilla/xpcom/nsIProxyCreateInstance.h
|
||||
include/mozilla/xpcom/nsIProxyObjectManager.h
|
||||
include/mozilla/xpcom/nsProxyRelease.h
|
||||
include/mozilla/xpcom/nsIRegistry.h
|
||||
include/mozilla/xpcom/nsIRegistryUtils.h
|
||||
include/mozilla/xpcom/nsIRunnable.h
|
||||
@ -2182,7 +2193,6 @@ include/mozilla/zlib/zlib.h
|
||||
@dirrm include/mozilla/docshell
|
||||
@dirrm include/mozilla/dbm
|
||||
@dirrm include/mozilla/cookie
|
||||
@dirrm include/mozilla/content_xsl
|
||||
@dirrm include/mozilla/content
|
||||
@dirrm include/mozilla/composer
|
||||
@dirrm include/mozilla/commandhandler
|
||||
|
@ -6,13 +6,13 @@
|
||||
#
|
||||
|
||||
PORTNAME= mozilla
|
||||
PORTVERSION= 1.0
|
||||
PORTVERSION= 1.0.1
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
|
||||
http://people.FreeBSD.org/~sobomax/:local
|
||||
http://people.FreeBSD.org/~marcus/:local
|
||||
MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
|
||||
sobomax/:local
|
||||
marcus/:local
|
||||
DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
|
||||
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
|
||||
|
||||
@ -27,7 +27,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
||||
WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
|
||||
#WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
|
||||
|
||||
USE_BZIP2= yes
|
||||
EXTRACT_AFTER_ARGS= | tar -xf - -X ${FILESDIR}/tar-exclude
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
|
||||
MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
|
||||
MD5 (mozilla-source-1.0.1.tar.bz2) = 8a4b5be862c3a0c33a86adf3a3a67c09
|
||||
MD5 (libart_lgpl-1.0.1.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -53,7 +53,7 @@ lib/mozilla/components/composer.xpt
|
||||
lib/mozilla/components/content.xpt
|
||||
lib/mozilla/components/content_base.xpt
|
||||
lib/mozilla/components/content_html.xpt
|
||||
lib/mozilla/components/content_xsl.xpt
|
||||
lib/mozilla/components/content_xslt.xpt
|
||||
lib/mozilla/components/cookie.xpt
|
||||
lib/mozilla/components/directory.xpt
|
||||
lib/mozilla/components/docshell.xpt
|
||||
@ -125,6 +125,7 @@ lib/mozilla/components/libimglib2.so
|
||||
lib/mozilla/components/libimgmng.so
|
||||
lib/mozilla/components/libimgpng.so
|
||||
lib/mozilla/components/libimgppm.so
|
||||
lib/mozilla/components/libimgxbm.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
|
||||
|
@ -6,13 +6,13 @@
|
||||
#
|
||||
|
||||
PORTNAME= mozilla
|
||||
PORTVERSION= 1.0
|
||||
PORTVERSION= 1.0.1
|
||||
PORTEPOCH= 2
|
||||
CATEGORIES= www
|
||||
MASTER_SITES= ${MASTER_SITE_MOZILLA} \
|
||||
http://people.FreeBSD.org/~sobomax/:local
|
||||
http://people.FreeBSD.org/~marcus/:local
|
||||
MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \
|
||||
sobomax/:local
|
||||
marcus/:local
|
||||
DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \
|
||||
libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local
|
||||
|
||||
@ -27,7 +27,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
|
||||
|
||||
WRKSRC= ${WRKDIR}/${PORTNAME}
|
||||
|
||||
WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
|
||||
#WITHOUT_CHATZILLA= "Contains a buffer overflow reported at http://online.securityfocus.com/archive/1/270249"
|
||||
|
||||
USE_BZIP2= yes
|
||||
EXTRACT_AFTER_ARGS= | tar -xf - -X ${FILESDIR}/tar-exclude
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056
|
||||
MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
|
||||
MD5 (mozilla-source-1.0.1.tar.bz2) = 8a4b5be862c3a0c33a86adf3a3a67c09
|
||||
MD5 (libart_lgpl-1.0.1.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -53,7 +53,7 @@ lib/mozilla/components/composer.xpt
|
||||
lib/mozilla/components/content.xpt
|
||||
lib/mozilla/components/content_base.xpt
|
||||
lib/mozilla/components/content_html.xpt
|
||||
lib/mozilla/components/content_xsl.xpt
|
||||
lib/mozilla/components/content_xslt.xpt
|
||||
lib/mozilla/components/cookie.xpt
|
||||
lib/mozilla/components/directory.xpt
|
||||
lib/mozilla/components/docshell.xpt
|
||||
@ -125,6 +125,7 @@ lib/mozilla/components/libimglib2.so
|
||||
lib/mozilla/components/libimgmng.so
|
||||
lib/mozilla/components/libimgpng.so
|
||||
lib/mozilla/components/libimgppm.so
|
||||
lib/mozilla/components/libimgxbm.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimpComm4xMail.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimpText.so
|
||||
%%MOZILLAMAILNEWS%%lib/mozilla/components/libimport.so
|
||||
|
Loading…
Reference in New Issue
Block a user