diff options
author | Jeremy Messenger <mezz@FreeBSD.org> | 2005-08-28 07:59:05 +0000 |
---|---|---|
committer | Jeremy Messenger <mezz@FreeBSD.org> | 2005-08-28 07:59:05 +0000 |
commit | 0083ef4403a5409b575af728a51b7caf9603b374 (patch) | |
tree | 3c67b88f3dedcf171bb748da660c469946a2706f /www/firefox36 | |
parent | 9e389814c321a23b61eb0beb65d8994791245073 (diff) | |
download | ports-0083ef4403a5409b575af728a51b7caf9603b374.tar.gz ports-0083ef4403a5409b575af728a51b7caf9603b374.zip |
- Make portlint happier.
- Add Java 5 plugins support. [1]
- Use system's libm (/usr/src/lib/msun), nss, nspr and etc. Also, do
not extract those. Better explain, use external dependencies. [1]
- Teach firefox-config and *.pc files for nspr that will making other
third apps to buildable like epiphany, vlc-devel's mozilla plugins
and etc. Have been tested with full GNOME 2.11.x build too.
- Add four patches: [1]
patch-bugzilla243151:
https://bugzilla.mozilla.org/show_bug.cgi?id=243151
patch-jsosdep:
Fix the FreeBSD define
patch-oji-threads:
64-bit wide pthread_t
patch-xptcinvoke_x86_64_linux:
Setting a possibly uninitialized variable (value).
- Fix a crash that can occur using gtk+-2.7 and possibly 2.6.10 when closing
windows. https://bugzilla.mozilla.org/show_bug.cgi?id=3002 [2]
- Get rid of FIREFOX and FF_VER, best to use PORTNAME and PORTVERSION
varibles that are arleady exist and lesser complicate.
- Change all hardcore of 'firefox' to PORTNAME.
- Change a manual loop for patch all.js to find(1), so we can sleep
on it.
Submitted by: mi [1], marcus [2]
Reviewed by: my team, FreeBSD GNOME Team.
Tested by: many
Notes
Notes:
svn path=/head/; revision=141034
Diffstat (limited to 'www/firefox36')
-rw-r--r-- | www/firefox36/Makefile | 146 | ||||
-rw-r--r-- | www/firefox36/files/firefox.desktop.in | 2 | ||||
-rw-r--r-- | www/firefox36/files/mozconfig.in | 4 | ||||
-rw-r--r-- | www/firefox36/files/patch-bugzilla243151 | 10 | ||||
-rw-r--r-- | www/firefox36/files/patch-gfx-src-gtk-Makefile.in | 15 | ||||
-rw-r--r-- | www/firefox36/files/patch-jsosdep | 9 | ||||
-rw-r--r-- | www/firefox36/files/patch-libm | 25 | ||||
-rw-r--r-- | www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c | 12 | ||||
-rw-r--r-- | www/firefox36/files/patch-nspr-unix.c | 23 | ||||
-rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.cfg | 163 | ||||
-rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.h | 15 | ||||
-rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-include-md-_pth.h | 11 | ||||
-rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-src-io-prprf.c | 14 | ||||
-rw-r--r-- | www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c | 31 | ||||
-rw-r--r-- | www/firefox36/files/patch-oji-threads | 60 | ||||
-rw-r--r-- | www/firefox36/files/patch-sysnss | 178 | ||||
-rw-r--r-- | www/firefox36/files/patch-xptcinvoke_x86_64_linux | 17 |
17 files changed, 408 insertions, 327 deletions
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index bf5d53216b71..05fb6c5c736a 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -3,11 +3,12 @@ # Whom: Alan Eldridge <alane@FreeBSD.org> # # $FreeBSD$ +# $MCom: ports-stable/www/firefox/Makefile,v 1.18 2005/08/20 21:53:54 mezz Exp $ # PORTNAME= firefox PORTVERSION= 1.0.6 -PORTREVISION= 1 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} @@ -17,8 +18,10 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-source MAINTAINER= gnome@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ + nspr4:${PORTSDIR}/devel/nspr \ + png:${PORTSDIR}/graphics/png \ + nss3:${PORTSDIR}/security/nss BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip ALL_TARGET= default @@ -41,29 +44,35 @@ PKGDEINSTALL= ${WRKDIR}/pkg-deinstall EXTRACT_AFTER_ARGS= | ${TAR} -xf - --exclude */CVS/* \ --exclude */macbuild/*\ + --exclude */nsprpub/*\ --exclude */package/* \ + --exclude */zlib/ \ + --exclude mozilla/modules/libimg/png \ + --exclude mozilla/jpeg \ + --exclude mozilla/dbm \ + --exclude mozilla/js/src/fdlibm \ + --exclude mozilla/security/nss \ + --exclude mozilla/gc/boehm \ --exclude .cvsignore \ --exclude makefile.win \ --exclude MANIFEST -FIREFOX= ${PORTNAME} -FF_VER= ${PORTVERSION} +PORTNAME_ICON= ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm -FIREFOX_ICON= ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm - -PKGCONFIG_FILES=firefox-gtkmozembed firefox-js firefox-xpcom \ - firefox-nspr firefox-nss firefox-plugin +PKGCONFIG_FILES=${PORTNAME}-gtkmozembed ${PORTNAME}-js ${PORTNAME}-xpcom \ + ${PORTNAME}-plugin JPI_LIST?=\ + ${LOCALBASE}/jdk1.5.0/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.2/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.4.1/jre/plugin/${ARCH}/ns610/libjavaplugin_oji.so \ ${LOCALBASE}/diablo-jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so \ ${LOCALBASE}/jdk1.3.1/jre/plugin/${ARCH}/ns600/libjavaplugin_oji.so -SYSTEM_PREFS= ${FAKEDIR}/lib/${FIREFOX}-${FF_VER}/defaults/pref/firefox.js -SCRIPTS_DIR= ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} -MOZ_PIS_SCRIPTS= S50cleanhome -MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d +SYSTEM_PREFS= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION}/defaults/pref/${PORTNAME}.js +SCRIPTS_DIR= ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} +MOZ_PIS_SCRIPTS=S50cleanhome +MOZ_PIS_DIR= ${SCRIPTS_DIR}/init.d OPTIONS= DEBUG "Build a debugging image" off \ LOGGING "Enable additional log messages" off \ @@ -131,24 +140,28 @@ post-extract:: -e 's|@FAKEDIR@|${FAKEDIR}|' \ -e 's|@PERL@|${PERL5}|' \ <${FILESDIR}/mozconfig.in >${WRKSRC}/.mozconfig - @${SED} -e 's|@FIREFOX_ICON@|${FIREFOX_ICON}|' \ - <${FILESDIR}/firefox.desktop.in >${WRKDIR}/firefox.desktop + @${SED} -e 's|@PORTNAME_ICON@|${PORTNAME_ICON}|' \ + <${FILESDIR}/${PORTNAME}.desktop.in >${WRKDIR}/${PORTNAME}.desktop post-patch: - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g ; \ + @${REINPLACE_CMD} -e 's/%{idldir}/%idldir%/g ; \ + s|"%FULL_NSPR_CFLAGS%"|`nspr-config --cflags`|g ; \ + s|"%FULL_NSPR_LIBS%"|`nspr-config --libs`|g' \ + ${WRKSRC}/build/unix/mozilla-config.in + @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ < ${MASTERDIR}/pkg-install.in > ${PKGINSTALL} - @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${FIREFOX}|g' \ + @${SED} -e 's|%%MOZDIR%%|${PREFIX}/lib/${PORTNAME}|g' \ < ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL} .for ii in ${EXTRA_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \ + @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ < ${FILESDIR}/${ii} > ${WRKDIR}/${ii} .endfor .for ii in ${MOZ_PIS_SCRIPTS} - @${SED} -e 's|%%MOZILLA%%|${FIREFOX}|g ; \ + @${SED} -e 's|%%MOZILLA%%|${PORTNAME}|g ; \ s|%%PREFIX%%|${PREFIX}|g ; \ s|%%X11BASE%%|${X11BASE}|g' \ < ${FILESDIR}/moz_pis_${ii} > ${WRKDIR}/moz_pis_${ii} @@ -157,10 +170,8 @@ post-patch: ${WRKSRC}/build/unix/run-mozilla.sh @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/nsprpub/configure + ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g' \ - ${WRKSRC}/nsprpub/config/config.mk \ ${WRKSRC}/security/coreconf/FreeBSD.mk \ ${WRKSRC}/directory/c-sdk/config/FreeBSD.mk \ ${WRKSRC}/js/src/Makefile.in @@ -168,12 +179,12 @@ post-patch: ${WRKSRC}/widget/src/gtk2/nsSound.cpp @${REINPLACE_CMD} -E -e 's|libcups\.so\.[0-9]+|libcups.so|g' \ ${WRKSRC}/gfx/src/gtk/nsDeviceContextSpecG.cpp -.for ii in modules/libpref/src/init extensions/sroaming/resources/content/prefs \ - embedding/minimo - @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ - /dom.disable_window_open_feature.toolbar/s/false/true/' \ - ${WRKSRC}/${ii}/all.js -.endfor + @${REINPLACE_CMD} -e 's|/usr/local/netscape|${LOCALBASE}|g' \ + -e 's|/usr/local/lib/netscape|${LOCALBASE}/lib|g' \ + ${WRKSRC}/xpcom/*/SpecialSystemDirectory.cpp + @${FIND} ${WRKSRC} -name all.js | ${XARGS} ${REINPLACE_CMD} -e \ + '/accessibility.typeaheadfind.enablesound/s/true/false/ ; \ + /dom.disable_window_open_feature.toolbar/s/false/true/' pre-configure: @if [ -n "`${PKG_INFO} -xI '^bind[0-9]*-base-[0-9]'`" ]; then \ @@ -184,19 +195,19 @@ pre-configure: pre-install: @${RM} -rf ${FAKEDIR} ${PLIST} @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ - Makefile ${MAKE_ARGS} install + Makefile ${MAKE_ARGS} ${INSTALL_TARGET} @${MKDIR} ${SCRIPTS_DIR} @${MKDIR} ${MOZ_PIS_DIR} - ${ECHO_CMD} 'share/applications/firefox.desktop' >> ${PLIST} + ${ECHO_CMD} 'share/applications/${PORTNAME}.desktop' >> ${PLIST} ${REINPLACE_CMD} -e 's|${FAKEDIR}|${PREFIX}|g; \ - s|${FIREFOX}-${FF_VER}|${FIREFOX}|' \ - ${FAKEDIR}/bin/firefox \ - ${FAKEDIR}/bin/firefox-config + s|${PORTNAME}-${PORTVERSION}|${PORTNAME}|' \ + ${FAKEDIR}/bin/${PORTNAME} \ + ${FAKEDIR}/bin/${PORTNAME}-config for i in ${EXTRA_SCRIPTS}; do \ ${ECHO_CMD} bin/$${i} >> ${PLIST}; \ done - ${ECHO_CMD} bin/firefox >> ${PLIST} - ${ECHO_CMD} bin/firefox-config >> ${PLIST} + ${ECHO_CMD} bin/${PORTNAME} >> ${PLIST} + ${ECHO_CMD} bin/${PORTNAME}-config >> ${PLIST} .for ii in ${MOZ_PIS_SCRIPTS} ${INSTALL_SCRIPT} ${WRKDIR}/moz_pis_${ii} ${MOZ_PIS_DIR}/${ii} .endfor @@ -206,39 +217,40 @@ pre-install: ${ECHO_CMD} "pref(\"browser.link.open_external\", 3);" \ >> ${SYSTEM_PREFS} .endif # !defined(WITHOUT_NEWTAB) - cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|lib/${FIREFOX}/|' >> ${PLIST} \ + cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's|^|lib/${PORTNAME}/|' >> ${PLIST} \ && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm lib/${FIREFOX}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm lib/firefox >> ${PLIST} + ${SED} -e 's|^|@dirrm lib/${PORTNAME}/|' >> ${PLIST} + ${ECHO_CMD} @dirrm lib/${PORTNAME} >> ${PLIST} for pcfile in ${PKGCONFIG_FILES}; do \ - ${REINPLACE_CMD} -e 's|${FIREFOX}-${FF_VER}|${FIREFOX}|g; \ - s|${FAKEDIR}|${PREFIX}|' \ + ${REINPLACE_CMD} -e 's|${PORTNAME}-${PORTVERSION}|${PORTNAME}|g; \ + s|${FAKEDIR}|${PREFIX}|g ; \ + s|${PORTNAME}-nspr = ${PORTVERSION}|nspr >= 4.6.0|g' \ ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc ; \ ${ECHO_CMD} libdata/pkgconfig/$${pcfile}.pc >> ${PLIST} ; \ done - cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's|^|include/${FIREFOX}/|' >> ${PLIST} \ + cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} -s * -type f -o -type l | \ + ${SED} -e 's|^|include/${PORTNAME}/|' >> ${PLIST} \ && ${FIND} -d * -type d | \ - ${SED} -e 's|^|@dirrm include/${FIREFOX}/|' >> ${PLIST} - ${ECHO_CMD} @dirrm include/${FIREFOX} >> ${PLIST} + ${SED} -e 's|^|@dirrm include/${PORTNAME}/|' >> ${PLIST} + ${ECHO_CMD} @dirrm include/${PORTNAME} >> ${PLIST} ${ECHO_CMD} lib/browser_plugins/.${PORTNAME}.keep >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/browser_plugins 2>/dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} "@exec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} ${ECHO_CMD} "@unexec ${LOCALBASE}/bin/update-desktop-database > /dev/null || ${TRUE}" >> ${PLIST} - cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} \ + cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} \ && ${FIND} -s * -type f -o -type l | \ - ${SED} -e 's:^:share/idl/${FIREFOX}/:' >> ${PLIST} \ + ${SED} -e 's:^:share/idl/${PORTNAME}/:' >> ${PLIST} \ && ${FIND} -d * -type d | \ - ${SED} -e 's:^:@dirrm share/idl/${FIREFOX}/:' >> ${PLIST} - ${ECHO_CMD} "@dirrm share/idl/${FIREFOX}" >> ${PLIST} - ${ECHO_CMD} "@unexec rmdir %D/share/idl 2>/dev/null || true" >> ${PLIST} + ${SED} -e 's:^:@dirrm share/idl/${PORTNAME}/:' >> ${PLIST} + ${ECHO_CMD} "@dirrm share/idl/${PORTNAME}" >> ${PLIST} + ${ECHO_CMD} "@unexec ${RMDIR} %D/share/idl 2>/dev/null || true" >> ${PLIST} do-install: - ${MKDIR} ${PREFIX}/lib/${FIREFOX} - ${CHMOD} 755 ${PREFIX}/lib/${FIREFOX} - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox ${PREFIX}/bin - ${INSTALL_SCRIPT} ${FAKEDIR}/bin/firefox-config ${PREFIX}/bin + ${MKDIR} ${PREFIX}/lib/${PORTNAME} + ${CHMOD} 755 ${PREFIX}/lib/${PORTNAME} + ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${FAKEDIR}/bin/${PORTNAME}-config ${PREFIX}/bin if [ ! -d ${PREFIX}/lib/browser_plugins ]; then \ ${MKDIR} ${PREFIX}/lib/browser_plugins ; \ fi @@ -256,16 +268,16 @@ do-install: ${INSTALL_DATA} ${FAKEDIR}/lib/pkgconfig/$${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/$${pcfile}.pc ; \ done - -${RM} -fr ${PREFIX}/include/${FIREFOX} - ${MKDIR} ${PREFIX}/include/${FIREFOX} - ${CHMOD} 755 ${PREFIX}/include/${FIREFOX} - cd ${FAKEDIR}/include/${FIREFOX}-${FF_VER} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${FIREFOX} - cd ${FAKEDIR}/lib/${FIREFOX}-${FF_VER} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${FIREFOX} - ${MKDIR} ${PREFIX}/share/idl/${FIREFOX} - cd ${FAKEDIR}/share/idl/${FIREFOX}-${FF_VER} && ${FIND} . | \ - ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${FIREFOX} + -${RM} -fr ${PREFIX}/include/${PORTNAME} + ${MKDIR} ${PREFIX}/include/${PORTNAME} + ${CHMOD} 755 ${PREFIX}/include/${PORTNAME} + cd ${FAKEDIR}/include/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/include/${PORTNAME} + cd ${FAKEDIR}/lib/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ + ${CPIO} -pdm -L -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/${PORTNAME} + ${MKDIR} ${PREFIX}/share/idl/${PORTNAME} + cd ${FAKEDIR}/share/idl/${PORTNAME}-${PORTVERSION} && ${FIND} . | \ + ${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/idl/${PORTNAME} post-install: .if !defined(PACKAGE_BUILDING) @@ -275,9 +287,9 @@ post-install: ${INSTALL_SCRIPT} ${FILESDIR}/${i} ${PREFIX}/bin .endfor ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKDIR}/firefox.desktop ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/firefox/default.xpm \ - ${PREFIX}/lib/${FIREFOX}/chrome/icons/default/default.xpm + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications + ${INSTALL_DATA} ${WRKSRC}/other-licenses/branding/${PORTNAME}/default.xpm \ + ${PREFIX}/lib/${PORTNAME}/chrome/icons/default/default.xpm @-update-desktop-database .include <bsd.port.post.mk> diff --git a/www/firefox36/files/firefox.desktop.in b/www/firefox36/files/firefox.desktop.in index c1b7a2e59ab9..8d288dc574f4 100644 --- a/www/firefox36/files/firefox.desktop.in +++ b/www/firefox36/files/firefox.desktop.in @@ -183,7 +183,7 @@ Comment[wa]=Naivyî avå les waibes Comment[zh_CN]=浏览 Web Comment[zh_TW]=瀏覽網頁 Exec=firefox %U -Icon=@FIREFOX_ICON@ +Icon=@PORTNAME_ICON@ StartupNotify=false Terminal=false Type=Application diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in index 347c5dff87ee..ad642f0bf408 100644 --- a/www/firefox36/files/mozconfig.in +++ b/www/firefox36/files/mozconfig.in @@ -32,7 +32,7 @@ ac_add_options --x-libraries=@X11BASE@/lib ac_add_options --with-system-jpeg=@LOCALBASE@ ac_add_options --with-system-zlib ac_add_options --with-system-png=@LOCALBASE@ -ac_add_options --without-system-nspr +ac_add_options --with-system-nspr ac_add_options --with-gssapi=/usr ###################################################################### # set compile/link features @@ -49,7 +49,7 @@ ac_add_options --disable-profilesharing ac_add_options --disable-installer ac_add_options --enable-single-profile ac_add_options --disable-profilesharing -ac_add_options --enable-image-decoders=png,gif,jpeg,bmp +ac_add_options --enable-image-decoders=all ac_add_options --enable-extensions="cookie,xml-rpc,xmlextras,pref,transformiix,universalchardet,webservices,inspector,p3p,gnomevfs" ###################################################################### # conditional from port Makefile diff --git a/www/firefox36/files/patch-bugzilla243151 b/www/firefox36/files/patch-bugzilla243151 new file mode 100644 index 000000000000..e1a2a77acc20 --- /dev/null +++ b/www/firefox36/files/patch-bugzilla243151 @@ -0,0 +1,10 @@ +Bogus assertion, see https://bugzilla.mozilla.org/show_bug.cgi?id=243151 + +--- xpcom/threads/nsThread.cpp Sun Oct 5 21:42:05 2003 ++++ xpcom/threads/nsThread.cpp Mon Aug 8 00:33:45 2005 +@@ -374,5 +374,4 @@ + status = PR_NewThreadPrivateIndex(&nsThread::kIThreadSelfIndex, nsThread::Exit); + if (status != PR_SUCCESS) return NS_ERROR_FAILURE; +- NS_ASSERTION(nsThread::kIThreadSelfIndex != 0, "couldn't get thread private index"); + } + diff --git a/www/firefox36/files/patch-gfx-src-gtk-Makefile.in b/www/firefox36/files/patch-gfx-src-gtk-Makefile.in new file mode 100644 index 000000000000..ff8b699841a3 --- /dev/null +++ b/www/firefox36/files/patch-gfx-src-gtk-Makefile.in @@ -0,0 +1,15 @@ +When using ``--with-system-nspr'' option, MOZ_COMPONENT_LIBS does not +contain the ``-L../../../dist/lib'' -- only ``-L../../../dist/bin''. + +This causes an error, because libgfxshared_s is only under dist/lib. + + -mi + +--- gfx/src/gtk/Makefile.in Mon Nov 10 07:24:51 2003 ++++ gfx/src/gtk/Makefile.in Thu Jul 21 23:58:26 2005 +@@ -165,4 +165,5 @@ + ifdef MOZ_ENABLE_GTK2 + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) \ ++ $(LIBS_DIR) \ + -lgkgfx \ + -lgfxshared_s \ diff --git a/www/firefox36/files/patch-jsosdep b/www/firefox36/files/patch-jsosdep new file mode 100644 index 000000000000..7f54845657ed --- /dev/null +++ b/www/firefox36/files/patch-jsosdep @@ -0,0 +1,9 @@ +--- js/src/jsosdep.h Fri Nov 14 19:10:59 2003 ++++ js/src/jsosdep.h Fri Aug 5 00:50:44 2005 +@@ -102,5 +102,5 @@ + #define JS_HAVE_LONG_LONG + +-#elif defined(FREEBSD) ++#elif defined(FREEBSD) || defined(__FreeBSD__) + #define JS_HAVE_LONG_LONG + diff --git a/www/firefox36/files/patch-libm b/www/firefox36/files/patch-libm new file mode 100644 index 000000000000..7de64b2a5068 --- /dev/null +++ b/www/firefox36/files/patch-libm @@ -0,0 +1,25 @@ +--- js/src/Makefile.in Thu Aug 4 22:26:52 2005 ++++ js/src/Makefile.in Thu Aug 4 23:02:32 2005 +@@ -148,5 +148,4 @@ + endif + +-FDLIBM_LIBRARY = fdlibm/$(LIB_PREFIX)fdm.$(LIB_SUFFIX) + JSMATH_PRELINK = jsmathtemp.o + JS_SAFE_ARENA = 1 +@@ -320,7 +319,4 @@ + endif + @$(RM) -f $(JSMATH_PRELINK) +-else +-# Create dependency so we build fdlibm +-jsmath.o: $(FDLIBM_LIBRARY) Makefile.in + endif + +--- js/Makefile.in Sun Mar 23 14:36:00 2003 ++++ js/Makefile.in Thu Aug 4 23:08:06 2005 +@@ -46,5 +46,5 @@ + # + +-DIRS = src/fdlibm src ++DIRS = src + + include $(topsrcdir)/config/rules.mk diff --git a/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c b/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c new file mode 100644 index 000000000000..9e58b51864f2 --- /dev/null +++ b/www/firefox36/files/patch-mozilla_widget_src_gtk2_mozdrawingarea.c @@ -0,0 +1,12 @@ +--- widget/src/gtk2/mozdrawingarea.c.orig Tue Apr 30 12:29:00 2002 ++++ widget/src/gtk2/mozdrawingarea.c Thu Aug 18 22:27:27 2005 +@@ -168,7 +168,9 @@ + + drawingarea = MOZ_DRAWINGAREA(object); + ++ gdk_window_set_user_data(drawingarea->inner_window, NULL); + gdk_window_destroy(drawingarea->inner_window); ++ gdk_window_set_user_data(drawingarea->clip_window, NULL); + gdk_window_destroy(drawingarea->clip_window); + + (* parent_class->finalize) (object); diff --git a/www/firefox36/files/patch-nspr-unix.c b/www/firefox36/files/patch-nspr-unix.c deleted file mode 100644 index 4a221aa9d6b3..000000000000 --- a/www/firefox36/files/patch-nspr-unix.c +++ /dev/null @@ -1,23 +0,0 @@ -$FreeBSD$ - ---- nsprpub/pr/src/md/unix/unix.c.orig Sat May 31 18:06:04 2003 -+++ nsprpub/pr/src/md/unix/unix.c Sat May 31 18:04:43 2003 -@@ -65,7 +65,8 @@ - * PRInt32* pointer to a _PRSockLen_t* pointer. - */ - #if defined(HAVE_SOCKLEN_T) \ -- || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) -+ || (defined(LINUX) && defined(__GLIBC__) && __GLIBC__ >= 2) \ -+ || defined(FREEBSD) - #define _PRSockLen_t socklen_t - #elif defined(IRIX) || defined(HPUX) || defined(OSF1) || defined(SOLARIS) \ - || defined(AIX4_1) || defined(LINUX) || defined(SONY) \ -@@ -73,7 +74,7 @@ - || defined(SUNOS4) || defined(NCR) || defined(DARWIN) \ - || defined(NEXTSTEP) || defined(QNX) - #define _PRSockLen_t int --#elif (defined(AIX) && !defined(AIX4_1)) || defined(FREEBSD) \ -+#elif (defined(AIX) && !defined(AIX4_1)) \ - || defined(NETBSD) || defined(OPENBSD) || defined(UNIXWARE) \ - || defined(DGUX) || defined(VMS) || defined(NTO) - #define _PRSockLen_t size_t diff --git a/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.cfg b/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.cfg deleted file mode 100644 index 30a28b01459b..000000000000 --- a/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.cfg +++ /dev/null @@ -1,163 +0,0 @@ -$FreeBSD$ - ---- nsprpub/pr/include/md/_freebsd.cfg.orig Wed Jan 2 18:38:25 2002 -+++ nsprpub/pr/include/md/_freebsd.cfg Sun Feb 1 15:09:53 2004 -@@ -91,7 +91,7 @@ - #define PR_ALIGN_OF_DOUBLE 4 - #define PR_ALIGN_OF_POINTER 4 - --#elif defined(__alpha) -+#elif defined(__alpha__) - - #define IS_LITTLE_ENDIAN 1 - #undef IS_BIG_ENDIAN -@@ -138,6 +138,149 @@ - #define PR_ALIGN_OF_DOUBLE 8 - #define PR_ALIGN_OF_POINTER 8 - -+#elif defined(__sparc64__) -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_POINTER 8 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+ -+#elif defined(__ia64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__amd64__) -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#define HAVE_LONG_LONG -+#define HAVE_ALIGNED_DOUBLES -+#define HAVE_ALIGNED_LONGLONGS - #else - - #error "Unknown CPU architecture" diff --git a/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.h b/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.h deleted file mode 100644 index 02923f6d3e22..000000000000 --- a/www/firefox36/files/patch-nsprpub-pr-include-md-_freebsd.h +++ /dev/null @@ -1,15 +0,0 @@ -$FreeBSD$ - ---- nsprpub/pr/include/md/_freebsd.h.orig Sat Nov 15 23:36:13 2003 -+++ nsprpub/pr/include/md/_freebsd.h Mon Feb 9 22:24:39 2004 -@@ -50,6 +50,10 @@ - #define _PR_SI_ARCHITECTURE "alpha" - #elif defined(__sparc__) - #define _PR_SI_ARCHITECTURE "sparc" -+#elif defined(__ia64__) -+#define _PR_SI_ARCHITECTURE "ia64" -+#elif defined(__amd64__) -+#define _PR_SI_ARCHITECTURE "amd64" - #else - #error "Unknown CPU architecture" - #endif diff --git a/www/firefox36/files/patch-nsprpub-pr-include-md-_pth.h b/www/firefox36/files/patch-nsprpub-pr-include-md-_pth.h deleted file mode 100644 index 1f8159c70b1f..000000000000 --- a/www/firefox36/files/patch-nsprpub-pr-include-md-_pth.h +++ /dev/null @@ -1,11 +0,0 @@ ---- nsprpub/pr/include/md/_pth.h.orig Mon Jul 26 07:23:42 2004 -+++ nsprpub/pr/include/md/_pth.h Mon Jul 26 07:18:37 2004 -@@ -90,7 +90,7 @@ - #define _PT_PTHREAD_MUTEXATTR_INIT pthread_mutexattr_init - #define _PT_PTHREAD_MUTEXATTR_DESTROY pthread_mutexattr_destroy - #define _PT_PTHREAD_MUTEX_INIT(m, a) pthread_mutex_init(&(m), &(a)) --#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (EBUSY == pthread_mutex_trylock(&(m))) -+#define _PT_PTHREAD_MUTEX_IS_LOCKED(m) (0 != pthread_mutex_trylock(&(m))) - #if defined(DARWIN) - #define _PT_PTHREAD_CONDATTR_INIT(x) 0 - #else diff --git a/www/firefox36/files/patch-nsprpub-pr-src-io-prprf.c b/www/firefox36/files/patch-nsprpub-pr-src-io-prprf.c deleted file mode 100644 index 38bd959aef25..000000000000 --- a/www/firefox36/files/patch-nsprpub-pr-src-io-prprf.c +++ /dev/null @@ -1,14 +0,0 @@ ---- nsprpub/pr/src/io/prprf.c.orig Mon Mar 8 22:18:19 2004 -+++ nsprpub/pr/src/io/prprf.c Tue Jun 15 13:17:30 2004 -@@ -51,7 +51,10 @@ - ** Note: on some platforms va_list is defined as an array, - ** and requires array notation. - */ --#if (defined(LINUX) && defined(__x86_64__)) -+#if defined(__amd64__) -+#include <stdarg.h> -+#define VARARGS_ASSIGN(foo, bar) va_copy((foo), (bar)) -+#elif (defined(LINUX) && defined(__x86_64__)) - #define VARARGS_ASSIGN(foo, bar) __va_copy((foo), (bar)) - #elif (defined(LINUX) && defined(__powerpc__)) || \ - (defined(LINUX) && defined(__s390__)) || \ diff --git a/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c b/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c deleted file mode 100644 index c015c3d19d27..000000000000 --- a/www/firefox36/files/patch-nsprpub-pr-src-pthreads-ptio.c +++ /dev/null @@ -1,31 +0,0 @@ -$FreeBSD$ - ---- nsprpub/pr/src/pthreads/ptio.c.orig Mon Jul 14 21:59:47 2003 -+++ nsprpub/pr/src/pthreads/ptio.c Fri Oct 17 05:25:43 2003 -@@ -189,7 +189,7 @@ - #endif - #endif - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - static PRBool _pr_ipv6_v6only_on_by_default; - /* The IPV6_V6ONLY socket option is not defined on Mac OS X 10.1. */ - #ifndef IPV6_V6ONLY -@@ -1154,7 +1154,7 @@ - _pr_stderr = pt_SetMethods(2, PR_DESC_FILE, PR_FALSE, PR_TRUE); - PR_ASSERT(_pr_stdin && _pr_stdout && _pr_stderr); - --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - /* In Mac OS X v10.3 Panther Beta the IPV6_V6ONLY socket option - * is turned on by default, contrary to what RFC 3493, Section - * 5.3 says. So we have to turn it off. Find out whether we -@@ -3462,7 +3462,7 @@ - if (osfd == -1) pt_MapError(_PR_MD_MAP_SOCKET_ERROR, errno); - else - { --#ifdef DARWIN -+#if defined(DARWIN) || defined(FREEBSD) - if ((domain == AF_INET6) && _pr_ipv6_v6only_on_by_default) - { - int on = 0; diff --git a/www/firefox36/files/patch-oji-threads b/www/firefox36/files/patch-oji-threads new file mode 100644 index 000000000000..5d4031c8e6e6 --- /dev/null +++ b/www/firefox36/files/patch-oji-threads @@ -0,0 +1,60 @@ +--- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 ++++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 +@@ -113,5 +113,5 @@ + */ + NS_IMETHOD +- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; ++ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; + + /** +@@ -122,5 +122,5 @@ + */ + NS_IMETHOD +- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; ++ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; + }; + +--- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 ++++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 +@@ -268,9 +268,9 @@ + + NS_METHOD +-nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) ++nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) + { + PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, + PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); +- *outThreadID = NS_PTR_TO_INT32(thread); ++ *outThreadID = (uintptr_t)(thread); + return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); + } +@@ -308,5 +308,5 @@ + + NS_METHOD +-nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) ++nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) + { + nsresult rv; +@@ -873,5 +873,5 @@ + + do { +- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); ++ JSJ_RegisterLiveConnectFactory(); + if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { + JVM_InitLCGlue(); +--- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 ++++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 +@@ -122,5 +122,5 @@ + */ + NS_IMETHOD +- CreateThread(PRUint32* threadID, nsIRunnable* runnable); ++ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); + + /** +@@ -131,5 +131,5 @@ + */ + NS_IMETHOD +- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); ++ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); + + /* from nsILiveConnectManager: */ diff --git a/www/firefox36/files/patch-sysnss b/www/firefox36/files/patch-sysnss new file mode 100644 index 000000000000..d854cabc053a --- /dev/null +++ b/www/firefox36/files/patch-sysnss @@ -0,0 +1,178 @@ +--- Makefile.in Tue Sep 14 16:59:40 2004 ++++ Makefile.in Tue Aug 2 08:26:55 2005 +@@ -102,6 +102,4 @@ + # tier 1 - 3rd party individual libraries + # +-tier_1_dirs += dbm +- + ifndef MOZ_NATIVE_JPEG + tier_1_dirs += jpeg +--- security/manager/Makefile.in Mon Mar 28 19:56:36 2005 ++++ security/manager/Makefile.in Tue Aug 2 09:02:50 2005 +@@ -37,16 +37,7 @@ + SOFTOKEN3_LIB \ + SOFTOKEN3_CHK \ +- LOADABLE_ROOT_MODULE \ + HAVE_FREEBL_MODULES \ + $(NULL) + +-LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) +- +-NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) +-SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX) +-SSL3_LIB = $(DLL_PREFIX)ssl3$(DLL_SUFFIX) +-SOFTOKEN3_LIB = $(DLL_PREFIX)softokn3$(DLL_SUFFIX) +-SOFTOKEN3_CHK = $(DLL_PREFIX)softokn3.chk +- + ifneq (,$(filter SunOS HP-UX,$(OS_ARCH))) + ifeq (,$(filter i86pc ia64,$(OS_TEST))) +@@ -132,9 +123,4 @@ + .nss.cleaned: .nss.checkout + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + touch $@ + +@@ -153,43 +139,4 @@ + ifeq ($(OS_ARCH),WINNT) + cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) +-else +- cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) +-endif +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) +-endif +-ifndef DISABLE_DIST_GRE +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(GRE_DIST) +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(GRE_DIST) +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(GRE_DIST) +-ifdef HAVE_FREEBL_MODULES +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(GRE_DIST) +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(GRE_DIST) +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(GRE_DIST) +-endif +-endif +-ifndef _SKIP_OLD_GRE_INSTALL +- $(INSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DIST)/bin +-ifndef SKIP_CHK +- $(INSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DIST)/bin +-endif +- $(INSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin +-ifdef HAVE_FREEBL_MODULES +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DIST)/bin +- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DIST)/bin +- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin +-endif + endif + $(MAKE) -C boot $@ +@@ -200,18 +147,4 @@ + + install:: +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir) +-ifndef SKIP_CHK +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir) +-endif +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SOFTOKEN3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSS3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) +-ifdef HAVE_FREEBL_MODULES +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_PURE32_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_PURE32_MODULE) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir) +- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir) +-endif + $(MAKE) -C boot $@ + $(MAKE) -C ssl $@ +@@ -227,9 +160,4 @@ + endif + $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean +-ifndef SKIP_CHK +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean +- $(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean +-endif + + echo-requires-recursive:: +--- security/manager/ssl/src/Makefile.in Wed Jan 7 08:36:51 2004 ++++ security/manager/ssl/src/Makefile.in Tue Aug 2 09:13:07 2005 +@@ -117,5 +117,5 @@ + # Use local includes because they are inserted before INCLUDES + # so that Mozilla's nss.h is used, not glibc's +-LOCAL_INCLUDES += -I$(DIST)/public/nss \ ++LOCAL_INCLUDES += -I$(LOCALBASE)/include/nss/nss \ + $(NULL) + +--- config/config.mk Tue Oct 12 00:11:11 2004 ++++ config/config.mk Tue Aug 2 09:19:18 2005 +@@ -170,5 +170,4 @@ + NSS_LIBS = \ + $(LIBS_DIR) \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ + -lsmime3 \ + -lssl3 \ +@@ -189,11 +188,5 @@ + endif + +-NSS_DEP_LIBS = \ +- $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \ +- $(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \ +- $(NULL) ++NSS_DEP_LIBS = + + MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX) +--- security/manager/ssl/src/nsNSSComponent.cpp Thu Apr 22 15:48:30 2004 ++++ security/manager/ssl/src/nsNSSComponent.cpp Thu Aug 4 16:44:27 2005 +@@ -88,4 +88,8 @@ + } + ++#include <sys/types.h> ++#include <sys/stat.h> ++#include <errno.h> ++ + #ifdef PR_LOGGING + PRLogModuleInfo* gPIPNSSLog = nsnull; +@@ -406,4 +410,5 @@ + const char *possible_ckbi_locations[] = { + NS_GRE_DIR, ++ NS_UNIX_LIB_DIR, + NS_XPCOM_CURRENT_PROCESS_DIR + }; +@@ -419,5 +424,5 @@ + } + +- char *fullModuleName = nsnull; ++ char *fullModuleName; + #ifdef XP_MAC + nsCAutoString nativePath; +@@ -431,4 +436,12 @@ + fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi"); + #endif ++ if (fullModuleName == nsnull) ++ continue; ++ struct stat sb; ++ if (stat(fullModuleName, &sb)) { ++ if (errno != ENOENT) ++ perror(fullModuleName); ++ continue; ++ } + /* If a module exists with the same name, delete it. */ + NS_ConvertUCS2toUTF8 modNameUTF8(modName); diff --git a/www/firefox36/files/patch-xptcinvoke_x86_64_linux b/www/firefox36/files/patch-xptcinvoke_x86_64_linux new file mode 100644 index 000000000000..724e24089803 --- /dev/null +++ b/www/firefox36/files/patch-xptcinvoke_x86_64_linux @@ -0,0 +1,17 @@ +--- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Thu Apr 22 16:50:05 2004 ++++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_linux.cpp Fri Aug 5 02:16:00 2005 +@@ -82,11 +82,11 @@ + PRUint64 value; + +- for (uint32 i = 0; i < paramCount; i++, s++) { ++ for (unsigned int i = 0; i < paramCount; i++, s++) { + if (s->IsPtrData()) + value = (PRUint64) s->ptr; + else { + switch (s->type) { +- case nsXPTType::T_FLOAT: break; +- case nsXPTType::T_DOUBLE: break; ++ case nsXPTType::T_FLOAT: ++ case nsXPTType::T_DOUBLE: value = 0; /* initialize */ break; + case nsXPTType::T_I8: value = s->val.i8; break; + case nsXPTType::T_I16: value = s->val.i16; break; |