From 36353c589f868095c2c4e18fcdee86c8345cc2fc Mon Sep 17 00:00:00 2001 From: Michael Johnson Date: Tue, 29 Nov 2005 21:12:28 +0000 Subject: - Update firefox to 1.5 - Add Makefile.common o A new build/install system for gecko ports, Makefile.common includes many generic routines and common tasks. o Fix ld-run-path in all gecko's by using -Wl,-rpath,${moz_libdir} thus removing the need to have a startup script for ports that depend on gecko. [2] o Use system libm, nss, nspr in all gecko ports - Add bsd.gecko.mk o This is the predecessor to WITH_MOZILLA=[mozilla|firefox|...] with a more robust way of detecting a gecko a end user wishs to use. o bsd.gecko.mk abstracts the selection of gecko-based backends. It allows users and porters to support any available gecko backend without needing to build many conditional tests. ${USE_GECKO} is the list of backends that your port can handle, and ${GECKO} is set by bsd.gecko.mk to be the chosen backend. Users set ${WITH_GECKO} to the list of gecko backends they want on their system. Port Makefile example: USE_GECKO=firefox mozilla seamonkey thunderbird .include .include "${.CURDIR}/../../www/mozilla/bsd.gecko.mk" End user example: WITH_GECKO=seamonkey firefox We highly recommend moving away from using WITH_MOZILLA and switching to USE/WITH_GECKO. PR: 89052 [2] Submitted by: vs [2] Obtained from: www/firefox Thanks to: adamw, marcus, and mezz for ideas, bug squashing, and more sajd from irc.freenode.org/#FreeBSD-Gnome for pointing out many bugs --- www/firefox15/files/patch-oji-threads | 60 ----------------------------------- 1 file changed, 60 deletions(-) delete mode 100644 www/firefox15/files/patch-oji-threads (limited to 'www/firefox15/files/patch-oji-threads') diff --git a/www/firefox15/files/patch-oji-threads b/www/firefox15/files/patch-oji-threads deleted file mode 100644 index 5d4031c8e6e6..000000000000 --- a/www/firefox15/files/patch-oji-threads +++ /dev/null @@ -1,60 +0,0 @@ ---- modules/oji/public/nsIThreadManager.h Fri Sep 28 16:08:27 2001 -+++ modules/oji/public/nsIThreadManager.h Sat Aug 6 03:27:26 2005 -@@ -113,5 +113,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable) = 0; -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable) = 0; - - /** -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) = 0; -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) = 0; - }; - ---- modules/oji/src/nsJVMManager.cpp Mon Feb 9 17:48:48 2004 -+++ modules/oji/src/nsJVMManager.cpp Sat Aug 6 03:29:19 2005 -@@ -268,9 +268,9 @@ - - NS_METHOD --nsJVMManager::CreateThread(PRUint32* outThreadID, nsIRunnable* runnable) -+nsJVMManager::CreateThread(uintptr_t* outThreadID, nsIRunnable* runnable) - { - PRThread* thread = PR_CreateThread(PR_USER_THREAD, &thread_starter, (void*) runnable, - PR_PRIORITY_NORMAL, PR_GLOBAL_THREAD, PR_JOINABLE_THREAD, 0); -- *outThreadID = NS_PTR_TO_INT32(thread); -+ *outThreadID = (uintptr_t)(thread); - return (thread != NULL ? NS_OK : NS_ERROR_FAILURE); - } -@@ -308,5 +308,5 @@ - - NS_METHOD --nsJVMManager::PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async) -+nsJVMManager::PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async) - { - nsresult rv; -@@ -873,5 +873,5 @@ - - do { -- static PRBool registeredLiveConnectFactory = NS_SUCCEEDED(JSJ_RegisterLiveConnectFactory()); -+ JSJ_RegisterLiveConnectFactory(); - if (IsLiveConnectEnabled() && StartupJVM() == nsJVMStatus_Running) { - JVM_InitLCGlue(); ---- modules/oji/src/nsJVMManager.h Sat Nov 29 13:56:08 2003 -+++ modules/oji/src/nsJVMManager.h Sat Aug 6 03:30:01 2005 -@@ -122,5 +122,5 @@ - */ - NS_IMETHOD -- CreateThread(PRUint32* threadID, nsIRunnable* runnable); -+ CreateThread(uintptr_t* threadID, nsIRunnable* runnable); - - /** -@@ -131,5 +131,5 @@ - */ - NS_IMETHOD -- PostEvent(PRUint32 threadID, nsIRunnable* runnable, PRBool async); -+ PostEvent(uintptr_t threadID, nsIRunnable* runnable, PRBool async); - - /* from nsILiveConnectManager: */ -- cgit v1.2.3