Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/1b97408860880a30c711c9fc8ee04bb4cde121aa
...commit
http://git.netsurf-browser.org/toolchains.git/commit/1b97408860880a30c711c9fc8ee04bb4cde121aa
...tree
http://git.netsurf-browser.org/toolchains.git/tree/1b97408860880a30c711c9fc8ee04bb4cde121aa
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=1b97408860880a30c711c9fc8ee04bb4cde121aa
commit 1b97408860880a30c711c9fc8ee04bb4cde121aa
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
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
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
