diff options
Diffstat (limited to 'www/firefox-esr/files')
44 files changed, 0 insertions, 1390 deletions
diff --git a/www/firefox-esr/files/firefox.desktop.in b/www/firefox-esr/files/firefox.desktop.in deleted file mode 100644 index 27b81ce2bdd7..000000000000 --- a/www/firefox-esr/files/firefox.desktop.in +++ /dev/null @@ -1,191 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=@MOZILLA_NAME@ Web Browser -Name[am]= -Name[ar]= -Name[az]=@MOZILLA_NAME@ Veb Səyyahı -Name[be]= -Name[bg]=Интернет браузър @MOZILLA_NAME@ -Name[bn]= -Name[bs]=@MOZILLA_NAME@ web preglednik -Name[ca]=Navegador web @MOZILLA_NAME@ -Name[cs]=Prohlížeč WWW @MOZILLA_NAME@ -Name[cy]=Y Porwr Gwe @MOZILLA_NAME@ -Name[da]=@MOZILLA_NAME@ - internetsurfning -Name[de]=@MOZILLA_NAME@ Webbrowser -Name[el]=Περιηγητής Διαδικτύου @MOZILLA_NAME@ -Name[en_CA]=@MOZILLA_NAME@ Web Browser -Name[en_GB]=@MOZILLA_NAME@ Web Browser -Name[es]=Navegador Web @MOZILLA_NAME@ -Name[et]=@MOZILLA_NAME@ veebibrauser -Name[eu]=@MOZILLA_NAME@ web arakatzailea -Name[fi]=@MOZILLA_NAME@, WWW-selain -Name[fr]=Navigateur Web @MOZILLA_NAME@ -Name[ga]=Brabhsálaí Lín @MOZILLA_NAME@ -Name[gu]=એપીફની વૅબ બ્રાઉઝર -Name[he]=דפדפן @MOZILLA_NAME@ -Name[hi]= -Name[hr]=@MOZILLA_NAME@ Web preglednik -Name[hu]=@MOZILLA_NAME@ webböngésző -Name[id]=Web Browser @MOZILLA_NAME@ -Name[it]=Browser web @MOZILLA_NAME@ -Name[ja]=@MOZILLA_NAME@ ウェブ・ブラウザ -Name[ko]=@MOZILLA_NAME@ 웹 브라우저 -Name[li]=@MOZILLA_NAME@ Web Browser -Name[lt]=@MOZILLA_NAME@ web naršyklė -Name[mk]=@MOZILLA_NAME@ веб прелистувач -Name[ml]=എപ്പിഫാനി വെബ്ബ് ബ്രൌസര് -Name[mn]=@MOZILLA_NAME@ веб хөтөч -Name[ms]=Pelungsur Web @MOZILLA_NAME@ -Name[nb]=@MOZILLA_NAME@ nettleser -Name[nl]=@MOZILLA_NAME@ Webbrowser -Name[nn]=@MOZILLA_NAME@ nettlesar -Name[no]=@MOZILLA_NAME@ nettleser -Name[pa]=ਏਪੀਫਾਨੀ ਵੈੱਬ ਬਰਾਊਜ਼ਰ -Name[pl]=Przeglądarka WWW @MOZILLA_NAME@ -Name[pt]=Navegador Web @MOZILLA_NAME@ -Name[pt_BR]=Navegador Web @MOZILLA_NAME@ -Name[ro]=Navigatorul @MOZILLA_NAME@ -Name[ru]=Веб-браузер @MOZILLA_NAME@ -Name[sk]= -Name[sl]=Spletni brskalnik @MOZILLA_NAME@ -Name[sq]=@MOZILLA_NAME@ - Shfletuesi Web -Name[sr]= -Name[sr@Latn]=Veb čitač Spoznaja -Name[sv]=Webbläsaren @MOZILLA_NAME@ -Name[ta]=எபிபனி வலை உலாவி -Name[tk]=@MOZILLA_NAME@ Web Ahtarçisi -Name[tr]=@MOZILLA_NAME@ Web Tarayıcı -Name[uk]=Переглядач web @MOZILLA_NAME@ -Name[vi]=Trình Duyệt Web @MOZILLA_NAME@ -Name[wa]=Betchteu waibe epiphany -Name[zh_CN]=@MOZILLA_NAME@ Web 浏览器 -Name[zh_TW]=@MOZILLA_NAME@ 網頁瀏覽器 -GenericName=Web Browser -GenericName[ar]=متصفّح الانترنت -GenericName[az]=Veb Səyyahı -GenericName[be]=Вандроўнік па павуціньню -GenericName[bg]=Браузър -GenericName[bn]=ওয়েব ব্রাউজার -GenericName[bs]=Web preglednik -GenericName[ca]=Navegador web -GenericName[cs]=Prohlížeč WWW -GenericName[cy]=Porwr Gwe -GenericName[da]=Internetsurfning -GenericName[de]=Webbrowser -GenericName[el]=Περιηγητής Ιστοσελίδων -GenericName[en_CA]=Web Browser -GenericName[en_GB]=Web Browser -GenericName[es]=Navegador web -GenericName[et]=Veebilehitseja -GenericName[eu]=Web arakatzailea -GenericName[fi]=WWW-selain -GenericName[fr]=Navigateur Web @MOZILLA_NAME@ -GenericName[ga]=Brabhsálaí Lín -GenericName[gu]=વેબ બ્રાઉઝર -GenericName[he]=דפדפן אינטרנט -GenericName[hi]=वेब ब्राउज़र -GenericName[hr]=Web preglednik -GenericName[hu]=Webböngésző -GenericName[id]=Browser Web -GenericName[it]=Browser web -GenericName[ja]=GNOME ウェブ・ブラウザ -GenericName[ko]=웹 브라우저 -GenericName[li]=Wèb Browser -GenericName[lt]=Web naršyklė -GenericName[mk]=Веб прелистувач -GenericName[mn]=Веб хөтөч -GenericName[ms]=Pelungsur Web -GenericName[nb]=Nettleser -GenericName[nl]=Web-browser -GenericName[nn]=Nettlesar -GenericName[no]=Nettleser -GenericName[pa]=ਵੈਬ ਬਰਾਊਜ਼ -GenericName[pl]=Przeglądarka WWW -GenericName[pt]=Navegador Web -GenericName[pt_BR]=Navegador Web -GenericName[ro]=Navigator Internet -GenericName[ru]=Веб-браузер -GenericName[sk]=WWW prehliadač -GenericName[sl]=Spletni brskalnik -GenericName[sq]=Shfletuesi Web -GenericName[sr]=Веб читач -GenericName[sr@Latn]=Veb čitač -GenericName[sv]=Webbläsare -GenericName[ta]=வலை உலாவி -GenericName[th]=เว็บบราวเซอร์ -GenericName[tk]=Web Ahtarçysy -GenericName[tr]=Web Tarayıcı -GenericName[uk]=Переглядач web-сторінок -GenericName[vi]=Trình duyệt Web -GenericName[wa]=Betchteu waibe -GenericName[zh_CN]=Web 浏览器 -GenericName[zh_TW]=網頁瀏覽器 -Comment=Browse the web -Comment[ar]=تصفح الانترنت -Comment[az]=Vebi gəzin -Comment[be]=Вандраваць па павуціньню -Comment[bg]=Сърфиране в интернет -Comment[bn]=ওয়েব ব্রাউজ করুন -Comment[bs]=Pregledaj na internetu -Comment[ca]=Navegueu per la web -Comment[cs]=Prohlížet WWW -Comment[cy]=Pori'r we -Comment[da]=Surf på internettet -Comment[de]=Im Web surfen -Comment[el]=Περιήγηση στον παγκόσμιο ιστό -Comment[en_CA]=Browse the web -Comment[en_GB]=Browse the web -Comment[es]=Navegar por la web -Comment[et]=Sirvi veebi -Comment[eu]=Arakatu web-a -Comment[fi]=Selaa WWW:tä -Comment[fr]=Naviguer sur Internet -Comment[ga]=Brabhsáil an Líon -Comment[gu]=વેબમાં શોધો -Comment[he]=גלוש ברשת -Comment[hi]=वेब ब्राउज़ करें -Comment[hr]=Pregledaj Web -Comment[hu]=A világháló böngészése -Comment[id]=Jelajah web -Comment[it]=Esplora il web -Comment[ja]=ウェブを閲覧します -Comment[ko]=웹을 돌아 다닙니다 -Comment[li]=Blajere op internet -Comment[lt]=Naršyti internete -Comment[mk]=Прелистувајте на веб -Comment[ml]=വലക്കെട്ട് തിരയുക -Comment[mn]=Веб броузе хийх -Comment[ms]=Layari web -Comment[nb]=Surf på nettet -Comment[nl]=Websurfen -Comment[nn]=Surf på nettet -Comment[no]=Surf på nettet -Comment[pa]=ਵੈਬ ਬਰਾਊਜ਼ -Comment[pl]=Przeglądanie stron WWW -Comment[pt]=Navegar na web -Comment[pt_BR]=Navegar na web -Comment[ro]=Navigare Internet -Comment[ru]=Веб-браузер -Comment[sk]=Prehliadať internet -Comment[sl]=Brskaj po spletu -Comment[sq]=Eksploro web-in -Comment[sr]=Прегледај веб -Comment[sr@Latn]=Pregledaj veb -Comment[sv]=Surfa på nätet -Comment[ta]=வலையில் உலாவு -Comment[th]=ใช้งานเว็บบราวเซอร์ @MOZILLA_NAME@ -Comment[tk]=Webi Ahtar -Comment[tr]=Web'e Gözat -Comment[uk]=Програма перегляду web-сторінок -Comment[vi]=Duyệt web -Comment[wa]=Naivyî avå les waibes -Comment[zh_CN]=浏览 Web -Comment[zh_TW]=瀏覽網頁 -Exec=@MOZILLA@ %u -Icon=@FIREFOX_ICON@ -StartupNotify=false -Terminal=false -Type=Application -Categories=Application;Network; -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; diff --git a/www/firefox-esr/files/mozconfig-profile_guided_optimization.in b/www/firefox-esr/files/mozconfig-profile_guided_optimization.in deleted file mode 100644 index 5caba0f4196d..000000000000 --- a/www/firefox-esr/files/mozconfig-profile_guided_optimization.in +++ /dev/null @@ -1 +0,0 @@ -mk_add_options PROFILE_GEN_SCRIPT='@PYTHON@ $(OBJDIR)/_profile/pgo/profileserver.py' diff --git a/www/firefox-esr/files/patch-browser-app-Makefile.in b/www/firefox-esr/files/patch-browser-app-Makefile.in deleted file mode 100644 index 12c3f0bf8392..000000000000 --- a/www/firefox-esr/files/patch-browser-app-Makefile.in +++ /dev/null @@ -1,63 +0,0 @@ ---- browser/app/Makefile.in 2011-09-28 22:24:36.000000000 +0200 -+++ ../../ff6/mozilla-release/browser/app/Makefile.in 2011-09-02 22:15:19.000000000 +0200 -@@ -92,22 +91,35 @@ - else - # Build a binary bootstrapping with XRE_main - -+ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) - PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) -+else -+PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -+endif - - CPPSRCS = nsBrowserApp.cpp - - LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre - LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base --LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build - --DEFINES += -DXPCOM_GLUE --STL_FLAGS= -+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -+LIBS += $(DIST)/bin/XUL -+TK_LIBS := $(TK_LIBS) -+else -+EXTRA_DSO_LIBS += xul -+endif - - LIBS += \ -+ $(STATIC_COMPONENTS_LINKER_PATH) \ - $(EXTRA_DSO_LIBS) \ -- $(XPCOM_STANDALONE_GLUE_LDOPTS) \ -+ $(XPCOM_GLUE_LDOPTS) \ -+ $(NSPR_LIBS) \ - $(NULL) - -+ifdef MOZ_JPROF -+LIBS += -ljprof -+endif -+ - ifndef MOZ_WINCONSOLE - ifdef MOZ_DEBUG - MOZ_WINCONSOLE = 1 -@@ -182,9 +194,18 @@ - - ifneq (,$(filter-out OS2 WINNT,$(OS_ARCH))) - --libs:: -- cp -p $(MOZ_APP_NAME)$(BIN_SUFFIX) $(DIST)/bin/$(MOZ_APP_NAME)-bin$(BIN_SUFFIX) -+$(MOZ_APP_NAME):: $(topsrcdir)/build/unix/mozilla.in $(GLOBAL_DEPS) -+ cat $< | sed -e "s|%MOZAPPDIR%|$(installdir)|" \ -+ -e "s|%MOZ_APP_DISPLAYNAME%|$(MOZ_APP_DISPLAYNAME)|" > $@ -+ chmod +x $@ -+ -+libs:: $(MOZ_APP_NAME) -+ $(INSTALL) $< $(DIST)/bin -+ -+install:: $(MOZ_APP_NAME) -+ $(SYSINSTALL) $< $(DESTDIR)$(bindir) - -+GARBAGE += $(MOZ_APP_NAME) - GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/, firefox.js) - - endif diff --git a/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp b/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp deleted file mode 100644 index 8737fd9a2fa5..000000000000 --- a/www/firefox-esr/files/patch-browser-app-nsBrowserApp.cpp +++ /dev/null @@ -1,221 +0,0 @@ ---- browser/app/nsBrowserApp.cpp 2011-09-28 22:24:36.000000000 +0200 -+++ ../../ff6/mozilla-release/browser/app/nsBrowserApp.cpp 2011-09-02 22:15:19.000000000 +0200 -@@ -36,19 +36,14 @@ - * - * ***** END LICENSE BLOCK ***** */ - --#include "nsXPCOMGlue.h" - #include "nsXULAppAPI.h" --#if defined(XP_WIN) -+#ifdef XP_WIN - #include <windows.h> - #include <stdlib.h> --#elif defined(XP_UNIX) --#include <sys/time.h> --#include <sys/resource.h> - #endif - - #include <stdio.h> - #include <stdarg.h> --#include <string.h> - - #include "plstr.h" - #include "prprf.h" -@@ -59,16 +54,11 @@ - #include "nsStringGlue.h" - - #ifdef XP_WIN -+// we want to use the DLL blocklist if possible -+#define XRE_WANT_DLL_BLOCKLIST - // we want a wmain entry point - #include "nsWindowsWMain.cpp" --#define snprintf _snprintf --#define strcasecmp _stricmp - #endif --#include "BinaryPath.h" -- --#include "nsXPCOMPrivate.h" // for MAXPATHLEN and XPCOM_DLL -- --#include "mozilla/Telemetry.h" - - static void Output(const char *fmt, ... ) - { -@@ -95,12 +85,12 @@ - { - if (*++arg == '-') - ++arg; -- return !strcasecmp(arg, s); -+ return !PL_strcasecmp(arg, s); - } - - #if defined(XP_WIN) || defined(XP_OS2) - if (*arg == '/') -- return !strcasecmp(++arg, s); -+ return !PL_strcasecmp(++arg, s); - #endif - - return PR_FALSE; -@@ -116,48 +106,22 @@ - ~ScopedLogging() { NS_LogTerm(); } - }; - --XRE_GetFileFromPathType XRE_GetFileFromPath; --XRE_CreateAppDataType XRE_CreateAppData; --XRE_FreeAppDataType XRE_FreeAppData; --#ifdef XRE_HAS_DLL_BLOCKLIST --XRE_SetupDllBlocklistType XRE_SetupDllBlocklist; --#endif --XRE_TelemetryAccumulateType XRE_TelemetryAccumulate; --XRE_mainType XRE_main; -- --static const nsDynamicFunctionLoad kXULFuncs[] = { -- { "XRE_GetFileFromPath", (NSFuncPtr*) &XRE_GetFileFromPath }, -- { "XRE_CreateAppData", (NSFuncPtr*) &XRE_CreateAppData }, -- { "XRE_FreeAppData", (NSFuncPtr*) &XRE_FreeAppData }, --#ifdef XRE_HAS_DLL_BLOCKLIST -- { "XRE_SetupDllBlocklist", (NSFuncPtr*) &XRE_SetupDllBlocklist }, --#endif -- { "XRE_TelemetryAccumulate", (NSFuncPtr*) &XRE_TelemetryAccumulate }, -- { "XRE_main", (NSFuncPtr*) &XRE_main }, -- { nsnull, nsnull } --}; -- --static int do_main(const char *exePath, int argc, char* argv[]) -+int main(int argc, char* argv[]) - { -+ ScopedLogging log; -+ - nsCOMPtr<nsILocalFile> appini; --#ifdef XP_WIN -- // exePath comes from mozilla::BinaryPath::Get, which returns a UTF-8 -- // encoded path, so it is safe to convert it -- nsresult rv = NS_NewLocalFile(NS_ConvertUTF8toUTF16(exePath), false, -- getter_AddRefs(appini)); --#else -- nsresult rv = NS_NewNativeLocalFile(nsDependentCString(exePath), false, -- getter_AddRefs(appini)); --#endif -+ nsresult rv = XRE_GetBinaryPath(argv[0], getter_AddRefs(appini)); - if (NS_FAILED(rv)) { -+ Output("Couldn't calculate the application directory."); - return 255; - } -- - appini->SetNativeLeafName(NS_LITERAL_CSTRING("application.ini")); - - // Allow firefox.exe to launch XULRunner apps via -app <application.ini> - // Note that -app must be the *first* argument. -- const char *appDataFile = getenv("XUL_APP_FILE"); -+ char *appEnv = nsnull; -+ const char *appDataFile = PR_GetEnv("XUL_APP_FILE"); - if (appDataFile && *appDataFile) { - rv = XRE_GetFileFromPath(appDataFile, getter_AddRefs(appini)); - if (NS_FAILED(rv)) { -@@ -177,12 +141,8 @@ - return 255; - } - -- char appEnv[MAXPATHLEN]; -- snprintf(appEnv, MAXPATHLEN, "XUL_APP_FILE=%s", argv[2]); -- if (putenv(appEnv)) { -- Output("Couldn't set %s.\n", appEnv); -- return 255; -- } -+ appEnv = PR_smprintf("XUL_APP_FILE=%s", argv[2]); -+ PR_SetEnv(appEnv); - argv[2] = argv[0]; - argv += 2; - argc -= 2; -@@ -197,90 +157,7 @@ - - int result = XRE_main(argc, argv, appData); - XRE_FreeAppData(appData); -- return result; --} -- --int main(int argc, char* argv[]) --{ -- char exePath[MAXPATHLEN]; -- -- nsresult rv = mozilla::BinaryPath::Get(argv[0], exePath); -- if (NS_FAILED(rv)) { -- Output("Couldn't calculate the application directory.\n"); -- return 255; -- } -- -- char *lastSlash = strrchr(exePath, XPCOM_FILE_PATH_SEPARATOR[0]); -- if (!lastSlash || (lastSlash - exePath > MAXPATHLEN - sizeof(XPCOM_DLL) - 1)) -- return 255; -- -- strcpy(++lastSlash, XPCOM_DLL); -- -- int gotCounters; --#if defined(XP_UNIX) -- struct rusage initialRUsage; -- gotCounters = !getrusage(RUSAGE_SELF, &initialRUsage); --#elif defined(XP_WIN) -- // GetProcessIoCounters().ReadOperationCount seems to have little to -- // do with actual read operations. It reports 0 or 1 at this stage -- // in the program. Luckily 1 coincides with when prefetch is -- // enabled. If Windows prefetch didn't happen we can do our own -- // faster dll preloading. -- IO_COUNTERS ioCounters; -- gotCounters = GetProcessIoCounters(GetCurrentProcess(), &ioCounters); -- if (gotCounters && !ioCounters.ReadOperationCount) --#endif -- { -- XPCOMGlueEnablePreload(); -- } -- -- -- rv = XPCOMGlueStartup(exePath); -- if (NS_FAILED(rv)) { -- Output("Couldn't load XPCOM.\n"); -- return 255; -- } -- -- rv = XPCOMGlueLoadXULFunctions(kXULFuncs); -- if (NS_FAILED(rv)) { -- Output("Couldn't load XRE functions.\n"); -- return 255; -- } -- --#ifdef XRE_HAS_DLL_BLOCKLIST -- XRE_SetupDllBlocklist(); --#endif -- -- if (gotCounters) { --#if defined(XP_WIN) -- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_OPS, -- int(ioCounters.ReadOperationCount)); -- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_READ_TRANSFER, -- int(ioCounters.ReadTransferCount / 1024)); -- IO_COUNTERS newIoCounters; -- if (GetProcessIoCounters(GetCurrentProcess(), &newIoCounters)) { -- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_OPS, -- int(newIoCounters.ReadOperationCount - ioCounters.ReadOperationCount)); -- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_READ_TRANSFER, -- int((newIoCounters.ReadTransferCount - ioCounters.ReadTransferCount) / 1024)); -- } --#elif defined(XP_UNIX) -- XRE_TelemetryAccumulate(mozilla::Telemetry::EARLY_GLUESTARTUP_HARD_FAULTS, -- int(initialRUsage.ru_majflt)); -- struct rusage newRUsage; -- if (!getrusage(RUSAGE_SELF, &newRUsage)) { -- XRE_TelemetryAccumulate(mozilla::Telemetry::GLUESTARTUP_HARD_FAULTS, -- int(newRUsage.ru_majflt - initialRUsage.ru_majflt)); -- } --#endif -- } -- -- int result; -- { -- ScopedLogging log; -- result = do_main(exePath, argc, argv); -- } -- -- XPCOMGlueShutdown(); -+ if (appEnv) -+ PR_smprintf_free(appEnv); - return result; - } diff --git a/www/firefox-esr/files/patch-build-pgo-profileserver.py b/www/firefox-esr/files/patch-build-pgo-profileserver.py deleted file mode 100644 index 0571eb19903d..000000000000 --- a/www/firefox-esr/files/patch-build-pgo-profileserver.py +++ /dev/null @@ -1,18 +0,0 @@ ---- build/pgo/profileserver.py.orig 2011-02-24 21:49:47.000000000 +0100 -+++ build/pgo/profileserver.py 2011-02-24 21:50:30.000000000 +0100 -@@ -77,13 +77,13 @@ - t.setDaemon(True) # don't hang on exit - t.start() - -- automation.setServerInfo("localhost", PORT) -+ automation.setServerInfo("127.0.0.1", PORT) - automation.initializeProfile(PROFILE_DIRECTORY) - browserEnv = automation.environment() - browserEnv["XPCOM_DEBUG_BREAK"] = "warn" - browserEnv["MOZ_JAR_LOG_DIR"] = MOZ_JAR_LOG_DIR - -- url = "http://localhost:%d/index.html" % PORT -+ url = "http://127.0.0.1:%d/index.html" % PORT - appPath = os.path.join(SCRIPT_DIR, automation.DEFAULT_APP) - status = automation.runApp(url, browserEnv, appPath, PROFILE_DIRECTORY, {}, - debuggerInfo=debuggerInfo, diff --git a/www/firefox-esr/files/patch-build_unix_run-mozilla.sh b/www/firefox-esr/files/patch-build_unix_run-mozilla.sh deleted file mode 100644 index aae079e55456..000000000000 --- a/www/firefox-esr/files/patch-build_unix_run-mozilla.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- build/unix/run-mozilla.sh.orig Tue Feb 14 19:56:54 2006 -+++ build/unix/run-mozilla.sh Fri Dec 8 15:49:48 2006 -@@ -443,6 +443,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/gecko19:%%LOCALBASE%%/lib/npapi/symlinks/firefox -+export MOZ_PLUGIN_PATH -+ - if [ $moz_debug -eq 1 ] - then - moz_debug_program ${1+"$@"} diff --git a/www/firefox-esr/files/patch-config_autoconf.mk.in b/www/firefox-esr/files/patch-config_autoconf.mk.in deleted file mode 100644 index 0c6127366c69..000000000000 --- a/www/firefox-esr/files/patch-config_autoconf.mk.in +++ /dev/null @@ -1,30 +0,0 @@ ---- config/autoconf.mk.in.orig 2009-04-24 03:46:37.000000000 +0200 -+++ config/autoconf.mk.in 2009-05-11 15:03:26.000000000 +0200 -@@ -57,14 +57,14 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/%%MOZILLA%% - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = $(datadir)/idl/%%MOZILLA%% - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/%%MOZILLA%% -+sdkdir = $(libdir)/%%MOZILLA%% - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ -@@ -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/firefox-esr/files/patch-config_config.mk b/www/firefox-esr/files/patch-config_config.mk deleted file mode 100644 index bea88f7f78e4..000000000000 --- a/www/firefox-esr/files/patch-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in b/www/firefox-esr/files/patch-config_mkdepend_Makefile.in deleted file mode 100644 index 65687c7c5feb..000000000000 --- a/www/firefox-esr/files/patch-config_mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox-esr/files/patch-configure.in b/www/firefox-esr/files/patch-configure.in deleted file mode 100644 index 103defe63c68..000000000000 --- a/www/firefox-esr/files/patch-configure.in +++ /dev/null @@ -1,86 +0,0 @@ ---- configure.in.orig 2010-11-04 21:05:18.000000000 +0100 -+++ 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/firefox-esr/files/patch-content__base__public__nsContentUtils.h b/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h deleted file mode 100644 index 8239b2e8b8fd..000000000000 --- a/www/firefox-esr/files/patch-content__base__public__nsContentUtils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- content/base/public/nsContentUtils.h.orig 2011-07-07 10:44:49.000000000 +0200 -+++ content/base/public/nsContentUtils.h 2011-07-07 10:46:12.000000000 +0200 -@@ -54,7 +54,7 @@ - //A trick to handle IEEE floating point exceptions on FreeBSD - E.D. - #ifdef __FreeBSD__ - #include <ieeefp.h> --#ifdef __alpha__ -+#if !defined(__amd64__) && !defined(__i386__) - 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; diff --git a/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in b/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in deleted file mode 100644 index e52ba517e14a..000000000000 --- a/www/firefox-esr/files/patch-db_sqlite3_src_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- db/sqlite3/src/Makefile.in.orig 2009-04-28 11:12:00.829684825 +0000 -+++ db/sqlite3/src/Makefile.in 2009-04-28 11:12:20.628076799 +0000 -@@ -45,6 +45,8 @@ - - include $(DEPTH)/config/autoconf.mk - -+OS_CFLAGS = -I../../../dist/include/sqlite3 -+OS_LIBS = %%PTHREAD_LIBS%% -lc - MODULE = sqlite3 - LIBRARY_NAME = sqlite3 - FORCE_SHARED_LIB = 1 diff --git a/www/firefox-esr/files/patch-gfx-qcms-Makefile.in b/www/firefox-esr/files/patch-gfx-qcms-Makefile.in deleted file mode 100644 index cc7414a33fe7..000000000000 --- a/www/firefox-esr/files/patch-gfx-qcms-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- gfx/qcms/Makefile.in.orig 2011-01-22 01:25:38.000000000 +0100 -+++ 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/firefox-esr/files/patch-gfx-qcms-qcmstypes.h b/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h deleted file mode 100644 index 33d9e3356b77..000000000000 --- a/www/firefox-esr/files/patch-gfx-qcms-qcmstypes.h +++ /dev/null @@ -1,11 +0,0 @@ ---- gfx/qcms/qcmstypes.h.orig 2010-11-22 12:01:36.000000000 +0100 -+++ 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/firefox-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc deleted file mode 100644 index 1c8dde492901..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-atomicops_internals_mutex.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ipc/chromium/src/base/atomicops_internals_mutex.cc~ -+++ 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/firefox-esr/files/patch-ipc-chromium-src-base-dir_reader_linux.h b/www/firefox-esr/files/patch-ipc-chromium-src-base-dir_reader_linux.h deleted file mode 100644 index 36749ba8abc4..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-dir_reader_linux.h +++ /dev/null @@ -1,45 +0,0 @@ ---- ipc/chromium/src/base/dir_reader_linux.h.orig 2011-12-16 21:29:22.000000000 +0100 -+++ ipc/chromium/src/base/dir_reader_linux.h 2011-12-19 21:00:27.000000000 +0100 -@@ -9,6 +9,7 @@ - #include <errno.h> - #include <fcntl.h> - #include <stdint.h> -+#include <sys/dirent.h> - #include <sys/syscall.h> - #include <unistd.h> - -@@ -19,6 +20,8 @@ - - namespace base { - -+#define linux_dirent struct dirent -+#if 0 - struct linux_dirent { - uint64_t d_ino; - int64_t d_off; -@@ -26,11 +29,16 @@ - unsigned char d_type; - char d_name[0]; - }; -+#endif - - class DirReaderLinux { - public: - explicit DirReaderLinux(const char* directory_path) -+#ifdef O_DIRECTORY - : fd_(open(directory_path, O_RDONLY | O_DIRECTORY)), -+#else -+ : fd_(open(directory_path, O_RDONLY)), -+#endif - offset_(0), - size_(0) { - memset(buf_, 0, sizeof(buf_)); -@@ -57,7 +65,7 @@ - if (offset_ != size_) - return true; - -- const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); -+ const int r = syscall(SYS_getdents, fd_, buf_, sizeof(buf_)); - if (r == 0) - return false; - if (r == -1) { diff --git a/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc deleted file mode 100644 index c6e4df63d444..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_linux.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/file_util_linux.cc~ -+++ 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/firefox-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc deleted file mode 100644 index b43b33f44510..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-file_util_posix.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/file_util_posix.cc~ -+++ 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/firefox-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc deleted file mode 100644 index 01111459c4bb..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-platform_file_posix.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- ipc/chromium/src/base/platform_file_posix.cc~ -+++ 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/firefox-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc b/www/firefox-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc deleted file mode 100644 index 0b527d38d4f6..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-platform_thread_posix.cc +++ /dev/null @@ -1,25 +0,0 @@ ---- ipc/chromium/src/base/platform_thread_posix.cc~ -+++ ipc/chromium/src/base/platform_thread_posix.cc -@@ -11,6 +11,7 @@ - #include <mach/mach.h> - #elif defined(OS_LINUX) - #include <sys/syscall.h> -+#include <pthread_np.h> - #include <unistd.h> - #endif - -@@ -34,7 +35,13 @@ PlatformThreadId PlatformThread::Current - #if defined(OS_MACOSX) - return mach_thread_self(); - #elif defined(OS_LINUX) -- return syscall(__NR_gettid); -+#if __FreeBSD_version > 900030 -+ return pthread_getthreadid_np(); -+#else -+ long tid; -+ syscall(SYS_thr_self, &tid); -+ return tid; -+#endif - #endif - } - diff --git a/www/firefox-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h b/www/firefox-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h deleted file mode 100644 index 75bf9d8a0269..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-base-third_party-nspr-prcpucfg.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ipc/chromium/src/base/third_party/nspr/prcpucfg.h~ -+++ 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/firefox-esr/files/patch-ipc-chromium-src-build-build_config.h b/www/firefox-esr/files/patch-ipc-chromium-src-build-build_config.h deleted file mode 100644 index 076370d85a80..000000000000 --- a/www/firefox-esr/files/patch-ipc-chromium-src-build-build_config.h +++ /dev/null @@ -1,11 +0,0 @@ ---- ipc/chromium/src/build/build_config.h~ -+++ 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/firefox-esr/files/patch-js-src-Makefile.in b/www/firefox-esr/files/patch-js-src-Makefile.in deleted file mode 100644 index b9f4996d371f..000000000000 --- a/www/firefox-esr/files/patch-js-src-Makefile.in +++ /dev/null @@ -1,30 +0,0 @@ ---- js/src/Makefile.in.orig 2011-07-06 05:09:22.000000000 +0200 -+++ js/src/Makefile.in 2011-07-06 22:23:46.363233778 +0200 -@@ -416,7 +416,7 @@ - # END enclude sources for V8 dtoa - ############################################# - --ifeq (,$(filter arm% sparc %86 x86_64,$(TARGET_CPU))) -+ifeq (,$(filter arm% sparc %86 amd64 x86_64,$(TARGET_CPU))) - - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ -@@ -469,6 +469,9 @@ - else - #CPPSRCS += only_on_x86.cpp - endif -+ifeq (amd64, $(TARGET_CPU)) -+#CPPSRCS += only_on_x86_64.cpp -+endif - endif - ifeq (arm, $(TARGET_CPU)) - #CPPSRCS += only_on_arm.cpp -@@ -793,7 +796,7 @@ - endif # WINNT - - ifeq ($(OS_ARCH),FreeBSD) --EXTRA_LIBS += -pthread -+EXTRA_LIBS += -pthread -lc - endif - ifeq ($(OS_ARCH),IRIX) - ifdef USE_N32 diff --git a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in b/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in deleted file mode 100644 index fa2cc6012a3a..000000000000 --- a/www/firefox-esr/files/patch-js-src-config-mkdepend_Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- js/src/config/mkdepend/Makefile.in.orig 2011-12-16 21:29:22.000000000 +0100 -+++ js/src/config/mkdepend/Makefile.in 2011-12-21 23:02:17.000000000 +0100 -@@ -71,7 +71,8 @@ - - include $(topsrcdir)/config/rules.mk - --HOST_CFLAGS += -DINCLUDEDIR=\"/usr/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -+HOST_CFLAGS += -DINCLUDEDIR=\"%%LOCALBASE%%/include\" -DOBJSUFFIX=\".$(OBJ_SUFFIX)\" -I%%LOCALBASE%%/include -+HOST_CFLAGS += $(XCFLAGS) - - ifdef GNU_CC - _GCCDIR = $(shell $(CC) -print-file-name=include) diff --git a/www/firefox-esr/files/patch-js-src-config_config.mk b/www/firefox-esr/files/patch-js-src-config_config.mk deleted file mode 100644 index 13bf2e58a794..000000000000 --- a/www/firefox-esr/files/patch-js-src-config_config.mk +++ /dev/null @@ -1,10 +0,0 @@ ---- js/src/config/config.mk.orig 2009-08-07 00:49:23.000000000 +0200 -+++ js/src/config/config.mk 2009-08-09 20:50:05.000000000 +0200 -@@ -506,6 +506,7 @@ - -I$(srcdir) \ - -I. \ - -I$(DIST)/include -I$(DIST)/include/nsprpub \ -+ -I%%LOCALBASE%%/include \ - $(if $(LIBXUL_SDK),-I$(LIBXUL_SDK)/include -I$(LIBXUL_SDK)/include/nsprpub) \ - $(OS_INCLUDES) \ - $(NULL) diff --git a/www/firefox-esr/files/patch-js-src-configure.in b/www/firefox-esr/files/patch-js-src-configure.in deleted file mode 100644 index 27c02de1c14c..000000000000 --- a/www/firefox-esr/files/patch-js-src-configure.in +++ /dev/null @@ -1,64 +0,0 @@ ---- js/src/configure.in.orig 2012-01-29 11:24:33.000000000 +0100 -+++ js/src/configure.in 2012-01-30 23:30:02.051087215 +0100 -@@ -1410,7 +1410,7 @@ - CPU_ARCH=sparc - ;; - --x86_64 | ia64) -+amd64 | x86_64 | ia64) - CPU_ARCH="$OS_TEST" - ;; - -@@ -1432,7 +1432,7 @@ - dnl =============================================================== - INTEL_ARCHITECTURE= - case "$OS_TEST" in -- x86_64|i?86) -+ amd64|x86_64|i?86) - INTEL_ARCHITECTURE=1 - esac - -@@ -2713,6 +2713,16 @@ - AC_DEFINE(JS_CPU_X86) - AC_DEFINE(JS_NUNBOX32) - ;; -+amd64*-*) -+ ENABLE_TRACEJIT=1 -+ NANOJIT_ARCH=X64 -+ ENABLE_METHODJIT=1 -+ ENABLE_MONOIC=1 -+ ENABLE_POLYIC=1 -+ ENABLE_POLYIC_TYPED_ARRAY=1 -+ AC_DEFINE(JS_CPU_X64) -+ AC_DEFINE(JS_PUNBOX64) -+ ;; - x86_64*-*) - NANOJIT_ARCH=X64 - ENABLE_METHODJIT=1 -@@ -2732,6 +2742,7 @@ - AC_DEFINE(JS_NUNBOX32) - ;; - sparc*-*) -+ if test ! "$HAVE_64BIT_OS" ; then - NANOJIT_ARCH=Sparc - ENABLE_METHODJIT=1 - ENABLE_MONOIC=1 -@@ -2739,6 +2750,7 @@ - ENABLE_METHODJIT_TYPED_ARRAY=1 - AC_DEFINE(JS_CPU_SPARC) - AC_DEFINE(JS_NUNBOX32) -+ fi - ;; - esac - -@@ -2795,6 +2807,10 @@ - i?86-*) - AC_DEFINE(AVMPLUS_IA32) - ;; -+amd64*-*) -+ AC_DEFINE(AVMPLUS_AMD64) -+ AC_DEFINE(AVMPLUS_64BIT) -+ ;; - x86_64*-*) - AC_DEFINE(AVMPLUS_AMD64) - AC_DEFINE(AVMPLUS_64BIT) diff --git a/www/firefox-esr/files/patch-js-src-jscpucfg.h b/www/firefox-esr/files/patch-js-src-jscpucfg.h deleted file mode 100644 index 85fe261572cf..000000000000 --- a/www/firefox-esr/files/patch-js-src-jscpucfg.h +++ /dev/null @@ -1,22 +0,0 @@ ---- js/src/jscpucfg.h.orig 2012-01-18 17:38:54.409461514 +0100 -+++ js/src/jscpucfg.h 2012-01-18 17:38:59.522462164 +0100 -@@ -77,6 +77,19 @@ - #define IS_BIG_ENDIAN 1 - #endif - -+#elif defined(__FreeBSD__) -+#include <sys/endian.h> -+ -+#if defined(BYTE_ORDER) -+#if BYTE_ORDER == LITTLE_ENDIAN -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#elif BYTE_ORDER == BIG_ENDIAN -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#endif -+#endif -+ - #elif defined(JS_HAVE_ENDIAN_H) - #include <endian.h> - diff --git a/www/firefox-esr/files/patch-js_src_jsnum.cpp b/www/firefox-esr/files/patch-js_src_jsnum.cpp deleted file mode 100644 index ea2515a74d94..000000000000 --- a/www/firefox-esr/files/patch-js_src_jsnum.cpp +++ /dev/null @@ -1,31 +0,0 @@ ---- js/src/jsnum.cpp.orig 2010-01-05 22:35:17.000000000 -0500 -+++ js/src/jsnum.cpp 2010-01-11 05:10:19.000000000 -0500 -@@ -43,6 +43,9 @@ - /* - * JS number type and wrapper class. - */ -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#endif - #ifdef XP_OS2 - #define _PC_53 PC_53 - #define _MCW_EM MCW_EM -@@ -691,8 +694,18 @@ - - #else - -+#if defined(__FreeBSD__) -+#if __BSD_VISIBLE == 0 -+#error __BSD_VISIBLE is zero, so fedisableexcept is not defined -+#endif -+#include <fenv.h> -+#define FIX_FPU() ((void)fedisableexcept(FE_ALL_EXCEPT)) -+#else -+ - #define FIX_FPU() ((void)0) - -+#endif /* defined(__FreeBSD__) && __FreeBSD_version >= 503000 */ -+ - #endif - - JSBool diff --git a/www/firefox-esr/files/patch-layout_generic_Makefile.in b/www/firefox-esr/files/patch-layout_generic_Makefile.in deleted file mode 100644 index ad2bc6b2ae3d..000000000000 --- a/www/firefox-esr/files/patch-layout_generic_Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- layout/generic/Makefile.in.orig 2011-07-06 05:09:28.000000000 +0200 -+++ layout/generic/Makefile.in 2011-07-06 21:49:25.105659269 +0200 -@@ -159,9 +159,10 @@ - -I$(srcdir)/../../content/html/content/src \ - -I$(srcdir)/../../dom/base \ - -I$(srcdir)/../../dom/plugins/base \ -- $(MOZ_CAIRO_CFLAGS) \ - $(NULL) - -+CXXFLAGS += $(MOZ_CAIRO_CFLAGS) -+ - ifdef MOZ_ENABLE_GTK2 - CXXFLAGS += $(MOZ_GTK2_CFLAGS) - endif diff --git a/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h b/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h deleted file mode 100644 index d8e318e9bcb2..000000000000 --- a/www/firefox-esr/files/patch-media-libsydneyaudio-include-sydney_audio.h +++ /dev/null @@ -1,11 +0,0 @@ ---- media/libsydneyaudio/include/sydney_audio.h.orgi 2009-04-10 12:24:01.000000000 +0200 -+++ media/libsydneyaudio/include/sydney_audio.h 2009-04-10 12:24:30.000000000 +0200 -@@ -73,7 +73,7 @@ - # endif - #elif defined(WIN32) - # define SA_LITTLE_ENDIAN 1 --#elif defined(__APPLE__) -+#elif defined(__APPLE__) || defined(__FreeBSD__) - # if defined(__BIG_ENDIAN__) - # define SA_BIG_ENDIAN 1 - # else diff --git a/www/firefox-esr/files/patch-media-libvpx-vpx_config.c b/www/firefox-esr/files/patch-media-libvpx-vpx_config.c deleted file mode 100644 index 1cc3dab5b8bb..000000000000 --- a/www/firefox-esr/files/patch-media-libvpx-vpx_config.c +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config_c.c~ -+++ 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/firefox-esr/files/patch-media-libvpx-vpx_config.h b/www/firefox-esr/files/patch-media-libvpx-vpx_config.h deleted file mode 100644 index d813ca8c608b..000000000000 --- a/www/firefox-esr/files/patch-media-libvpx-vpx_config.h +++ /dev/null @@ -1,16 +0,0 @@ ---- media/libvpx/vpx_config.h~ -+++ 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/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg b/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg deleted file mode 100644 index 2236b6f5788c..000000000000 --- a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.cfg +++ /dev/null @@ -1,100 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.cfg.orig 2010-12-23 17:34:06.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.cfg 2010-12-23 17:34:44.000000000 +0100 -@@ -283,6 +283,97 @@ - #define PR_ALIGN_OF_POINTER 8 - #define PR_ALIGN_OF_WORD 8 - -+#elif defined(__powerpc64__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+#define IS_64 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 8 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 8 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 64 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 64 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 6 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 6 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 8 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 8 -+#define PR_ALIGN_OF_WORD 8 -+ -+#define PR_BYTES_PER_WORD_LOG2 3 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ -+#elif defined(__powerpc__) -+ -+#undef IS_LITTLE_ENDIAN -+#define IS_BIG_ENDIAN 1 -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 8 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 8 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" diff --git a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h b/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h deleted file mode 100644 index f6d36d5c5e64..000000000000 --- a/www/firefox-esr/files/patch-nsprpub-pr-include-md_freebsd.h +++ /dev/null @@ -1,30 +0,0 @@ ---- nsprpub/pr/include/md/_freebsd.h.orig 2010-12-23 17:34:13.000000000 +0100 -+++ nsprpub/pr/include/md/_freebsd.h 2010-12-23 17:34:46.000000000 +0100 -@@ -57,6 +57,10 @@ - #define _PR_SI_ARCHITECTURE "ia64" - #elif defined(__amd64__) - #define _PR_SI_ARCHITECTURE "amd64" -+#elif defined(__powerpc64__) -+#define _PR_SI_ARCHITECTURE "powerpc64" -+#elif defined(__powerpc__) -+#define _PR_SI_ARCHITECTURE "powerpc" - #else - #error "Unknown CPU architecture" - #endif -@@ -106,6 +110,16 @@ - #define _PR_IPV6_V6ONLY_PROBE - #endif - -+#if (__FreeBSD_version >= 700016) -+#if defined(_PR_PTHREADS) -+#define _PR_HAVE_GETPROTO_R -+#define _PR_HAVE_5_ARG_GETPROTO_R -+#define _PR_HAVE_GETHOST_R -+#define _PR_HAVE_GETHOST_R_INT -+#define _PR_HAVE_THREADSAFE_GETHOST -+#endif -+#endif -+ - #define USE_SETJMP - - #ifndef _PR_PTHREADS diff --git a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk b/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk deleted file mode 100644 index 279110fa0321..000000000000 --- a/www/firefox-esr/files/patch-security-coreconf-FreeBSD.mk +++ /dev/null @@ -1,40 +0,0 @@ ---- security/coreconf/FreeBSD.mk.orig 2010-02-28 23:30:04.000000000 +0000 -+++ security/coreconf/FreeBSD.mk 2010-03-03 02:05:22.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/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp b/www/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp deleted file mode 100644 index f30d12229ccd..000000000000 --- a/www/firefox-esr/files/patch-security_manager_ssl_src_nsNSSComponent.cpp +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 -@@ -110,6 +110,7 @@ - #include "nss.h" - #include "pk11func.h" - #include "ssl.h" -+#define NSS_ENABLE_ECC 1 - #include "sslproto.h" - #include "secmod.h" - #include "sechash.h" diff --git a/www/firefox-esr/files/patch-toolkit_library_Makefile.in b/www/firefox-esr/files/patch-toolkit_library_Makefile.in deleted file mode 100644 index 64b0c47e4b64..000000000000 --- a/www/firefox-esr/files/patch-toolkit_library_Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- toolkit/library/Makefile.in.orig 2010-01-11 12:13:08.000000000 -0500 -+++ 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/firefox-esr/files/patch-toolkit_xre_Makefile.in b/www/firefox-esr/files/patch-toolkit_xre_Makefile.in deleted file mode 100644 index 4a9c8533a2f8..000000000000 --- a/www/firefox-esr/files/patch-toolkit_xre_Makefile.in +++ /dev/null @@ -1,8 +0,0 @@ ---- toolkit/xre/Makefile.in.orig 2007-09-10 10:31:53.000000000 -0400 -+++ toolkit/xre/Makefile.in 2007-09-10 10:35:00.000000000 -0400 -@@ -263,5 +263,3 @@ - libs:: platform.ini - $(INSTALL) $^ $(DIST)/bin - --install:: -- $(INSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir) diff --git a/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp b/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp deleted file mode 100644 index c16124abefa0..000000000000 --- a/www/firefox-esr/files/patch-xpcom-io-nsAppFileLocationProvider.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/io/nsAppFileLocationProvider.cpp.orig 2011-09-30 15:52:07.000000000 +0200 -+++ xpcom/io/nsAppFileLocationProvider.cpp 2011-09-30 15:52:40.000000000 +0200 -@@ -238,7 +238,7 @@ - #if defined(HAVE_USR_LIB64_DIR) && defined(__LP64__) - "/usr/lib64/mozilla/plugins"; - #else -- "/usr/lib/mozilla/plugins"; -+ "%%LOCALBASE%%/lib/npapi/symlinks/firefox"; - #endif - rv = NS_NewNativeLocalFile(nsDependentCString(sysLPlgDir), - PR_FALSE, getter_AddRefs(localFile)); diff --git a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc deleted file mode 100644 index 9a41bbfc4602..000000000000 --- a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-public-xptcstubsdecl.inc +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/reflect/xptcall/public/xptcstubsdecl.inc.orig Tue Mar 16 03:07:25 2004 -+++ xpcom/reflect/xptcall/public/xptcstubsdecl.inc Tue Jun 15 12:52:36 2004 -@@ -8,7 +8,7 @@ - * 1 is AddRef - * 2 is Release - */ --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - NS_IMETHOD Stub3(); - NS_IMETHOD Stub4(); - NS_IMETHOD Stub5(); diff --git a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h b/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h deleted file mode 100644 index 0440ce0a263f..000000000000 --- a/www/firefox-esr/files/patch-xpcom-reflect-xptcall-src-xptcprivate.h +++ /dev/null @@ -1,20 +0,0 @@ ---- xpcom/reflect/xptcall/src/xptcprivate.h.orig 2009-11-09 21:43:49.000000000 -0800 -+++ xpcom/reflect/xptcall/src/xptcprivate.h 2009-11-09 21:44:05.000000000 -0800 -@@ -45,7 +45,7 @@ - - class xptiInterfaceEntry; - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n() = 0; - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64) = 0; -@@ -62,7 +62,7 @@ - #undef STUB_ENTRY - #undef SENTINEL_ENTRY - --#if !defined(__ia64) || (!defined(__hpux) && !defined(__linux__)) -+#if !defined(__ia64) - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(); - #else - #define STUB_ENTRY(n) NS_IMETHOD Stub##n(PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64,PRUint64); diff --git a/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp b/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp deleted file mode 100644 index 80e832263a77..000000000000 --- a/www/firefox-esr/files/patch-xpcom__threads__nsThreadManager.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- ./xpcom/threads/nsThreadManager.cpp.orig 2011-08-25 02:37:45.000000000 +0200 -+++ ./xpcom/threads/nsThreadManager.cpp 2011-08-28 17:14:14.000000000 +0200 -@@ -89,6 +89,11 @@ - nsresult - nsThreadManager::Init() - { -+#ifdef NS_TLS && (__FreeBSD_version < 802513 \ -+ || (__FreeBSD_version >= 900000 && __FreeBSD_version < 900045)) -+ if (!gTLSThreadID) -+ gTLSThreadID = mozilla::threads::Generic; -+#endif - if (!mThreadsByPRThread.Init()) - return NS_ERROR_OUT_OF_MEMORY; - diff --git a/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp b/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp deleted file mode 100644 index d9956b6852c3..000000000000 --- a/www/firefox-esr/files/patch-xpcom_base_nsStackWalk.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- xpcom/base/nsStackWalk.cpp.orig 2010-12-15 02:03:41.000000000 +0100 -+++ xpcom/base/nsStackWalk.cpp 2010-12-15 11:28:20.000000000 +0100 -@@ -1137,7 +1137,7 @@ - #define __USE_GNU - #endif - --#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) -+#if defined(HAVE_DLOPEN) || defined(XP_MACOSX) || defined(__FreeBSD__) - #include <dlfcn.h> - #endif - diff --git a/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in b/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in deleted file mode 100644 index 169fa43553d7..000000000000 --- a/www/firefox-esr/files/patch-xpcom_reflect_xptcall_src_md_unix_Makefile.in +++ /dev/null @@ -1,76 +0,0 @@ ---- xpcom/reflect/xptcall/src/md/unix/Makefile.in.orig 2011-04-26 23:22:05.000000000 +0200 -+++ xpcom/reflect/xptcall/src/md/unix/Makefile.in 2011-04-26 23:48:09.637442986 +0200 -@@ -94,6 +94,9 @@ - DEFINES += -DKEEP_STACK_16_BYTE_ALIGNED - CPPSRCS := xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp - 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 -@@ -130,6 +133,12 @@ - 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) - # - ifeq ($(OS_TARGET),NTO) -@@ -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) |