Author: jbeich Date: Fri Mar 1 05:11:57 2013 New Revision: 1195 Log: prune legacy support for FreeBSD < 8.3/9.0
Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-content-media-nsAudioStream.cpp trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c trunk/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp trunk/www/firefox-nightly/files/patch-gfx-ots-include-opentype-sanitiser.h trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c trunk/www/firefox/files/patch-content-media-AudioStream.cpp trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c Modified: trunk/Gecko_ChangeLog trunk/Mk/bsd.gecko.mk trunk/mail/thunderbird-esr/files/patch-bug753046 trunk/security/nss/Makefile trunk/www/firefox-esr/files/patch-bug753046 trunk/www/firefox-esr/pkg-message trunk/www/firefox-nightly/pkg-message trunk/www/firefox/pkg-message trunk/www/libxul/files/patch-bug753046 Modified: trunk/Gecko_ChangeLog ============================================================================== --- trunk/Gecko_ChangeLog Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/Gecko_ChangeLog Fri Mar 1 05:11:57 2013 (r1195) @@ -0,0 +1,3 @@ +20.0: +- prune support for old FreeBSD versions; users of 8.2, 7.4 or earlier + are advised to upgrade - http://www.freebsd.org/security/ Modified: trunk/Mk/bsd.gecko.mk ============================================================================== --- trunk/Mk/bsd.gecko.mk Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/Mk/bsd.gecko.mk Fri Mar 1 05:11:57 2013 (r1195) @@ -543,13 +543,7 @@ MOZ_OPTIONS+= --prefix="${FAKEDIR}" CPPFLAGS+= -isystem${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -.if ${OSVERSION} > 800072 -LDFLAGS+= -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN -.else -LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/${MOZ_RPATH} -.endif +LDFLAGS+= -L${LOCALBASE}/lib -Wl,-z,origin -Wl,-rpath,\\\$$\$$ORIGIN .if ${MOZILLA_VER:R:R} >= 19 || ${MOZILLA:Mseamonkey*} # prefer clang @@ -1032,13 +1026,6 @@ ${TAR} cf - -C${FAKEDIR}/${dir} -s'|${FAKEDIR}|${PREFIX}|s' . | \ ${TAR} xof - -C${PREFIX}/${dir} .endfor -.if (${OSVERSION} < 800081 ) - # XXX: make sure bsdtar(1) corrected symlinks - ${FIND} ${FAKEDIR} -type l -exec \ - ${ECHO_CMD} stat -f \'${LN} -hfs \"%Y\" \"%N\"\' {} + | \ - ${SED} s'|${FAKEDIR}|${PREFIX}|g' | ${SH} | \ - ${SED} -n s'|${FAKEDIR}|${PREFIX}|p' | ${SH} -x -.endif .for pcfile in ${MOZ_PKGCONFIG_FILES} ${INSTALL_DATA} ${FAKEDIR}/libdata/pkgconfig/${pcfile}.pc \ ${PREFIX}/libdata/pkgconfig/${pcfile}.pc Modified: trunk/mail/thunderbird-esr/files/patch-bug753046 ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-bug753046 Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/mail/thunderbird-esr/files/patch-bug753046 Fri Mar 1 05:11:57 2013 (r1195) @@ -460,7 +460,7 @@ --- mozilla/ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,16 +9,30 @@ +@@ -9,16 +9,24 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -474,13 +474,7 @@ -#include <pthread_np.h> +#elif defined(OS_FREEBSD) +#include <sys/param.h> -+#if __FreeBSD_version > 802500 +#include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif #endif + +#if !defined(OS_MACOSX) Deleted: trunk/mail/thunderbird-esr/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/mail/thunderbird-esr/files/patch-mozilla-content-media-nsAudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- mozilla/content/media/nsAudioStream.cpp~ -+++ mozilla/content/media/nsAudioStream.cpp -@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { -+#if defined(__FreeBSD__) && __FreeBSD_version < 800097 -+ bool value = Preferences::GetBool(aPref, false); -+#else - bool value = Preferences::GetBool(aPref, true); -+#endif - mozilla::MutexAutoLock lock(*gAudioPrefsLock); - gUseCubeb = value; - } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { Deleted: trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-content-media-nsAudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/media/AudioStream.cpp~ -+++ mozilla/content/media/AudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Deleted: trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ -diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h -index f42822e..1a5a699 100644 ---- mozilla/gfx/ots/include/opentype-sanitiser.h -+++ mozilla/gfx/ots/include/opentype-sanitiser.h -@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; - #include <stdint.h> - #endif - -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if __FreeBSD_version < 800067 -+# include <sys/types.h> // for off_t -+# endif -+#endif -+ - #include <algorithm> // for std::min - #include <cassert> - #include <cstddef> Deleted: trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc~ -+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -16,7 +16,13 @@ - #include <sys/prctl.h> - #elif defined(OS_FREEBSD) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if !defined(OS_MACOSX) Deleted: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,37 +0,0 @@ ---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~ -+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc -@@ -31,6 +31,10 @@ - #include <dlfcn.h> - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead. - using namespace webrtc; - -@@ -38,7 +42,11 @@ namespace webrtc_adm_linux { - - inline static const char *GetDllError() { - #ifdef WEBRTC_LINUX -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - return err; - } else { -@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle, - void **symbol) { - #ifdef WEBRTC_LINUX - *symbol = dlsym(handle, symbol_name); -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, - "Error loading symbol %s : %d", symbol_name, err); Deleted: trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~ -+++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc -@@ -62,7 +62,13 @@ - #include <lwp.h> - #elif defined(__FreeBSD__) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if defined(WEBRTC_BSD) && !defined(__NetBSD__) Deleted: trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c ============================================================================== --- trunk/mail/thunderbird/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800 -+++ mozilla/python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800 -@@ -1376,8 +1376,10 @@ - strlcat(opts, ",noclusterr", sizeof(opts)); - if (flags & MNT_NOCLUSTERW) - strlcat(opts, ",noclusterw", sizeof(opts)); -+#if __FreeBSD_version >= 800000 - if (flags & MNT_NFS4ACLS) - strlcat(opts, ",nfs4acls", sizeof(opts)); -+#endif - - py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device - fs[i].f_mntonname, // mount point Modified: trunk/security/nss/Makefile ============================================================================== --- trunk/security/nss/Makefile Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/security/nss/Makefile Fri Mar 1 05:11:57 2013 (r1195) @@ -58,10 +58,6 @@ .if defined(WITH_CLANG_IS_CC) || ${CC:Mcc} && ${OSVERSION} > 1000023 EXTRA_PATCHES+= ${FILESDIR}/extra-bug835050 .endif -.if ${CC:Mcc} && (${OSVERSION} >= 800000 && ${OSVERSION} < 802503 \ - || ${OSVERSION} < 704101) -USE_GCC?= yes # -mssse3 -.endif .endif check regression-test test: Modified: trunk/www/firefox-esr/files/patch-bug753046 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug753046 Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/www/firefox-esr/files/patch-bug753046 Fri Mar 1 05:11:57 2013 (r1195) @@ -460,7 +460,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,16 +9,30 @@ +@@ -9,16 +9,24 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -474,13 +474,7 @@ -#include <pthread_np.h> +#elif defined(OS_FREEBSD) +#include <sys/param.h> -+#if __FreeBSD_version > 802500 +#include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif #endif + +#if !defined(OS_MACOSX) Deleted: trunk/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp ============================================================================== --- trunk/www/firefox-esr/files/patch-content-media-nsAudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,14 +0,0 @@ ---- content/media/nsAudioStream.cpp~ -+++ content/media/nsAudioStream.cpp -@@ -298,7 +298,11 @@ static int PrefChanged(const char* aPref - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nsnull)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { -+#if defined(__FreeBSD__) && __FreeBSD_version < 800097 -+ bool value = Preferences::GetBool(aPref, false); -+#else - bool value = Preferences::GetBool(aPref, true); -+#endif - mozilla::MutexAutoLock lock(*gAudioPrefsLock); - gUseCubeb = value; - } else if (strcmp(aPref, PREF_CUBEB_LATENCY) == 0) { Modified: trunk/www/firefox-esr/pkg-message ============================================================================== --- trunk/www/firefox-esr/pkg-message Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/www/firefox-esr/pkg-message Fri Mar 1 05:11:57 2013 (r1195) @@ -17,7 +17,7 @@ Firefox and HTML5 Certain functions used to display HTML5 elements need the sem module -on 7.x and 8.x releases. +only on 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Deleted: trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp ============================================================================== --- trunk/www/firefox-nightly/files/patch-content-media-AudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/media/AudioStream.cpp~ -+++ content/media/AudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Deleted: trunk/www/firefox-nightly/files/patch-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- trunk/www/firefox-nightly/files/patch-gfx-ots-include-opentype-sanitiser.h Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ -diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h -index f42822e..1a5a699 100644 ---- gfx/ots/include/opentype-sanitiser.h -+++ gfx/ots/include/opentype-sanitiser.h -@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; - #include <stdint.h> - #endif - -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if __FreeBSD_version < 800067 -+# include <sys/types.h> // for off_t -+# endif -+#endif -+ - #include <algorithm> // for std::min - #include <cassert> - #include <cstddef> Deleted: trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc~ -+++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -16,7 +16,13 @@ - #include <sys/prctl.h> - #elif defined(OS_FREEBSD) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if !defined(OS_MACOSX) Deleted: trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,37 +0,0 @@ ---- media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc~ -+++ media/webrtc/trunk/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.cc -@@ -31,6 +31,10 @@ - #include <dlfcn.h> - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead. - using namespace webrtc; - -@@ -38,7 +42,11 @@ namespace webrtc_adm_linux { - - inline static const char *GetDllError() { - #ifdef WEBRTC_LINUX -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - return err; - } else { -@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle, - void **symbol) { - #ifdef WEBRTC_LINUX - *symbol = dlsym(handle, symbol_name); -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, - "Error loading symbol %s : %d", symbol_name, err); Deleted: trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc ============================================================================== --- trunk/www/firefox-nightly/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc~ -+++ media/webrtc/trunk/webrtc/system_wrappers/source/thread_posix.cc -@@ -62,7 +62,13 @@ - #include <lwp.h> - #elif defined(__FreeBSD__) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if defined(WEBRTC_BSD) && !defined(__NetBSD__) Deleted: trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c ============================================================================== --- trunk/www/firefox-nightly/files/patch-python-psutil-psutil-_psutil_bsd.c Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800 -+++ python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800 -@@ -1376,8 +1376,10 @@ - strlcat(opts, ",noclusterr", sizeof(opts)); - if (flags & MNT_NOCLUSTERW) - strlcat(opts, ",noclusterw", sizeof(opts)); -+#if __FreeBSD_version >= 800000 - if (flags & MNT_NFS4ACLS) - strlcat(opts, ",nfs4acls", sizeof(opts)); -+#endif - - py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device - fs[i].f_mntonname, // mount point Modified: trunk/www/firefox-nightly/pkg-message ============================================================================== --- trunk/www/firefox-nightly/pkg-message Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/www/firefox-nightly/pkg-message Fri Mar 1 05:11:57 2013 (r1195) @@ -17,7 +17,7 @@ Firefox and HTML5 Certain functions used to display HTML5 elements need the sem module -on 7.x and 8.x releases. +only on 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Deleted: trunk/www/firefox/files/patch-content-media-AudioStream.cpp ============================================================================== --- trunk/www/firefox/files/patch-content-media-AudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- content/media/AudioStream.cpp~ -+++ content/media/AudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Deleted: trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- trunk/www/firefox/files/patch-gfx-ots-include-opentype-sanitiser.h Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ -diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h -index f42822e..1a5a699 100644 ---- gfx/ots/include/opentype-sanitiser.h -+++ gfx/ots/include/opentype-sanitiser.h -@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; - #include <stdint.h> - #endif - -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if __FreeBSD_version < 800067 -+# include <sys/types.h> // for off_t -+# endif -+#endif -+ - #include <algorithm> // for std::min - #include <cassert> - #include <cstddef> Deleted: trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- trunk/www/firefox/files/patch-ipc-chromium-src-base-platform_thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc~ -+++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -16,7 +16,13 @@ - #include <sys/prctl.h> - #elif defined(OS_FREEBSD) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if !defined(OS_MACOSX) Deleted: trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc ============================================================================== --- trunk/www/firefox/files/patch-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebindingsymboltable_linux.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,37 +0,0 @@ ---- media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~ -+++ media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc -@@ -31,6 +31,10 @@ - #include <dlfcn.h> - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead. - using namespace webrtc; - -@@ -38,7 +42,11 @@ namespace webrtc_adm_linux { - - inline static const char *GetDllError() { - #ifdef WEBRTC_LINUX -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - return err; - } else { -@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle, - void **symbol) { - #ifdef WEBRTC_LINUX - *symbol = dlsym(handle, symbol_name); -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, - "Error loading symbol %s : %d", symbol_name, err); Deleted: trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc ============================================================================== --- trunk/www/firefox/files/patch-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~ -+++ media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc -@@ -62,7 +62,13 @@ - #include <lwp.h> - #elif defined(__FreeBSD__) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if defined(WEBRTC_BSD) && !defined(__NetBSD__) Deleted: trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c ============================================================================== --- trunk/www/firefox/files/patch-python-psutil-psutil-_psutil_bsd.c Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800 -+++ python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800 -@@ -1376,8 +1376,10 @@ - strlcat(opts, ",noclusterr", sizeof(opts)); - if (flags & MNT_NOCLUSTERW) - strlcat(opts, ",noclusterw", sizeof(opts)); -+#if __FreeBSD_version >= 800000 - if (flags & MNT_NFS4ACLS) - strlcat(opts, ",nfs4acls", sizeof(opts)); -+#endif - - py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device - fs[i].f_mntonname, // mount point Modified: trunk/www/firefox/pkg-message ============================================================================== --- trunk/www/firefox/pkg-message Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/www/firefox/pkg-message Fri Mar 1 05:11:57 2013 (r1195) @@ -17,7 +17,7 @@ Firefox and HTML5 Certain functions used to display HTML5 elements need the sem module -on 7.x and 8.x releases. +only on 8.x releases. If your Firefox crashes with the following message while viewing a HTML5 page: Modified: trunk/www/libxul/files/patch-bug753046 ============================================================================== --- trunk/www/libxul/files/patch-bug753046 Wed Feb 27 23:32:44 2013 (r1194) +++ trunk/www/libxul/files/patch-bug753046 Fri Mar 1 05:11:57 2013 (r1195) @@ -469,7 +469,7 @@ --- ipc/chromium/src/base/platform_thread_posix.cc.orig 2012-03-13 01:36:53.000000000 +0000 +++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -9,9 +9,23 @@ +@@ -9,9 +9,17 @@ #if defined(OS_MACOSX) #include <mach/mach.h> @@ -482,13 +482,7 @@ +#include <unistd.h> +#elif defined(OS_FREEBSD) +#include <sys/param.h> -+#if __FreeBSD_version > 802500 +#include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif +#include <pthread_np.h> #endif Deleted: trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-content-media-nsAudioStream.cpp Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,11 +0,0 @@ ---- mozilla/content/media/AudioStream.cpp~ -+++ mozilla/content/media/AudioStream.cpp -@@ -298,7 +298,7 @@ static int PrefChanged(const char* aPref, void* aClosure) - gVolumeScale = NS_MAX<double>(0, PR_strtod(utf8.get(), nullptr)); - } - } else if (strcmp(aPref, PREF_USE_CUBEB) == 0) { --#ifdef MOZ_WIDGET_GONK -+#if defined(MOZ_WIDGET_GONK) || defined(__FreeBSD__) && __FreeBSD_version < 800097 - bool value = Preferences::GetBool(aPref, false); - #else - bool value = Preferences::GetBool(aPref, true); Deleted: trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-gfx-ots-include-opentype-sanitiser.h Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,18 +0,0 @@ -diff --git gfx/ots/include/opentype-sanitiser.h gfx/ots/include/opentype-sanitiser.h -index f42822e..1a5a699 100644 ---- mozilla/gfx/ots/include/opentype-sanitiser.h -+++ mozilla/gfx/ots/include/opentype-sanitiser.h -@@ -44,6 +44,13 @@ typedef unsigned __int64 uint64_t; - #include <stdint.h> - #endif - -+#ifdef __FreeBSD__ -+# include <osreldate.h> -+# if __FreeBSD_version < 800067 -+# include <sys/types.h> // for off_t -+# endif -+#endif -+ - #include <algorithm> // for std::min - #include <cassert> - #include <cstddef> Deleted: trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-ipc-chromium-src-base-platform_thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/ipc/chromium/src/base/platform_thread_posix.cc~ -+++ mozilla/ipc/chromium/src/base/platform_thread_posix.cc -@@ -16,7 +16,13 @@ - #include <sys/prctl.h> - #elif defined(OS_FREEBSD) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if !defined(OS_MACOSX) Deleted: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-modules-audio_device-main-source-linux-latebind_linux.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,37 +0,0 @@ ---- mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc~ -+++ mozilla/media/webrtc/trunk/src/modules/audio_device/main/source/linux/latebindingsymboltable_linux.cc -@@ -31,6 +31,10 @@ - #include <dlfcn.h> - #endif - -+#ifdef __FreeBSD__ -+#include <osreldate.h> -+#endif -+ - // TODO(grunell): Either put inside webrtc namespace or use webrtc:: instead. - using namespace webrtc; - -@@ -38,7 +42,11 @@ namespace webrtc_adm_linux { - - inline static const char *GetDllError() { - #ifdef WEBRTC_LINUX -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - return err; - } else { -@@ -78,7 +86,11 @@ static bool LoadSymbol(DllHandle handle, - void **symbol) { - #ifdef WEBRTC_LINUX - *symbol = dlsym(handle, symbol_name); -+#if __FreeBSD_version < 800505 -+ const char *err = dlerror(); -+#else - char *err = dlerror(); -+#endif - if (err) { - WEBRTC_TRACE(kTraceError, kTraceAudioDevice, -1, - "Error loading symbol %s : %d", symbol_name, err); Deleted: trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-media-webrtc-trunk-src-system_wrappers-source-thread_posix.cc Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,16 +0,0 @@ ---- mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc~ -+++ mozilla/media/webrtc/trunk/src/system_wrappers/source/thread_posix.cc -@@ -62,7 +62,13 @@ - #include <lwp.h> - #elif defined(__FreeBSD__) - #include <sys/param.h> -+#if __FreeBSD_version > 802500 - #include <sys/thr.h> -+#else -+_Pragma("GCC visibility push(default)") -+extern "C" int thr_self(long *); -+_Pragma("GCC visibility pop") -+#endif - #endif - - #if defined(WEBRTC_BSD) && !defined(__NetBSD__) Deleted: trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c ============================================================================== --- trunk/www/seamonkey/files/patch-mozilla-python-psutil-psutil-_psutil_bsd.c Fri Mar 1 05:11:57 2013 (r1194) +++ /dev/null 00:00:00 1970 (deleted) @@ -1,13 +0,0 @@ ---- mozilla/python/psutil/psutil/_psutil_bsd.c.orig 2012-08-16 23:07:37.000000000 +0800 -+++ mozilla/python/psutil/psutil/_psutil_bsd.c 2012-09-27 14:50:20.843763756 +0800 -@@ -1376,8 +1376,10 @@ - strlcat(opts, ",noclusterr", sizeof(opts)); - if (flags & MNT_NOCLUSTERW) - strlcat(opts, ",noclusterw", sizeof(opts)); -+#if __FreeBSD_version >= 800000 - if (flags & MNT_NFS4ACLS) - strlcat(opts, ",nfs4acls", sizeof(opts)); -+#endif - - py_tuple = Py_BuildValue("(ssss)", fs[i].f_mntfromname, // device - fs[i].f_mntonname, // mount point _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-gecko To unsubscribe, send any mail to "[email protected]"
