diff options
Diffstat (limited to 'www/mozilla')
| -rw-r--r-- | www/mozilla/Makefile | 16 | ||||
| -rw-r--r-- | www/mozilla/distinfo | 4 | ||||
| -rw-r--r-- | www/mozilla/files/patch-Makefile.in | 19 | ||||
| -rw-r--r-- | www/mozilla/files/patch-nsFontMetricsGTK.cpp | 40 | ||||
| -rw-r--r-- | www/mozilla/files/patch-nsFontMetricsXlib.cpp | 40 | ||||
| -rw-r--r-- | www/mozilla/pkg-plist | 54 |
6 files changed, 111 insertions, 62 deletions
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile index 9bc3db95e4e5..87488fb95bf0 100644 --- a/www/mozilla/Makefile +++ b/www/mozilla/Makefile @@ -6,13 +6,13 @@ # PORTNAME= mozilla -PORTVERSION= 1.1 -PORTEPOCH= 1 +PORTVERSION= 1.0 +PORTEPOCH= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} \ - http://people.FreeBSD.org/~marcus/:local + http://people.FreeBSD.org/~sobomax/:local MASTER_SITE_SUBDIR= mozilla/releases/${PORTNAME}${PORTVERSION:S/.rc/rc/}/src \ - marcus/:local + sobomax/:local DISTFILES= ${PORTNAME}-source-${PORTVERSION:S/.rc/rc/}${EXTRACT_SUFX} \ libart_lgpl-${PORTVERSION}${EXTRACT_SUFX}:local @@ -27,8 +27,9 @@ 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 USE_X_PREFIX= yes USE_PERL5= yes @@ -112,8 +113,9 @@ post-build: ${FILESDIR}/mozilla.sh >${WRKSRC}/mozilla (cd ${WRKSRC}/dist/bin; \ ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regxpcom; \ - ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome; \ - ${TOUCH} ./chrome/user-skins.rdf ./chrome/user-locales.rdf) + ${ECHO_CMD} skin,install,select,classic/1.0 >> chrome/installed-chrome.txt; \ + ${ECHO_CMD} locale,install,select,en-US >> chrome/installed-chrome.txt; \ + ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. ./regchrome) ${FIND} ${WRKSRC}/dist/bin -type d | /usr/bin/sort -r | \ ${XARGS} ${RMDIR} 2> /dev/null || ${TRUE} diff --git a/www/mozilla/distinfo b/www/mozilla/distinfo index c1329ca724a4..e145e2426723 100644 --- a/www/mozilla/distinfo +++ b/www/mozilla/distinfo @@ -1,2 +1,2 @@ -MD5 (mozilla-source-1.1.tar.gz) = 4fa54be2a540d584e428f50eaedfac76 -MD5 (libart_lgpl-1.1.tar.gz) = 276f65c384d020c36003260689806735 +MD5 (mozilla-source-1.0.tar.bz2) = 033da936e48336aa2c5d8bf0aa039056 +MD5 (libart_lgpl-1.0.tar.bz2) = f332c3c026adc1c2c0ceb3ac5847d5f5 diff --git a/www/mozilla/files/patch-Makefile.in b/www/mozilla/files/patch-Makefile.in index 43fa34684782..f65ae1be8d13 100644 --- a/www/mozilla/files/patch-Makefile.in +++ b/www/mozilla/files/patch-Makefile.in @@ -1,22 +1,25 @@ ---- Makefile.in.orig Thu May 30 20:39:07 2002 -+++ Makefile.in Wed Aug 28 13:55:32 2002 -@@ -70,8 +70,7 @@ + +$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) \ $(tier_0_dirs) \ $(tier_1_dirs) \ - $(tier_2_dirs) \ - $(tier_9_dirs) \ - $(NULL) + $(tier_9_dirs) - ifdef GC_LEAK_DETECTOR - DIRS += gc/boehm -@@ -90,7 +89,8 @@ + ifdef MOZ_LDAP_XPCOM + DIRS += directory/c-sdk/ldap +@@ -81,7 +80,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/files/patch-nsFontMetricsGTK.cpp b/www/mozilla/files/patch-nsFontMetricsGTK.cpp new file mode 100644 index 000000000000..3bab909b5a89 --- /dev/null +++ b/www/mozilla/files/patch-nsFontMetricsGTK.cpp @@ -0,0 +1,40 @@ +$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/files/patch-nsFontMetricsXlib.cpp b/www/mozilla/files/patch-nsFontMetricsXlib.cpp new file mode 100644 index 000000000000..fd470f66d234 --- /dev/null +++ b/www/mozilla/files/patch-nsFontMetricsXlib.cpp @@ -0,0 +1,40 @@ +$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/pkg-plist b/www/mozilla/pkg-plist index 5b76f7163ace..1eaf93402b43 100644 --- a/www/mozilla/pkg-plist +++ b/www/mozilla/pkg-plist @@ -21,40 +21,6 @@ lib/mozilla/chrome/en-unix.jar lib/mozilla/chrome/en-win.jar lib/mozilla/chrome/forms.jar lib/mozilla/chrome/help.jar -lib/mozilla/chrome/icons/default/abcardWindow.xpm -lib/mozilla/chrome/icons/default/abcardWindow16.xpm -lib/mozilla/chrome/icons/default/addressbookWindow.xpm -lib/mozilla/chrome/icons/default/addressbookWindow16.xpm -lib/mozilla/chrome/icons/default/bmPropsWindow.xpm -lib/mozilla/chrome/icons/default/bmPropsWindow16.xpm -lib/mozilla/chrome/icons/default/bookmark-window.xpm -lib/mozilla/chrome/icons/default/bookmark-window16.xpm -lib/mozilla/chrome/icons/default/calendar-window.xpm -lib/mozilla/chrome/icons/default/calendar-window16.xpm -lib/mozilla/chrome/icons/default/chatzilla-window.xpm -lib/mozilla/chrome/icons/default/chatzilla-window16.xpm -lib/mozilla/chrome/icons/default/downloadManager.xpm -lib/mozilla/chrome/icons/default/downloadManager16.xpm -lib/mozilla/chrome/icons/default/editorWindow.xpm -lib/mozilla/chrome/icons/default/editorWindow16.xpm -lib/mozilla/chrome/icons/default/findBookmarkWindow.xpm -lib/mozilla/chrome/icons/default/findBookmarkWindow16.xpm -lib/mozilla/chrome/icons/default/findHistoryWindow.xpm -lib/mozilla/chrome/icons/default/findHistoryWindow16.xpm -lib/mozilla/chrome/icons/default/history-window.xpm -lib/mozilla/chrome/icons/default/history-window16.xpm -lib/mozilla/chrome/icons/default/jsconsoleWindow.xpm -lib/mozilla/chrome/icons/default/jsconsoleWindow16.xpm -lib/mozilla/chrome/icons/default/main-window.xpm -lib/mozilla/chrome/icons/default/main-window16.xpm -lib/mozilla/chrome/icons/default/messengerWindow.xpm -lib/mozilla/chrome/icons/default/messengerWindow16.xpm -lib/mozilla/chrome/icons/default/msgcomposeWindow.xpm -lib/mozilla/chrome/icons/default/msgcomposeWindow16.xpm -lib/mozilla/chrome/icons/default/venkman-window.xpm -lib/mozilla/chrome/icons/default/venkman-window16.xpm -lib/mozilla/chrome/icons/default/winInspectorMain.xpm -lib/mozilla/chrome/icons/default/winInspectorMain16.xpm lib/mozilla/chrome/inspector.jar lib/mozilla/chrome/installed-chrome.txt %%MOZILLAMAILNEWS%%lib/mozilla/chrome/messenger.jar @@ -69,9 +35,8 @@ lib/mozilla/chrome/pipnss.jar lib/mozilla/chrome/pippki.jar lib/mozilla/chrome/toolkit.jar lib/mozilla/chrome/venkman.jar -lib/mozilla/chrome/user-locales.rdf -lib/mozilla/chrome/user-skins.rdf lib/mozilla/chrome/xmlterm.jar +lib/mozilla/component.reg %%MOZILLAMAILNEWS%%lib/mozilla/components/absync.xpt lib/mozilla/components/accessibility.xpt %%MOZILLAMAILNEWS%%lib/mozilla/components/addrbook.xpt @@ -85,11 +50,10 @@ lib/mozilla/components/chardet.xpt lib/mozilla/components/chrome.xpt lib/mozilla/components/commandhandler.xpt lib/mozilla/components/composer.xpt -lib/mozilla/components/compreg.dat lib/mozilla/components/content.xpt -lib/mozilla/components/content_xslt.xpt lib/mozilla/components/content_base.xpt lib/mozilla/components/content_html.xpt +lib/mozilla/components/content_xsl.xpt lib/mozilla/components/cookie.xpt lib/mozilla/components/directory.xpt lib/mozilla/components/docshell.xpt @@ -161,7 +125,6 @@ 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 @@ -180,6 +143,7 @@ lib/mozilla/components/libmork.so lib/mozilla/components/libmozbrwsr.so lib/mozilla/components/libmozfind.so %%MOZILLALDAP%%lib/mozilla/components/libmozldap.so +lib/mozilla/components/libmozxfer.so %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgcompose.so %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgdb.so %%MOZILLAMAILNEWS%%lib/mozilla/components/libmsgimap.so @@ -236,6 +200,7 @@ lib/mozilla/components/mimetype.xpt lib/mozilla/components/mozbrwsr.xpt lib/mozilla/components/mozfind.xpt %%MOZILLALDAP%%lib/mozilla/components/mozldap.xpt +lib/mozilla/components/mozxfer.xpt %%MOZILLAMAILNEWS%%lib/mozilla/components/msgbase.xpt %%MOZILLAMAILNEWS%%lib/mozilla/components/msgcompose.xpt %%MOZILLAMAILNEWS%%lib/mozilla/components/msgdb.xpt @@ -291,6 +256,7 @@ lib/mozilla/components/signonviewer.xpt lib/mozilla/components/timebomb.xpt lib/mozilla/components/transformiix.xpt lib/mozilla/components/txmgr.xpt +lib/mozilla/components/txtsvc.xpt lib/mozilla/components/uconv.xpt lib/mozilla/components/unicharutil.xpt lib/mozilla/components/uriloader.xpt @@ -304,7 +270,6 @@ lib/mozilla/components/webBrowser_core.xpt lib/mozilla/components/webbrowserpersist.xpt lib/mozilla/components/webshell_idls.xpt lib/mozilla/components/widget.xpt -lib/mozilla/components/windowds.xpt lib/mozilla/components/windowwatcher.xpt lib/mozilla/components/xml-rpc.xpt lib/mozilla/components/xmlextras.xpt @@ -324,10 +289,11 @@ lib/mozilla/components/xpti.dat lib/mozilla/components/xremoteservice.xpt lib/mozilla/components/xuldoc.xpt lib/mozilla/components/xultmpl.xpt -lib/mozilla/defaults/autoconfig/platform.js lib/mozilla/defaults/autoconfig/prefcalls.js lib/mozilla/defaults/pref/all.js +lib/mozilla/defaults/pref/config.js lib/mozilla/defaults/pref/editor.js +lib/mozilla/defaults/pref/initpref.js lib/mozilla/defaults/pref/inspector.js lib/mozilla/defaults/pref/mailnews.js %%MOZILLAMAILNEWS%%lib/mozilla/defaults/pref/mdn.js @@ -398,6 +364,7 @@ lib/mozilla/res/arrowd.gif lib/mozilla/res/broken-image.gif lib/mozilla/res/builtin/htmlBindings.xml lib/mozilla/res/builtin/platformHTMLBindings.xml +lib/mozilla/res/builtin/xbl-forms.css lib/mozilla/res/charsetData.properties lib/mozilla/res/charsetalias.properties lib/mozilla/res/cmessage.txt @@ -408,7 +375,6 @@ lib/mozilla/res/entityTables/html40Latin1.properties lib/mozilla/res/entityTables/html40Special.properties lib/mozilla/res/entityTables/html40Symbols.properties lib/mozilla/res/entityTables/htmlEntityVersions.properties -lib/mozilla/res/entityTables/mathml20.properties lib/mozilla/res/entityTables/transliterate.properties lib/mozilla/res/fonts/mathfont.properties lib/mozilla/res/fonts/mathfontCMEX10.properties @@ -585,7 +551,7 @@ lib/mozilla/xpidl lib/mozilla/xpt_dump lib/mozilla/xpt_link @unexec rm -f %D/lib/mozilla/chrome/chrome.rdf || true -@unexec rm -f %D/lib/mozilla/compreg.dat || true +@unexec rm -f %D/lib/mozilla/component.reg || true @unexec rm -f %D/lib/mozilla/components/xpti.dat || true @dirrm lib/mozilla/searchplugins @dirrm lib/mozilla/res/throbber @@ -624,7 +590,5 @@ lib/mozilla/xpt_link @dirrm lib/mozilla/chrome/overlayinfo/communicator/content @dirrm lib/mozilla/chrome/overlayinfo/communicator @dirrm lib/mozilla/chrome/overlayinfo -@dirrm lib/mozilla/chrome/icons/default -@dirrm lib/mozilla/chrome/icons @dirrm lib/mozilla/chrome @dirrm lib/mozilla |