March 2019 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch chris/amissl updated. release/3.8-120-g60e9eb5

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/60e9eb50c32594acb2885... ...commit http://git.netsurf-browser.org/netsurf.git/commit/60e9eb50c32594acb28857e... ...tree http://git.netsurf-browser.org/netsurf.git/tree/60e9eb50c32594acb28857e3f... The branch, chris/amissl has been updated via 60e9eb50c32594acb28857e3f6ae640f1992a2cd (commit) from 7ecc0d3bf8cc2728e04addccc5a575c6141649a7 (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=60e9eb50c32594acb28... commit 60e9eb50c32594acb28857e3f6ae640f1992a2cd Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> lpthread no longer being picked up from curl pkgconfig diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 4aa09b6..b71ae3c 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -25,6 +25,8 @@ LDFLAGS += -lpbl -liconv ifeq ($(SUBTARGET),os3) LDFLAGS += -lamiga -lm +else + LDFLAGS += -lpthread endif EXETARGET := NetSurf ----------------------------------------------------------------------- Summary of changes: frontends/amiga/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 4aa09b6..b71ae3c 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -25,6 +25,8 @@ LDFLAGS += -lpbl -liconv ifeq ($(SUBTARGET),os3) LDFLAGS += -lamiga -lm +else + LDFLAGS += -lpthread endif EXETARGET := NetSurf -- NetSurf Browser

3 years, 11 months

1
0
0 / 0

toolchains: branch chris/amissl updated. 80876c7ae0c7cc58b8f103b35cf422efa19c7e50

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/80876c7ae0c7cc58b8... ...commit http://git.netsurf-browser.org/toolchains.git/commit/80876c7ae0c7cc58b8f1... ...tree http://git.netsurf-browser.org/toolchains.git/tree/80876c7ae0c7cc58b8f103... The branch, chris/amissl has been updated via 80876c7ae0c7cc58b8f103b35cf422efa19c7e50 (commit) from 32cb94f59525f4b9ccfdf80111dc857bfdea1a41 (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/toolchains.git/commit/?id=80876c7ae0c7cc58... commit 80876c7ae0c7cc58b8f103b35cf422efa19c7e50 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Fix ppc-amigaos libcurl 7.64.1 build diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p index 9833c94..5243fc5 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p @@ -1,11 +1,20 @@ ---- lib/amigaos.c.old 2012-10-19 21:37:45.000000000 +0100 -+++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100 -@@ -22,7 +22,7 @@ +--- lib/amigaos.c 2019-03-25 08:42:50.000000000 +0000 ++++ lib/amigaos.c 2019-03-30 12:49:06.680985341 +0000 +@@ -24,7 +24,7 @@ - #include "curl_setup.h" + #ifdef __AMIGA__ + # include "amigaos.h" +-# if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL) ++# if 0 + # include <amitcp/socketbasetags.h> + # endif + # ifdef __libnix__ +@@ -37,7 +37,7 @@ + #include "memdebug.h" --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) - - #include <amitcp/socketbasetags.h> + #ifdef __AMIGA__ +-#if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL) ++#if 0 + struct Library *SocketBase = NULL; + extern int errno, h_errno; diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p index 050bea7..2f62a1c 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p @@ -1,11 +1,11 @@ ---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100 -+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100 +--- lib/amigaos.h 2019-03-25 08:42:50.000000000 +0000 ++++ lib/amigaos.h 2019-03-30 12:49:50.744493740 +0000 @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) +-#if defined(__AMIGA__) && defined(HAVE_BSDSOCKET_H) && !defined(USE_AMISSL) ++#if 0 bool Curl_amiga_init(); void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p index 7e47a50..0e52d73 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p @@ -1,23 +1,12 @@ ---- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100 -+++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100 -@@ -323,11 +323,15 @@ - - #ifdef __AMIGA__ - # ifndef __ixemul__ --# include <exec/types.h> --# include <exec/execbase.h> --# include <proto/exec.h> --# include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# ifdef __amigaos4__ -+# include <unistd.h> -+# else -+# include <exec/types.h> -+# include <exec/execbase.h> -+# include <proto/exec.h> -+# include <proto/dos.h> -+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# endif +--- lib/curl_setup.h 2019-03-30 13:44:08.576270700 +0000 ++++ lib/curl_setup.h 2019-03-30 13:44:33.011975643 +0000 +@@ -314,7 +314,8 @@ + # include <exec/execbase.h> + # include <proto/exec.h> + # include <proto/dos.h> +-# ifdef HAVE_PROTO_BSDSOCKET_H ++# define HAVE_SELECT 1 ++# if 0 + # include <proto/bsdsocket.h> /* ensure bsdsocket.library use */ + # define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) # endif - #endif - diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p index 6237496..4c9a726 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p @@ -1,26 +1,11 @@ ---- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 -+++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 -@@ -33,6 +33,10 @@ - # include <fabdef.h> - #endif - -+#ifdef __AMIGA__ -+#include <proto/dos.h> -+#endif -+ - #include "strcase.h" - - #define ENABLE_CURLX_PRINTF -@@ -1856,9 +1860,9 @@ - #ifdef __AMIGA__ - if(!result && outs.s_isreg && outs.filename) { +--- src/tool_operate.c 2019-03-30 12:33:41.315465662 +0000 ++++ src/tool_operate.c 2019-03-30 12:42:36.643382219 +0000 +@@ -1872,7 +1872,7 @@ static CURLcode operate_do(struct Global /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -+ if(strlen(urlnode->url) > 78) -+ urlnode->url[79] = '\0'; -+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ + if(strlen(urlnode->url) > 78) + urlnode->url[79] = '\0'; +- SetComment(outs.filename, urlnode->url); ++ IDOS->SetComment(outs.filename, urlnode->url); } #endif ----------------------------------------------------------------------- Summary of changes: .../patches/libcurl/ppc-amigaos/lib.amigaos.c.p | 25 ++++++++++----- .../patches/libcurl/ppc-amigaos/lib.amigaos.h.p | 8 ++--- .../patches/libcurl/ppc-amigaos/lib.curl_setup.h.p | 33 +++++++------------- .../libcurl/ppc-amigaos/src.tool_operate.c.p | 29 +++++------------ 4 files changed, 39 insertions(+), 56 deletions(-) diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p index 9833c94..5243fc5 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p @@ -1,11 +1,20 @@ ---- lib/amigaos.c.old 2012-10-19 21:37:45.000000000 +0100 -+++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100 -@@ -22,7 +22,7 @@ +--- lib/amigaos.c 2019-03-25 08:42:50.000000000 +0000 ++++ lib/amigaos.c 2019-03-30 12:49:06.680985341 +0000 +@@ -24,7 +24,7 @@ - #include "curl_setup.h" + #ifdef __AMIGA__ + # include "amigaos.h" +-# if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL) ++# if 0 + # include <amitcp/socketbasetags.h> + # endif + # ifdef __libnix__ +@@ -37,7 +37,7 @@ + #include "memdebug.h" --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) - - #include <amitcp/socketbasetags.h> + #ifdef __AMIGA__ +-#if defined(HAVE_PROTO_BSDSOCKET_H) && !defined(USE_AMISSL) ++#if 0 + struct Library *SocketBase = NULL; + extern int errno, h_errno; diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p index 050bea7..2f62a1c 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p @@ -1,11 +1,11 @@ ---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100 -+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100 +--- lib/amigaos.h 2019-03-25 08:42:50.000000000 +0000 ++++ lib/amigaos.h 2019-03-30 12:49:50.744493740 +0000 @@ -23,7 +23,7 @@ ***************************************************************************/ #include "curl_setup.h" --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) +-#if defined(__AMIGA__) && defined(HAVE_BSDSOCKET_H) && !defined(USE_AMISSL) ++#if 0 bool Curl_amiga_init(); void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p index 7e47a50..0e52d73 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p @@ -1,23 +1,12 @@ ---- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100 -+++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100 -@@ -323,11 +323,15 @@ - - #ifdef __AMIGA__ - # ifndef __ixemul__ --# include <exec/types.h> --# include <exec/execbase.h> --# include <proto/exec.h> --# include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# ifdef __amigaos4__ -+# include <unistd.h> -+# else -+# include <exec/types.h> -+# include <exec/execbase.h> -+# include <proto/exec.h> -+# include <proto/dos.h> -+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# endif +--- lib/curl_setup.h 2019-03-30 13:44:08.576270700 +0000 ++++ lib/curl_setup.h 2019-03-30 13:44:33.011975643 +0000 +@@ -314,7 +314,8 @@ + # include <exec/execbase.h> + # include <proto/exec.h> + # include <proto/dos.h> +-# ifdef HAVE_PROTO_BSDSOCKET_H ++# define HAVE_SELECT 1 ++# if 0 + # include <proto/bsdsocket.h> /* ensure bsdsocket.library use */ + # define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) # endif - #endif - diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p index 6237496..4c9a726 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p @@ -1,26 +1,11 @@ ---- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 -+++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 -@@ -33,6 +33,10 @@ - # include <fabdef.h> - #endif - -+#ifdef __AMIGA__ -+#include <proto/dos.h> -+#endif -+ - #include "strcase.h" - - #define ENABLE_CURLX_PRINTF -@@ -1856,9 +1860,9 @@ - #ifdef __AMIGA__ - if(!result && outs.s_isreg && outs.filename) { +--- src/tool_operate.c 2019-03-30 12:33:41.315465662 +0000 ++++ src/tool_operate.c 2019-03-30 12:42:36.643382219 +0000 +@@ -1872,7 +1872,7 @@ static CURLcode operate_do(struct Global /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -+ if(strlen(urlnode->url) > 78) -+ urlnode->url[79] = '\0'; -+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ + if(strlen(urlnode->url) > 78) + urlnode->url[79] = '\0'; +- SetComment(outs.filename, urlnode->url); ++ IDOS->SetComment(outs.filename, urlnode->url); } #endif -- Cross-compilation toolchains and environments

3 years, 11 months

1
0
0 / 0

netsurf: branch chris/amissl updated. release/3.8-119-g7ecc0d3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7ecc0d3bf8cc2728e04ad... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7ecc0d3bf8cc2728e04addc... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7ecc0d3bf8cc2728e04addccc... The branch, chris/amissl has been updated via 7ecc0d3bf8cc2728e04addccc5a575c6141649a7 (commit) from 7c4663de14edaff53367a32f5670ecb711f5e8c4 (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=7ecc0d3bf8cc2728e04... commit 7ecc0d3bf8cc2728e04addccc5a575c6141649a7 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Add AmiSSL requirement diff --git a/frontends/amiga/pkg/netsurf_os3.readme b/frontends/amiga/pkg/netsurf_os3.readme index 66774e6..0b31275 100644 --- a/frontends/amiga/pkg/netsurf_os3.readme +++ b/frontends/amiga/pkg/netsurf_os3.readme @@ -3,7 +3,7 @@ Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www Version: 3.9 BETA -Requires: dev/misc/guigfxlib.lha +Requires: dev/misc/guigfxlib.lha util/libs/AmiSSL-4.3.lha Architecture: m68k-amigaos >= 3.5.0 This is NetSurf 3.9 BETA for AmigaOS 3. ----------------------------------------------------------------------- Summary of changes: frontends/amiga/pkg/netsurf_os3.readme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontends/amiga/pkg/netsurf_os3.readme b/frontends/amiga/pkg/netsurf_os3.readme index 66774e6..0b31275 100644 --- a/frontends/amiga/pkg/netsurf_os3.readme +++ b/frontends/amiga/pkg/netsurf_os3.readme @@ -3,7 +3,7 @@ Uploader: chris(a)unsatisfactorysoftware.co.uk (Chris Young) Author: NetSurf contributors (OS4 port by Chris Young) Type: comm/www Version: 3.9 BETA -Requires: dev/misc/guigfxlib.lha +Requires: dev/misc/guigfxlib.lha util/libs/AmiSSL-4.3.lha Architecture: m68k-amigaos >= 3.5.0 This is NetSurf 3.9 BETA for AmigaOS 3. -- NetSurf Browser

3 years, 11 months

1
0
0 / 0

toolchains: branch chris/amissl updated. 32cb94f59525f4b9ccfdf80111dc857bfdea1a41

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/32cb94f59525f4b9cc... ...commit http://git.netsurf-browser.org/toolchains.git/commit/32cb94f59525f4b9ccfd... ...tree http://git.netsurf-browser.org/toolchains.git/tree/32cb94f59525f4b9ccfdf8... The branch, chris/amissl has been updated via 32cb94f59525f4b9ccfdf80111dc857bfdea1a41 (commit) via 5016ed76a46f44fec3d0576538a68036aad8b9a8 (commit) from 1b97408860880a30c711c9fc8ee04bb4cde121aa (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/toolchains.git/commit/?id=32cb94f59525f4b9... commit 32cb94f59525f4b9ccfdf80111dc857bfdea1a41 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> AmiSSL 4.2 SDK is more compatible v4.3 has compatibility issues which means that SDK won't work with future versions, whereas 4.2 will. diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 6dd0d2a..dd171af 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -36,7 +36,7 @@ UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... -UPSTREAM_AMISSL_VERSION := 4.3 +UPSTREAM_AMISSL_VERSION := 4.2 UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha UPSTREAM_AMISSL_URI := https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_V... commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=5016ed76a46f44fe... commit 5016ed76a46f44fec3d0576538a68036aad8b9a8 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Need Curl 7.64.1 for AmiSSL diff --git a/sdk/Makefile b/sdk/Makefile index d176e63..e49b01c 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -31,7 +31,7 @@ VERSION_LIBPNG := 1.6.36 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.3 VERSION_LIBCARES := 1.13.0 -VERSION_LIBCURL := 7.64.0 +VERSION_LIBCURL := 7.64.1 VERSION_LIBGNURX := 2.5.1 VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 ----------------------------------------------------------------------- Summary of changes: m68k-unknown-amigaos/Makefile | 2 +- sdk/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 6dd0d2a..dd171af 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -36,7 +36,7 @@ UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... -UPSTREAM_AMISSL_VERSION := 4.3 +UPSTREAM_AMISSL_VERSION := 4.2 UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION).lha UPSTREAM_AMISSL_URI := https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_V... diff --git a/sdk/Makefile b/sdk/Makefile index d176e63..e49b01c 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -31,7 +31,7 @@ VERSION_LIBPNG := 1.6.36 VERSION_LIBJPEG := 8d VERSION_LIBJPEG_TURBO := 1.5.3 VERSION_LIBCARES := 1.13.0 -VERSION_LIBCURL := 7.64.0 +VERSION_LIBCURL := 7.64.1 VERSION_LIBGNURX := 2.5.1 VERSION_LIBPBL := 1_04 VERSION_LIBCF := CVS-20130415 -- Cross-compilation toolchains and environments

3 years, 11 months

1
0
0 / 0

toolchains: branch chris/amissl updated. 1b97408860880a30c711c9fc8ee04bb4cde121aa

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/1b97408860880a30c7... ...commit http://git.netsurf-browser.org/toolchains.git/commit/1b97408860880a30c711... ...tree http://git.netsurf-browser.org/toolchains.git/tree/1b97408860880a30c711c9... The branch, chris/amissl has been updated via 1b97408860880a30c711c9fc8ee04bb4cde121aa (commit) from c7a9662f9f362809fee572665c4ec8f00f3dbd93 (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/toolchains.git/commit/?id=1b97408860880a30... commit 1b97408860880a30c711c9fc8ee04bb4cde121aa Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> These patches shouldn't be needed with the next release of curl (>7.64.0) At least if built against AmiSSL+bsdsocket the base package will configure properly for OS3 (OS4, not so much) diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p deleted file mode 100644 index 5b6c913..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000 -@@ -22,7 +22,7 @@ - - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - #include <amitcp/socketbasetags.h> - diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p deleted file mode 100644 index de22d82..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000 -@@ -23,7 +23,7 @@ - ***************************************************************************/ - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - bool Curl_amiga_init(); - void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p deleted file mode 100644 index c9b9af3..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100 -+++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000 -@@ -311,7 +311,6 @@ - # include <exec/execbase.h> - # include <proto/exec.h> - # include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) - # endif - #endif - diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p deleted file mode 100644 index 7de5cba..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p +++ /dev/null @@ -1,13 +0,0 @@ ---- ./tool_getpass.c 2014-06-11 18:52:29.000000000 +0100 -+++ src/tool_getpass.c 2015-01-05 21:42:31.826011647 +0000 -@@ -24,6 +24,10 @@ - #ifndef HAVE_GETPASS_R - /* this file is only for systems without getpass_r() */ - -+#ifdef __AMIGA__ -+#undef HAVE_TERMIOS_H -+#endif -+ - #ifdef HAVE_FCNTL_H - # include <fcntl.h> - #endif diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p deleted file mode 100644 index 6237496..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,26 +0,0 @@ ---- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 -+++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 -@@ -33,6 +33,10 @@ - # include <fabdef.h> - #endif - -+#ifdef __AMIGA__ -+#include <proto/dos.h> -+#endif -+ - #include "strcase.h" - - #define ENABLE_CURLX_PRINTF -@@ -1856,9 +1860,9 @@ - #ifdef __AMIGA__ - if(!result && outs.s_isreg && outs.filename) { - /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -+ if(strlen(urlnode->url) > 78) -+ urlnode->url[79] = '\0'; -+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ - } - #endif - ----------------------------------------------------------------------- Summary of changes: .../libcurl/m68k-unknown-amigaos/lib.amigaos.c.p | 11 --------- .../libcurl/m68k-unknown-amigaos/lib.amigaos.h.p | 11 --------- .../m68k-unknown-amigaos/lib.curl_setup.h.p | 10 -------- .../m68k-unknown-amigaos/src.tool_getpass.c.p | 13 ---------- .../m68k-unknown-amigaos/src.tool_operate.c.p | 26 -------------------- 5 files changed, 71 deletions(-) delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p delete mode 100644 sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p deleted file mode 100644 index 5b6c913..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000 -@@ -22,7 +22,7 @@ - - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - #include <amitcp/socketbasetags.h> - diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p deleted file mode 100644 index de22d82..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000 -@@ -23,7 +23,7 @@ - ***************************************************************************/ - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - bool Curl_amiga_init(); - void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p deleted file mode 100644 index c9b9af3..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p +++ /dev/null @@ -1,10 +0,0 @@ ---- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100 -+++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000 -@@ -311,7 +311,6 @@ - # include <exec/execbase.h> - # include <proto/exec.h> - # include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) - # endif - #endif - diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p deleted file mode 100644 index 7de5cba..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p +++ /dev/null @@ -1,13 +0,0 @@ ---- ./tool_getpass.c 2014-06-11 18:52:29.000000000 +0100 -+++ src/tool_getpass.c 2015-01-05 21:42:31.826011647 +0000 -@@ -24,6 +24,10 @@ - #ifndef HAVE_GETPASS_R - /* this file is only for systems without getpass_r() */ - -+#ifdef __AMIGA__ -+#undef HAVE_TERMIOS_H -+#endif -+ - #ifdef HAVE_FCNTL_H - # include <fcntl.h> - #endif diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p deleted file mode 100644 index 6237496..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,26 +0,0 @@ ---- src/tool_operate.c.orig 2019-02-14 14:10:08.086190650 +0000 -+++ src/tool_operate.c 2019-02-14 14:10:04.862196063 +0000 -@@ -33,6 +33,10 @@ - # include <fabdef.h> - #endif - -+#ifdef __AMIGA__ -+#include <proto/dos.h> -+#endif -+ - #include "strcase.h" - - #define ENABLE_CURLX_PRINTF -@@ -1856,9 +1860,9 @@ - #ifdef __AMIGA__ - if(!result && outs.s_isreg && outs.filename) { - /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -+ if(strlen(urlnode->url) > 78) -+ urlnode->url[79] = '\0'; -+ /*SetComment(outs.filename, urlnode->url);*/ /* cannot get a header to include that provides this function */ - } - #endif - -- Cross-compilation toolchains and environments

3 years, 12 months

1
0
0 / 0

netsurf: branch chris/amissl updated. release/3.8-118-g7c4663d

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7c4663de14edaff53367a... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7c4663de14edaff53367a32... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7c4663de14edaff53367a32f5... The branch, chris/amissl has been updated via 7c4663de14edaff53367a32f5670ecb711f5e8c4 (commit) via 806ac45d8c46a4ce5968675f23363206d6a736a8 (commit) via 1a274192a7905d9a7366388ac67018bb67edf7e9 (commit) via 3a8484c0b706cf439eb91545774734a4a755bb7c (commit) via 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (commit) via bd0a1533a52f5049680d67006dad6d9477b2a4be (commit) via 22b1484300c727aacd0f0e410810d666df5c027d (commit) via d0a9fc3e35113e8734d10338856a43599f98d50c (commit) via 5d69dd9ddff1f39d8d8320df662fb881d8775649 (commit) via 7d402ebc460ec5a11eab526cc52b4d6430496df3 (commit) from 155c0c568f56012b624ae7000200e6f2d270ce50 (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=7c4663de14edaff5336... commit 7c4663de14edaff53367a32f5670ecb711f5e8c4 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Add new netinclude path to the includes if building against AmiSSL/direct bsdsocket.library diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 7c4d16e..4aa09b6 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -12,7 +12,7 @@ endif $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) -$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL)) +$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=806ac45d8c46a4ce596... commit 806ac45d8c46a4ce5968675f23363206d6a736a8 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Add some extra comment about AmiSSL diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index 17e097d..2d5cec7 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -8,6 +8,7 @@ NETSURF_USE_LIBICONV_PLUG := NO # Use AmiSSL for secure connections. # Either this or NETSURF_USE_OPENSSL should be specified, not both. +# libcurl must have been built against the same library. # Valid options: YES, NO NETSURF_USE_AMISSL := NO commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=1a274192a7905d9a736... commit 1a274192a7905d9a7366388ac67018bb67edf7e9 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Revert "try different debug option" This reverts commit bd0a1533a52f5049680d67006dad6d9477b2a4be. diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index 5e93012..17e097d 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -33,14 +33,11 @@ NETSURF_USE_NSSVG := YES NETSURF_FS_BACKING_STORE := YES # Optimisation levels -CFLAGS += -fomit-frame-pointer +CFLAGS += -fomit-frame-pointer -gstabs # Target-specific ifeq ($(SUBTARGET),os3) NETSURF_USE_OPENSSL := NO NETSURF_USE_AMISSL := YES - CFLAGS += -ggdb -else - CFLAGS += -gstabs endif commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=3a8484c0b706cf439eb... commit 3a8484c0b706cf439eb91545774734a4a755bb7c Merge: bd0a153 7c9066b Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/amissl commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=bd0a1533a52f5049680... commit bd0a1533a52f5049680d67006dad6d9477b2a4be Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> try different debug option diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index 17e097d..5e93012 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -33,11 +33,14 @@ NETSURF_USE_NSSVG := YES NETSURF_FS_BACKING_STORE := YES # Optimisation levels -CFLAGS += -fomit-frame-pointer -gstabs +CFLAGS += -fomit-frame-pointer # Target-specific ifeq ($(SUBTARGET),os3) NETSURF_USE_OPENSSL := NO NETSURF_USE_AMISSL := YES + CFLAGS += -ggdb +else + CFLAGS += -gstabs endif commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=22b1484300c727aacd0... commit 22b1484300c727aacd0f0e410810d666df5c027d Merge: 5d69dd9 d0a9fc3 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/amissl commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=5d69dd9ddff1f39d8d8... commit 5d69dd9ddff1f39d8d8320df662fb881d8775649 Merge: 155c0c5 7d402eb Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/amissl ----------------------------------------------------------------------- Summary of changes: frontends/amiga/Makefile | 4 ++-- frontends/amiga/Makefile.defaults | 1 + frontends/amiga/gui.c | 16 +--------------- frontends/amiga/libs.c | 10 +++++++--- frontends/amiga/schedule.c | 10 +++++++++- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 850c941..4aa09b6 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -12,7 +12,7 @@ endif $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) -$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL)) +$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) @@ -99,5 +99,5 @@ netsurf.lha: $(EXETARGET) $(Q)cp -p $(AMIGA_PKG_DIR)/netsurf.readme.info $(AMIGA_INSTALL_TARGET_DIR)/NetSurf endif $(Q)cd $(AMIGA_INSTALL_TARGET_DIR); \ - lha a netsurf.lha NetSurf NetSurf.info AutoInstall + lha ao6 netsurf.lha NetSurf NetSurf.info AutoInstall diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index 17e097d..2d5cec7 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -8,6 +8,7 @@ NETSURF_USE_LIBICONV_PLUG := NO # Use AmiSSL for secure connections. # Either this or NETSURF_USE_OPENSSL should be specified, not both. +# libcurl must have been built against the same library. # Valid options: YES, NO NETSURF_USE_AMISSL := NO diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index cc4397e..2c84d4d 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -787,21 +787,7 @@ static nsurl *gui_get_resource_url(const char *path) nsurl *url = NULL; if(ami_locate_resource(buf, path) == false) - { - if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm", SLEN(".htm")) == 0) || - (strncmp(path + strlen(path) - SLEN(".html"), ".html", SLEN(".html")) == 0)) - { - /* Try with RISC OS HTML filetype, might work */ - strcpy(path2, path); - strcat(path2, ",faf"); - - if(ami_locate_resource(buf, path2) == false) - { - return NULL; - } - } - else return NULL; - } + return NULL; netsurf_path_to_nsurl(buf, &url); diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c index cbef3c2..7de768b 100644 --- a/frontends/amiga/libs.c +++ b/frontends/amiga/libs.c @@ -113,7 +113,9 @@ #define AMINS_CLASS_CLOSE(PREFIX) \ if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \ - if(PREFIX##Base) CloseClass(PREFIX##Base); + if(PREFIX##Base) CloseClass(PREFIX##Base); \ + I##PREFIX = NULL; \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct ClassLibrary *PREFIX##Base = NULL; \ @@ -136,7 +138,8 @@ } #define AMINS_LIB_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); + if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_LIB_STRUCT(PREFIX) \ struct PREFIX##Base *PREFIX##Base = NULL; @@ -156,7 +159,8 @@ } #define AMINS_CLASS_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary(PREFIX##Base); + if(PREFIX##Base) CloseLibrary(PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct Library *PREFIX##Base = NULL; \ diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c index 2d2da38..ee4e34a 100644 --- a/frontends/amiga/schedule.c +++ b/frontends/amiga/schedule.c @@ -170,7 +170,11 @@ static nserror schedule_remove(void (*callback)(void *p), void *p, bool abort) if(nscb != NULL) { if(abort == true) ami_schedule_remove_timer_event(nscb); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif pblHeapConstruct(schedule_list); } @@ -190,7 +194,11 @@ static void schedule_remove_all(void) { ami_schedule_remove_timer_event(nscb); pblIteratorRemove(iterator); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif }; pblIteratorFree(iterator); @@ -337,7 +345,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void *p) TAG_DONE); #else if(schedule_msgport == NULL) return NSERROR_NOMEM; - nscb = (struct nscallback *)CreateIORequest(schedule_msgport, sizeof(struct nscallback)); + nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR); *nscb = *tioreq; #endif if(!nscb) return NSERROR_NOMEM; -- NetSurf Browser

3 years, 12 months

1
0
0 / 0

toolchains: branch chris/amissl updated. c7a9662f9f362809fee572665c4ec8f00f3dbd93

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/c7a9662f9f362809fe... ...commit http://git.netsurf-browser.org/toolchains.git/commit/c7a9662f9f362809fee5... ...tree http://git.netsurf-browser.org/toolchains.git/tree/c7a9662f9f362809fee572... The branch, chris/amissl has been updated via c7a9662f9f362809fee572665c4ec8f00f3dbd93 (commit) via 2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791 (commit) via 5aa16e27177fbaffb9955abe48bd2917d0253828 (commit) from 89e31170574c954cfabec1634df5d1918d5fa59f (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/toolchains.git/commit/?id=c7a9662f9f362809... commit c7a9662f9f362809fee572665c4ec8f00f3dbd93 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Add netinclude dir to Curl's CFLAGS diff --git a/sdk/Makefile b/sdk/Makefile index 8c8c93d..d176e63 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -131,7 +131,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos) LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" - LIBCURL_ENV := CFLAGS="-D__NO_NET_API" LIBS="-lm" + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -306,6 +306,7 @@ $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d mkdir -p $(BUILDDIR)/Roadshow-SDK lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + mkdir -p $(GCCSDK_INSTALL_ENV)/netinclude cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ touch $@ commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=2b2fc4177cdc4fee... commit 2b2fc4177cdc4feef6c46cbd0e710b49ccfc4791 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Move Roadshow SDK into the SDK part of the toolchain where the include path can be determined more easily diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index d26af6b..6dd0d2a 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -32,9 +32,6 @@ UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_ UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am... -UPSTREAM_ROADSHOWSDK_TARBALL := Roadshow-SDK-NS.lha -UPSTREAM_ROADSHOWSDK_URI := https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/$(UP... - UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... @@ -127,7 +124,7 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -149,9 +146,6 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/* $(PREFIX)/$(TARGET_NAME)/lib/ - mkdir -p $(BUILDDIR)/Roadshow-SDK - lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) - cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(PREFIX)/$(TARGET_NAME)/netinclude/ touch $@ ### @@ -262,9 +256,6 @@ $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL): $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) -$(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL): - wget -q -O $@ $(UPSTREAM_ROADSHOWSDK_URI) - $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) diff --git a/sdk/Makefile b/sdk/Makefile index 82940b7..8c8c93d 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -125,7 +125,7 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) EXTRAARGS_LIBCARES := --disable-shared --without-random EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" @@ -302,6 +302,19 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$( $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FRE..." $@ +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ + touch $@ + +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS.lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS.lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/Road..." $@ + # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d mkdir -p $(BUILDDIR)/libtre commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=5aa16e27177fbaff... commit 5aa16e27177fbaffb9955abe48bd2917d0253828 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Install the Roadshow SDK into netinclude This is a modified copy of the SDK, partly because the official download is buried behind a form and can't be downloaded directly: netinclude/inline/* are the corrected ones netinclude/errno.h has been removed source_code has been removed diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 6dd0d2a..d26af6b 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -32,6 +32,9 @@ UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_ UPSTREAM_NDK_TARBALL := ndk-3.9-includes.tar.bz2 UPSTREAM_NDK_URI := http://kas1e.mikendezign.com/zerohero_crosscompilers_backup/files/m68k-am... +UPSTREAM_ROADSHOWSDK_TARBALL := Roadshow-SDK-NS.lha +UPSTREAM_ROADSHOWSDK_URI := https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/$(UP... + UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSIO... @@ -124,7 +127,7 @@ $(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -146,6 +149,9 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/* $(PREFIX)/$(TARGET_NAME)/lib/ + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL) + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(PREFIX)/$(TARGET_NAME)/netinclude/ touch $@ ### @@ -256,6 +262,9 @@ $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL): $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) +$(SOURCESDIR)/$(UPSTREAM_ROADSHOWSDK_TARBALL): + wget -q -O $@ $(UPSTREAM_ROADSHOWSDK_URI) + $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sdk/Makefile b/sdk/Makefile index 82940b7..d176e63 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -125,13 +125,13 @@ ifeq ($(TARGET),i686-w64-mingw32) endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) EXTRAARGS_LIBCARES := --disable-shared --without-random EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" - LIBCURL_ENV := CFLAGS="-D__NO_NET_API" LIBS="-lm" + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API" LIBS="-lm" endif ifeq ($(SDK_ITEMS),) @@ -302,6 +302,20 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$( $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FRE..." $@ +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS.lha + mkdir -p $(GCCSDK_INSTALL_ENV)/netinclude + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ + touch $@ + +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS.lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS.lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-7_64_0-amissl/Road..." $@ + # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d mkdir -p $(BUILDDIR)/libtre -- Cross-compilation toolchains and environments

3 years, 12 months

1
0
0 / 0

netsurf: branch tlsa/monkey-driver deleted. release/3.8-41-g7eacd9a

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/000000000000000000000... ...commit http://git.netsurf-browser.org/netsurf.git/commit/00000000000000000000000... ...tree http://git.netsurf-browser.org/netsurf.git/tree/0000000000000000000000000... The branch, tlsa/monkey-driver has been deleted was 7eacd9a626ef0ac690868af07dcbb7ed05792aa9 ----------------------------------------------------------------------- 7eacd9a626ef0ac690868af07dcbb7ed05792aa9 Monkey driver: Initial loader for monkey test plans. ----------------------------------------------------------------------- -- NetSurf Browser

4 years

1
0
0 / 0

netsurf: branch master updated. release/3.8-105-g7c9066b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7c9066b49faed1a4f614a... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7c9066b49faed1a4f614a4f... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7c9066b49faed1a4f614a4f2a... The branch, master has been updated via 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (commit) from d0a9fc3e35113e8734d10338856a43599f98d50c (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=7c9066b49faed1a4f61... commit 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> No reason why RISC OS ,type extensions should end up in the Amiga resources any more diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 43dd351..ae99450 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -781,21 +781,7 @@ static nsurl *gui_get_resource_url(const char *path) nsurl *url = NULL; if(ami_locate_resource(buf, path) == false) - { - if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm", SLEN(".htm")) == 0) || - (strncmp(path + strlen(path) - SLEN(".html"), ".html", SLEN(".html")) == 0)) - { - /* Try with RISC OS HTML filetype, might work */ - strcpy(path2, path); - strcat(path2, ",faf"); - - if(ami_locate_resource(buf, path2) == false) - { - return NULL; - } - } - else return NULL; - } + return NULL; netsurf_path_to_nsurl(buf, &url); ----------------------------------------------------------------------- Summary of changes: frontends/amiga/gui.c | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 43dd351..ae99450 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -781,21 +781,7 @@ static nsurl *gui_get_resource_url(const char *path) nsurl *url = NULL; if(ami_locate_resource(buf, path) == false) - { - if((strncmp(path + strlen(path) - SLEN(".htm"), ".htm", SLEN(".htm")) == 0) || - (strncmp(path + strlen(path) - SLEN(".html"), ".html", SLEN(".html")) == 0)) - { - /* Try with RISC OS HTML filetype, might work */ - strcpy(path2, path); - strcat(path2, ",faf"); - - if(ami_locate_resource(buf, path2) == false) - { - return NULL; - } - } - else return NULL; - } + return NULL; netsurf_path_to_nsurl(buf, &url); -- NetSurf Browser

4 years

1
0
0 / 0

netsurf: branch master updated. release/3.8-104-gd0a9fc3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/d0a9fc3e35113e8734d10... ...commit http://git.netsurf-browser.org/netsurf.git/commit/d0a9fc3e35113e8734d1033... ...tree http://git.netsurf-browser.org/netsurf.git/tree/d0a9fc3e35113e8734d103388... The branch, master has been updated via d0a9fc3e35113e8734d10338856a43599f98d50c (commit) from 7d402ebc460ec5a11eab526cc52b4d6430496df3 (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=d0a9fc3e35113e8734d... commit d0a9fc3e35113e8734d10338856a43599f98d50c Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Fix IORequest duplication and ensure library bases are cleared when closed. diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c index cbef3c2..7de768b 100644 --- a/frontends/amiga/libs.c +++ b/frontends/amiga/libs.c @@ -113,7 +113,9 @@ #define AMINS_CLASS_CLOSE(PREFIX) \ if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \ - if(PREFIX##Base) CloseClass(PREFIX##Base); + if(PREFIX##Base) CloseClass(PREFIX##Base); \ + I##PREFIX = NULL; \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct ClassLibrary *PREFIX##Base = NULL; \ @@ -136,7 +138,8 @@ } #define AMINS_LIB_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); + if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_LIB_STRUCT(PREFIX) \ struct PREFIX##Base *PREFIX##Base = NULL; @@ -156,7 +159,8 @@ } #define AMINS_CLASS_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary(PREFIX##Base); + if(PREFIX##Base) CloseLibrary(PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct Library *PREFIX##Base = NULL; \ diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c index 2d2da38..ee4e34a 100644 --- a/frontends/amiga/schedule.c +++ b/frontends/amiga/schedule.c @@ -170,7 +170,11 @@ static nserror schedule_remove(void (*callback)(void *p), void *p, bool abort) if(nscb != NULL) { if(abort == true) ami_schedule_remove_timer_event(nscb); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif pblHeapConstruct(schedule_list); } @@ -190,7 +194,11 @@ static void schedule_remove_all(void) { ami_schedule_remove_timer_event(nscb); pblIteratorRemove(iterator); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif }; pblIteratorFree(iterator); @@ -337,7 +345,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void *p) TAG_DONE); #else if(schedule_msgport == NULL) return NSERROR_NOMEM; - nscb = (struct nscallback *)CreateIORequest(schedule_msgport, sizeof(struct nscallback)); + nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR); *nscb = *tioreq; #endif if(!nscb) return NSERROR_NOMEM; ----------------------------------------------------------------------- Summary of changes: frontends/amiga/libs.c | 10 +++++++--- frontends/amiga/schedule.c | 10 +++++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/frontends/amiga/libs.c b/frontends/amiga/libs.c index cbef3c2..7de768b 100644 --- a/frontends/amiga/libs.c +++ b/frontends/amiga/libs.c @@ -113,7 +113,9 @@ #define AMINS_CLASS_CLOSE(PREFIX) \ if(I##PREFIX) DropInterface((struct Interface *)I##PREFIX); \ - if(PREFIX##Base) CloseClass(PREFIX##Base); + if(PREFIX##Base) CloseClass(PREFIX##Base); \ + I##PREFIX = NULL; \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct ClassLibrary *PREFIX##Base = NULL; \ @@ -136,7 +138,8 @@ } #define AMINS_LIB_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); + if(PREFIX##Base) CloseLibrary((struct Library *)PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_LIB_STRUCT(PREFIX) \ struct PREFIX##Base *PREFIX##Base = NULL; @@ -156,7 +159,8 @@ } #define AMINS_CLASS_CLOSE(PREFIX) \ - if(PREFIX##Base) CloseLibrary(PREFIX##Base); + if(PREFIX##Base) CloseLibrary(PREFIX##Base); \ + PREFIX##Base = NULL; #define AMINS_CLASS_STRUCT(PREFIX) \ struct Library *PREFIX##Base = NULL; \ diff --git a/frontends/amiga/schedule.c b/frontends/amiga/schedule.c index 2d2da38..ee4e34a 100644 --- a/frontends/amiga/schedule.c +++ b/frontends/amiga/schedule.c @@ -170,7 +170,11 @@ static nserror schedule_remove(void (*callback)(void *p), void *p, bool abort) if(nscb != NULL) { if(abort == true) ami_schedule_remove_timer_event(nscb); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif pblHeapConstruct(schedule_list); } @@ -190,7 +194,11 @@ static void schedule_remove_all(void) { ami_schedule_remove_timer_event(nscb); pblIteratorRemove(iterator); +#ifdef __amigaos4__ FreeSysObject(ASOT_IOREQUEST, nscb); +#else + FreeVec(nscb); +#endif }; pblIteratorFree(iterator); @@ -337,7 +345,7 @@ nserror ami_schedule(int t, void (*callback)(void *p), void *p) TAG_DONE); #else if(schedule_msgport == NULL) return NSERROR_NOMEM; - nscb = (struct nscallback *)CreateIORequest(schedule_msgport, sizeof(struct nscallback)); + nscb = AllocVec(sizeof(struct nscallback), MEMF_PUBLIC | MEMF_CLEAR); *nscb = *tioreq; #endif if(!nscb) return NSERROR_NOMEM; -- NetSurf Browser

4 years

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits March 2019