diff options
| author | flo <flo@FreeBSD.org> | 2011-08-02 07:31:53 +0800 |
|---|---|---|
| committer | flo <flo@FreeBSD.org> | 2011-08-02 07:31:53 +0800 |
| commit | 07b734fa98462cc52c5cdfb2b909b241a207f53b (patch) | |
| tree | 669855f1e76bc13423fcb9320c21bf46b6d0eb6f /www/seamonkey | |
| parent | 7a59ec3d35e339530c7bad5cab8fd3d78025b6b3 (diff) | |
| download | freebsd-ports-gnome-07b734fa98462cc52c5cdfb2b909b241a207f53b.tar.gz freebsd-ports-gnome-07b734fa98462cc52c5cdfb2b909b241a207f53b.tar.zst freebsd-ports-gnome-07b734fa98462cc52c5cdfb2b909b241a207f53b.zip | |
update to 2.2 and make this the default seamonkey version
Much of the work was done by beat for the 2.1 update, i update everything to 2.2
Diffstat (limited to 'www/seamonkey')
62 files changed, 795 insertions, 1008 deletions
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile index 229d8de85c80..5a136ef55a05 100644 --- a/www/seamonkey/Makefile +++ b/www/seamonkey/Makefile @@ -3,23 +3,25 @@ # Whom: eivind/dima/jseger # # $FreeBSD$ -# $MCom: ports-stable/www/seamonkey/Makefile,v 1.9 2009/01/09 23:41:22 mezz Exp $ # PORTNAME= seamonkey -DISTVERSION= 1.1.19 -PORTREVISION= 1 +DISTVERSION= 2.2 CATEGORIES?= www ipv6 MASTER_SITES= ${MASTER_SITE_MOZILLA_EXTENDED} -MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION} -DISTNAME= ${PORTNAME}-${DISTVERSION}.source +MASTER_SITE_SUBDIR= seamonkey/releases/${DISTVERSION}/source +DISTNAME= seamonkey-${DISTVERSION}.source MAINTAINER= gecko@FreeBSD.org COMMENT= The open source, standards compliant web browser -DEPRECATED= Upstream support dropped. Please consider using www/seamonkey2 instead. -FORBIDDEN= several security vulnerabilities -CONFLICTS= seamonkey-2* +BUILD_DEPENDS= nspr>=4.8.7:${PORTSDIR}/devel/nspr +LIB_DEPENDS= execinfo.1:${PORTSDIR}/devel/libexecinfo \ + event-1.4:${PORTSDIR}/devel/libevent + +USE_AUTOTOOLS= autoconf213 +CONFLICTS_BUILD= spidermonkey-1.[0-7]* +CONFLICTS_INSTALL= seamonkey-2.0* USE_BZIP2= yes USE_GMAKE= yes USE_GECKO= gecko @@ -27,24 +29,32 @@ WANT_GNOME= yes WANT_PERL= yes HAS_CONFIGURE= yes ALL_TARGET= default +USE_GL= gl MAKE_JOBS_SAFE= yes MOZ_PIS_SCRIPTS= moz_pis_S50cleanhome MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC}/dist/bin CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/cairo" +USE_GCC= 4.2+ CONFIGURE_ENV= LOCALBASE=${LOCALBASE} -GECKO_PLIST_PRE_FILES= lib/${MOZILLA}/chrome/icons/default/default.xpm - +MOZILLA= ${PORTNAME}-${PORTVERSION} +MOZILLA_EXEC_NAME= ${PORTNAME} MOZ_EXTENSIONS= default MOZ_OPTIONS+= --with-default-mozilla-five-home=${PREFIX}/lib/${MOZILLA} \ --enable-svg \ --enable-application=suite \ --enable-svg-renderer=cairo \ --enable-system-cairo \ - --enable-canvas \ - --with-system-nss -MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=suite + --enable-canvas \ + --disable-necko-wifi \ + --disable-updater \ + --with-system-libevent=${LOCALBASE} + +USE_MOZILLA= -png -nss -dbm -jpeg -xft +MOZ_TOOLKIT= cairo-gtk2 +MOZILLA_PLIST_DIRS= bin lib +MOZ_PKGCONFIG_FILES= NOT_FOR_ARCHS= ia64 @@ -52,12 +62,23 @@ OPTIONS=MAILNEWS "Enable Mail and News modules" on \ COMPOSER "Enable the HTML Composer module" on \ LDAP "Enable LDAP support for Mailnews" on \ CHATZILLA "Enable the Chatzilla IRC module" on \ - JAVASCRIPT_DEBUGGER "Enable DTD and JavaScript debuggers" off \ + LIGHTNING "Enable calendar extension" off \ + DBUS "Enable D-BUS support" on \ SMB "Enable smb:// URI support using gnomevfs" off .include <bsd.port.pre.mk> -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 pthread | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} +MOZSRC:= ${WRKDIR}/comm-release/mozilla +WRKSRC= ${WRKDIR}/comm-release + +GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} + +.if ${HAVE_GNOME:Mlibgnomeui}!="" +USE_GNOME+= libgnomeui +MOZ_OPTIONS+= --enable-gnomeui +.else +MOZ_OPTIONS+= --disable-gnomeui +.endif .if exists(${LOCALBASE}/include/cairo/cairo-glitz.h) # Glitz support can only be enabled if cairo is built with glitz support @@ -65,16 +86,13 @@ MOZ_OPTIONS+= --enable-glitz LIB_DEPENDS+= glitz.1:${PORTSDIR}/graphics/glitz .endif -.if ${ARCH}=="sparc64" && ${OSVERSION} < 601101 -IGNORE= core dumps on ${ARCH}, need kern.osreldate>=601101 -.endif - .if defined(WITHOUT_MAILNEWS) MOZ_OPTIONS+= --disable-ldap --disable-mailnews .else # mail and news desired, but not LDAP .if defined(WITHOUT_LDAP) MOZ_OPTIONS+= --disable-ldap --enable-mailnews +BROKEN= Does not build .else MOZ_OPTIONS+= --enable-ldap --enable-mailnews .endif @@ -82,41 +100,86 @@ MOZ_OPTIONS+= --enable-ldap --enable-mailnews .if !defined(WITHOUT_CHATZILLA) MOZ_EXTENSIONS:= ${MOZ_EXTENSIONS},irc .endif -.if defined(WITH_JAVASCRIPT_DEBUGGER) -MOZ_OPTIONS+= --enable-jsd \ - --enable-dtd-debug -.else -MOZ_OPTIONS+= --disable-jsd \ - --disable-dtd-debug -.endif .if defined(WITHOUT_COMPOSER) MOZ_OPTIONS+= --disable-composer .endif +.if defined(WITHOUT_DBUS) +MOZ_OPTIONS+= --disable-dbus --disable-libnotify +.else +LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ + notify.1:${PORTSDIR}/devel/libnotify +.endif + +.if ${ARCH} == amd64 || ${ARCH} == i386 +BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm +.endif + +.if defined(WITH_LIGHTNING) +MOZ_OPTIONS+= --enable-calendar +MOZ_MK_OPTIONS+= MOZ_CO_PROJECT=calendar +LIGHTNING_DIR= share/lightning +SUB_FILES+= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message +.else +MOZ_OPTIONS+= --disable-calendar +.endif + post-patch: @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ - ${WRKSRC}/security/manager/ssl/src/Makefile.in + ${WRKSRC}/mozilla/security/manager/ssl/src/Makefile.in \ + ${WRKSRC}/mozilla/js/src/config/mkdepend/Makefile.in ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ - ${WRKSRC}/storage/build/Makefile.in + ${MOZSRC}/storage/build/Makefile.in \ + ${MOZSRC}/toolkit/library/Makefile.in \ + ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e '/accessibility.typeaheadfind.enablesound/s/true/false/' \ - ${WRKSRC}/modules/libpref/src/init/all.js + ${WRKSRC}/mozilla/modules/libpref/src/init/all.js @${REINPLACE_CMD} -e 's|<iconv.h>|\"${LOCALBASE}/include/iconv.h\"|g' \ - ${WRKSRC}/configure \ - ${WRKSRC}/intl/uconv/native/nsNativeUConvService.cpp \ - ${WRKSRC}/xpcom/io/nsNativeCharsetUtils.cpp + ${WRKSRC}/configure.in \ + ${WRKSRC}/mozilla/configure.in \ + ${WRKSRC}/mozilla/xpcom/io/nsNativeCharsetUtils.cpp + @${REINPLACE_CMD} -e 's|libgnome-2.so.0|libgnome-2.so|' \ + ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|libgnomeui-2.so.0|libgnomeui-2.so|' \ + ${WRKSRC}/mozilla/toolkit/xre/nsNativeAppSupportUnix.cpp \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|libgnomevfs-2.so.0|libgnomevfs-2.so|' \ + ${WRKSRC}/mozilla/modules/libpr0n/decoders/icon/gtk/nsIconChannel.cpp + @${REINPLACE_CMD} -e 's|-lc_r|${PTHREAD_LIBS}|g ; \ + s|-lpthread|${PTHREAD_LIBS}|g ; \ + s|echo aout|echo elf|g ; \ + s|/usr/X11R6|${LOCALBASE}|g' \ + ${WRKSRC}/mozilla/js/src/configure.in \ + ${WRKSRC}/mozilla/configure.in \ + ${WRKSRC}/configure.in @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ < ${FILESDIR}/seamonkey.desktop.in > \ ${WRKDIR}/seamonkey.desktop +pre-configure: + (cd ${WRKSRC} && ${AUTOCONF}) + (cd ${MOZSRC} && ${AUTOCONF}) + (cd ${MOZSRC}/js/src/ && ${AUTOCONF}) pre-install: ${ECHO_CMD} share/applications/seamonkey.desktop >> ${PLIST} ${ECHO_CMD} "@unexec ${RMDIR} %D/share/applications 2>/dev/null || ${TRUE}" >> ${PLIST} - ${CP} ${WRKSRC}/suite/branding/icons/gtk/default.xpm \ - ${FAKEDIR}/lib/${MOZILLA}/chrome/icons/default/ +.if defined(WITH_LIGHTNING) + @${PRINTF} '%s/lightning-${PORTNAME}.xpi\n@dirrmtry %s\n' \ + ${LIGHTNING_DIR} ${LIGHTNING_DIR} >> ${PLIST} +.endif do-install: ${MKDIR} ${PREFIX}/share/applications ${INSTALL_DATA} ${WRKDIR}/seamonkey.desktop ${PREFIX}/share/applications +post-install: +.if defined(WITH_LIGHTNING) + ${MKDIR} ${PREFIX}/${LIGHTNING_DIR} + ${INSTALL_DATA} ${MOZSRC}/dist/xpi-stage/lightning.xpi ${PREFIX}/${LIGHTNING_DIR}/lightning-${PORTNAME}.xpi + @${CAT} ${PKGMESSAGE} +.endif + .include <bsd.port.post.mk> diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo index 0bf1034bfcc9..4fd6b5693247 100644 --- a/www/seamonkey/distinfo +++ b/www/seamonkey/distinfo @@ -1,2 +1,2 @@ -SHA256 (seamonkey-1.1.19.source.tar.bz2) = 665e0998e7af516826b12d943206de9d9ed6d341503660b72251821fccf1932e -SIZE (seamonkey-1.1.19.source.tar.bz2) = 36272561 +SHA256 (seamonkey-2.2.source.tar.bz2) = 0b713e2f78a2c5139bf16736bd12e87017cdbc675948d4a8893a3d834bf8c13a +SIZE (seamonkey-2.2.source.tar.bz2) = 87478968 diff --git a/www/seamonkey/files/patch-build_unix_run-mozilla.sh b/www/seamonkey/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index 17288b12b27e..000000000000 --- a/www/seamonkey/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,21 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Sat Oct 1 01:36:47 2005 -+++ build/unix/run-mozilla.sh Thu Dec 22 17:51:10 2005 -@@ -328,7 +328,7 @@ - fi - ## - ## Set LD_LIBRARY_PATH --LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} -+LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} - if [ -n "$LD_LIBRARYN32_PATH" ] - then - LD_LIBRARYN32_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARYN32_PATH+":$LD_LIBRARYN32_PATH"} -@@ -415,6 +415,9 @@ - # - export MOZILLA_FIVE_HOME LD_LIBRARY_PATH - export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH -+ -+MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey -+export MOZ_PLUGIN_PATH - - if [ $moz_debug -eq 1 ] - then diff --git a/www/seamonkey/files/patch-config_autoconf.mk.in b/www/seamonkey/files/patch-config_autoconf.mk.in index c4fa0b516d1d..31066fbc66fb 100644 --- a/www/seamonkey/files/patch-config_autoconf.mk.in +++ b/www/seamonkey/files/patch-config_autoconf.mk.in @@ -1,6 +1,6 @@ ---- config/autoconf.mk.in.orig Mon Mar 15 22:56:25 2004 -+++ config/autoconf.mk.in Fri Mar 19 15:17:50 2004 -@@ -31,13 +31,13 @@ +--- config/autoconf.mk.in.orig 2009-07-17 15:18:04.000000000 +0200 ++++ config/autoconf.mk.in 2009-08-25 01:15:47.000000000 +0200 +@@ -61,7 +61,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ @@ -9,10 +9,3 @@ libdir = @libdir@ datadir = @datadir@ mandir = @mandir@ - idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) - --mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+mozappdir = $(libdir)/%%MOZILLA%% - mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION) - mrelibdir = $(mredir)/lib - diff --git a/www/seamonkey/files/patch-configure b/www/seamonkey/files/patch-configure deleted file mode 100644 index 4880c78c5e71..000000000000 --- a/www/seamonkey/files/patch-configure +++ /dev/null @@ -1,56 +0,0 @@ ---- configure.orig 2008-10-30 23:05:30.000000000 +0100 -+++ configure 2009-07-22 15:14:23.000000000 +0200 -@@ -1047,7 +1047,7 @@ - - MOZJPEG=62 - MOZPNG=10217 --MOZZLIB=1.2.3 -+MOZZLIB=1.2.2 - NSPR_VERSION=4 - NSS_VERSION=3 - -@@ -5408,7 +5408,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | sparc | ppc | ia64) -+amd64 | x86_64 | sparc | ppc | ia64) - CPU_ARCH="$OS_TEST" - ;; - esac -@@ -10442,7 +10442,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10448 "configure" - #include "confdefs.h" -@@ -10473,7 +10473,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -@@ -10483,7 +10483,7 @@ - echo $ac_n "(cached) $ac_c" 1>&6 - else - ac_save_LIBS="$LIBS" --LIBS="-liconv $LIBS" -+LIBS="-L$LOCALBASE/lib -liconv $LIBS" - cat > conftest.$ac_ext <<EOF - #line 10489 "configure" - #include "confdefs.h" -@@ -10514,7 +10514,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- _ICONV_LIBS="$_ICONV_LIBS -liconv" -+ _ICONV_LIBS="$_ICONV_LIBS -L$LOCALBASE/lib -liconv" - else - echo "$ac_t""no" 1>&6 - fi diff --git a/www/seamonkey/files/patch-configure.in b/www/seamonkey/files/patch-configure.in new file mode 100644 index 000000000000..8b7b316f8643 --- /dev/null +++ b/www/seamonkey/files/patch-configure.in @@ -0,0 +1,20 @@ +--- configure.in.orig 2011-07-28 00:58:59.534861026 +0200 ++++ configure.in 2011-07-28 01:00:05.591863508 +0200 +@@ -1438,7 +1438,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1458,7 +1458,7 @@ + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + diff --git a/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in b/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in deleted file mode 100644 index 40562345842c..000000000000 --- a/www/seamonkey/files/patch-db-sqlite3-src-Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig 2009-08-22 00:49:32.000000000 +0200 -+++ db/sqlite3/src/Makefile.in 2009-08-22 00:51:29.000000000 +0200 -@@ -113,6 +113,10 @@ - ##SIMPLE_PROGRAMS = sqlite-shell - endif - -+ifeq ($(OS_ARCH),FreeBSD) -+EXTRA_LIBS += -lpthread -+endif -+ - include $(topsrcdir)/config/rules.mk - - sqlite-shell.$(OBJ_SUFFIX): shell.c diff --git a/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp b/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp deleted file mode 100644 index 2cc9823fed1c..000000000000 --- a/www/seamonkey/files/patch-embedding_base_nsEmbedAPI.cpp +++ /dev/null @@ -1,16 +0,0 @@ ---- embedding/base/nsEmbedAPI.cpp.orig 2007-10-09 20:00:30.000000000 -0400 -+++ embedding/base/nsEmbedAPI.cpp 2007-10-09 20:01:45.000000000 -0400 -@@ -53,7 +53,12 @@ static PRBool sRegistryIniti - static PRUint32 sInitCounter = 0; - - #define HACK_AROUND_THREADING_ISSUES --//#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#ifdef __FreeBSD__ -+#include <sys/param.h> -+#if __FreeBSD_version < 700042 -+#define HACK_AROUND_NONREENTRANT_INITXPCOM -+#endif -+#endif - - #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM - // XXX hack class to clean up XPCOM when this module is unloaded diff --git a/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp b/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp deleted file mode 100644 index 38ce7ec12167..000000000000 --- a/www/seamonkey/files/patch-extensions_transformiix_source_base_Double.cpp +++ /dev/null @@ -1,23 +0,0 @@ ---- extensions/transformiix/source/base/Double.cpp.orig Mon Feb 6 15:40:52 2006 -+++ extensions/transformiix/source/base/Double.cpp Mon Feb 6 15:51:01 2006 -@@ -52,11 +52,16 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; --#else --fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; -+#if !defined(FP_X_DNML) -+#define FP_X_DNML 0 - #endif -+#if !defined(FP_X_STK) -+#define FP_X_STK 0 -+#endif -+#if !defined(FP_X_IOV) -+#define FP_X_IOV 0 -+#endif -+fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; - fp_except_t oldmask = fpsetmask(~allmask); - #endif - diff --git a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp b/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp deleted file mode 100644 index bc141062f7c6..000000000000 --- a/www/seamonkey/files/patch-gfx_src_gtk_nsFontMetricsXft.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- gfx/src/gtk/nsFontMetricsXft.cpp.orig Wed Mar 17 02:08:01 2004 -+++ gfx/src/gtk/nsFontMetricsXft.cpp Wed Mar 17 02:08:15 2004 -@@ -65,7 +65,8 @@ - - #include <gdk/gdkx.h> - #include <freetype/tttables.h> --#include <freetype/freetype.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #define FORCE_PR_LOG - #include "prlog.h" diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc new file mode 100644 index 000000000000..ffb56ac25100 --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc~ ++++ mozilla/ipc/chromium/src/base/atomicops_internals_mutex.cc +@@ -39,6 +39,7 @@ + * ***** END LICENSE BLOCK ***** */ + + #include "base/atomicops.h" ++#include "base/lock.h" + + namespace base { + namespace subtle { diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h new file mode 100644 index 000000000000..81a4693140a8 --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util.h @@ -0,0 +1,13 @@ +--- mozilla/ipc/chromium/src/base/file_util.h~ ++++ mozilla/ipc/chromium/src/base/file_util.h +@@ -15,8 +15,9 @@ + #elif defined(ANDROID) + #include <sys/stat.h> + #elif defined(OS_POSIX) ++#include <sys/types.h> ++#include <sys/stat.h> + #include <fts.h> +-#include <sys/stat.h> + #endif + + #include <stdio.h> diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc new file mode 100644 index 000000000000..d0cc3b14e68b --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_linux.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_linux.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_linux.cc +@@ -28,7 +28,7 @@ bool GetShmemTempDir(FilePath* path) { + #ifdef ANDROID + return GetTempDir(path); + #else +- *path = FilePath("/dev/shm"); ++ *path = FilePath("/tmp"); + return true; + #endif + } diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc new file mode 100644 index 000000000000..3c722016e77b --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-file_util_posix.cc @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/file_util_posix.cc~ ++++ mozilla/ipc/chromium/src/base/file_util_posix.cc +@@ -30,6 +30,8 @@ + #include "base/string_util.h" + #include "base/time.h" + ++#define stat64 stat ++ + namespace file_util { + + #if defined(GOOGLE_CHROME_BUILD) diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc new file mode 100644 index 000000000000..14e333ca339b --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-platform_file_posix.cc @@ -0,0 +1,10 @@ +--- mozilla/ipc/chromium/src/base/platform_file_posix.cc~ ++++ mozilla/ipc/chromium/src/base/platform_file_posix.cc +@@ -9,6 +9,7 @@ + #ifdef ANDROID + #include <linux/stat.h> + #endif ++#include <sys/stat.h> + + #include "base/logging.h" + #include "base/string_util.h" diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc new file mode 100644 index 000000000000..3445b281bc48 --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-platform_thread_posix.cc @@ -0,0 +1,12 @@ +--- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2011-04-27 09:34:28.000000000 +0200 ++++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc 2011-04-27 19:47:36.344446266 +0200 +@@ -34,7 +33,8 @@ + #if defined(OS_MACOSX) + return mach_thread_self(); + #elif defined(OS_LINUX) +- return syscall(__NR_gettid); ++ // TODO(BSD): find a better thread ID ++ return reinterpret_cast<int64>(pthread_self()); + #endif + } + diff --git a/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h new file mode 100644 index 000000000000..ca7b24fa4860 --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ ++++ mozilla/ipc/chromium/src/base/third_party/nspr/prcpucfg.h +@@ -34,7 +34,7 @@ + #include "base/third_party/nspr/prcpucfg_win.h" + #elif defined(__APPLE__) + #include "base/third_party/nspr/prcpucfg_mac.h" +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #include "base/third_party/nspr/prcpucfg_linux.h" + #else + #error Provide a prcpucfg.h appropriate for your platform diff --git a/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h b/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h new file mode 100644 index 000000000000..e7540d38eceb --- /dev/null +++ b/www/seamonkey/files/patch-ipc-chromium-src-build-build_config.h @@ -0,0 +1,11 @@ +--- mozilla/ipc/chromium/src/build/build_config.h~ ++++ mozilla/ipc/chromium/src/build/build_config.h +@@ -17,7 +17,7 @@ + // A set of macros to use for platform detection. + #if defined(__APPLE__) + #define OS_MACOSX 1 +-#elif defined(__linux__) || defined(ANDROID) ++#elif defined(__FreeBSD__) || defined(ANDROID) + #define OS_LINUX 1 + #elif defined(_WIN32) + #define OS_WIN 1 diff --git a/www/seamonkey/files/patch-js_src_Makefile.in b/www/seamonkey/files/patch-js_src_Makefile.in deleted file mode 100644 index fb0bd7f1986b..000000000000 --- a/www/seamonkey/files/patch-js_src_Makefile.in +++ /dev/null @@ -1,10 +0,0 @@ ---- js/src/Makefile.in.orig Wed Oct 18 09:23:09 2006 -+++ js/src/Makefile.in Wed Oct 18 09:27:27 2006 -@@ -244,6 +244,7 @@ - endif - - LDFLAGS += $(pathsubst -l%,$(NSPR_STATIC_PATH)/%.a,$(NSPR_LIBS)) -+LDFLAGS += -lc - - # BeOS and HP-UX do not require the extra linking of "-lm" - ifeq (,$(filter BeOS HP-UX WINNT WINCE OpenVMS,$(OS_ARCH))) diff --git a/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h b/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h deleted file mode 100644 index a672de913dd6..000000000000 --- a/www/seamonkey/files/patch-js_src_liveconnect_nsISecureLiveconnect.h +++ /dev/null @@ -1,14 +0,0 @@ ---- js/src/liveconnect/nsISecureLiveconnect.h.orig 2007-10-09 20:03:00.000000000 -0400 -+++ js/src/liveconnect/nsISecureLiveconnect.h 2007-10-09 20:03:50.000000000 -0400 -@@ -51,7 +51,11 @@ - #include "nsIFactory.h" - #include "jni.h" - -+#if JS_BYTES_PER_WORD == 8 -+typedef jlong jsobject; -+#else - typedef jint jsobject; -+#endif - - class nsISecureLiveconnect : public nsISupports { - public: diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in new file mode 100644 index 000000000000..63f7b76052c3 --- /dev/null +++ b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libldap-Makefile.in @@ -0,0 +1,13 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in.orig 2009-11-10 09:56:42.000000000 +0100 ++++ ldap/sdks/c-sdk/ldap/libraries/libldap/Makefile.in 2009-11-10 09:58:15.000000000 +0100 +@@ -254,6 +254,10 @@ + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lbe + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + ifeq ($(OS_ARCH), NetBSD) + EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) + endif diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in new file mode 100644 index 000000000000..4b6a5bcca21a --- /dev/null +++ b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libprldap-Makefile.in @@ -0,0 +1,14 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in.orig 2008-09-11 16:38:35.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libprldap/Makefile.in 2009-12-01 10:18:43.000000000 +0100 +@@ -147,6 +147,11 @@ + CUSTOM_LIBS=1 + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++CUSTOM_LIBS=1 ++endif ++ + # no extra libs on HP-UX + ifeq ($(OS_ARCH), HP-UX) + CUSTOM_LIBS=1 diff --git a/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in new file mode 100644 index 000000000000..7ca660b34206 --- /dev/null +++ b/www/seamonkey/files/patch-ldap-sdks-c-sdk-ldap-libraries-libssldap-Makefile.in @@ -0,0 +1,22 @@ +--- ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in.orig 2009-09-10 17:36:39.000000000 +0200 ++++ ldap/sdks/c-sdk/ldap/libraries/libssldap/Makefile.in 2009-09-10 17:37:28.000000000 +0200 +@@ -42,7 +42,7 @@ + NSPR_LIBS = @NSPR_LIBS@ + NSPR_CFLAGS = @NSPR_CFLAGS@ + NSS_LIBS = @NSS_LIBS@ +-NSS_CFLAGS = @NSS_CFLAGS@ ++NSS_CFLAGS = @NSS_CFLAGS@ -I/usr/local/include/nss/nss + + include $(MOD_DEPTH)/config/autoconf.mk + include $(topsrcdir)/build.mk +@@ -180,6 +180,10 @@ + CUSTOM_LIBS=1 + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++CUSTOM_LIBS=1 ++endif ++ + ifndef CUSTOM_LIBS + EXTRA_LIBS = -L$(dist_libdir) -l$(LDAP_LIBNAME) -l$(PRLDAP_LIBNAME) + EXTRA_LIBS += $(NSSLINK) diff --git a/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in b/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in new file mode 100644 index 000000000000..127245003114 --- /dev/null +++ b/www/seamonkey/files/patch-ldap-xpcom-src-Makefile.in @@ -0,0 +1,13 @@ +--- ldap/xpcom/src/Makefile.in.orig 2009-11-22 03:44:31.000000000 +0100 ++++ ldap/xpcom/src/Makefile.in 2009-11-26 13:06:53.000000000 +0100 +@@ -97,6 +97,10 @@ + $(NULL) + endif + ++ifeq ($(OS_ARCH), FreeBSD) ++EXTRA_LIBS = -L$(dist_libdir) -l$(LBER_LIBNAME) -lpthread ++endif ++ + EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_LIBS) $(LDAP_LIBS) + + include $(topsrcdir)/config/rules.mk diff --git a/www/seamonkey/files/patch-libm b/www/seamonkey/files/patch-libm deleted file mode 100644 index d9295c9068d4..000000000000 --- a/www/seamonkey/files/patch-libm +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp b/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp deleted file mode 100644 index ab9689957cbc..000000000000 --- a/www/seamonkey/files/patch-modules-libpr0n-encoders-png-nsPNGEncoder.cpp +++ /dev/null @@ -1,15 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-03-28 13:48:53.000000000 +0200 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-03-28 13:46:50.000000000 +0200 -@@ -111,9 +111,9 @@ - - // initialize - png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (! png_ptr) - return NS_ERROR_OUT_OF_MEMORY; - png_info* info_ptr = png_create_info_struct(png_ptr); diff --git a/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub b/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub new file mode 100644 index 000000000000..12a704ade44b --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-build-autoconf-config.sub @@ -0,0 +1,12 @@ +--- mozilla/build/autoconf/config.sub.orig 2010-01-05 12:26:13.000000000 +0100 ++++ mozilla/build/autoconf/config.sub 2010-01-05 12:26:46.000000000 +0100 +@@ -403,9 +403,6 @@ + amd64) + basic_machine=x86_64-pc + ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff --git a/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh b/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh new file mode 100644 index 000000000000..e610c0afb5ee --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-build-unix-run-mozilla.sh @@ -0,0 +1,21 @@ +--- mozilla/build/unix/run-mozilla.sh.orig 2010-10-08 21:51:26.000000000 +0200 ++++ mozilla/build/unix/run-mozilla.sh 2010-10-10 21:45:33.000000000 +0200 +@@ -308,7 +308,7 @@ + } + if moz_should_set_ld_library_path + then +- LD_LIBRARY_PATH=${MOZ_DIST_BIN}:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH:+":$LD_LIBRARY_PATH"} ++ LD_LIBRARY_PATH=${MOZ_DIST_BIN}:%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey:${MOZ_DIST_BIN}/plugins:${MRE_HOME}${LD_LIBRARY_PATH+":$LD_LIBRARY_PATH"} + fi + + if [ -n "$LD_LIBRARYN32_PATH" ] +@@ -390,6 +390,9 @@ + export MOZILLA_FIVE_HOME LD_LIBRARY_PATH + export SHLIB_PATH LIBPATH LIBRARY_PATH ADDON_PATH DYLD_LIBRARY_PATH + ++MOZ_PLUGIN_PATH=%%LOCALBASE%%/lib/browser_plugins/symlinks/gecko18:%%LOCALBASE%%/lib/npapi/symlinks/seamonkey ++export MOZ_PLUGIN_PATH ++ + if [ $moz_debug -eq 1 ] + then + moz_debug_program ${1+"$@"} diff --git a/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in b/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in new file mode 100644 index 000000000000..566b95240799 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-config-autoconf.mk.in @@ -0,0 +1,11 @@ +--- mozilla/config/autoconf.mk.in.orig 2009-09-17 19:09:10.000000000 +0200 ++++ mozilla/config/autoconf.mk.in 2009-09-17 19:09:26.000000000 +0200 +@@ -275,7 +275,7 @@ + OS_CPPFLAGS = @CPPFLAGS@ + OS_CFLAGS = $(OS_CPPFLAGS) @CFLAGS@ + OS_CXXFLAGS = $(OS_CPPFLAGS) @CXXFLAGS@ +-OS_LDFLAGS = @LDFLAGS@ ++OS_LDFLAGS = @LDFLAGS@ -lc + + OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ + OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ diff --git a/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h b/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h new file mode 100644 index 000000000000..c0d470567863 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-config-gcc-stl-wrapper.template.h @@ -0,0 +1,11 @@ +--- mozilla/config/gcc-stl-wrapper.template.h.orig 2010-05-12 13:56:18.000000000 +0000 ++++ mozilla/config/gcc-stl-wrapper.template.h 2010-05-12 13:56:52.000000000 +0000 +@@ -89,7 +89,7 @@ + // -fshort-wchar). We don't want that and so define our own inlined + // __throw_*(). + #ifndef mozilla_throw_gcc_h +-# include "mozilla/throw_gcc.h" ++# include "../../memory/mozalloc/throw_gcc.h" + #endif + + #endif // if mozilla_${HEADER}_h diff --git a/www/seamonkey/files/patch-config_mkdepend_Makefile.in b/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in index 8da7e48ab0df..64d685b847ed 100644 --- a/www/seamonkey/files/patch-config_mkdepend_Makefile.in +++ b/www/seamonkey/files/patch-mozilla-config-mkdepend-Makefile.in @@ -1,5 +1,5 @@ ---- config/mkdepend/Makefile.in.orig Sun Apr 18 14:17:26 2004 -+++ config/mkdepend/Makefile.in Sun Dec 12 09:42:11 2004 +--- mozilla/config/mkdepend/Makefile.in.orig 2009-09-11 19:30:23.000000000 +0200 ++++ mozilla/config/mkdepend/Makefile.in 2009-09-11 19:29:53.000000000 +0200 @@ -73,6 +73,7 @@ include $(topsrcdir)/config/rules.mk diff --git a/www/seamonkey/files/patch-config-mkdepend-imakemdep.h b/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h index b688e664475d..6df7089f91d3 100644 --- a/www/seamonkey/files/patch-config-mkdepend-imakemdep.h +++ b/www/seamonkey/files/patch-mozilla-config-mkdepend-imakemdep.h @@ -1,5 +1,5 @@ ---- config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 -+++ config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 +--- mozilla/config/mkdepend/imakemdep.h Fri Sep 4 21:22:25 1998 ++++ mozilla/config/mkdepend/imakemdep.h Thu Oct 16 22:43:25 2003 @@ -278,4 +278,7 @@ "-D__i386__", # endif diff --git a/www/seamonkey/files/patch-mozilla-configure.in b/www/seamonkey/files/patch-mozilla-configure.in new file mode 100644 index 000000000000..4ccc7bfe5017 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-configure.in @@ -0,0 +1,86 @@ +--- mozilla/configure.in.orig 2010-11-04 21:05:18.000000000 +0100 ++++ mozilla/configure.in 2010-11-09 12:59:28.000000000 +0100 +@@ -1549,7 +1549,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -1567,7 +1567,7 @@ dnl Set INTEL_ARCHITECTURE if we're comp + dnl =============================================================== + INTEL_ARCHITECTURE= + case "$OS_TEST" in +- x86_64|i?86) ++ amd64|x86_64|i?86) + INTEL_ARCHITECTURE=1 + esac + +@@ -3803,19 +3803,21 @@ + AC_CHECK_FUNCS(localtime_r strtok_r) + + dnl check for clock_gettime(), the CLOCK_MONOTONIC clock, and -lrt +-_SAVE_LDFLAGS=$LDFLAGS +-LDFLAGS="$LDFLAGS -lrt" +-AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC) and -lrt, ++_SAVE_LIBS=$LIBS ++AC_SEARCH_LIBS(clock_gettime, rt) ++AC_CACHE_CHECK(for clock_gettime(CLOCK_MONOTONIC), + ac_cv_have_clock_monotonic, + [AC_TRY_LINK([#include <time.h>], + [ struct timespec ts; + clock_gettime(CLOCK_MONOTONIC, &ts); ], + ac_cv_have_clock_monotonic=yes, + ac_cv_have_clock_monotonic=no)]) +-LDFLAGS=$_SAVE_LDFLAGS ++LIBS=$_SAVE_LIBS + if test "$ac_cv_have_clock_monotonic" = "yes"; then + HAVE_CLOCK_MONOTONIC=1 +- REALTIME_LIBS=-lrt ++ if test "$ac_cv_search_clock_gettime" != "none required"; then ++ REALTIME_LIBS=$ac_cv_search_clock_gettime ++ fi + AC_DEFINE(HAVE_CLOCK_MONOTONIC) + AC_SUBST(HAVE_CLOCK_MONOTONIC) + AC_SUBST(REALTIME_LIBS) +@@ -4808,7 +4810,7 @@ CFLAGS=$_SAVE_CFLAGS + LDFLAGS=$_SAVE_LDFLAGS + LIBS=$_SAVE_LIBS + +-if test "${ZLIB_DIR}" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then ++if test "${ZLIB_DIR}" -a "${ZLIB_DIR}" != "/usr" -a -d "${ZLIB_DIR}" -a "$SYSTEM_ZLIB" = 1; then + ZLIB_CFLAGS="-I${ZLIB_DIR}/include" + ZLIB_LIBS="-L${ZLIB_DIR}/lib ${ZLIB_LIBS}" + fi +@@ -6022,6 +6024,14 @@ + VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" + VPX_X86_ASM=1 + ;; ++ FreeBSD:i386) ++ VPX_ASFLAGS="-f elf32 -rnasm -pnasm" ++ VPX_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ VPX_ASFLAGS="-f elf64 -rnasm -pnasm -DPIC" ++ VPX_X86_ASM=1 ++ ;; + SunOS:x86) + VPX_ASFLAGS="-f elf32 -rnasm -pnasm" + VPX_X86_ASM=1 +@@ -6392,6 +6402,14 @@ if test -n "$MOZ_LIBJPEG_TURBO"; then + LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" + LIBJPEG_TURBO_X64_ASM=1 + ;; ++ FreeBSD:i386) ++ LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" ++ LIBJPEG_TURBO_X86_ASM=1 ++ ;; ++ FreeBSD:amd64) ++ LIBJPEG_TURBO_ASFLAGS="-f elf64 -rnasm -pnasm -D__x86_64__ -DPIC -DELF" ++ LIBJPEG_TURBO_X64_ASM=1 ++ ;; + SunOS:i?86) + LIBJPEG_TURBO_ASFLAGS="-f elf32 -rnasm -pnasm -DPIC -DELF" + LIBJPEG_TURBO_X86_ASM=1 diff --git a/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp b/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp new file mode 100644 index 000000000000..8e7abde1aa74 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-content-svg-content-src-nsSVGElement.cpp @@ -0,0 +1,15 @@ +--- mozilla/content/svg/content/src/nsSVGElement.cpp.orig 2010-05-12 16:46:09.000000000 +0200 ++++ mozilla/content/svg/content/src/nsSVGElement.cpp 2010-05-12 16:49:33.000000000 +0200 +@@ -102,7 +102,11 @@ + // vararg-list methods in this file: + // nsSVGElement::GetAnimated{Length,Number,Integer}Values + // See bug 547964 for details: +-PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); ++// I really try to get the details but I'm not allowed to ++// access this bug in bugzilla: ++// You are not authorized to access bug #547964. ++// So disable this ASSERT as it breaks build. ++//PR_STATIC_ASSERT(sizeof(void*) == sizeof(nsnull)); + + + nsSVGEnumMapping nsSVGElement::sSVGUnitTypesMap[] = { diff --git a/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h b/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h new file mode 100644 index 000000000000..a23257af52ca --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-content-xslt-public-txDouble.h @@ -0,0 +1,23 @@ +--- mozilla/content/xslt/public/txDouble.h.orig 2009-08-25 01:35:47.000000000 +0200 ++++ mozilla/content/xslt/public/txDouble.h 2009-08-25 01:37:41.000000000 +0200 +@@ -43,11 +43,16 @@ + //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. + #ifdef __FreeBSD__ + #include <ieeefp.h> +-#ifdef __alpha__ +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP; +-#else +-static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML; ++#if !defined(FP_X_DNML) ++#define FP_X_DNML 0 ++#endif ++#if !defined(FP_X_STK) ++#define FP_X_STK 0 ++#endif ++#if !defined(FP_X_IOV) ++#define FP_X_IOV 0 + #endif ++static fp_except_t allmask = FP_X_INV|FP_X_OFL|FP_X_UFL|FP_X_DZ|FP_X_IMP|FP_X_DNML|FP_X_STK|FP_X_IOV; + static fp_except_t oldmask = fpsetmask(~allmask); + #endif + diff --git a/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in b/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in new file mode 100644 index 000000000000..44a97f7f0629 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-gfx-qcms-Makefile.in @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 ++++ mozilla/gfx/qcms/Makefile.in 2011-01-27 18:16:39.000000000 +0100 +@@ -15,7 +15,7 @@ + + CSRCS = iccread.c transform.c + +-ifeq (86,$(findstring 86,$(OS_TEST))) ++ifneq (,$(INTEL_ARCHITECTURE)) + CSRCS += transform-sse2.c + ifdef _MSC_VER + ifneq ($(OS_ARCH)_$(OS_TEST),WINNT_x86_64) diff --git a/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h b/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h new file mode 100644 index 000000000000..7a23c9dd3820 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-gfx-qcms-qcmstypes.h @@ -0,0 +1,11 @@ +--- mozilla/gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 ++++ mozilla/gfx/qcms/qcmstypes.h 2010-11-22 12:02:42.000000000 +0100 +@@ -25,7 +25,7 @@ + #ifdef __OS2__ + /* OS/2's stdlib typdefs uintptr_t. So we'll just include that so we don't collide */ + #include <stdlib.h> +-#elif !defined(__intptr_t_defined) && !defined(_UINTPTR_T_DEFINED) ++#elif !defined(__intptr_t_defined) && !defined(_INTPTR_T_DECLARED) + typedef PRUptrdiff uintptr_t; + #endif + #endif diff --git a/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp b/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp new file mode 100644 index 000000000000..7ed4a626ddf5 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-gfx-thebes-gfxTeeSurface.cpp @@ -0,0 +1,36 @@ +diff --git a/gfx/thebes/gfxTeeSurface.cpp b/gfx/thebes/gfxTeeSurface.cpp +--- mozilla/gfx/thebes/gfxTeeSurface.cpp ++++ mozilla/gfx/thebes/gfxTeeSurface.cpp +@@ -47,4 +47,5 @@ gfxTeeSurface::gfxTeeSurface(cairo_surfa + gfxTeeSurface::gfxTeeSurface(gfxASurface **aSurfaces, PRInt32 aSurfaceCount) + { ++#ifdef MOZ_TREE_CAIRO + NS_ASSERTION(aSurfaceCount > 0, "Must have a least one surface"); + cairo_surface_t *csurf = cairo_tee_surface_create(aSurfaces[0]->CairoSurface()); +@@ -54,4 +55,5 @@ gfxTeeSurface::gfxTeeSurface(gfxASurface + cairo_tee_surface_add(csurf, aSurfaces[i]->CairoSurface()); + } ++#endif + } + +@@ -59,6 +61,8 @@ const gfxIntSize + gfxTeeSurface::GetSize() const + { ++#ifdef MOZ_TREE_CAIRO + nsRefPtr<gfxASurface> master = Wrap(cairo_tee_surface_index(mSurface, 0)); + return master->GetSize(); ++#endif + } + +@@ -66,4 +70,5 @@ void + gfxTeeSurface::GetSurfaces(nsTArray<nsRefPtr<gfxASurface> >* aSurfaces) + { ++#ifdef MOZ_TREE_CAIRO + for (PRInt32 i = 0; ; ++i) { + cairo_surface_t *csurf = cairo_tee_surface_index(mSurface, i); +@@ -75,3 +80,4 @@ gfxTeeSurface::GetSurfaces(nsTArray<nsRe + *elem = Wrap(csurf); + } ++#endif + } + diff --git a/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h b/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h new file mode 100644 index 000000000000..aa584b0710fc --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-gfx-ycbcr-chromium_types.h @@ -0,0 +1,13 @@ +--- mozilla/gfx/ycbcr/chromium_types.h.orig 2010-07-12 11:52:39.000000000 +0200 ++++ mozilla/gfx/ycbcr/chromium_types.h 2010-07-12 11:53:21.000000000 +0200 +@@ -72,6 +72,10 @@ + #define ARCH_CPU_SPARC_FAMILY 1 + #define ARCH_CPU_SPARC 1 + #define ARCH_CPU_64_BITS 1 ++#elif defined(__sparc64__) ++#define ARCH_CPU_SPARC_FAMILY 1 ++#define ARCH_CPU_SPARC 1 ++#define ARCH_CPU_64_BITS 1 + #else + #error Please add support for your architecture in chromium_types.h + #endif diff --git a/www/seamonkey/files/patch-mozilla-js-src-Makefile.in b/www/seamonkey/files/patch-mozilla-js-src-Makefile.in new file mode 100644 index 000000000000..125c74e7dfd1 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-js-src-Makefile.in @@ -0,0 +1,10 @@ +--- mozilla/js/src/Makefile.in.orig 2009-08-25 18:58:30.000000000 +0200 ++++ mozilla/js/src/Makefile.in 2009-08-25 18:58:47.000000000 +0200 +@@ -428,6 +428,7 @@ + + ifeq ($(OS_ARCH),FreeBSD) + EXTRA_LIBS += -pthread ++LDFLAGS += -lc + endif + ifeq ($(OS_ARCH),IRIX) + ifdef USE_N32 diff --git a/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub b/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub new file mode 100644 index 000000000000..2cb48a88c0e9 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-js-src-build-autoconf-config.sub @@ -0,0 +1,12 @@ +--- mozilla/js/src/build/autoconf/config.sub.orig 2010-01-08 09:52:25.000000000 +0100 ++++ mozilla/js/src/build/autoconf/config.sub 2010-01-08 09:52:33.000000000 +0100 +@@ -403,9 +403,6 @@ + amd64) + basic_machine=x86_64-pc + ;; +- amd64-*) +- basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` +- ;; + amdahl) + basic_machine=580-amdahl + os=-sysv diff --git a/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in b/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in new file mode 100644 index 000000000000..2f5b09be6df7 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-js-src-config-mkdepend-Makefile.in @@ -0,0 +1,11 @@ +--- mozilla/js/src/config/mkdepend/Makefile.in.orig 2009-09-14 13:17:15.000000000 +0200 ++++ mozilla/js/src/config/mkdepend/Makefile.in 2009-09-14 13:17:34.000000000 +0200 +@@ -72,7 +72,7 @@ + + include $(topsrcdir)/config/rules.mk + +-HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" ++HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I/usr/local/include + + ifdef GNU_CC + _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/seamonkey/files/patch-mozilla-js-src-configure b/www/seamonkey/files/patch-mozilla-js-src-configure new file mode 100644 index 000000000000..085a8545806b --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-js-src-configure @@ -0,0 +1,26 @@ +--- mozilla/js/src/configure.orig 2010-10-08 21:56:36.000000000 +0200 ++++ mozilla/js/src/configure 2010-10-10 21:48:36.000000000 +0200 +@@ -5373,7 +5373,7 @@ + CPU_ARCH=sparc + ;; + +-x86_64 | ia64) ++amd64 | x86_64 | ia64) + CPU_ARCH="$OS_TEST" + ;; + +@@ -7346,14 +7346,6 @@ + EOF + + ;; +-sparc*-*) +- ENABLE_TRACEJIT=1 +- NANOJIT_ARCH=Sparc +- cat >> confdefs.h <<\EOF +-#define JS_CPU_SPARC 1 +-EOF +- +- ;; + esac + + # Check whether --enable-methodjit or --disable-methodjit was given. diff --git a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c new file mode 100644 index 000000000000..3d0283312aa2 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.c @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config_c.c~ ++++ mozilla/media/libvpx/vpx_config_c.c +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.c" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.c" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.c" + diff --git a/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h new file mode 100644 index 000000000000..3c12576bab54 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-media-libvpx-vpx_config.h @@ -0,0 +1,16 @@ +--- mozilla/media/libvpx/vpx_config.h~ ++++ mozilla/media/libvpx/vpx_config.h +@@ -12,11 +12,11 @@ + /* 32 bit MacOS. */ + #include "vpx_config_x86-darwin9-gcc.h" + +-#elif defined(__linux__) && defined(__i386__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__i386__) + /* 32 bit Linux. */ + #include "vpx_config_x86-linux-gcc.h" + +-#elif defined(__linux__) && defined(__x86_64__) ++#elif (defined(__linux__) || defined(__FreeBSD__)) && defined(__x86_64__) + /* 64 bit Linux. */ + #include "vpx_config_x86_64-linux-gcc.h" + diff --git a/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk b/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk new file mode 100644 index 000000000000..3015445bfc08 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-security-coreconf-FreeBSD.mk @@ -0,0 +1,40 @@ +--- mozilla/security/coreconf/FreeBSD.mk.orig 2010-03-16 09:57:06.000000000 +0000 ++++ mozilla/security/coreconf/FreeBSD.mk 2010-03-20 17:40:12.000000000 +0000 +@@ -49,8 +49,20 @@ + ifeq ($(CPU_ARCH),pc98) + CPU_ARCH = x86 + endif +-ifeq ($(CPU_ARCH),amd64) +-CPU_ARCH = x86_64 ++ifeq ($(OS_TEST),alpha) ++CPU_ARCH = alpha ++endif ++ifeq ($(OS_TEST),amd64) ++CPU_ARCH = amd64 ++endif ++ifeq ($(OS_TEST),ia64) ++CPU_ARCH = ia64 ++endif ++ifeq ($(OS_TEST),powerpc) ++CPU_ARCH = powerpc ++endif ++ifeq ($(OS_TEST),sparc64) ++CPU_ARCH = sparc64 + endif + + OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK +@@ -78,7 +90,7 @@ + DLL_SUFFIX = so.1.0 + endif + +-MKSHLIB = $(CC) $(DSO_LDOPTS) ++MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ + ifdef MAPFILE + MKSHLIB += -Wl,--version-script,$(MAPFILE) + endif +@@ -87,4 +99,4 @@ + + G++INCLUDES = -I/usr/include/g++ + +-INCLUDES += -I/usr/X11R6/include ++#INCLUDES += -I/usr/local/include diff --git a/www/seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp index f30d12229ccd..272a02bdb9e0 100644 --- a/www/seamonkey/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ b/www/seamonkey/files/patch-mozilla-security-manager-ssl-src-nsNSSComponent.cpp @@ -1,5 +1,5 @@ ---- security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 -+++ security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 +--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp.orig Mon May 29 23:10:54 2006 ++++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp Mon May 29 23:12:22 2006 @@ -110,6 +110,7 @@ #include "nss.h" #include "pk11func.h" diff --git a/www/seamonkey/files/patch-storage_build_Makefile.in b/www/seamonkey/files/patch-mozilla-storage-build-Makefile.in index 18202a5a61d8..44ed0d3e7318 100644 --- a/www/seamonkey/files/patch-storage_build_Makefile.in +++ b/www/seamonkey/files/patch-mozilla-storage-build-Makefile.in @@ -1,5 +1,5 @@ ---- storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 -+++ storage/build/Makefile.in Sun Nov 5 16:16:06 2006 +--- mozilla/storage/build/Makefile.in.orig Tue Feb 21 11:18:56 2006 ++++ mozilla/storage/build/Makefile.in Sun Nov 5 16:16:06 2006 @@ -77,6 +77,7 @@ $(EXTRA_DSO_LIBS) \ $(MOZ_COMPONENT_LIBS) \ diff --git a/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in b/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in new file mode 100644 index 000000000000..f222b6dca9e9 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-toolkit-library-Makefile.in @@ -0,0 +1,12 @@ +--- mozilla/toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 ++++ mozilla/toolkit/library/Makefile.in 2010-01-11 12:15:05.000000000 -0500 +@@ -181,7 +181,7 @@ + export:: $(RDF_UTIL_SRC_CPPSRCS) $(INTL_UNICHARUTIL_UTIL_CPPSRCS) + $(INSTALL) $^ . + +-EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) ++EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) -lexecinfo %%PTHREAD_LIBS%% + + ifdef MOZ_ENABLE_LIBXUL + include $(srcdir)/libxul-rules.mk + diff --git a/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp b/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp new file mode 100644 index 000000000000..fe6f025c996c --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-xpcom-io-nsNativeCharsetUtils.cpp @@ -0,0 +1,18 @@ +--- mozilla/xpcom/io/nsNativeCharsetUtils.cpp.orig 2011-06-16 15:45:54.000000000 +0200 ++++ mozilla/xpcom/io/nsNativeCharsetUtils.cpp 2011-06-16 15:46:49.000000000 +0200 +@@ -96,11 +96,11 @@ + // iconv for all platforms where nltypes.h and nllanginfo.h are present + // along with iconv. + // +-#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) +-#define USE_ICONV 1 +-#else ++//#if defined(HAVE_ICONV) && defined(HAVE_NL_TYPES_H) && defined(HAVE_LANGINFO_CODESET) ++//#define USE_ICONV 1 ++//#else + #define USE_STDCONV 1 +-#endif ++//#endif + + static void + isolatin1_to_utf16(const char **input, PRUint32 *inputLeft, PRUnichar **output, PRUint32 *outputLeft) diff --git a/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc index ebe5474ca275..1997e6c2d19d 100644 --- a/www/seamonkey/files/patch-xpcom_reflect_xptcall_public_xptcstubsdecl.inc +++ b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-public-xptcstubsdecl.inc @@ -1,5 +1,5 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 +--- mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 ++++ mozilla/xpcom/reflect/xptcall/public/xptcstubsdecl.inc Fri Mar 19 15:58:14 2004 @@ -8,7 +8,7 @@ * 1 is AddRef * 2 is Release diff --git a/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in new file mode 100644 index 000000000000..e896cec90613 --- /dev/null +++ b/www/seamonkey/files/patch-mozilla-xpcom-reflect-xptcall-src-md-unix-Makefile.in @@ -0,0 +1,76 @@ +--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-05-28 15:26:21.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-06-03 18:39:42.769434047 +0200 +@@ -74,6 +74,9 @@ + # NOTE: MODULE_OPTIMIZE_FLAGS must be set before including config.mk + MODULE_OPTIMIZE_FLAGS=-O3 + endif ++ifeq (x86_64,$(OS_TEST)) ++CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp ++endif + endif + endif + +@@ -117,7 +120,7 @@ + endif + endif + # IA64 Linux +-ifneq (,$(filter Linux,$(OS_ARCH))) ++ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) + ifneq (,$(findstring ia64,$(OS_TEST))) + CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp + ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s +@@ -129,6 +132,12 @@ + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDx86_64) + CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp + endif ++# FreeBSD/amd64 ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDamd64) ++CPPSRCS := xptcinvoke_amd64_openbsd.cpp xptcstubs_amd64_openbsd.cpp ++endif ++# + # + # Neutrino/Intel (uses the same unixish_x86 code) + # +@@ -184,9 +193,15 @@ + ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s + endif + # ++# FreeBSD/Alpha ++# ++ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) ++CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp ++endif ++# + # Linux/Alpha + # +-ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) ++ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp + endif + # +@@ -341,7 +356,7 @@ + # + # Linux/PPC + # +-ifeq ($(OS_ARCH)$(OS_TEST),Linuxpowerpc) ++ifneq (,$(filter Linuxpowerpc FreeBSDpowerpc,$(OS_ARCH)$(OS_TEST))) + CPPSRCS := xptcinvoke_ppc_linux.cpp xptcstubs_ppc_linux.cpp + ASFILES := xptcinvoke_asm_ppc_linux.s xptcstubs_asm_ppc_linux.s + AS := $(CC) -c -x assembler-with-cpp +@@ -419,6 +434,15 @@ + ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s + endif + # ++# FreeBSD/SPARC64 ++# ++ifeq ($(OS_ARCH),FreeBSD) ++ifneq (,$(findstring sparc,$(OS_TEST))) ++CPPSRCS := xptcinvoke_sparc64_openbsd.cpp xptcstubs_sparc64_openbsd.cpp ++ASFILES := xptcinvoke_asm_sparc64_openbsd.s xptcstubs_asm_sparc64_openbsd.s ++endif ++endif ++# + # OpenBSD/SPARC + # + ifeq ($(OS_ARCH)$(OS_TEST),OpenBSDsparc) diff --git a/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk b/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 0f7a04a0279f..000000000000 --- a/www/seamonkey/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,24 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig Mon Sep 25 18:26:23 2006 -+++ security/coreconf/FreeBSD.mk Mon Sep 25 18:27:03 2006 -@@ -45,8 +45,12 @@ - ifeq ($(OS_TEST),alpha) - CPU_ARCH = alpha - else -+ifeq ($(OS_TEST),amd64) -+CPU_ARCH = amd64 -+else - CPU_ARCH = x86 - endif -+endif - - OS_CFLAGS = $(DSO_CFLAGS) -ansi -Wall -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK - -@@ -73,7 +77,7 @@ - DLL_SUFFIX = so.1.0 - endif - --MKSHLIB = $(CC) $(DSO_LDOPTS) -+MKSHLIB = $(CC) -Wl,-Bsymbolic -lc $(DSO_LDOPTS) -o $@ - ifdef MAPFILE - MKSHLIB += -Wl,--version-script,$(MAPFILE) - endif diff --git a/www/seamonkey/files/patch-sysnss b/www/seamonkey/files/patch-sysnss deleted file mode 100644 index cd1e26811ad1..000000000000 --- a/www/seamonkey/files/patch-sysnss +++ /dev/null @@ -1,180 +0,0 @@ ---- 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/ssl/src/Makefile.in.orig Mon Aug 14 19:22:52 2006 -+++ security/manager/ssl/src/Makefile.in Thu Aug 31 15:17:20 2006 -@@ -124,19 +124,19 @@ - pipboot \ - $(NULL) - --EXTRA_DEPS = $(NSS_DEP_LIBS) - - DEFINES += -DNSS_ENABLE_ECC - - # Use local includes because they are inserted before INCLUDES - # so that Mozilla's nss.h is used, not glibc's --LOCAL_INCLUDES += $(NSS_CFLAGS) -+LOCAL_INCLUDES += -I%%LOCALBASE%%/include/nss/nss - - EXTRA_DSO_LDOPTS += \ - $(MOZ_UNICHARUTIL_LIBS) \ - $(MOZ_COMPONENT_LIBS) \ - $(MOZ_JS_LIBS) \ - $(NSS_LIBS) \ -+ $(LOCAL_INCLUDES) \ - $(NULL) - - include $(topsrcdir)/config/rules.mk ---- security/manager/Makefile.in.orig 2009-08-07 22:37:51.000000000 +0200 -+++ security/manager/Makefile.in 2009-08-21 10:41:53.000000000 +0200 -@@ -56,24 +56,13 @@ - SOFTOKEN3_LIB \ - SOFTOKEN3_CHK \ - NSSDBM3_LIB \ -- LOADABLE_ROOT_MODULE \ - HAVE_FREEBL_LIBS \ - HAVE_FREEBL_LIBS_32 \ - HAVE_FREEBL_LIBS_32INT64 \ - HAVE_FREEBL_LIBS_64 \ - $(NULL) -- --LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX) - endif - --NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX) --NSSUTIL3_LIB = $(DLL_PREFIX)nssutil3$(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 --NSSDBM3_LIB = $(DLL_PREFIX)nssdbm3$(DLL_SUFFIX) -- - # Default - HAVE_FREEBL_LIBS = 1 - -@@ -222,11 +211,6 @@ - .nss.cleaned: .nss.checkout - ifndef MOZ_NATIVE_NSS - $(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 $@ - endif - -@@ -253,49 +237,6 @@ - cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX) - endif - ifndef MOZ_NATIVE_NSS -- $(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 -- $(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/$(NSSUTIL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DIST)/bin --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DIST)/bin --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DIST)/bin -- $(INSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DIST)/bin --endif -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin -- $(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -306,44 +247,6 @@ - - install:: - ifndef MOZ_NATIVE_NSS -- $(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/$(NSSUTIL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(NSSDBM3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SSL3_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(SMIME3_LIB) $(DESTDIR)$(mozappdir) --ifdef HAVE_FREEBL_LIBS --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32FPU_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_32INT64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_32INT64_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_32INT64_LIB) $(DESTDIR)$(mozappdir) --endif --ifdef HAVE_FREEBL_LIBS_64 --ifndef SKIP_CHK -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64INT_CHK) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_64FPU_CHK) $(DESTDIR)$(mozappdir) --endif -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DESTDIR)$(mozappdir) -- $(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DESTDIR)$(mozappdir) --endif - endif - $(MAKE) -C boot $@ - $(MAKE) -C ssl $@ -@@ -360,12 +263,6 @@ - $(MAKE) -C pki $@ - endif - ifndef MOZ_NATIVE_NSS -- $(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 - endif - - echo-requires-recursive:: diff --git a/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp b/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp deleted file mode 100644 index 7f8e55f536df..000000000000 --- a/www/seamonkey/files/patch-uriloader_exthandler_unix_nsGNOMERegistry.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- uriloader/exthandler/unix/nsGNOMERegistry.cpp.orig Fri Dec 24 04:30:00 2004 -+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp Fri Dec 24 04:34:05 2004 -@@ -143,7 +143,7 @@ - PR_END_MACRO - - // Attempt to open libgconf -- gconfLib = LoadVersionedLibrary("gconf-2", ".4"); -+ gconfLib = PR_LoadLibrary("libgconf-2.so"); - ENSURE_LIB(gconfLib); - - GET_LIB_FUNCTION(gconf, gconf_client_get_default); -@@ -151,7 +151,7 @@ - GET_LIB_FUNCTION(gconf, gconf_client_get_bool); - - // Attempt to open libgnome -- gnomeLib = LoadVersionedLibrary("gnome-2", ".0"); -+ gnomeLib = PR_LoadLibrary("libgnome-2.so"); - ENSURE_LIB(gnomeLib); - - GET_LIB_FUNCTION(gnome, gnome_url_show); -@@ -160,7 +160,7 @@ - GET_LIB_FUNCTION(gnome, gnome_program_get); - - // Attempt to open libgnomevfs -- vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0"); -+ vfsLib = PR_LoadLibrary("libgnomevfs-2.so"); - ENSURE_LIB(vfsLib); - - GET_LIB_FUNCTION(vfs, gnome_vfs_mime_type_from_name); diff --git a/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index dbdc47b6f8e4..000000000000 --- a/www/seamonkey/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig Thu Aug 14 21:00:23 2003 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in Sun Feb 1 14:31:25 2004 -@@ -49,6 +49,9 @@ - ifeq (86,$(findstring 86,$(OS_TEST))) - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - endif -+ifeq (amd64,$(OS_TEST)) -+CPPSRCS := xptcinvoke_amd64_freebsd.cpp xptcstubs_amd64_freebsd.cpp -+endif - endif - # - # New code for Linux, et. al., with gcc -@@ -59,8 +62,8 @@ - CPPSRCS := xptcinvoke_gcc_x86_unix.cpp xptcstubs_gcc_x86_unix.cpp - endif - endif --# IA64 Linux --ifneq (,$(filter Linux,$(OS_ARCH))) -+# IA64 Linux & FreeBSD -+ifneq (,$(filter Linux FreeBSD,$(OS_ARCH))) - ifneq (,$(findstring ia64,$(OS_TEST))) - CPPSRCS := xptcinvoke_ipf64.cpp xptcstubs_ipf64.cpp - ASFILES := xptcstubs_asm_ipf64.s xptcinvoke_asm_ipf64.s -@@ -106,9 +109,15 @@ - ASFILES := xptcinvoke_asm_osf1_alpha.s xptcstubs_asm_osf1_alpha.s - endif - # -+# FreeBSD/Alpha -+# -+ifeq ($(OS_ARCH)$(OS_TEST),FreeBSDalpha) -+CPPSRCS := xptcinvoke_freebsd_alpha.cpp xptcstubs_freebsd_alpha.cpp -+endif -+# - # Linux/Alpha - # --ifneq (,$(filter Linuxalpha FreeBSDalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) -+ifneq (,$(filter Linuxalpha NetBSDalpha,$(OS_ARCH)$(OS_TEST))) - CPPSRCS := xptcinvoke_linux_alpha.cpp xptcstubs_linux_alpha.cpp - endif - # -@@ -294,6 +303,15 @@ - ifeq ($(OS_ARCH)$(OS_TEST),NetBSDsparc) - CPPSRCS := xptcinvoke_sparc_netbsd.cpp xptcstubs_sparc_netbsd.cpp - ASFILES := xptcinvoke_asm_sparc_netbsd.s xptcstubs_asm_sparc_netbsd.s -+endif -+# -+# FreeBSD/SPARC64 -+# -+ifeq ($(OS_ARCH),FreeBSD) -+ifneq (,$(findstring sparc,$(OS_TEST))) -+CPPSRCS := xptcinvoke_sparc64_freebsd.cpp xptcstubs_sparc64_freebsd.cpp -+ASFILES := xptcinvoke_asm_sparc64_freebsd.s xptcstubs_asm_sparcv9_solaris.s -+endif - endif - # - # Solaris/SPARC diff --git a/www/seamonkey/files/patch-xptcall-alpha b/www/seamonkey/files/patch-xptcall-alpha deleted file mode 100644 index 29631a98e61e..000000000000 --- a/www/seamonkey/files/patch-xptcall-alpha +++ /dev/null @@ -1,459 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp.orig Tue May 27 01:37:25 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_freebsd_alpha.cpp Tue May 27 01:37:00 2003 -@@ -0,0 +1,184 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1998 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Platform specific code to invoke XPCOM methods on native objects */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+__asm__("invoke_copy_to_stack") __attribute__((unused)); -+ -+static void -+invoke_copy_to_stack(PRUint64* d, PRUint32 paramCount, nsXPTCVariant* s) -+{ -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ for(PRUint32 i = 0; i < paramCount; i++, d++, s++) -+ { -+ if(s->IsPtrData()) -+ { -+ *d = (PRUint64)s->ptr; -+ continue; -+ } -+ switch(s->type) -+ { -+ case nsXPTType::T_I8 : *d = (PRUint64)s->val.i8; break; -+ case nsXPTType::T_I16 : *d = (PRUint64)s->val.i16; break; -+ case nsXPTType::T_I32 : *d = (PRUint64)s->val.i32; break; -+ case nsXPTType::T_I64 : *d = (PRUint64)s->val.i64; break; -+ case nsXPTType::T_U8 : *d = (PRUint64)s->val.u8; break; -+ case nsXPTType::T_U16 : *d = (PRUint64)s->val.u16; break; -+ case nsXPTType::T_U32 : *d = (PRUint64)s->val.u32; break; -+ case nsXPTType::T_U64 : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // convert floats to doubles if they are to be passed -+ // via registers so we can just deal with doubles later -+ union { PRUint64 u64; double d; } t; -+ t.d = (double)s->val.f; -+ *d = t.u64; -+ } -+ else -+ // otherwise copy to stack normally -+ *d = (PRUint64)s->val.u32; -+ break; -+ case nsXPTType::T_DOUBLE : *d = (PRUint64)s->val.u64; break; -+ case nsXPTType::T_BOOL : *d = (PRUint64)s->val.b; break; -+ case nsXPTType::T_CHAR : *d = (PRUint64)s->val.c; break; -+ case nsXPTType::T_WCHAR : *d = (PRUint64)s->val.wc; break; -+ default: -+ // all the others are plain pointer types -+ *d = (PRUint64)s->val.p; -+ break; -+ } -+ } -+} -+ -+/* -+ * XPTC_PUBLIC_API(nsresult) -+ * XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, -+ * PRUint32 paramCount, nsXPTCVariant* params, void* vt) -+ */ -+__asm__( -+ "#### XPTC_InvokeByIndex ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".globl XPTC_InvokeByIndex\n\t" -+ ".ent XPTC_InvokeByIndex\n" -+"XPTC_InvokeByIndex:\n\t" -+ ".frame $15,32,$26,0\n\t" -+ ".mask 0x4008000,-32\n\t" -+ "ldgp $29,0($27)\n" -+"$XPTC_InvokeByIndex..ng:\n\t" -+ "subq $30,32,$30\n\t" -+ "stq $26,0($30)\n\t" -+ "stq $15,8($30)\n\t" -+ "bis $30,$30,$15\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Allocate enough stack space to hold the greater of 6 or "paramCount"+1 -+ * parameters. (+1 for "this" pointer) Room for at least 6 parameters -+ * is required for storage of those passed via registers. -+ */ -+ -+ "bis $31,5,$2\n\t" /* count = MAX(5, "paramCount") */ -+ "cmplt $2,$18,$1\n\t" -+ "cmovne $1,$18,$2\n\t" -+ "s8addq $2,16,$1\n\t" /* room for count+1 params (8 bytes each) */ -+ "bic $1,15,$1\n\t" /* stack space is rounded up to 0 % 16 */ -+ "subq $30,$1,$30\n\t" -+ -+ "stq $16,0($30)\n\t" /* save "that" (as "this" pointer) */ -+ "stq $17,16($15)\n\t" /* save "methodIndex" */ -+ -+ "addq $30,8,$16\n\t" /* pass stack pointer */ -+ "bis $18,$18,$17\n\t" /* pass "paramCount" */ -+ "bis $19,$19,$18\n\t" /* pass "params" */ -+ "bsr $26,$invoke_copy_to_stack..ng\n\t" /* call invoke_copy_to_stack */ -+ -+ /* -+ * Copy the first 6 parameters to registers and remove from stack frame. -+ * Both the integer and floating point registers are set for each parameter -+ * except the first which is the "this" pointer. (integer only) -+ * The floating point registers are all set as doubles since the -+ * invoke_copy_to_stack function should have converted the floats. -+ */ -+ "ldq $16,0($30)\n\t" /* integer registers */ -+ "ldq $17,8($30)\n\t" -+ "ldq $18,16($30)\n\t" -+ "ldq $19,24($30)\n\t" -+ "ldq $20,32($30)\n\t" -+ "ldq $21,40($30)\n\t" -+ "ldt $f17,8($30)\n\t" /* floating point registers */ -+ "ldt $f18,16($30)\n\t" -+ "ldt $f19,24($30)\n\t" -+ "ldt $f20,32($30)\n\t" -+ "ldt $f21,40($30)\n\t" -+ -+ "addq $30,48,$30\n\t" /* remove params from stack */ -+ -+ /* -+ * Call the virtual function with the constructed stack frame. -+ */ -+ "bis $16,$16,$1\n\t" /* load "this" */ -+ "ldq $2,16($15)\n\t" /* load "methodIndex" */ -+ "ldq $1,0($1)\n\t" /* load vtable */ -+#if 0 -+ "s8addq $2,16,$2\n\t" /* vtable index = "methodIndex" * 8 + 16 */ -+#else -+ "mulq $2, 8, $2\n\t" -+ "addq $2, 0, $2\n\t" /* vtable index = "methodIndex" * 16 + 24 */ -+#endif -+ "addq $1,$2,$1\n\t" -+ "ldq $27,0($1)\n\t" /* load address of function */ -+ "jsr $26,($27),0\n\t" /* call virtual function */ -+ "ldgp $29,0($26)\n\t" -+ -+ "bis $15,$15,$30\n\t" -+ "ldq $26,0($30)\n\t" -+ "ldq $15,8($30)\n\t" -+ "addq $30,32,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end XPTC_InvokeByIndex" -+ ); -+ ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp.orig Tue May 27 01:37:30 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_freebsd_alpha.cpp Tue May 27 01:37:04 2003 -@@ -0,0 +1,269 @@ -+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -+/* ***** BEGIN LICENSE BLOCK ***** -+ * Version: NPL 1.1/GPL 2.0/LGPL 2.1 -+ * -+ * The contents of this file are subject to the Netscape Public License -+ * Version 1.1 (the "License"); you may not use this file except in -+ * compliance with the License. You may obtain a copy of the License at -+ * http://www.mozilla.org/NPL/ -+ * -+ * Software distributed under the License is distributed on an "AS IS" basis, -+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -+ * for the specific language governing rights and limitations under the -+ * License. -+ * -+ * The Original Code is mozilla.org code. -+ * -+ * The Initial Developer of the Original Code is -+ * Netscape Communications Corporation. -+ * Portions created by the Initial Developer are Copyright (C) 1999 -+ * the Initial Developer. All Rights Reserved. -+ * -+ * Contributor(s): -+ * -+ * Alternatively, the contents of this file may be used under the terms of -+ * either the GNU General Public License Version 2 or later (the "GPL"), or -+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), -+ * in which case the provisions of the GPL or the LGPL are applicable instead -+ * of those above. If you wish to allow use of your version of this file only -+ * under the terms of either the GPL or the LGPL, and not to allow others to -+ * use your version of this file under the terms of the NPL, indicate your -+ * decision by deleting the provisions above and replace them with the notice -+ * and other provisions required by the GPL or the LGPL. If you do not delete -+ * the provisions above, a recipient may use your version of this file under -+ * the terms of any one of the NPL, the GPL or the LGPL. -+ * -+ * ***** END LICENSE BLOCK ***** */ -+ -+/* Implement shared vtbl methods. */ -+ -+/* contributed by Glen Nakamura <glen.nakamura@usa.net> */ -+ -+#include <sys/types.h> -+#include <machine/cpu.h> -+#include "xptcprivate.h" -+ -+/* Prototype specifies unmangled function name and disables unused warning */ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+__asm__("PrepareAndDispatch") __attribute__((unused)); -+ -+static nsresult -+PrepareAndDispatch(nsXPTCStubBase* self, uint32 methodIndex, PRUint64* args) -+{ -+ const PRUint8 PARAM_BUFFER_COUNT = 16; -+ const PRUint8 NUM_ARG_REGS = 6-1; // -1 for "this" pointer -+ -+ nsXPTCMiniVariant paramBuffer[PARAM_BUFFER_COUNT]; -+ nsXPTCMiniVariant* dispatchParams = NULL; -+ nsIInterfaceInfo* iface_info = NULL; -+ const nsXPTMethodInfo* info; -+ PRUint8 paramCount; -+ PRUint8 i; -+ nsresult result = NS_ERROR_FAILURE; -+ -+ NS_ASSERTION(self,"no self"); -+ -+ self->GetInterfaceInfo(&iface_info); -+ NS_ASSERTION(iface_info,"no interface info"); -+ -+ iface_info->GetMethodInfo(PRUint16(methodIndex), &info); -+ NS_ASSERTION(info,"no interface info"); -+ -+ paramCount = info->GetParamCount(); -+ -+ // setup variant array pointer -+ if(paramCount > PARAM_BUFFER_COUNT) -+ dispatchParams = new nsXPTCMiniVariant[paramCount]; -+ else -+ dispatchParams = paramBuffer; -+ NS_ASSERTION(dispatchParams,"no place for params"); -+ -+ // args[0] to args[NUM_ARG_REGS] hold floating point register values -+ PRUint64* ap = args + NUM_ARG_REGS; -+ for(i = 0; i < paramCount; i++, ap++) -+ { -+ const nsXPTParamInfo& param = info->GetParam(i); -+ const nsXPTType& type = param.GetType(); -+ nsXPTCMiniVariant* dp = &dispatchParams[i]; -+ -+ if(param.IsOut() || !type.IsArithmetic()) -+ { -+ dp->val.p = (void*) *ap; -+ continue; -+ } -+ // else -+ switch(type) -+ { -+ case nsXPTType::T_I8 : dp->val.i8 = (PRInt8) *ap; break; -+ case nsXPTType::T_I16 : dp->val.i16 = (PRInt16) *ap; break; -+ case nsXPTType::T_I32 : dp->val.i32 = (PRInt32) *ap; break; -+ case nsXPTType::T_I64 : dp->val.i64 = (PRInt64) *ap; break; -+ case nsXPTType::T_U8 : dp->val.u8 = (PRUint8) *ap; break; -+ case nsXPTType::T_U16 : dp->val.u16 = (PRUint16) *ap; break; -+ case nsXPTType::T_U32 : dp->val.u32 = (PRUint32) *ap; break; -+ case nsXPTType::T_U64 : dp->val.u64 = (PRUint64) *ap; break; -+ case nsXPTType::T_FLOAT : -+ if(i < NUM_ARG_REGS) -+ { -+ // floats passed via registers are stored as doubles -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (PRUint64) args[i]; -+ dp->val.f = (float) dp->val.d; // convert double to float -+ } -+ else -+ dp->val.u32 = (PRUint32) *ap; -+ break; -+ case nsXPTType::T_DOUBLE : -+ // doubles passed via registers are also stored -+ // in the first NUM_ARG_REGS entries in args -+ dp->val.u64 = (i < NUM_ARG_REGS) ? args[i] : *ap; -+ break; -+ case nsXPTType::T_BOOL : dp->val.b = (PRBool) *ap; break; -+ case nsXPTType::T_CHAR : dp->val.c = (char) *ap; break; -+ case nsXPTType::T_WCHAR : dp->val.wc = (PRUnichar) *ap; break; -+ default: -+ NS_ASSERTION(0, "bad type"); -+ break; -+ } -+ } -+ -+ result = self->CallMethod((PRUint16)methodIndex, info, dispatchParams); -+ -+ NS_RELEASE(iface_info); -+ -+ if(dispatchParams != paramBuffer) -+ delete [] dispatchParams; -+ -+ return result; -+} -+ -+/* -+ * SharedStub() -+ * Collects arguments and calls PrepareAndDispatch. The "methodIndex" is -+ * passed to this function via $1 to preserve the argument registers. -+ */ -+__asm__( -+ "#### SharedStub ####\n" -+".text\n\t" -+ ".align 5\n\t" -+ ".ent SharedStub\n" -+"SharedStub:\n\t" -+ ".frame $30,96,$26,0\n\t" -+ ".mask 0x4000000,-96\n\t" -+ "ldgp $29,0($27)\n" -+"$SharedStub..ng:\n\t" -+ "subq $30,96,$30\n\t" -+ "stq $26,0($30)\n\t" -+ ".prologue 1\n\t" -+ -+ /* -+ * Store arguments passed via registers to the stack. -+ * Floating point registers are stored as doubles and converted -+ * to floats in PrepareAndDispatch if necessary. -+ */ -+ "stt $f17,16($30)\n\t" /* floating point registers */ -+ "stt $f18,24($30)\n\t" -+ "stt $f19,32($30)\n\t" -+ "stt $f20,40($30)\n\t" -+ "stt $f21,48($30)\n\t" -+ "stq $17,56($30)\n\t" /* integer registers */ -+ "stq $18,64($30)\n\t" -+ "stq $19,72($30)\n\t" -+ "stq $20,80($30)\n\t" -+ "stq $21,88($30)\n\t" -+ -+ /* -+ * Call PrepareAndDispatch function. -+ */ -+ "bis $1,$1,$17\n\t" /* pass "methodIndex" */ -+ "addq $30,16,$18\n\t" /* pass "args" */ -+ "bsr $26,$PrepareAndDispatch..ng\n\t" -+ -+ "ldq $26,0($30)\n\t" -+ "addq $30,96,$30\n\t" -+ "ret $31,($26),1\n\t" -+ ".end SharedStub" -+ ); -+ -+#if defined(__GXX_ABI_VERSION) && __GXX_ABI_VERSION >= 100 /* G++ V3 ABI */ -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase5Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase5Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase5Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase5Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase5Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase6Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase6Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase6Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase6Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase6Stub"#n"Ev" \ -+ ); \ -+__asm__( \ -+ "#### Stub"#n" ####\n" \ -+".text\n\t" \ -+ ".align 5\n\t" \ -+ ".globl _ZN14nsXPTCStubBase7Stub"#n"Ev\n\t" \ -+ ".ent _ZN14nsXPTCStubBase7Stub"#n"Ev\n" \ -+"_ZN14nsXPTCStubBase7Stub"#n"Ev:\n\t" \ -+ ".frame $30,0,$26,0\n\t" \ -+ "ldgp $29,0($27)\n" \ -+"$_ZN14nsXPTCStubBase7Stub"#n"Ev..ng:\n\t" \ -+ ".prologue 1\n\t" \ -+ "lda $1,"#n"\n\t" \ -+ "br $31,$SharedStub..ng\n\t" \ -+ ".end _ZN14nsXPTCStubBase7Stub"#n"Ev" \ -+ ); -+#else -+/* -+ * nsresult nsXPTCStubBase::Stub##n() -+ * Sets register $1 to "methodIndex" and jumps to SharedStub. -+ */ -+#define STUB_ENTRY(n) \ -+nsresult nsXPTCStubBase::Stub##n() \ -+{ \ -+ nsresult result; \ -+__asm__ __volatile__( \ -+ "ldah $29,0($27)\n\t" \ -+ "lda $29,0($29)\n\t" \ -+ "lda $1, "#n"\n\t" \ -+ "br $31, $SharedStub..ng\n\t" \ -+ "mov $0, %0\n\t" \ -+ : "=r" (result) \ -+ ); \ -+ return result; \ -+} -+#endif -+ -+#define SENTINEL_ENTRY(n) \ -+nsresult nsXPTCStubBase::Sentinel##n() \ -+{ \ -+ NS_ASSERTION(0,"nsXPTCStubBase::Sentinel called"); \ -+ return NS_ERROR_NOT_IMPLEMENTED; \ -+} -+ -+#include "xptcstubsdef.inc" -+ diff --git a/www/seamonkey/files/patch-xptcall-amd64 b/www/seamonkey/files/patch-xptcall-amd64 index 3227cad02182..feb3452a20bc 100644 --- a/www/seamonkey/files/patch-xptcall-amd64 +++ b/www/seamonkey/files/patch-xptcall-amd64 @@ -1,5 +1,5 @@ --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_freebsd.cpp Thu Oct 16 22:59:43 2003 @@ -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 @@ -176,7 +176,7 @@ + return result; +} --- /dev/null Wed Dec 31 16:00:00 1969 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_freebsd.cpp Thu Oct 16 23:01:08 2003 @@ -0,0 +1,206 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ + diff --git a/www/seamonkey/files/patch-xptcall-ia64 b/www/seamonkey/files/patch-xptcall-ia64 index 7d33a8693cc8..d9f4f15525de 100644 --- a/www/seamonkey/files/patch-xptcall-ia64 +++ b/www/seamonkey/files/patch-xptcall-ia64 @@ -1,24 +1,24 @@ ---- xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig Sun Jul 20 00:05:32 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s Sun Jul 20 00:06:37 2003 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s 2009-08-26 18:49:39.000000000 +0200 @@ -8,6 +8,7 @@ // Section has executable code .section .text, "ax","progbits" - // procedure named 'XPTC_InvokeByIndex' -+ .global XPTC_InvokeByIndex - .proc XPTC_InvokeByIndex + // procedure named 'NS_InvokeByIndex_P' ++ .global XPTC_InvokeByIndex + .proc NS_InvokeByIndex_P // manual bundling .explicit @@ -24,7 +25,7 @@ // XPTC_InvokeByIndex(nsISupports* that, PRUint32 methodIndex, // PRUint32 paramCount, nsXPTCVariant* params); --XPTC_InvokeByIndex:: -+XPTC_InvokeByIndex: +-NS_InvokeByIndex_P:: ++NS_InvokeByIndex_P: .prologue .save ar.pfs, r37 // allocate 4 input args, 6 local args, and 8 output args ---- xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig Tue May 24 11:30:54 2005 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s Fri Sep 16 15:50:20 2005 +--- mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s.orig 2009-08-26 18:47:07.000000000 +0200 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s 2009-08-26 18:47:34.000000000 +0200 @@ -6,6 +6,7 @@ // Section has executable code .section .text, "ax","progbits" diff --git a/www/seamonkey/files/patch-xptcall-sparc64 b/www/seamonkey/files/patch-xptcall-sparc64 index 9599a8a71336..bbf418dd3e2a 100644 --- a/www/seamonkey/files/patch-xptcall-sparc64 +++ b/www/seamonkey/files/patch-xptcall-sparc64 @@ -1,5 +1,5 @@ --- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_freebsd.cpp Mon May 26 04:12:55 2003 @@ -0,0 +1,123 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * @@ -125,7 +125,7 @@ + +#endif /* sparc || __sparc__ */ --- /dev/null Mon May 26 13:22:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_freebsd.s Mon May 26 04:06:09 2003 @@ -0,0 +1,104 @@ +/* -*- Mode: asm; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * @@ -232,7 +232,7 @@ + + .size XPTC_InvokeByIndex, .-XPTC_InvokeByIndex --- /dev/null Mon May 26 14:00:00 2003 -+++ xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 ++++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_freebsd.cpp Mon May 26 14:00:49 2003 @@ -0,0 +1,91 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * diff --git a/www/seamonkey/files/pkg-message.in b/www/seamonkey/files/pkg-message.in new file mode 100644 index 000000000000..1b3721f5b9b9 --- /dev/null +++ b/www/seamonkey/files/pkg-message.in @@ -0,0 +1,10 @@ +***************************************************************************** +In order to activate the Lightning extension, every user should install the +XPI file into his own profile via the menu: + +Tools -> Add-ons -> Extensions -> Icon left of the search field + -> Install From File + +The XPI file was installed as: +%%PREFIX%%/share/lightning/lightning-seamonkey.xpi +***************************************************************************** diff --git a/www/seamonkey/files/seamonkey.desktop.in b/www/seamonkey/files/seamonkey.desktop.in index 16966f3488c9..cc1bcb340d7c 100644 --- a/www/seamonkey/files/seamonkey.desktop.in +++ b/www/seamonkey/files/seamonkey.desktop.in @@ -164,6 +164,6 @@ Exec=seamonkey %U StartupNotify=true Terminal=false Type=Application -Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default.xpm +Icon=%%PREFIX%%/lib/seamonkey/chrome/icons/default/default48.png Categories=Application;Network; MimeType=text/html;text/xml;application/xhtml+xml; |