Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/0adbfe125e288c59588be... ...commit http://git.netsurf-browser.org/netsurf.git/commit/0adbfe125e288c59588be87... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0adbfe125e288c59588be87f7... The branch, master has been updated via 0adbfe125e288c59588be87f7cd8493b0c8c0351 (commit) from 97c12b975c163aa878736fe66d1968f0dc5af7eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=0adbfe125e288c59588... commit 0adbfe125e288c59588be87f7cd8493b0c8c0351 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Update for 3.1 release diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS index c15db57..3239e88 100644 --- a/Docs/BUILDING-AmigaOS +++ b/Docs/BUILDING-AmigaOS @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - Build Instructions for AmigaOS NetSurf 13 February 2010 + Build Instructions for AmigaOS NetSurf 29 March 2014 -------------------------------------------------------------------------------- This document provides instructions for building the AmigaOS version of @@ -59,19 +59,9 @@ To build and install these libraries, simply enter each of their directories and run: - 1> gmake install + 1> gmake PREFIX=/path/to/buildsystem - | Note: We advise enabling iconv() support in libparserutils, which vastly - | increases the number of supported character sets. To do this, - | create a file called Makefile.config.override in the libparserutils - | directory, containing the following lines: - | - | CFLAGS += -DWITH_ICONV_FILTER - | LDFLAGS += -liconv - | - | This requires libiconv as iconv support in newlib.library is buggy. - | - | For more information, consult the libparserutils README file. + The path MUST be in UNIX format and point to directory containing "share". | Note: Building libsvgtiny requires gperf, which is available from Aminet: | @@ -83,21 +73,23 @@ A version of libcurl built for newlib is available from Aminet - http://www.aminet.net/package/dev/lib/libcurl + http://www.os4depot.net/share/development/library/misc/libcurl.lha - There is a shared object version included with some OWB releases. To use - this when compiling with Cairo support, a link must be made: + To use the shared object when compiling with Cairo support, a link must be made: - 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl-7.16.so soft + 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl.so.8 soft libpng -------- NetSurf uses libPNG to display PNG files. - It builds without any problems on OS4, or available from Aminet: + It builds without any problems on OS4, or available from OS4Depot: - http://www.aminet.net/package/dev/lib/libpng_so + http://www.os4depot.net/share/development/library/graphics/libpng.lha + + If building with Cairo, NetSurf MUST be linked against the version of + libpng.so included with OS4. OpenSSL @@ -107,11 +99,10 @@ http://www.os4depot.net/share/development/library/misc/libopenssl.lha - There is a shared object version included with some OWB releases. To use - this when compiling with Cairo support, a link must be made: + To use the shared object when compiling with Cairo support, a link must be made: - 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl-0.9.8.so soft - 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libssl-0.9.8.so soft + 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl.so.1.0.0 soft + 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libcrypto.so.1.0.0 soft Libharu @@ -141,19 +132,18 @@ http://www.aminet.net/package/comm/www/OpenURL-OS4 - General requirements ----------------------- + Spidermonkey +-------------- - SDK:newlib/include/strings.h needs to be modified by adding the following: + Experimental Javascript support requires Spidermonkey. The patches to + build v1.7 are available from the NetSurf toolchains Git repository. - extern int strcasecmp(const char *, const char *); - extern int strncasecmp(const char *, const char *, size_t); - amiga/version.c is generated by version.rexx using the SVN command. If - the source has not been checked out from SVN, or is being cross-compiled, - this file will need to be created by hand. See the end of version.rexx - for the variables that are defined in the file. + General requirements +---------------------- Please note that building with Cairo (option NETSURF_AMIGA_USE_CAIRO) will link NetSurf against shared objects, and require the OS4.1 SDK to build and - AmigaOS 4.1 to run. + AmigaOS 4.1 to run. There is no longer any advantage in building against + Cairo beyond anti-aliasing, and this option may be removed in the future. + ----------------------------------------------------------------------- Summary of changes: Docs/BUILDING-AmigaOS | 56 ++++++++++++++++++++---------------------------- 1 files changed, 23 insertions(+), 33 deletions(-) diff --git a/Docs/BUILDING-AmigaOS b/Docs/BUILDING-AmigaOS index c15db57..3239e88 100644 --- a/Docs/BUILDING-AmigaOS +++ b/Docs/BUILDING-AmigaOS @@ -1,5 +1,5 @@ -------------------------------------------------------------------------------- - Build Instructions for AmigaOS NetSurf 13 February 2010 + Build Instructions for AmigaOS NetSurf 29 March 2014 -------------------------------------------------------------------------------- This document provides instructions for building the AmigaOS version of @@ -59,19 +59,9 @@ To build and install these libraries, simply enter each of their directories and run: - 1> gmake install + 1> gmake PREFIX=/path/to/buildsystem - | Note: We advise enabling iconv() support in libparserutils, which vastly - | increases the number of supported character sets. To do this, - | create a file called Makefile.config.override in the libparserutils - | directory, containing the following lines: - | - | CFLAGS += -DWITH_ICONV_FILTER - | LDFLAGS += -liconv - | - | This requires libiconv as iconv support in newlib.library is buggy. - | - | For more information, consult the libparserutils README file. + The path MUST be in UNIX format and point to directory containing "share". | Note: Building libsvgtiny requires gperf, which is available from Aminet: | @@ -83,21 +73,23 @@ A version of libcurl built for newlib is available from Aminet - http://www.aminet.net/package/dev/lib/libcurl + http://www.os4depot.net/share/development/library/misc/libcurl.lha - There is a shared object version included with some OWB releases. To use - this when compiling with Cairo support, a link must be made: + To use the shared object when compiling with Cairo support, a link must be made: - 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl-7.16.so soft + 1> makelink sdk:local/newlib/lib/libcurl.so sobjs:libcurl.so.8 soft libpng -------- NetSurf uses libPNG to display PNG files. - It builds without any problems on OS4, or available from Aminet: + It builds without any problems on OS4, or available from OS4Depot: - http://www.aminet.net/package/dev/lib/libpng_so + http://www.os4depot.net/share/development/library/graphics/libpng.lha + + If building with Cairo, NetSurf MUST be linked against the version of + libpng.so included with OS4. OpenSSL @@ -107,11 +99,10 @@ http://www.os4depot.net/share/development/library/misc/libopenssl.lha - There is a shared object version included with some OWB releases. To use - this when compiling with Cairo support, a link must be made: + To use the shared object when compiling with Cairo support, a link must be made: - 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl-0.9.8.so soft - 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libssl-0.9.8.so soft + 1> makelink sdk:local/newlib/lib/libssl.so sobjs:libssl.so.1.0.0 soft + 1> makelink sdk:local/newlib/lib/libcrypto.so sobjs:libcrypto.so.1.0.0 soft Libharu @@ -141,19 +132,18 @@ http://www.aminet.net/package/comm/www/OpenURL-OS4 - General requirements ----------------------- + Spidermonkey +-------------- - SDK:newlib/include/strings.h needs to be modified by adding the following: + Experimental Javascript support requires Spidermonkey. The patches to + build v1.7 are available from the NetSurf toolchains Git repository. - extern int strcasecmp(const char *, const char *); - extern int strncasecmp(const char *, const char *, size_t); - amiga/version.c is generated by version.rexx using the SVN command. If - the source has not been checked out from SVN, or is being cross-compiled, - this file will need to be created by hand. See the end of version.rexx - for the variables that are defined in the file. + General requirements +---------------------- Please note that building with Cairo (option NETSURF_AMIGA_USE_CAIRO) will link NetSurf against shared objects, and require the OS4.1 SDK to build and - AmigaOS 4.1 to run. + AmigaOS 4.1 to run. There is no longer any advantage in building against + Cairo beyond anti-aliasing, and this option may be removed in the future. + -- NetSurf Browser