netsurf: branch master updated. release/3.0-779-g14387a5
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/14387a53b7ab2e15790a7...
...commit http://git.netsurf-browser.org/netsurf.git/commit/14387a53b7ab2e15790a733...
...tree http://git.netsurf-browser.org/netsurf.git/tree/14387a53b7ab2e15790a733c3...
The branch, master has been updated
via 14387a53b7ab2e15790a733c3db5841f6705fc89 (commit)
from d4c80c2f4e2f74b9e69113e036a1a80cee5b892d (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=14387a53b7ab2e15790...
commit 14387a53b7ab2e15790a733c3db5841f6705fc89
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
check mkdir call for errors (coverity 1109834)
diff --git a/utils/filename.c b/utils/filename.c
index 3f5e169..5306418 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -183,7 +183,13 @@ bool filename_initialise(void)
for (start = directory; *start != '\0'; start++) {
if (*start == '/') {
*start = '\0';
- nsmkdir(directory, S_IRWXU);
+ ret = nsmkdir(directory, S_IRWXU);
+ if (ret != 0) {
+ free(directory);
+
+ return false;
+ }
+
*start = '/';
}
}
-----------------------------------------------------------------------
Summary of changes:
utils/filename.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/utils/filename.c b/utils/filename.c
index 3f5e169..5306418 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -183,7 +183,13 @@ bool filename_initialise(void)
for (start = directory; *start != '\0'; start++) {
if (*start == '/') {
*start = '\0';
- nsmkdir(directory, S_IRWXU);
+ ret = nsmkdir(directory, S_IRWXU);
+ if (ret != 0) {
+ free(directory);
+
+ return false;
+ }
+
*start = '/';
}
}
--
NetSurf Browser
9 years, 9 months
- 1
- 0
netsurf: branch master updated. release/3.0-778-gd4c80c2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d4c80c2f4e2f74b9e6911...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d4c80c2f4e2f74b9e69113e...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d4c80c2f4e2f74b9e69113e03...
The branch, master has been updated
via d4c80c2f4e2f74b9e69113e036a1a80cee5b892d (commit)
from 857dc3d8c818866d3e5e36bd04c91c8ca85df3ca (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=d4c80c2f4e2f74b9e69...
commit d4c80c2f4e2f74b9e69113e036a1a80cee5b892d
Author: Michael Drake <tlsa(a)netsurf-browser.org>
Commit: Michael Drake <tlsa(a)netsurf-browser.org>
Wrap line.
diff --git a/css/select.c b/css/select.c
index 6c67c2e..812bc06 100644
--- a/css/select.c
+++ b/css/select.c
@@ -801,7 +801,8 @@ css_error node_has_name(void *pw, void *node,
nscss_select_ctx *ctx = pw;
dom_node *n = node;
- if (lwc_string_isequal(qname->name, ctx->universal, match) == lwc_error_ok && *match == false) {
+ if (lwc_string_isequal(qname->name, ctx->universal, match) ==
+ lwc_error_ok && *match == false) {
dom_string *name;
dom_exception err;
-----------------------------------------------------------------------
Summary of changes:
css/select.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/css/select.c b/css/select.c
index 6c67c2e..812bc06 100644
--- a/css/select.c
+++ b/css/select.c
@@ -801,7 +801,8 @@ css_error node_has_name(void *pw, void *node,
nscss_select_ctx *ctx = pw;
dom_node *n = node;
- if (lwc_string_isequal(qname->name, ctx->universal, match) == lwc_error_ok && *match == false) {
+ if (lwc_string_isequal(qname->name, ctx->universal, match) ==
+ lwc_error_ok && *match == false) {
dom_string *name;
dom_exception err;
--
NetSurf Browser
9 years, 9 months
- 1
- 0
netsurf: branch master updated. release/3.0-777-g857dc3d
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/857dc3d8c818866d3e5e3...
...commit http://git.netsurf-browser.org/netsurf.git/commit/857dc3d8c818866d3e5e36b...
...tree http://git.netsurf-browser.org/netsurf.git/tree/857dc3d8c818866d3e5e36bd0...
The branch, master has been updated
via 857dc3d8c818866d3e5e36bd04c91c8ca85df3ca (commit)
via f725c2dcdef846c8ac079b082bce53b98da61c12 (commit)
via 47c17ad8895f6287ee38b18ec52dd9571fbea5c5 (commit)
via 75ec87cbca4dbf5e0a06a3fdbe799e17f1fc366b (commit)
via 36bf4547c687973bae98002df1d515a2161d6ad9 (commit)
via 447ab79e896abc72ff72bb495abba29759beb695 (commit)
from e0883a40bb8210438e3f65846b04cf42297c895c (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=857dc3d8c818866d3e5...
commit 857dc3d8c818866d3e5e36bd04c91c8ca85df3ca
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
check return from mkdir (coverity 1109834)
diff --git a/utils/filename.c b/utils/filename.c
index 5df7d33..3f5e169 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -174,6 +174,7 @@ void filename_release(const char *filename)
bool filename_initialise(void)
{
char *directory, *start;
+ int ret;
directory = strdup(TEMP_FILENAME_PREFIX);
if (directory == NULL)
@@ -188,10 +189,13 @@ bool filename_initialise(void)
}
LOG(("Temporary directory location: %s", directory));
- nsmkdir(directory, S_IRWXU);
+ ret = nsmkdir(directory, S_IRWXU);
free(directory);
+ if (ret != 0) {
+ return false;
+ }
return true;
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f725c2dcdef846c8ac0...
commit f725c2dcdef846c8ac079b082bce53b98da61c12
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
check stat error return (coverity 1109835)
diff --git a/gtk/filetype.c b/gtk/filetype.c
index f5cf3bf..2ae59d8 100644
--- a/gtk/filetype.c
+++ b/gtk/filetype.c
@@ -157,7 +157,11 @@ const char *fetch_filetype(const char *unix_path)
const char *type;
int l;
- stat(unix_path, &statbuf);
+ if (stat(unix_path, &statbuf) != 0) {
+ /* stat failed */
+ return "text/plain";
+ }
+
if (S_ISDIR(statbuf.st_mode))
return "application/x-netsurf-directory";
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=47c17ad8895f6287ee3...
commit 47c17ad8895f6287ee38b18ec52dd9571fbea5c5
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
check return of chmod (coverity 1109836)
diff --git a/gtk/gui.c b/gtk/gui.c
index 9aa563f..649c4a2 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -524,7 +524,9 @@ static void nsgtk_check_homedir(void)
die("NetSurf requires ~/.netsurf to exist, but it cannot be created.\n");
}
} else {
- chmod(buf, S_IRWXU);
+ if (chmod(buf, S_IRWXU) != 0) {
+ LOG(("Unable to set permissions on %s", buf));
+ }
}
}
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=75ec87cbca4dbf5e0a0...
commit 75ec87cbca4dbf5e0a06a3fdbe799e17f1fc366b
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix null derference (coverity 1127056)
diff --git a/monkey/cert.c b/monkey/cert.c
index d7f44d1..0aa01f3 100644
--- a/monkey/cert.c
+++ b/monkey/cert.c
@@ -39,8 +39,10 @@ gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
void *cbpw)
{
monkey_cert_t *m4t = calloc(sizeof(*m4t), 1);
- if (m4t == NULL)
+ if (m4t == NULL) {
cb(false, cbpw);
+ return;
+ }
m4t->cb = cb;
m4t->pw = cbpw;
m4t->num = cert_ctr++;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=36bf4547c687973bae9...
commit 36bf4547c687973bae98002df1d515a2161d6ad9
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix null ereference (coverity 1127057)
diff --git a/monkey/401login.c b/monkey/401login.c
index b2bff31..605a21a 100644
--- a/monkey/401login.c
+++ b/monkey/401login.c
@@ -37,8 +37,10 @@ void gui_401login_open(nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw)
{
monkey401_t *m4t = calloc(sizeof(*m4t), 1);
- if (m4t == NULL)
+ if (m4t == NULL) {
cb(false, cbpw);
+ return;
+ }
m4t->cb = cb;
m4t->pw = cbpw;
m4t->num = m4_ctr++;
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=447ab79e896abc72ff7...
commit 447ab79e896abc72ff72bb495abba29759beb695
Author: Vincent Sanders <vince(a)netsurf-browser.org>
Commit: Vincent Sanders <vince(a)netsurf-browser.org>
fix null dereference (coverity 1127058)
diff --git a/monkey/thumbnail.c b/monkey/thumbnail.c
index 3348895..e558c2b 100644
--- a/monkey/thumbnail.c
+++ b/monkey/thumbnail.c
@@ -25,7 +25,8 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
struct gui_window *win = monkey_find_window_by_content(content);
if (win == NULL) {
fprintf(stdout, "GENERIC THUMBNAIL URL %s\n", nsurl_access(url));
+ } else {
+ fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, nsurl_access(url));
}
- fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, nsurl_access(url));
return false;
}
-----------------------------------------------------------------------
Summary of changes:
gtk/filetype.c | 6 +++++-
gtk/gui.c | 4 +++-
monkey/401login.c | 4 +++-
monkey/cert.c | 4 +++-
monkey/thumbnail.c | 3 ++-
utils/filename.c | 6 +++++-
6 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/gtk/filetype.c b/gtk/filetype.c
index f5cf3bf..2ae59d8 100644
--- a/gtk/filetype.c
+++ b/gtk/filetype.c
@@ -157,7 +157,11 @@ const char *fetch_filetype(const char *unix_path)
const char *type;
int l;
- stat(unix_path, &statbuf);
+ if (stat(unix_path, &statbuf) != 0) {
+ /* stat failed */
+ return "text/plain";
+ }
+
if (S_ISDIR(statbuf.st_mode))
return "application/x-netsurf-directory";
diff --git a/gtk/gui.c b/gtk/gui.c
index 9aa563f..649c4a2 100644
--- a/gtk/gui.c
+++ b/gtk/gui.c
@@ -524,7 +524,9 @@ static void nsgtk_check_homedir(void)
die("NetSurf requires ~/.netsurf to exist, but it cannot be created.\n");
}
} else {
- chmod(buf, S_IRWXU);
+ if (chmod(buf, S_IRWXU) != 0) {
+ LOG(("Unable to set permissions on %s", buf));
+ }
}
}
diff --git a/monkey/401login.c b/monkey/401login.c
index b2bff31..605a21a 100644
--- a/monkey/401login.c
+++ b/monkey/401login.c
@@ -37,8 +37,10 @@ void gui_401login_open(nsurl *url, const char *realm,
nserror (*cb)(bool proceed, void *pw), void *cbpw)
{
monkey401_t *m4t = calloc(sizeof(*m4t), 1);
- if (m4t == NULL)
+ if (m4t == NULL) {
cb(false, cbpw);
+ return;
+ }
m4t->cb = cb;
m4t->pw = cbpw;
m4t->num = m4_ctr++;
diff --git a/monkey/cert.c b/monkey/cert.c
index d7f44d1..0aa01f3 100644
--- a/monkey/cert.c
+++ b/monkey/cert.c
@@ -39,8 +39,10 @@ gui_cert_verify(nsurl *url, const struct ssl_cert_info *certs,
void *cbpw)
{
monkey_cert_t *m4t = calloc(sizeof(*m4t), 1);
- if (m4t == NULL)
+ if (m4t == NULL) {
cb(false, cbpw);
+ return;
+ }
m4t->cb = cb;
m4t->pw = cbpw;
m4t->num = cert_ctr++;
diff --git a/monkey/thumbnail.c b/monkey/thumbnail.c
index 3348895..e558c2b 100644
--- a/monkey/thumbnail.c
+++ b/monkey/thumbnail.c
@@ -25,7 +25,8 @@ bool thumbnail_create(hlcache_handle *content, struct bitmap *bitmap,
struct gui_window *win = monkey_find_window_by_content(content);
if (win == NULL) {
fprintf(stdout, "GENERIC THUMBNAIL URL %s\n", nsurl_access(url));
+ } else {
+ fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, nsurl_access(url));
}
- fprintf(stdout, "WINDOW THUMBNAIL WIN %u URL %s\n", win->win_num, nsurl_access(url));
return false;
}
diff --git a/utils/filename.c b/utils/filename.c
index 5df7d33..3f5e169 100644
--- a/utils/filename.c
+++ b/utils/filename.c
@@ -174,6 +174,7 @@ void filename_release(const char *filename)
bool filename_initialise(void)
{
char *directory, *start;
+ int ret;
directory = strdup(TEMP_FILENAME_PREFIX);
if (directory == NULL)
@@ -188,10 +189,13 @@ bool filename_initialise(void)
}
LOG(("Temporary directory location: %s", directory));
- nsmkdir(directory, S_IRWXU);
+ ret = nsmkdir(directory, S_IRWXU);
free(directory);
+ if (ret != 0) {
+ return false;
+ }
return true;
}
--
NetSurf Browser
9 years, 9 months
- 1
- 0
toolchains: branch mono/atari-adjustments updated. af68fb87ac74088a15c12238947bf55834039f73
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/af68fb87ac74088a15...
...commit http://git.netsurf-browser.org/toolchains.git/commit/af68fb87ac74088a15c1...
...tree http://git.netsurf-browser.org/toolchains.git/tree/af68fb87ac74088a15c122...
The branch, mono/atari-adjustments has been updated
via af68fb87ac74088a15c12238947bf55834039f73 (commit)
via 1ca95b6aad5fc7bde21c68b9fd876f8d4c0154e7 (commit)
via 010abeda3f9cf3f49e566e11b905fc141b57f201 (commit)
via 99d3b803a9df5a982e61d665596900f66130603c (commit)
via 7350bbbfbf39b4918fbc3a95172a5562be7cb9e5 (commit)
via 7af2c94094637969b1a93f9c146fa0e5dd504204 (commit)
via 2d4e37e272db914c329816a26288aa2d62d99fe3 (commit)
via 0ab2b28ba619ba746d9b116b1b921e7d414e64f3 (commit)
via 2bfc88d4c96a3181be8214e7729c3091b55e4e9e (commit)
via bb5b765028811e7f9ddbce97033f158fface8090 (commit)
from b361534441bcc9598bf31387c85ee6e0bc406581 (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=af68fb87ac74088a...
commit af68fb87ac74088a15c12238947bf55834039f73
Merge: b361534 1ca95b6
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Merge branch 'master' into mono/atari-adjustments
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
i686-w64-mingw32/Makefile | 4 +-
m5475-atari-mint/Makefile | 30 ++++++++------
m5475-atari-mint/fetchsrc | 16 +++++++
m68k-atari-mint/Makefile | 31 ++++++++------
m68k-atari-mint/fetchsrc | 16 +++++++
sdk/Makefile | 99 ++++++++++++++++++++++++---------------------
sdk/fetchsrc | 18 ++++++++
8 files changed, 142 insertions(+), 74 deletions(-)
create mode 100755 m5475-atari-mint/fetchsrc
create mode 100755 m68k-atari-mint/fetchsrc
create mode 100755 sdk/fetchsrc
diff --git a/.gitignore b/.gitignore
index b25c15b..f19d406 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
*~
+m5475-atari-mint/builddir
+m5475-atari-mint/sources
diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile
index 73d2b8b..fda8123 100644
--- a/i686-w64-mingw32/Makefile
+++ b/i686-w64-mingw32/Makefile
@@ -1,6 +1,6 @@
-#!/bin/make
+#!/usr/bin/make
-# mingw toolchain
+# Build cross toolchain for i686 processor with a win32 (mingw) ABI
UPSTREAM_GCC_VERSION := 4.6.3
UPSTREAM_GCC_TARBALL := gcc-core-$(UPSTREAM_GCC_VERSION).tar.bz2
diff --git a/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile
index fdcd946..0458f15 100644
--- a/m5475-atari-mint/Makefile
+++ b/m5475-atari-mint/Makefile
@@ -1,3 +1,7 @@
+#!/usr/bin/make
+
+# Build cross toolchain for m5475 processor with an atari mint ABI
+
UPSTREAM_GCC_VERSION := 4.6.3
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TAR...
@@ -210,43 +214,43 @@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) $(SO
###
$(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL):
- wget -q -O $@ $(UPSTREAM_GCC_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GCC_TARBALL) $(UPSTREAM_GCC_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH):
- wget -q -O $@ $(UPSTREAM_GCC_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GCC_PATCH) $(UPSTREAM_GCC_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL):
- wget -q -O $@ $(UPSTREAM_GMP_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GMP_TARBALL) $(UPSTREAM_GMP_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL):
- wget -q -O $@ $(UPSTREAM_MPFR_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MPFR_TARBALL) $(UPSTREAM_MPFR_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL):
- wget -q -O $@ $(UPSTREAM_MPC_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MPC_TARBALL) $(UPSTREAM_MPC_URI) $@
$(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
- wget -q -O $@ $(UPSTREAM_BINUTILS_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_BINUTILS_TARBALL) $(UPSTREAM_BINUTILS_URI) $@
$(SOURCESDIR)/$(UPSTREAM_BINUTILS_PATCH):
- wget -q -O $@ $(UPSTREAM_BINUTILS_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_BINUTILS_PATCH) $(UPSTREAM_BINUTILS_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL):
- wget -q -O $@ $(UPSTREAM_MINTBIN_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTBIN_TARBALL) $(UPSTREAM_MINTBIN_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_PATCH):
- wget -q -O $@ $(UPSTREAM_MINTBIN_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTBIN_PATCH) $(UPSTREAM_MINTBIN_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTLIB_TARBALL):
- wget -q -O $@ $(UPSTREAM_MINTLIB_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTLIB_TARBALL) $(UPSTREAM_MINTLIB_URI) $@
$(SOURCESDIR)/$(UPSTREAM_PML_TARBALL):
- wget -q -O $@ $(UPSTREAM_PML_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_PML_TARBALL) $(UPSTREAM_PML_URI) $@
$(SOURCESDIR)/$(UPSTREAM_PML_PATCH):
- wget -q -O $@ $(UPSTREAM_PML_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_PML_PATCH) $(UPSTREAM_PML_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL):
- wget -q -O $@ $(UPSTREAM_GEMLIB_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GEMLIB_TARBALL) $(UPSTREAM_GEMLIB_URI) $@
###
# Rule to create buildsteps dir
diff --git a/m5475-atari-mint/fetchsrc b/m5475-atari-mint/fetchsrc
new file mode 100755
index 0000000..bbe8f6b
--- /dev/null
+++ b/m5475-atari-mint/fetchsrc
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache
+
+# Usage fetchsrc <target> <source> <upstream> <output>
+
+NSSRV="http://ci.netsurf-browser.org/toolchain/"
+
+wget -q -O ${4} ${NSSRV}/${1}/${2}
+if [ $? -ne 0 ];then
+ wget -q -O ${4} ${3}
+ if [ $? -ne 0 ];then
+ rm ${4}
+ return 1
+ fi
+fi
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 58b5bcd..413dbb4 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -1,3 +1,7 @@
+#!/usr/bin/make
+
+# Build cross toolchain for m68k processor with an atari mint ABI
+
UPSTREAM_GCC_VERSION := 4.6.3
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TAR...
@@ -210,43 +214,44 @@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) $(SO
###
$(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL):
- wget -q -O $@ $(UPSTREAM_GCC_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GCC_TARBALL) $(UPSTREAM_GCC_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GCC_PATCH):
- wget -q -O $@ $(UPSTREAM_GCC_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GCC_PATCH) $(UPSTREAM_GCC_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL):
- wget -q -O $@ $(UPSTREAM_GMP_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GMP_TARBALL) $(UPSTREAM_GMP_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL):
- wget -q -O $@ $(UPSTREAM_MPFR_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MPFR_TARBALL) $(UPSTREAM_MPFR_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL):
- wget -q -O $@ $(UPSTREAM_MPC_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MPC_TARBALL) $(UPSTREAM_MPC_URI) $@
$(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
- wget -q -O $@ $(UPSTREAM_BINUTILS_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_BINUTILS_TARBALL) $(UPSTREAM_BINUTILS_URI) $@
$(SOURCESDIR)/$(UPSTREAM_BINUTILS_PATCH):
- wget -q -O $@ $(UPSTREAM_BINUTILS_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_BINUTILS_PATCH) $(UPSTREAM_BINUTILS_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL):
- wget -q -O $@ $(UPSTREAM_MINTBIN_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTBIN_TARBALL) $(UPSTREAM_MINTBIN_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTBIN_PATCH):
- wget -q -O $@ $(UPSTREAM_MINTBIN_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTBIN_PATCH) $(UPSTREAM_MINTBIN_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_MINTLIB_TARBALL):
- wget -q -O $@ $(UPSTREAM_MINTLIB_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_MINTLIB_TARBALL) $(UPSTREAM_MINTLIB_URI) $@
$(SOURCESDIR)/$(UPSTREAM_PML_TARBALL):
- wget -q -O $@ $(UPSTREAM_PML_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_PML_TARBALL) $(UPSTREAM_PML_URI) $@
$(SOURCESDIR)/$(UPSTREAM_PML_PATCH):
- wget -q -O $@ $(UPSTREAM_PML_PATCH_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_PML_PATCH) $(UPSTREAM_PML_PATCH_URI) $@
$(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL):
- wget -q -O $@ $(UPSTREAM_GEMLIB_URI)
+ $(TOP)/fetchsrc $(TARGET_NAME) $(UPSTREAM_GEMLIB_TARBALL) $(UPSTREAM_GEMLIB_URI) $@
+
###
# Rule to create buildsteps dir
diff --git a/m68k-atari-mint/fetchsrc b/m68k-atari-mint/fetchsrc
new file mode 100755
index 0000000..bbe8f6b
--- /dev/null
+++ b/m68k-atari-mint/fetchsrc
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache
+
+# Usage fetchsrc <target> <source> <upstream> <output>
+
+NSSRV="http://ci.netsurf-browser.org/toolchain/"
+
+wget -q -O ${4} ${NSSRV}/${1}/${2}
+if [ $? -ne 0 ];then
+ wget -q -O ${4} ${3}
+ if [ $? -ne 0 ];then
+ rm ${4}
+ return 1
+ fi
+fi
diff --git a/sdk/Makefile b/sdk/Makefile
index f130088..25bec2f 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -23,12 +23,12 @@ ifeq ($(GCCSDK_INSTALL_CROSSBIN),)
endif
# Upstream package versions
-VERSION_ZLIB := 1.2.7
+VERSION_ZLIB := 1.2.8
VERSION_LIBICONV := 1.13.1
VERSION_LIBTRE := 0.8.0
VERSION_LIBXML := 2.8.0
VERSION_OPENSSL := 1.0.1e
-VERSION_LIBPNG := 1.6.1
+VERSION_LIBPNG := 1.6.7
VERSION_LIBJPEG := 8d
VERSION_LIBLCMS := 2.3
VERSION_LIBMNG := 1.0.10
@@ -72,6 +72,8 @@ SOURCEDIR := $(CURDIR)/sources
BUILDDIR := $(CURDIR)/builddir-$(TARGET)
BUILDSTEPS := $(BUILDDIR)/build-steps
+FETCHSRC := $(CURDIR)/fetchsrc
+
# Compute the SDK components
SDK_ITEMS :=
@@ -150,26 +152,26 @@ $(BUILDSTEPS)/builddir.d:
# zlib
$(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d
+ cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --static
+ cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) make install
+ touch $@
+
+$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
mkdir -p $(BUILDDIR)/zlib
- cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2
+ cd $(BUILDDIR)/zlib && tar xaf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/zlib/$(TARGET)),)
for p in `ls $(RECIPES)/patches/zlib/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
endif
- cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --static
- cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) make install
- touch $@
-
-$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2
touch $@
-$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2:
- wget -q -O $@ http://zlib.net/$(subst $(SOURCEDIR)/,,$@)
+$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz:
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://zlib.net/$(subst $(SOURCEDIR)/,,$@)" $@
# libiconv
$(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d
mkdir -p $(BUILDDIR)/libiconv
- cd $(BUILDDIR)/libiconv && tar xzf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
+ cd $(BUILDDIR)/libiconv && tar xaf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
for p in `ls $(RECIPES)/patches/libiconv/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libiconv/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libiconv/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
@@ -182,12 +184,12 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libiconv-$(
touch $@
$(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
- wget -q -O $@ http://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@
# libgnurx
$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
mkdir -p $(BUILDDIR)/libgnurx
- cd $(BUILDDIR)/libgnurx && tar xzf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ cd $(BUILDDIR)/libgnurx && tar xaf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
for p in `ls $(RECIPES)/patches/libgnurx/*.p` ; do patch -d $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) -p0 <$$p ; done
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET)
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) make
@@ -198,7 +200,7 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libgnurx-$(
touch $@
$(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz:
- wget -q -O $@ "http://downloads.sourceforge.net/project/mingw/Other/UserContributed/rege..."
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/mingw/Other/UserContributed/rege..." $@
# atari cf library
$(BUILDSTEPS)/libcf.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcf-src.d
@@ -216,7 +218,7 @@ $(BUILDSTEPS)/libcf-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libcf-$(VERSIO
touch $@
$(SOURCEDIR)/libcf-$(VERSION_LIBCF).tar.bz2:
- wget -q -O $@ "http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERS..."
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERS..." $@
# atari windom library
$(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d
@@ -234,7 +236,7 @@ $(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/windom-$(VERS
touch $@
$(SOURCEDIR)/windom-$(VERSION_WINDOM).zip:
- wget -q -O $@ "http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/..."
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/..." $@
# atari ldg library
$(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d
@@ -251,7 +253,7 @@ $(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/ldg-$(VERSION_LD
touch $@
$(SOURCEDIR)/ldg-$(VERSION_LDG).zip:
- wget -q -O $@ "http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip"
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip" $@
# hermes bitmap lib
$(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d
@@ -271,7 +273,7 @@ $(BUILDSTEPS)/hermes-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/hermes-$(VERS
touch $@
$(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.bz2:
- wget -q -O $@ "http://clanlib.org/download/legacy/Hermes-$(VERSION_HERMES).tar.bz2"
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://clanlib.org/download/legacy/Hermes-$(VERSION_HERMES).tar.bz2" $@
# freetype font lib
$(BUILDSTEPS)/freetype.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/freetype-src.d
@@ -286,12 +288,12 @@ $(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$(
touch $@
$(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2:
- wget -q -O $@ "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FRE..."
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FRE..." $@
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
- cd $(BUILDDIR)/libtre && tar xjf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
+ cd $(BUILDDIR)/libtre && tar xaf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) make install
cp $(RECIPES)/files/libtre/regex.h $(GCCSDK_INSTALL_ENV)/include/regex.h
@@ -301,12 +303,12 @@ $(BUILDSTEPS)/libtre-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/tre-$(VERSION
touch $@
$(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2:
- wget -q -O $@ http://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@
# libpbl
$(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d
mkdir -p $(BUILDDIR)/libpbl
- cd $(BUILDDIR)/libpbl && tar xzf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
+ cd $(BUILDDIR)/libpbl && tar xaf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
for p in `ls $(RECIPES)/patches/libpbl/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libpbl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpbl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
@@ -318,12 +320,12 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/pbl_$(VERSION
touch $@
$(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
- wget -q -O $@ http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@
# libXML2
$(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2-src.d
mkdir -p $(BUILDDIR)/libxml2
- cd $(BUILDDIR)/libxml2 && tar xzf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
+ cd $(BUILDDIR)/libxml2 && tar xaf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
for p in `ls $(RECIPES)/patches/libxml2/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
@@ -336,12 +338,12 @@ $(BUILDSTEPS)/libxml2-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libxml2-$(VE
touch $@
$(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz:
- wget -q -O $@ ftp://xmlsoft.org/libxml2/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "ftp://xmlsoft.org/libxml2/$(subst $(SOURCEDIR)/,,$@)" $@
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d
mkdir -p $(BUILDDIR)/openssl
- cd $(BUILDDIR)/openssl && tar xzf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
+ cd $(BUILDDIR)/openssl && tar xaf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
for p in `ls $(RECIPES)/patches/openssl/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
@@ -354,12 +356,12 @@ $(BUILDSTEPS)/openssl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/openssl-$(VE
touch $@
$(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
- wget -q -O $@ http://openssl.org/source/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@
# libPNG
$(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libpng-src.d
mkdir -p $(BUILDDIR)/libpng
- cd $(BUILDDIR)/libpng && tar xzf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
+ cd $(BUILDDIR)/libpng && tar xaf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
ifneq ($(realpath $(RECIPES)/patches/libpng/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpng/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) -p0 <$$p ; done
endif
@@ -371,12 +373,12 @@ $(BUILDSTEPS)/libpng-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libpng-$(VERS
touch $@
$(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz:
- wget -q -O $@ http://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@
# libjpeg
$(BUILDSTEPS)/libjpeg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-src.d
mkdir -p $(BUILDDIR)/libjpeg
- cd $(BUILDDIR)/libjpeg && tar xzf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
+ cd $(BUILDDIR)/libjpeg && tar xaf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
for p in `ls $(RECIPES)/patches/libjpeg/*.p` ; do patch -d $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) -p0 <$$p ; done
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) make install
@@ -386,12 +388,12 @@ $(BUILDSTEPS)/libjpeg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/jpegsrc.v$(V
touch $@
$(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz:
- wget -q -O $@ http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@
# liblcms
$(BUILDSTEPS)/liblcms.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms-src.d
mkdir -p $(BUILDDIR)/liblcms
- cd $(BUILDDIR)/liblcms && tar xzf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
+ cd $(BUILDDIR)/liblcms && tar xaf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
for p in `ls $(RECIPES)/patches/liblcms/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/liblcms/$(TARGET)),)
for p in `ls $(RECIPES)/patches/liblcms/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
@@ -404,12 +406,13 @@ $(BUILDSTEPS)/liblcms-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/lcms2-$(VERS
touch $@
$(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz:
- wget -q -O $@ http://downloads.sourceforge.net/project/lcms/lcms/$(VERSION_LIBLCMS)/$(s... $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/lcms/lcms/$(VERSION_LIBLCMS)/$(s... $(SOURCEDIR)/,,$@)" $@
+
# libMNG
$(BUILDSTEPS)/libmng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms.d $(BUILDSTEPS)/libmng-src.d
mkdir -p $(BUILDDIR)/libmng
- cd $(BUILDDIR)/libmng && tar xzf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
+ cd $(BUILDDIR)/libmng && tar xaf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
for p in `ls $(RECIPES)/patches/libmng/*.p` ; do patch -d $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) -p0 <$$p ; done
cp $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/makefiles/makefile.unix $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/Makefile
cd $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) && $(env) make install
@@ -419,12 +422,12 @@ $(BUILDSTEPS)/libmng-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libmng-$(VERS
touch $@
$(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz:
- wget -q -O $@ http://downloads.sourceforge.net/project/libmng/libmng-devel/$(VERSION_LI... $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/libmng/libmng-devel/$(VERSION_LI... $(SOURCEDIR)/,,$@)" $@
# libcares
$(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d
mkdir -p $(BUILDDIR)/libcares
- cd $(BUILDDIR)/libcares && tar xzf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
+ cd $(BUILDDIR)/libcares && tar xaf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
for p in `ls $(RECIPES)/patches/libcares/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
@@ -437,7 +440,8 @@ $(BUILDSTEPS)/libcares-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/c-ares-$(VE
touch $@
$(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz:
- wget -q -O $@ http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
+
# libcurl
$(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d
@@ -447,7 +451,7 @@ $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
$(BUILDSTEPS)/libcurl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
mkdir -p $(BUILDDIR)/libcurl
- cd $(BUILDDIR)/libcurl && tar xjf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
+ cd $(BUILDDIR)/libcurl && tar xaf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
for p in `ls $(RECIPES)/patches/libcurl/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcurl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcurl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
@@ -455,13 +459,13 @@ endif
touch $@
$(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
- wget -q -O $@ http://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@
-# libexpat
+# libexpat
$(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d
mkdir -p $(BUILDDIR)/libexpat
- cd $(BUILDDIR)/libexpat && tar xzf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
+ cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install
touch $@
@@ -470,7 +474,8 @@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/expat-$(VER
touch $@
$(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz:
- wget -q -O $@ http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/...
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/..." $@
+
# nspr
$(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
@@ -482,12 +487,12 @@ $(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
$(BUILDSTEPS)/nspr-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
$(RM) -rf $(BUILDDIR)/nspr
mkdir -p $(BUILDDIR)/nspr
- cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ cd $(BUILDDIR)/nspr && tar xaf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
touch $@
$(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz:
- wget -q -O $@ https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr...
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(VERSION_NSPR)/sr..." $@
# spidermonkey (libmozjs)
@@ -515,7 +520,9 @@ endif
touch $@
$(SOURCEDIR)/spidermonkey-1.8.5.tar.gz:
- wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz" $@
+
$(SOURCEDIR)/spidermonkey-1.7.0.tar.gz:
- wget -q -O $@ http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz
+ $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ftp.mozilla.org/pub/mozilla.org/js/js-1.7.0.tar.gz" $@
+
diff --git a/sdk/fetchsrc b/sdk/fetchsrc
new file mode 100755
index 0000000..46b72b0
--- /dev/null
+++ b/sdk/fetchsrc
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -x
+
+# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache
+
+# Usage fetchsrc <target> <source> <upstream> <output>
+
+NSSRV="http://ci.netsurf-browser.org/toolchain/"
+
+wget -q -O ${4} ${NSSRV}/${1}/${2}
+if [ $? -ne 0 ];then
+ wget -q -O ${4} ${3}
+ if [ $? -ne 0 ];then
+ rm ${4}
+ exit 1
+ fi
+fi
--
Cross-compilation toolchains and environments
9 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.0-771-ge0883a4
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/e0883a40bb8210438e3f6...
...commit http://git.netsurf-browser.org/netsurf.git/commit/e0883a40bb8210438e3f658...
...tree http://git.netsurf-browser.org/netsurf.git/tree/e0883a40bb8210438e3f65846...
The branch, master has been updated
via e0883a40bb8210438e3f65846b04cf42297c895c (commit)
from 3096669b19fbc46643af3a191a8cfb3b39dc7d15 (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=e0883a40bb8210438e3...
commit e0883a40bb8210438e3f65846b04cf42297c895c
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Improved file drop, use browser_window_navigate as fallback.
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 2344219..fddd7d0 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -64,7 +64,7 @@
#include "atari/encoding.h"
#include "atari/redrawslots.h"
#include "atari/toolbar.h"
-#include "atari/gemtk/gemtk.h"
+#include "atari/findfile.h"
extern struct gui_window *input_window;
extern EVMULT_OUT aes_event_out;
@@ -1477,44 +1477,71 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8])
gemtk_dd_reply(dd_hdl, DD_OK);
buff = (char*)malloc(sizeof(char)*(size+1));
if (buff != NULL) {
- if (Fread(dd_hdl, size, buff ) == size)
+ if (Fread(dd_hdl, size, buff ) == size) {
+
+ int sx, sy;
+ bool processed = false;
+ GRECT content_area;
+ struct browser_window * bw = gw->browser->bw;
+
buff[size] = 0;
- LOG(("file: %s, ext: %s, size: %d dropped at: %d,%d\n",
+
+ LOG(("file: %s, ext: %s, size: %d dropped at: %d,%d\n",
(char*)buff, (char*)&ext,
size, mx, my
));
- {
- GRECT content_area;
- struct browser_window * bw = gw->browser->bw;
+
window_get_grect(rootwin, BROWSER_AREA_CONTENT, &content_area);
mx = mx - content_area.g_x;
my = my - content_area.g_y;
- if( (mx < 0 || mx > content_area.g_w)
- || (my < 0 || my > content_area.g_h) )
+ if((mx < 0 || mx > content_area.g_w)
+ || (my < 0 || my > content_area.g_h))
return;
- utf8_convert_ret ret;
- char *utf8_fn;
- int sx, sy;
+ processed = browser_window_drop_file_at_point(gw->browser->bw,
+ mx+sx, my+sy,
+ NULL);
+ if(processed == true) {
+ utf8_convert_ret ret;
+ char *utf8_fn;
+
+ ret = utf8_from_local_encoding(buff, 0, &utf8_fn);
+ if (ret != UTF8_CONVERT_OK) {
+ free(buff);
+ /* A bad encoding should never happen */
+ LOG(("utf8_from_local_encoding failed"));
+ assert(ret != UTF8_CONVERT_BADENC);
+ /* no memory */
+ goto error;
+ }
+ gui_window_get_scroll(gw, &sx, &sy);
+ processed = browser_window_drop_file_at_point(gw->browser->bw,
+ mx+sx, my+sy,
+ utf8_fn);
+ free(utf8_fn);
+ }
- ret = utf8_from_local_encoding(buff, 0, &utf8_fn);
- if (ret != UTF8_CONVERT_OK) {
- free(buff);
- /* A bad encoding should never happen */
- LOG(("utf8_from_local_encoding failed"));
- assert(ret != UTF8_CONVERT_BADENC);
- /* no memory */
- return;
+ if(processed == false) {
+ // TODO: use localized string:
+ if(gemtk_msg_box_show(GEMTK_MSG_BOX_CONFIRM, "Open File?") > 0) {
+ nsurl * ns_url = NULL;
+ char * tmp_url = local_file_to_url(buff);
+ if ((tmp_url != NULL)
+ && nsurl_create(tmp_url, &ns_url) == NSERROR_OK) {
+ browser_window_navigate(gw->browser->bw, ns_url, NULL,
+ BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE,
+ NULL, NULL, NULL);
+ nsurl_unref(ns_url);
+ }
+ }
}
- gui_window_get_scroll(gw, &sx, &sy);
- browser_window_drop_file_at_point( gw->browser->bw, mx+sx,
- my+sy, utf8_fn );
- free(utf8_fn);
- free(buff);
}
}
}
error:
+ if (buff) {
+ free(buff);
+ }
gemtk_dd_close( dd_hdl);
}
-----------------------------------------------------------------------
Summary of changes:
atari/rootwin.c | 75 +++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 51 insertions(+), 24 deletions(-)
diff --git a/atari/rootwin.c b/atari/rootwin.c
index 2344219..fddd7d0 100755
--- a/atari/rootwin.c
+++ b/atari/rootwin.c
@@ -64,7 +64,7 @@
#include "atari/encoding.h"
#include "atari/redrawslots.h"
#include "atari/toolbar.h"
-#include "atari/gemtk/gemtk.h"
+#include "atari/findfile.h"
extern struct gui_window *input_window;
extern EVMULT_OUT aes_event_out;
@@ -1477,44 +1477,71 @@ static void on_file_dropped(ROOTWIN *rootwin, short msg[8])
gemtk_dd_reply(dd_hdl, DD_OK);
buff = (char*)malloc(sizeof(char)*(size+1));
if (buff != NULL) {
- if (Fread(dd_hdl, size, buff ) == size)
+ if (Fread(dd_hdl, size, buff ) == size) {
+
+ int sx, sy;
+ bool processed = false;
+ GRECT content_area;
+ struct browser_window * bw = gw->browser->bw;
+
buff[size] = 0;
- LOG(("file: %s, ext: %s, size: %d dropped at: %d,%d\n",
+
+ LOG(("file: %s, ext: %s, size: %d dropped at: %d,%d\n",
(char*)buff, (char*)&ext,
size, mx, my
));
- {
- GRECT content_area;
- struct browser_window * bw = gw->browser->bw;
+
window_get_grect(rootwin, BROWSER_AREA_CONTENT, &content_area);
mx = mx - content_area.g_x;
my = my - content_area.g_y;
- if( (mx < 0 || mx > content_area.g_w)
- || (my < 0 || my > content_area.g_h) )
+ if((mx < 0 || mx > content_area.g_w)
+ || (my < 0 || my > content_area.g_h))
return;
- utf8_convert_ret ret;
- char *utf8_fn;
- int sx, sy;
+ processed = browser_window_drop_file_at_point(gw->browser->bw,
+ mx+sx, my+sy,
+ NULL);
+ if(processed == true) {
+ utf8_convert_ret ret;
+ char *utf8_fn;
+
+ ret = utf8_from_local_encoding(buff, 0, &utf8_fn);
+ if (ret != UTF8_CONVERT_OK) {
+ free(buff);
+ /* A bad encoding should never happen */
+ LOG(("utf8_from_local_encoding failed"));
+ assert(ret != UTF8_CONVERT_BADENC);
+ /* no memory */
+ goto error;
+ }
+ gui_window_get_scroll(gw, &sx, &sy);
+ processed = browser_window_drop_file_at_point(gw->browser->bw,
+ mx+sx, my+sy,
+ utf8_fn);
+ free(utf8_fn);
+ }
- ret = utf8_from_local_encoding(buff, 0, &utf8_fn);
- if (ret != UTF8_CONVERT_OK) {
- free(buff);
- /* A bad encoding should never happen */
- LOG(("utf8_from_local_encoding failed"));
- assert(ret != UTF8_CONVERT_BADENC);
- /* no memory */
- return;
+ if(processed == false) {
+ // TODO: use localized string:
+ if(gemtk_msg_box_show(GEMTK_MSG_BOX_CONFIRM, "Open File?") > 0) {
+ nsurl * ns_url = NULL;
+ char * tmp_url = local_file_to_url(buff);
+ if ((tmp_url != NULL)
+ && nsurl_create(tmp_url, &ns_url) == NSERROR_OK) {
+ browser_window_navigate(gw->browser->bw, ns_url, NULL,
+ BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE,
+ NULL, NULL, NULL);
+ nsurl_unref(ns_url);
+ }
+ }
}
- gui_window_get_scroll(gw, &sx, &sy);
- browser_window_drop_file_at_point( gw->browser->bw, mx+sx,
- my+sy, utf8_fn );
- free(utf8_fn);
- free(buff);
}
}
}
error:
+ if (buff) {
+ free(buff);
+ }
gemtk_dd_close( dd_hdl);
}
--
NetSurf Browser
9 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.0-770-g3096669
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/3096669b19fbc46643af3...
...commit http://git.netsurf-browser.org/netsurf.git/commit/3096669b19fbc46643af3a1...
...tree http://git.netsurf-browser.org/netsurf.git/tree/3096669b19fbc46643af3a191...
The branch, master has been updated
via 3096669b19fbc46643af3a191a8cfb3b39dc7d15 (commit)
from aed34baa0678bf5f72e483ca24dbc538181268e6 (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=3096669b19fbc46643a...
commit 3096669b19fbc46643af3a191a8cfb3b39dc7d15
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Updated header file for new toolbar functions.
diff --git a/atari/toolbar.h b/atari/toolbar.h
index 16c4eb2..be4bd03 100644
--- a/atari/toolbar.h
+++ b/atari/toolbar.h
@@ -75,6 +75,8 @@ void toolbar_get_grect(struct s_toolbar *tb, short which, GRECT *g);
OBJECT *toolbar_get_form(struct s_toolbar *tb);
struct textarea *toolbar_get_textarea(struct s_toolbar *tb,
enum toolbar_textarea which);
+char *toolbar_get_url(struct s_toolbar *tb);
+nsurl * toolbar_get_nsurl(struct s_toolbar * tb);
void toolbar_set_throbber_state(struct s_toolbar *tb, bool active);
void toolbar_set_attached(struct s_toolbar *tb, bool attached);
void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible);
@@ -91,6 +93,8 @@ void toolbar_reload_click(struct s_toolbar *tb);
void toolbar_forward_click(struct s_toolbar *tb);
void toolbar_home_click(struct s_toolbar *tb);
void toolbar_stop_click(struct s_toolbar *tb);
+void toolbar_favorite_click(struct s_toolbar *tb);
+void toolbar_crypto_click(struct s_toolbar *tb);
#endif
-----------------------------------------------------------------------
Summary of changes:
atari/toolbar.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/atari/toolbar.h b/atari/toolbar.h
index 16c4eb2..be4bd03 100644
--- a/atari/toolbar.h
+++ b/atari/toolbar.h
@@ -75,6 +75,8 @@ void toolbar_get_grect(struct s_toolbar *tb, short which, GRECT *g);
OBJECT *toolbar_get_form(struct s_toolbar *tb);
struct textarea *toolbar_get_textarea(struct s_toolbar *tb,
enum toolbar_textarea which);
+char *toolbar_get_url(struct s_toolbar *tb);
+nsurl * toolbar_get_nsurl(struct s_toolbar * tb);
void toolbar_set_throbber_state(struct s_toolbar *tb, bool active);
void toolbar_set_attached(struct s_toolbar *tb, bool attached);
void toolbar_set_visible(struct s_toolbar *tb, short area, bool visible);
@@ -91,6 +93,8 @@ void toolbar_reload_click(struct s_toolbar *tb);
void toolbar_forward_click(struct s_toolbar *tb);
void toolbar_home_click(struct s_toolbar *tb);
void toolbar_stop_click(struct s_toolbar *tb);
+void toolbar_favorite_click(struct s_toolbar *tb);
+void toolbar_crypto_click(struct s_toolbar *tb);
#endif
--
NetSurf Browser
9 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.0-769-gaed34ba
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/aed34baa0678bf5f72e48...
...commit http://git.netsurf-browser.org/netsurf.git/commit/aed34baa0678bf5f72e483c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/aed34baa0678bf5f72e483ca2...
The branch, master has been updated
via aed34baa0678bf5f72e483ca24dbc538181268e6 (commit)
from b96562b35c0e62604b5b25261319f5291be43553 (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=aed34baa0678bf5f72e...
commit aed34baa0678bf5f72e483ca24dbc538181268e6
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added bookmark indicator and SSL/crypto indicator to toolbar.
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 1a30eef..0076e33 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index f096444..8dae177 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -1,47 +1,6 @@
/* Resource C-Header-File v1.97 f�r ResourceMaster ab v2.06 by ARDISOFT */
-#define MAINMENU 0 /* menu */
-#define MAINMENU_T_FILE 4 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_EDIT 5 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_VIEW 6 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_NAVIGATE 7 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_UTIL 8 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_HELP 9 /* TITLE in tree MAINMENU */
-#define MAINMENU_M_ABOUT 12 /* STRING in tree MAINMENU */
-#define MAINMENU_M_NEWWIN 21 /* STRING in tree MAINMENU */
-#define MAINMENU_M_OPENFILE 22 /* STRING in tree MAINMENU */
-#define MAINMENU_M_OPENURL 23 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CLOSEWIN 24 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP0 25 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SAVEPAGE 26 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP1 27 /* STRING in tree MAINMENU */
-#define MAINMENU_M_QUIT 28 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CUT 30 /* STRING in tree MAINMENU */
-#define MAINMENU_M_COPY 31 /* STRING in tree MAINMENU */
-#define MAINMENU_M_PASTE 32 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP3 33 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FIND 34 /* STRING in tree MAINMENU */
-#define MAINMENU_M_STOP 36 /* STRING in tree MAINMENU */
-#define MAINMENU_M_RELOAD 37 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SCALE 39 /* STRING in tree MAINMENU */
-#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
-#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
-#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
-#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
-#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
-#define MAINMENU_M_COOKIES 58 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CHOICES 60 /* STRING in tree MAINMENU */
-#define MAINMENU_M_VLOG 61 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HELP_CONTENT 63 /* STRING in tree MAINMENU */
-
-#define TOOLBAR 1 /* form/dial */
+#define TOOLBAR 0 /* form/dial */
#define TOOLBAR_AREA_SEARCH 1 /* BOX in tree TOOLBAR */
#define TOOLBAR_BT_SEARCH_FWD 2 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_BT_SEARCH_BACK 3 /* BUTTON in tree TOOLBAR */
@@ -51,21 +10,24 @@
#define TOOLBAR_SEARCH_ALIGN_RIGHT 8 /* IBOX in tree TOOLBAR */
#define TOOLBAR_BT_CLOSE_SEARCH 9 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_AREA_NAVIGATION 10 /* BOX in tree TOOLBAR */
-#define TOOLBAR_AREA_BUTTONS 11 /* IBOX in tree TOOLBAR */
-#define TOOLBAR_BT_BACK 12 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_HOME 13 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_FORWARD 14 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_STOP 15 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_RELOAD 16 /* CICON in tree TOOLBAR */
-#define TOOLBAR_AREA_URL 17 /* USERDEF in tree TOOLBAR */
-#define TOOLBAR_THROBBER_AREA 18 /* IBOX in tree TOOLBAR */
-
-#define ICONIFY 2 /* form/dial */
+#define TOOLBAR_AREA_URL 11 /* USERDEF in tree TOOLBAR */
+#define TOOLBAR_AREA_RIGHT 12 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_THROBBER_AREA 13 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_BT_CRYPTO 14 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_FAVORITE 15 /* CICON in tree TOOLBAR */
+#define TOOLBAR_AREA_LEFT 16 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_BT_BACK 17 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_HOME 18 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_FORWARD 19 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_STOP 20 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_RELOAD 21 /* CICON in tree TOOLBAR */
+
+#define ICONIFY 1 /* form/dial */
#define ICONIFY_GLOBE 1 /* CICON in tree ICONIFY */
-#define FAVICON 3 /* form/dial */
+#define FAVICON 2 /* form/dial */
-#define CURSOR 4 /* form/dial */
+#define CURSOR 3 /* form/dial */
#define CURSOR_HELP 1 /* ICON in tree CURSOR */
#define CURSOR_NODROP 2 /* ICON in tree CURSOR */
#define CURSOR_APPSTART 3 /* ICON in tree CURSOR */
@@ -74,21 +36,21 @@
#define CURSOR_SIZENS 6 /* ICON in tree CURSOR */
#define CURSOR_MENU 7 /* ICON in tree CURSOR */
-#define LOGIN 5 /* form/dial */
+#define LOGIN 4 /* form/dial */
#define LOGIN_TB_USER 2 /* FTEXT in tree LOGIN */
#define LOGIN_TB_PASSWORD 4 /* FTEXT in tree LOGIN */
#define LOGIN_BT_LOGIN 5 /* BUTTON in tree LOGIN */
#define LOGIN_BT_ABORT 6 /* BUTTON in tree LOGIN */
-#define THROBBER 6 /* form/dial */
+#define THROBBER 5 /* form/dial */
-#define TOOLBAR_HOTLIST 7 /* form/dial */
+#define TOOLBAR_HOTLIST 6 /* form/dial */
#define TOOLBAR_HOTLIST_ADD 1 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_CREATE_FOLDER 2 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_DELETE 3 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_EDIT 4 /* CICON in tree TOOLBAR_HOTLIST */
-#define SEARCH 8 /* form/dial */
+#define SEARCH 7 /* form/dial */
#define SEARCH_BT_SEARCH 1 /* BUTTON in tree SEARCH */
#define SEARCH_CB_FWD 2 /* BUTTON in tree SEARCH */
#define SEARCH_BT_SEARCH_BACK 3 /* BUTTON in tree SEARCH */
@@ -98,7 +60,7 @@
#define SEARCH_LBL_CASESENSE 8 /* TEXT in tree SEARCH */
#define SEARCH_TB_SRCH 9 /* FTEXT in tree SEARCH */
-#define DOWNLOAD 9 /* form/dial */
+#define DOWNLOAD 8 /* form/dial */
/* Width ist 400, code depends on that! If you change it, change it in download.c */
#define DOWNLOAD_PROGRESS 1 /* BOX in tree DOWNLOAD */
#define DOWNLOAD_PROGRESS_DONE 2 /* BOX in tree DOWNLOAD */
@@ -110,14 +72,14 @@
#define DOWNLOAD_LBL_SPEED 8 /* TEXT in tree DOWNLOAD */
#define DOWNLOAD_CB_CLOSE_RDY 9 /* BOXCHAR in tree DOWNLOAD */
-#define ABOUT 10 /* form/dial */
+#define ABOUT 9 /* form/dial */
#define ABOUT_LBL_VERSION 1 /* TEXT in tree ABOUT */
#define ABOUT_OK 4 /* BUTTON in tree ABOUT */
#define ABOUT_CONTENT 6 /* USERDEF in tree ABOUT */
#define ABOUT_CREDITS 7 /* BUTTON in tree ABOUT */
#define ABOUT_LICENSE 8 /* BUTTON in tree ABOUT */
-#define POP_CTX 11 /* form/dial */
+#define POP_CTX 10 /* form/dial */
#define POP_CTX_CUT_SEL 1 /* TEXT in tree POP_CTX */
#define POP_CTX_COPY_SEL 2 /* TEXT in tree POP_CTX */
#define POP_CTX_PASTE_SEL 3 /* TEXT in tree POP_CTX */
@@ -129,7 +91,7 @@
#define POP_CTX_VIEW_SOURCE 10 /* TEXT in tree POP_CTX */
#define POP_CTX_SAVE_LINK_AS 11 /* TEXT in tree POP_CTX */
-#define VSCROLLER 12 /* form/dial */
+#define VSCROLLER 11 /* form/dial */
#define VSCROLLER_AREA 1 /* BOX in tree VSCROLLER */
#define VSCROLLER_SLIDER_AREA 2 /* BUTTON in tree VSCROLLER */
#define VSCROLLER_SLIDER 3 /* BUTTON in tree VSCROLLER */
@@ -138,7 +100,35 @@
#define VSCROLLER_BT_UP 6 /* IBOX in tree VSCROLLER */
#define VSCROLLER_BT_UP_PIC 4 /* CICON in tree VSCROLLER */
-#define SETTINGS 13 /* form/dial */
+#define POP_LANGUAGE 12 /* form/dial */
+#define POP_LANGUAGE_CS 1 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_DE 2 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN 3 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN_GB 4 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_DE_DE 5 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN_US 6 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_ES 7 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_FR 8 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_IT 9 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_NL 10 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_NO 11 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_PL 12 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_RU 13 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_SK 14 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_SV 15 /* STRING in tree POP_LANGUAGE */
+
+#define POP_FONT_RENDERER 13 /* form/dial */
+#define POP_FONT_RENDERER_INTERNAL 1 /* STRING in tree POP_FONT_RENDERER */
+#define POP_FONT_RENDERER_FREETYPE 2 /* STRING in tree POP_FONT_RENDERER */
+
+#define TOOLBAR_COOKIES 14 /* form/dial */
+
+#define TOOLBAR_HISTORY 15 /* form/dial */
+
+#define TOOLBAR_SSL_CERT 16 /* form/dial */
+#define TOOLBAR_SSL_CERT_TRUSTED 1 /* BUTTON in tree TOOLBAR_SSL_CERT */
+
+#define SETTINGS 17 /* form/dial */
#define SETTINGS_SAVE 1 /* BUTTON in tree SETTINGS */
#define SETTINGS_ABORT 2 /* BUTTON in tree SETTINGS */
#define SETTINGS_EDIT_DOWNLOAD_PATH 5 /* FTEXT in tree SETTINGS */
@@ -196,26 +186,43 @@
#define SETTINGS_INC_HISTORY_AGE 91 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_BT_GUI_TOUT 94 /* BUTTON in tree SETTINGS */
-#define POP_LANGUAGE 14 /* form/dial */
-#define POP_LANGUAGE_CS 1 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_DE 2 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN 3 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN_GB 4 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_DE_DE 5 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN_US 6 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_ES 7 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_FR 8 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_IT 9 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_NL 10 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_NO 11 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_PL 12 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_RU 13 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_SK 14 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_SV 15 /* STRING in tree POP_LANGUAGE */
-
-#define TOOLBAR_COOKIES 15 /* form/dial */
-
-#define TOOLBAR_HISTORY 16 /* form/dial */
-
-#define TOOLBAR_SSL_CERT 17 /* form/dial */
-#define TOOLBAR_SSL_CERT_TRUSTED 1 /* BUTTON in tree TOOLBAR_SSL_CERT */
+#define MAINMENU 18 /* menu */
+#define MAINMENU_T_FILE 4 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_EDIT 5 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_VIEW 6 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_NAVIGATE 7 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_UTIL 8 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_HELP 9 /* TITLE in tree MAINMENU */
+#define MAINMENU_M_ABOUT 12 /* STRING in tree MAINMENU */
+#define MAINMENU_M_NEWWIN 21 /* STRING in tree MAINMENU */
+#define MAINMENU_M_OPENFILE 22 /* STRING in tree MAINMENU */
+#define MAINMENU_M_OPENURL 23 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CLOSEWIN 24 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP0 25 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SAVEPAGE 26 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP1 27 /* STRING in tree MAINMENU */
+#define MAINMENU_M_QUIT 28 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CUT 30 /* STRING in tree MAINMENU */
+#define MAINMENU_M_COPY 31 /* STRING in tree MAINMENU */
+#define MAINMENU_M_PASTE 32 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP3 33 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FIND 34 /* STRING in tree MAINMENU */
+#define MAINMENU_M_STOP 36 /* STRING in tree MAINMENU */
+#define MAINMENU_M_RELOAD 37 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SCALE 39 /* STRING in tree MAINMENU */
+#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
+#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
+#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
+#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
+#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
+#define MAINMENU_M_COOKIES 58 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CHOICES 60 /* STRING in tree MAINMENU */
+#define MAINMENU_M_VLOG 61 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HELP_CONTENT 63 /* STRING in tree MAINMENU */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 5fc1909..c3a7a64 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -1,50 +1,10 @@
ResourceMaster v3.65
-#C 18@0@0@0@
+#C 19@0@0@0@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 20010100@0@7728@656@
-#T 0@1@MAINMENU@@64@@
-#O 4@32@T_FILE@@
-#O 5@32@T_EDIT@@
-#O 6@32@T_VIEW@@
-#O 7@32@T_NAVIGATE@@
-#O 8@32@T_UTIL@@
-#O 9@32@T_HELP@@
-#O 12@28@M_ABOUT@@
-#O 21@28@M_NEWWIN@@
-#O 22@28@M_OPENFILE@@
-#O 23@28@M_OPENURL@@
-#O 24@28@M_CLOSEWIN@@
-#O 25@28@SEP0@@
-#O 26@28@M_SAVEPAGE@@
-#O 27@28@SEP1@@
-#O 28@28@M_QUIT@@
-#O 30@28@M_CUT@@
-#O 31@28@M_COPY@@
-#O 32@28@M_PASTE@@
-#O 33@28@SEP3@@
-#O 34@28@M_FIND@@
-#O 36@28@M_STOP@@
-#O 37@28@M_RELOAD@@
-#O 39@28@M_SCALE@@
-#O 41@28@M_TOOLBARS@@
-#O 43@28@M_SAVEWIN@@
-#O 44@28@M_DEBUG_RENDER@@
-#O 45@28@M_BG_IMAGES@@
-#O 46@28@M_FG_IMAGES@@
-#O 48@28@M_BACK@@
-#O 49@28@M_FORWARD@@
-#O 50@28@M_HOME@@
-#O 52@28@M_LHISTORY@@
-#O 53@28@M_GHISTORY@@
-#O 55@28@M_ADD_BOOKMARK@@
-#O 56@28@M_BOOKMARKS@@
-#O 58@28@M_COOKIES@@
-#O 60@28@M_CHOICES@@
-#O 61@28@M_VLOG@@
-#O 63@28@M_HELP_CONTENT@@
-#T 1@2@TOOLBAR@@19@@
+#M 11100100@0@7728@659@
+#T 0@2@TOOLBAR@@22@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
#O 3@26@BT_SEARCH_BACK@@
@@ -54,18 +14,21 @@ ResourceMaster v3.65
#O 8@25@SEARCH_ALIGN_RIGHT@@
#O 9@26@BT_CLOSE_SEARCH@@
#O 10@20@AREA_NAVIGATION@@
-#O 11@25@AREA_BUTTONS@@
-#O 12@33@BT_BACK@@
-#O 13@33@BT_HOME@@
-#O 14@33@BT_FORWARD@@
-#O 15@33@BT_STOP@@
-#O 16@33@BT_RELOAD@@
-#O 17@24@AREA_URL@@
-#O 18@25@THROBBER_AREA@@
-#T 2@2@ICONIFY@@3@@
+#O 11@24@AREA_URL@@
+#O 12@25@AREA_RIGHT@@
+#O 13@25@THROBBER_AREA@@
+#O 14@33@BT_CRYPTO@@
+#O 15@33@BT_FAVORITE@@
+#O 16@25@AREA_LEFT@@
+#O 17@33@BT_BACK@@
+#O 18@33@BT_HOME@@
+#O 19@33@BT_FORWARD@@
+#O 20@33@BT_STOP@@
+#O 21@33@BT_RELOAD@@
+#T 1@2@ICONIFY@@3@@
#O 1@33@GLOBE@@
-#T 3@2@FAVICON@@2@@
-#T 4@2@CURSOR@@8@@
+#T 2@2@FAVICON@@2@@
+#T 3@2@CURSOR@@8@@
#O 1@31@HELP@@
#O 2@31@NODROP@@
#O 3@31@APPSTART@@
@@ -73,18 +36,18 @@ ResourceMaster v3.65
#O 5@31@SIZEWE@@
#O 6@31@SIZENS@@
#O 7@31@MENU@@
-#T 5@2@LOGIN@@7@@
+#T 4@2@LOGIN@@7@@
#O 2@29@TB_USER@@
#O 4@29@TB_PASSWORD@@
#O 5@26@BT_LOGIN@@
#O 6@26@BT_ABORT@@
-#T 6@2@THROBBER@@14@@
-#T 7@2@TOOLBAR_HOTLIST@@5@@
+#T 5@2@THROBBER@@14@@
+#T 6@2@TOOLBAR_HOTLIST@@5@@
#O 1@33@ADD@@
#O 2@33@CREATE_FOLDER@@
#O 3@33@DELETE@@
#O 4@33@EDIT@@
-#T 8@2@SEARCH@@10@@
+#T 7@2@SEARCH@@10@@
#O 1@26@BT_SEARCH@@
#O 2@26@CB_FWD@@
#O 3@26@BT_SEARCH_BACK@@
@@ -93,7 +56,7 @@ ResourceMaster v3.65
#O 7@28@LBL_SHOWALL@@
#O 8@21@LBL_CASESENSE@@
#O 9@29@TB_SRCH@@
-#T 9@2@DOWNLOAD@@10@@
+#T 8@2@DOWNLOAD@@10@@
#O 1@20@PROGRESS@Width ist 400, code depends on that! If you change it, change it in download.c@
#O 2@20@PROGRESS_DONE@@
#O 3@21@FILENAME@@
@@ -103,13 +66,13 @@ ResourceMaster v3.65
#O 7@21@LBL_PERCENT@@
#O 8@21@LBL_SPEED@@
#O 9@27@CB_CLOSE_RDY@@
-#T 10@2@ABOUT@@9@@
+#T 9@2@ABOUT@@9@@
#O 1@21@LBL_VERSION@@
#O 4@26@OK@@
#O 6@24@CONTENT@@
#O 7@26@CREDITS@@
#O 8@26@LICENSE@@
-#T 11@2@POP_CTX@@12@@
+#T 10@2@POP_CTX@@12@@
#O 1@21@CUT_SEL@@
#O 2@21@COPY_SEL@@
#O 3@21@PASTE_SEL@@
@@ -120,7 +83,7 @@ ResourceMaster v3.65
#O 9@21@SAVE_AS@@
#O 10@21@VIEW_SOURCE@@
#O 11@21@SAVE_LINK_AS@@
-#T 12@2@VSCROLLER@@8@@
+#T 11@2@VSCROLLER@@8@@
#O 1@20@AREA@@
#O 2@26@SLIDER_AREA@@
#O 3@26@SLIDER@@
@@ -128,7 +91,30 @@ ResourceMaster v3.65
#O 5@33@BT_DOWN_PIC@@
#O 6@25@BT_UP@@
#O 4@33@BT_UP_PIC@@
-#T 13@2@SETTINGS@@96@@
+#T 12@2@POP_LANGUAGE@@16@@
+#O 1@28@CS@@
+#O 2@28@DE@@
+#O 3@28@EN@@
+#O 4@28@EN_GB@@
+#O 5@28@DE_DE@@
+#O 6@28@EN_US@@
+#O 7@28@ES@@
+#O 8@28@FR@@
+#O 9@28@IT@@
+#O 10@28@NL@@
+#O 11@28@NO@@
+#O 12@28@PL@@
+#O 13@28@RU@@
+#O 14@28@SK@@
+#O 15@28@SV@@
+#T 13@2@POP_FONT_RENDERER@@3@@
+#O 1@28@INTERNAL@@
+#O 2@28@FREETYPE@@
+#T 14@2@TOOLBAR_COOKIES@@1@@
+#T 15@2@TOOLBAR_HISTORY@@1@@
+#T 16@2@TOOLBAR_SSL_CERT@@2@@
+#O 1@26@TRUSTED@@
+#T 17@2@SETTINGS@@96@@
#O 1@26@SAVE@@
#O 2@26@ABORT@@
#O 5@29@EDIT_DOWNLOAD_PATH@@
@@ -184,24 +170,44 @@ ResourceMaster v3.65
#O 90@29@EDIT_HISTORY_AGE@@
#O 91@27@INC_HISTORY_AGE@@
#O 94@26@BT_GUI_TOUT@@
-#T 14@2@POP_LANGUAGE@@16@@
-#O 1@28@CS@@
-#O 2@28@DE@@
-#O 3@28@EN@@
-#O 4@28@EN_GB@@
-#O 5@28@DE_DE@@
-#O 6@28@EN_US@@
-#O 7@28@ES@@
-#O 8@28@FR@@
-#O 9@28@IT@@
-#O 10@28@NL@@
-#O 11@28@NO@@
-#O 12@28@PL@@
-#O 13@28@RU@@
-#O 14@28@SK@@
-#O 15@28@SV@@
-#T 15@2@TOOLBAR_COOKIES@@1@@
-#T 16@2@TOOLBAR_HISTORY@@1@@
-#T 17@2@TOOLBAR_SSL_CERT@@2@@
-#O 1@26@TRUSTED@@
-#c 29167@
+#T 18@1@MAINMENU@@64@@
+#O 4@32@T_FILE@@
+#O 5@32@T_EDIT@@
+#O 6@32@T_VIEW@@
+#O 7@32@T_NAVIGATE@@
+#O 8@32@T_UTIL@@
+#O 9@32@T_HELP@@
+#O 12@28@M_ABOUT@@
+#O 21@28@M_NEWWIN@@
+#O 22@28@M_OPENFILE@@
+#O 23@28@M_OPENURL@@
+#O 24@28@M_CLOSEWIN@@
+#O 25@28@SEP0@@
+#O 26@28@M_SAVEPAGE@@
+#O 27@28@SEP1@@
+#O 28@28@M_QUIT@@
+#O 30@28@M_CUT@@
+#O 31@28@M_COPY@@
+#O 32@28@M_PASTE@@
+#O 33@28@SEP3@@
+#O 34@28@M_FIND@@
+#O 36@28@M_STOP@@
+#O 37@28@M_RELOAD@@
+#O 39@28@M_SCALE@@
+#O 41@28@M_TOOLBARS@@
+#O 43@28@M_SAVEWIN@@
+#O 44@28@M_DEBUG_RENDER@@
+#O 45@28@M_BG_IMAGES@@
+#O 46@28@M_FG_IMAGES@@
+#O 48@28@M_BACK@@
+#O 49@28@M_FORWARD@@
+#O 50@28@M_HOME@@
+#O 52@28@M_LHISTORY@@
+#O 53@28@M_GHISTORY@@
+#O 55@28@M_ADD_BOOKMARK@@
+#O 56@28@M_BOOKMARKS@@
+#O 58@28@M_COOKIES@@
+#O 60@28@M_CHOICES@@
+#O 61@28@M_VLOG@@
+#O 63@28@M_HELP_CONTENT@@
+#c 20589@
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 4a63787..9a3412e 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -37,7 +37,9 @@
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
+#include "desktop/hotlist.h"
#include "utils/nsoption.h"
+#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "atari/clipboard.h"
#include "atari/gui.h"
@@ -139,6 +141,18 @@ static struct s_tb_button tb_buttons[] =
toolbar_reload_click,
{0,0},
0, 0, 0, {0,0,0,0}
+ },
+ {
+ TOOLBAR_BT_FAVORITE,
+ toolbar_favorite_click,
+ {0,0},
+ 0, 0, 0, {0,0,0,0}
+ },
+ {
+ TOOLBAR_BT_CRYPTO,
+ toolbar_crypto_click,
+ {0,0},
+ 0, 0, 0, {0,0,0,0}
},
{ 0, 0, {0,0}, 0, -1, 0, {0,0,0,0}}
};
@@ -371,6 +385,7 @@ static int toolbar_calculate_height(struct s_toolbar *tb)
static void toolbar_reflow(struct s_toolbar *tb)
{
int i;
+ short offx, offy;
// position toolbar areas:
tb->form->ob_x = tb->area.g_x;
@@ -389,32 +404,39 @@ static void toolbar_reflow(struct s_toolbar *tb)
}
- // align the throbber area at right edge:
- tb->form[TOOLBAR_THROBBER_AREA].ob_x = tb->area.g_w
- - tb->form[TOOLBAR_THROBBER_AREA].ob_width;
-
- // align the search button:
- tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
- - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
+ // align TOOLBAR_AREA_RIGHT IBOX at right edge:
+ tb->form[TOOLBAR_AREA_RIGHT].ob_x = tb->area.g_w
+ - tb->form[TOOLBAR_AREA_RIGHT].ob_width;
// center the URL area:
tb->form[TOOLBAR_AREA_URL].ob_width = tb->area.g_w
- - (tb->form[TOOLBAR_AREA_BUTTONS].ob_width
- + tb->form[TOOLBAR_THROBBER_AREA].ob_width + 1);
+ - (tb->form[TOOLBAR_AREA_LEFT].ob_width
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_width);
+ // position throbber image above IBOX:
+ objc_offset(tb->form, TOOLBAR_THROBBER_AREA, &offx, &offy);
+ throbber_form[tb->throbber.index].ob_x = offx;
+ throbber_form[tb->throbber.index].ob_y = offy;
- // position throbber image:
- throbber_form[tb->throbber.index].ob_x = tb->area.g_x +
- tb->form[TOOLBAR_THROBBER_AREA].ob_x;
+ /*throbber_form[tb->throbber.index].ob_x = tb->area.g_x
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+ + tb->form[TOOLBAR_THROBBER_AREA].ob_x;*/
+/*
throbber_form[tb->throbber.index].ob_x = tb->area.g_x
- + tb->form[TOOLBAR_THROBBER_AREA].ob_x +
- ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+ + tb->form[TOOLBAR_THROBBER_AREA].ob_x
+ + ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
- throbber_form[tb->throbber.index].ob_width) >> 1);
- throbber_form[tb->throbber.index].ob_y = tb->area.g_y +
- ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
+ throbber_form[tb->throbber.index].ob_y = tb->area.g_y
+ + ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
- throbber_form[tb->throbber.index].ob_height) >> 1);
+ */
+
+ // align the search button:
+ tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
+ - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
// set button states:
for (i=0; i < tb->btcnt; i++ ) {
@@ -440,8 +462,6 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip)
if(tb->reflow == true)
toolbar_reflow(tb);
- //TODO: fix redraw under popup menu ... that not handled correctly somehow.
-
//dbg_grect("toolbar redraw clip", clip);
/* Redraw the AES objects: */
@@ -476,6 +496,9 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
struct s_tb_button * bt;
bool enable = false;
GRECT area;
+ nsurl * ns_url;
+ char * c_url;
+ size_t c_url_len;
assert(bw != NULL);
@@ -523,13 +546,56 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
}
}
+ if (button == TOOLBAR_BT_FAVORITE || button <= 0) {
+ bt = find_button(tb, TOOLBAR_BT_FAVORITE);
+ ns_url = toolbar_get_nsurl(tb);
+ if (ns_url != NULL) {
+ if (hotlist_has_url(ns_url)) {
+ bt->state = button_on;
+ tb->form[TOOLBAR_BT_FAVORITE].ob_state |= OS_SELECTED;
+ }
+ else {
+ bt->state = button_on;
+ tb->form[TOOLBAR_BT_FAVORITE].ob_state &= ~OS_SELECTED;
+ }
+ }
+ nsurl_unref(ns_url);
+ }
+
+ if (button == TOOLBAR_BT_CRYPTO|| button <= 0) {
+ bt = find_button(tb, TOOLBAR_BT_CRYPTO);
+ ns_url = toolbar_get_nsurl(tb);
+ if (ns_url != NULL &&
+ nsurl_get(ns_url, NSURL_SCHEME, &c_url, &c_url_len) == NSERROR_OK) {
+ if (strncasecmp("https", c_url, 5) == 0) {
+ bt->state = button_on;
+ // TODO: this check actually doesn't work - why?
+ if (urldb_get_cert_permissions(ns_url) == true) {
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+ }
+ else {
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state |= OS_SELECTED;
+ }
+ }
+ else {
+ bt->state = button_off;
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+ }
+ nsurl_unref(ns_url);
+ free(c_url);
+ }
+ }
+
if (tb->attached) {
if (button > 0) {
toolbar_get_grect(tb, button, &area);
window_schedule_redraw_grect(tb->owner, &area);
}
else {
- toolbar_get_grect(tb, TOOLBAR_AREA_BUTTONS, &area);
+ toolbar_get_grect(tb, TOOLBAR_AREA_LEFT, &area);
+ window_schedule_redraw_grect(tb->owner, &area);
+
+ toolbar_get_grect(tb, TOOLBAR_AREA_RIGHT, &area);
window_schedule_redraw_grect(tb->owner, &area);
}
}
@@ -707,18 +773,12 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
char tmp_url[PATH_MAX];
if ( textarea_get_text( tb->url.textarea, tmp_url, PATH_MAX) > 0 ) {
window_set_focus(tb->owner, BROWSER, gw->browser);
-
if (nsurl_create((const char*)&tmp_url, &url) != NSERROR_OK) {
warn_user("NoMemory", 0);
} else {
- browser_window_navigate(gw->browser->bw,
- url,
- NULL,
- BROWSER_WINDOW_HISTORY |
- BROWSER_WINDOW_VERIFIABLE,
- NULL,
- NULL,
- NULL);
+ browser_window_navigate(gw->browser->bw, url, NULL,
+ BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE,
+ NULL, NULL, NULL);
nsurl_unref(url);
}
@@ -902,6 +962,36 @@ struct textarea *toolbar_get_textarea(struct s_toolbar *tb,
return(tb->url.textarea);
}
+char *toolbar_get_url(struct s_toolbar *tb)
+{
+ char * c_url = NULL;
+ int c_url_len = 0;
+
+ c_url_len = textarea_get_text(tb->url.textarea, NULL, 0);
+
+ if (c_url_len > -1) {
+ c_url = malloc(c_url_len+1);
+ textarea_get_text(tb->url.textarea, c_url, c_url_len+1);
+ }
+
+ return(c_url);
+}
+
+nsurl * toolbar_get_nsurl(struct s_toolbar * tb)
+{
+
+ nsurl * ns_url = NULL;
+ char * c_url;
+
+ c_url = toolbar_get_url(tb);
+ if (c_url) {
+ nsurl_create(c_url, &ns_url);
+ }
+
+ return(ns_url);
+}
+
+
OBJECT *toolbar_get_form(struct s_toolbar *tb)
{
return(tb->form);
@@ -997,3 +1087,35 @@ void toolbar_stop_click(struct s_toolbar *tb)
browser_window_stop(bw);
}
+void toolbar_favorite_click(struct s_toolbar *tb)
+{
+ nsurl * ns_url = NULL;
+ char * c_url;
+ int c_url_len = 0;
+
+ c_url = toolbar_get_url(tb);
+ c_url_len = strlen(c_url);
+
+ nsurl_create(c_url, &ns_url);
+
+ if (hotlist_has_url(ns_url)) {
+ char msg[c_url_len+100];
+ snprintf(msg, c_url_len+100, "Really delete from favorites: \"%s\"",
+ c_url);
+ if(gemtk_msg_box_show(GEMTK_MSG_BOX_CONFIRM, msg)) {
+ hotlist_remove_url(ns_url);
+ }
+ }
+ else {
+ hotlist_add_url(ns_url);
+ }
+
+ nsurl_unref(ns_url);
+ free(c_url);
+}
+
+void toolbar_crypto_click(struct s_toolbar *tb)
+{
+
+}
+
-----------------------------------------------------------------------
Summary of changes:
atari/res/netsurf.rsc | Bin 38074 -> 41232 bytes
atari/res/netsurf.rsh | 179 +++++++++++++++++++++++++-----------------------
atari/res/netsurf.rsm | 174 +++++++++++++++++++++++++-----------------------
atari/toolbar.c | 178 +++++++++++++++++++++++++++++++++++++++++--------
4 files changed, 333 insertions(+), 198 deletions(-)
diff --git a/atari/res/netsurf.rsc b/atari/res/netsurf.rsc
index 1a30eef..0076e33 100755
Binary files a/atari/res/netsurf.rsc and b/atari/res/netsurf.rsc differ
diff --git a/atari/res/netsurf.rsh b/atari/res/netsurf.rsh
index f096444..8dae177 100755
--- a/atari/res/netsurf.rsh
+++ b/atari/res/netsurf.rsh
@@ -1,47 +1,6 @@
/* Resource C-Header-File v1.97 f�r ResourceMaster ab v2.06 by ARDISOFT */
-#define MAINMENU 0 /* menu */
-#define MAINMENU_T_FILE 4 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_EDIT 5 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_VIEW 6 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_NAVIGATE 7 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_UTIL 8 /* TITLE in tree MAINMENU */
-#define MAINMENU_T_HELP 9 /* TITLE in tree MAINMENU */
-#define MAINMENU_M_ABOUT 12 /* STRING in tree MAINMENU */
-#define MAINMENU_M_NEWWIN 21 /* STRING in tree MAINMENU */
-#define MAINMENU_M_OPENFILE 22 /* STRING in tree MAINMENU */
-#define MAINMENU_M_OPENURL 23 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CLOSEWIN 24 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP0 25 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SAVEPAGE 26 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP1 27 /* STRING in tree MAINMENU */
-#define MAINMENU_M_QUIT 28 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CUT 30 /* STRING in tree MAINMENU */
-#define MAINMENU_M_COPY 31 /* STRING in tree MAINMENU */
-#define MAINMENU_M_PASTE 32 /* STRING in tree MAINMENU */
-#define MAINMENU_SEP3 33 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FIND 34 /* STRING in tree MAINMENU */
-#define MAINMENU_M_STOP 36 /* STRING in tree MAINMENU */
-#define MAINMENU_M_RELOAD 37 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SCALE 39 /* STRING in tree MAINMENU */
-#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
-#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
-#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
-#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
-#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
-#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
-#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
-#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
-#define MAINMENU_M_COOKIES 58 /* STRING in tree MAINMENU */
-#define MAINMENU_M_CHOICES 60 /* STRING in tree MAINMENU */
-#define MAINMENU_M_VLOG 61 /* STRING in tree MAINMENU */
-#define MAINMENU_M_HELP_CONTENT 63 /* STRING in tree MAINMENU */
-
-#define TOOLBAR 1 /* form/dial */
+#define TOOLBAR 0 /* form/dial */
#define TOOLBAR_AREA_SEARCH 1 /* BOX in tree TOOLBAR */
#define TOOLBAR_BT_SEARCH_FWD 2 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_BT_SEARCH_BACK 3 /* BUTTON in tree TOOLBAR */
@@ -51,21 +10,24 @@
#define TOOLBAR_SEARCH_ALIGN_RIGHT 8 /* IBOX in tree TOOLBAR */
#define TOOLBAR_BT_CLOSE_SEARCH 9 /* BUTTON in tree TOOLBAR */
#define TOOLBAR_AREA_NAVIGATION 10 /* BOX in tree TOOLBAR */
-#define TOOLBAR_AREA_BUTTONS 11 /* IBOX in tree TOOLBAR */
-#define TOOLBAR_BT_BACK 12 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_HOME 13 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_FORWARD 14 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_STOP 15 /* CICON in tree TOOLBAR */
-#define TOOLBAR_BT_RELOAD 16 /* CICON in tree TOOLBAR */
-#define TOOLBAR_AREA_URL 17 /* USERDEF in tree TOOLBAR */
-#define TOOLBAR_THROBBER_AREA 18 /* IBOX in tree TOOLBAR */
-
-#define ICONIFY 2 /* form/dial */
+#define TOOLBAR_AREA_URL 11 /* USERDEF in tree TOOLBAR */
+#define TOOLBAR_AREA_RIGHT 12 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_THROBBER_AREA 13 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_BT_CRYPTO 14 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_FAVORITE 15 /* CICON in tree TOOLBAR */
+#define TOOLBAR_AREA_LEFT 16 /* IBOX in tree TOOLBAR */
+#define TOOLBAR_BT_BACK 17 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_HOME 18 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_FORWARD 19 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_STOP 20 /* CICON in tree TOOLBAR */
+#define TOOLBAR_BT_RELOAD 21 /* CICON in tree TOOLBAR */
+
+#define ICONIFY 1 /* form/dial */
#define ICONIFY_GLOBE 1 /* CICON in tree ICONIFY */
-#define FAVICON 3 /* form/dial */
+#define FAVICON 2 /* form/dial */
-#define CURSOR 4 /* form/dial */
+#define CURSOR 3 /* form/dial */
#define CURSOR_HELP 1 /* ICON in tree CURSOR */
#define CURSOR_NODROP 2 /* ICON in tree CURSOR */
#define CURSOR_APPSTART 3 /* ICON in tree CURSOR */
@@ -74,21 +36,21 @@
#define CURSOR_SIZENS 6 /* ICON in tree CURSOR */
#define CURSOR_MENU 7 /* ICON in tree CURSOR */
-#define LOGIN 5 /* form/dial */
+#define LOGIN 4 /* form/dial */
#define LOGIN_TB_USER 2 /* FTEXT in tree LOGIN */
#define LOGIN_TB_PASSWORD 4 /* FTEXT in tree LOGIN */
#define LOGIN_BT_LOGIN 5 /* BUTTON in tree LOGIN */
#define LOGIN_BT_ABORT 6 /* BUTTON in tree LOGIN */
-#define THROBBER 6 /* form/dial */
+#define THROBBER 5 /* form/dial */
-#define TOOLBAR_HOTLIST 7 /* form/dial */
+#define TOOLBAR_HOTLIST 6 /* form/dial */
#define TOOLBAR_HOTLIST_ADD 1 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_CREATE_FOLDER 2 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_DELETE 3 /* CICON in tree TOOLBAR_HOTLIST */
#define TOOLBAR_HOTLIST_EDIT 4 /* CICON in tree TOOLBAR_HOTLIST */
-#define SEARCH 8 /* form/dial */
+#define SEARCH 7 /* form/dial */
#define SEARCH_BT_SEARCH 1 /* BUTTON in tree SEARCH */
#define SEARCH_CB_FWD 2 /* BUTTON in tree SEARCH */
#define SEARCH_BT_SEARCH_BACK 3 /* BUTTON in tree SEARCH */
@@ -98,7 +60,7 @@
#define SEARCH_LBL_CASESENSE 8 /* TEXT in tree SEARCH */
#define SEARCH_TB_SRCH 9 /* FTEXT in tree SEARCH */
-#define DOWNLOAD 9 /* form/dial */
+#define DOWNLOAD 8 /* form/dial */
/* Width ist 400, code depends on that! If you change it, change it in download.c */
#define DOWNLOAD_PROGRESS 1 /* BOX in tree DOWNLOAD */
#define DOWNLOAD_PROGRESS_DONE 2 /* BOX in tree DOWNLOAD */
@@ -110,14 +72,14 @@
#define DOWNLOAD_LBL_SPEED 8 /* TEXT in tree DOWNLOAD */
#define DOWNLOAD_CB_CLOSE_RDY 9 /* BOXCHAR in tree DOWNLOAD */
-#define ABOUT 10 /* form/dial */
+#define ABOUT 9 /* form/dial */
#define ABOUT_LBL_VERSION 1 /* TEXT in tree ABOUT */
#define ABOUT_OK 4 /* BUTTON in tree ABOUT */
#define ABOUT_CONTENT 6 /* USERDEF in tree ABOUT */
#define ABOUT_CREDITS 7 /* BUTTON in tree ABOUT */
#define ABOUT_LICENSE 8 /* BUTTON in tree ABOUT */
-#define POP_CTX 11 /* form/dial */
+#define POP_CTX 10 /* form/dial */
#define POP_CTX_CUT_SEL 1 /* TEXT in tree POP_CTX */
#define POP_CTX_COPY_SEL 2 /* TEXT in tree POP_CTX */
#define POP_CTX_PASTE_SEL 3 /* TEXT in tree POP_CTX */
@@ -129,7 +91,7 @@
#define POP_CTX_VIEW_SOURCE 10 /* TEXT in tree POP_CTX */
#define POP_CTX_SAVE_LINK_AS 11 /* TEXT in tree POP_CTX */
-#define VSCROLLER 12 /* form/dial */
+#define VSCROLLER 11 /* form/dial */
#define VSCROLLER_AREA 1 /* BOX in tree VSCROLLER */
#define VSCROLLER_SLIDER_AREA 2 /* BUTTON in tree VSCROLLER */
#define VSCROLLER_SLIDER 3 /* BUTTON in tree VSCROLLER */
@@ -138,7 +100,35 @@
#define VSCROLLER_BT_UP 6 /* IBOX in tree VSCROLLER */
#define VSCROLLER_BT_UP_PIC 4 /* CICON in tree VSCROLLER */
-#define SETTINGS 13 /* form/dial */
+#define POP_LANGUAGE 12 /* form/dial */
+#define POP_LANGUAGE_CS 1 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_DE 2 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN 3 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN_GB 4 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_DE_DE 5 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_EN_US 6 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_ES 7 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_FR 8 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_IT 9 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_NL 10 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_NO 11 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_PL 12 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_RU 13 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_SK 14 /* STRING in tree POP_LANGUAGE */
+#define POP_LANGUAGE_SV 15 /* STRING in tree POP_LANGUAGE */
+
+#define POP_FONT_RENDERER 13 /* form/dial */
+#define POP_FONT_RENDERER_INTERNAL 1 /* STRING in tree POP_FONT_RENDERER */
+#define POP_FONT_RENDERER_FREETYPE 2 /* STRING in tree POP_FONT_RENDERER */
+
+#define TOOLBAR_COOKIES 14 /* form/dial */
+
+#define TOOLBAR_HISTORY 15 /* form/dial */
+
+#define TOOLBAR_SSL_CERT 16 /* form/dial */
+#define TOOLBAR_SSL_CERT_TRUSTED 1 /* BUTTON in tree TOOLBAR_SSL_CERT */
+
+#define SETTINGS 17 /* form/dial */
#define SETTINGS_SAVE 1 /* BUTTON in tree SETTINGS */
#define SETTINGS_ABORT 2 /* BUTTON in tree SETTINGS */
#define SETTINGS_EDIT_DOWNLOAD_PATH 5 /* FTEXT in tree SETTINGS */
@@ -196,26 +186,43 @@
#define SETTINGS_INC_HISTORY_AGE 91 /* BOXCHAR in tree SETTINGS */
#define SETTINGS_BT_GUI_TOUT 94 /* BUTTON in tree SETTINGS */
-#define POP_LANGUAGE 14 /* form/dial */
-#define POP_LANGUAGE_CS 1 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_DE 2 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN 3 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN_GB 4 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_DE_DE 5 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_EN_US 6 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_ES 7 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_FR 8 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_IT 9 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_NL 10 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_NO 11 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_PL 12 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_RU 13 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_SK 14 /* STRING in tree POP_LANGUAGE */
-#define POP_LANGUAGE_SV 15 /* STRING in tree POP_LANGUAGE */
-
-#define TOOLBAR_COOKIES 15 /* form/dial */
-
-#define TOOLBAR_HISTORY 16 /* form/dial */
-
-#define TOOLBAR_SSL_CERT 17 /* form/dial */
-#define TOOLBAR_SSL_CERT_TRUSTED 1 /* BUTTON in tree TOOLBAR_SSL_CERT */
+#define MAINMENU 18 /* menu */
+#define MAINMENU_T_FILE 4 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_EDIT 5 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_VIEW 6 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_NAVIGATE 7 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_UTIL 8 /* TITLE in tree MAINMENU */
+#define MAINMENU_T_HELP 9 /* TITLE in tree MAINMENU */
+#define MAINMENU_M_ABOUT 12 /* STRING in tree MAINMENU */
+#define MAINMENU_M_NEWWIN 21 /* STRING in tree MAINMENU */
+#define MAINMENU_M_OPENFILE 22 /* STRING in tree MAINMENU */
+#define MAINMENU_M_OPENURL 23 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CLOSEWIN 24 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP0 25 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SAVEPAGE 26 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP1 27 /* STRING in tree MAINMENU */
+#define MAINMENU_M_QUIT 28 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CUT 30 /* STRING in tree MAINMENU */
+#define MAINMENU_M_COPY 31 /* STRING in tree MAINMENU */
+#define MAINMENU_M_PASTE 32 /* STRING in tree MAINMENU */
+#define MAINMENU_SEP3 33 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FIND 34 /* STRING in tree MAINMENU */
+#define MAINMENU_M_STOP 36 /* STRING in tree MAINMENU */
+#define MAINMENU_M_RELOAD 37 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SCALE 39 /* STRING in tree MAINMENU */
+#define MAINMENU_M_TOOLBARS 41 /* STRING in tree MAINMENU */
+#define MAINMENU_M_SAVEWIN 43 /* STRING in tree MAINMENU */
+#define MAINMENU_M_DEBUG_RENDER 44 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BG_IMAGES 45 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FG_IMAGES 46 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BACK 48 /* STRING in tree MAINMENU */
+#define MAINMENU_M_FORWARD 49 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HOME 50 /* STRING in tree MAINMENU */
+#define MAINMENU_M_LHISTORY 52 /* STRING in tree MAINMENU */
+#define MAINMENU_M_GHISTORY 53 /* STRING in tree MAINMENU */
+#define MAINMENU_M_ADD_BOOKMARK 55 /* STRING in tree MAINMENU */
+#define MAINMENU_M_BOOKMARKS 56 /* STRING in tree MAINMENU */
+#define MAINMENU_M_COOKIES 58 /* STRING in tree MAINMENU */
+#define MAINMENU_M_CHOICES 60 /* STRING in tree MAINMENU */
+#define MAINMENU_M_VLOG 61 /* STRING in tree MAINMENU */
+#define MAINMENU_M_HELP_CONTENT 63 /* STRING in tree MAINMENU */
diff --git a/atari/res/netsurf.rsm b/atari/res/netsurf.rsm
index 5fc1909..c3a7a64 100755
--- a/atari/res/netsurf.rsm
+++ b/atari/res/netsurf.rsm
@@ -1,50 +1,10 @@
ResourceMaster v3.65
-#C 18@0@0@0@
+#C 19@0@0@0@
#N 99@32@AZAaza___ _@AZAaza090___ _@@_@
#FoC-Header@rsm2out@C-Header@rsh@@@[C-Header@0@
#R 0@0@1@1@2@1@
-#M 20010100@0@7728@656@
-#T 0@1@MAINMENU@@64@@
-#O 4@32@T_FILE@@
-#O 5@32@T_EDIT@@
-#O 6@32@T_VIEW@@
-#O 7@32@T_NAVIGATE@@
-#O 8@32@T_UTIL@@
-#O 9@32@T_HELP@@
-#O 12@28@M_ABOUT@@
-#O 21@28@M_NEWWIN@@
-#O 22@28@M_OPENFILE@@
-#O 23@28@M_OPENURL@@
-#O 24@28@M_CLOSEWIN@@
-#O 25@28@SEP0@@
-#O 26@28@M_SAVEPAGE@@
-#O 27@28@SEP1@@
-#O 28@28@M_QUIT@@
-#O 30@28@M_CUT@@
-#O 31@28@M_COPY@@
-#O 32@28@M_PASTE@@
-#O 33@28@SEP3@@
-#O 34@28@M_FIND@@
-#O 36@28@M_STOP@@
-#O 37@28@M_RELOAD@@
-#O 39@28@M_SCALE@@
-#O 41@28@M_TOOLBARS@@
-#O 43@28@M_SAVEWIN@@
-#O 44@28@M_DEBUG_RENDER@@
-#O 45@28@M_BG_IMAGES@@
-#O 46@28@M_FG_IMAGES@@
-#O 48@28@M_BACK@@
-#O 49@28@M_FORWARD@@
-#O 50@28@M_HOME@@
-#O 52@28@M_LHISTORY@@
-#O 53@28@M_GHISTORY@@
-#O 55@28@M_ADD_BOOKMARK@@
-#O 56@28@M_BOOKMARKS@@
-#O 58@28@M_COOKIES@@
-#O 60@28@M_CHOICES@@
-#O 61@28@M_VLOG@@
-#O 63@28@M_HELP_CONTENT@@
-#T 1@2@TOOLBAR@@19@@
+#M 11100100@0@7728@659@
+#T 0@2@TOOLBAR@@22@@
#O 1@20@AREA_SEARCH@@
#O 2@26@BT_SEARCH_FWD@@
#O 3@26@BT_SEARCH_BACK@@
@@ -54,18 +14,21 @@ ResourceMaster v3.65
#O 8@25@SEARCH_ALIGN_RIGHT@@
#O 9@26@BT_CLOSE_SEARCH@@
#O 10@20@AREA_NAVIGATION@@
-#O 11@25@AREA_BUTTONS@@
-#O 12@33@BT_BACK@@
-#O 13@33@BT_HOME@@
-#O 14@33@BT_FORWARD@@
-#O 15@33@BT_STOP@@
-#O 16@33@BT_RELOAD@@
-#O 17@24@AREA_URL@@
-#O 18@25@THROBBER_AREA@@
-#T 2@2@ICONIFY@@3@@
+#O 11@24@AREA_URL@@
+#O 12@25@AREA_RIGHT@@
+#O 13@25@THROBBER_AREA@@
+#O 14@33@BT_CRYPTO@@
+#O 15@33@BT_FAVORITE@@
+#O 16@25@AREA_LEFT@@
+#O 17@33@BT_BACK@@
+#O 18@33@BT_HOME@@
+#O 19@33@BT_FORWARD@@
+#O 20@33@BT_STOP@@
+#O 21@33@BT_RELOAD@@
+#T 1@2@ICONIFY@@3@@
#O 1@33@GLOBE@@
-#T 3@2@FAVICON@@2@@
-#T 4@2@CURSOR@@8@@
+#T 2@2@FAVICON@@2@@
+#T 3@2@CURSOR@@8@@
#O 1@31@HELP@@
#O 2@31@NODROP@@
#O 3@31@APPSTART@@
@@ -73,18 +36,18 @@ ResourceMaster v3.65
#O 5@31@SIZEWE@@
#O 6@31@SIZENS@@
#O 7@31@MENU@@
-#T 5@2@LOGIN@@7@@
+#T 4@2@LOGIN@@7@@
#O 2@29@TB_USER@@
#O 4@29@TB_PASSWORD@@
#O 5@26@BT_LOGIN@@
#O 6@26@BT_ABORT@@
-#T 6@2@THROBBER@@14@@
-#T 7@2@TOOLBAR_HOTLIST@@5@@
+#T 5@2@THROBBER@@14@@
+#T 6@2@TOOLBAR_HOTLIST@@5@@
#O 1@33@ADD@@
#O 2@33@CREATE_FOLDER@@
#O 3@33@DELETE@@
#O 4@33@EDIT@@
-#T 8@2@SEARCH@@10@@
+#T 7@2@SEARCH@@10@@
#O 1@26@BT_SEARCH@@
#O 2@26@CB_FWD@@
#O 3@26@BT_SEARCH_BACK@@
@@ -93,7 +56,7 @@ ResourceMaster v3.65
#O 7@28@LBL_SHOWALL@@
#O 8@21@LBL_CASESENSE@@
#O 9@29@TB_SRCH@@
-#T 9@2@DOWNLOAD@@10@@
+#T 8@2@DOWNLOAD@@10@@
#O 1@20@PROGRESS@Width ist 400, code depends on that! If you change it, change it in download.c@
#O 2@20@PROGRESS_DONE@@
#O 3@21@FILENAME@@
@@ -103,13 +66,13 @@ ResourceMaster v3.65
#O 7@21@LBL_PERCENT@@
#O 8@21@LBL_SPEED@@
#O 9@27@CB_CLOSE_RDY@@
-#T 10@2@ABOUT@@9@@
+#T 9@2@ABOUT@@9@@
#O 1@21@LBL_VERSION@@
#O 4@26@OK@@
#O 6@24@CONTENT@@
#O 7@26@CREDITS@@
#O 8@26@LICENSE@@
-#T 11@2@POP_CTX@@12@@
+#T 10@2@POP_CTX@@12@@
#O 1@21@CUT_SEL@@
#O 2@21@COPY_SEL@@
#O 3@21@PASTE_SEL@@
@@ -120,7 +83,7 @@ ResourceMaster v3.65
#O 9@21@SAVE_AS@@
#O 10@21@VIEW_SOURCE@@
#O 11@21@SAVE_LINK_AS@@
-#T 12@2@VSCROLLER@@8@@
+#T 11@2@VSCROLLER@@8@@
#O 1@20@AREA@@
#O 2@26@SLIDER_AREA@@
#O 3@26@SLIDER@@
@@ -128,7 +91,30 @@ ResourceMaster v3.65
#O 5@33@BT_DOWN_PIC@@
#O 6@25@BT_UP@@
#O 4@33@BT_UP_PIC@@
-#T 13@2@SETTINGS@@96@@
+#T 12@2@POP_LANGUAGE@@16@@
+#O 1@28@CS@@
+#O 2@28@DE@@
+#O 3@28@EN@@
+#O 4@28@EN_GB@@
+#O 5@28@DE_DE@@
+#O 6@28@EN_US@@
+#O 7@28@ES@@
+#O 8@28@FR@@
+#O 9@28@IT@@
+#O 10@28@NL@@
+#O 11@28@NO@@
+#O 12@28@PL@@
+#O 13@28@RU@@
+#O 14@28@SK@@
+#O 15@28@SV@@
+#T 13@2@POP_FONT_RENDERER@@3@@
+#O 1@28@INTERNAL@@
+#O 2@28@FREETYPE@@
+#T 14@2@TOOLBAR_COOKIES@@1@@
+#T 15@2@TOOLBAR_HISTORY@@1@@
+#T 16@2@TOOLBAR_SSL_CERT@@2@@
+#O 1@26@TRUSTED@@
+#T 17@2@SETTINGS@@96@@
#O 1@26@SAVE@@
#O 2@26@ABORT@@
#O 5@29@EDIT_DOWNLOAD_PATH@@
@@ -184,24 +170,44 @@ ResourceMaster v3.65
#O 90@29@EDIT_HISTORY_AGE@@
#O 91@27@INC_HISTORY_AGE@@
#O 94@26@BT_GUI_TOUT@@
-#T 14@2@POP_LANGUAGE@@16@@
-#O 1@28@CS@@
-#O 2@28@DE@@
-#O 3@28@EN@@
-#O 4@28@EN_GB@@
-#O 5@28@DE_DE@@
-#O 6@28@EN_US@@
-#O 7@28@ES@@
-#O 8@28@FR@@
-#O 9@28@IT@@
-#O 10@28@NL@@
-#O 11@28@NO@@
-#O 12@28@PL@@
-#O 13@28@RU@@
-#O 14@28@SK@@
-#O 15@28@SV@@
-#T 15@2@TOOLBAR_COOKIES@@1@@
-#T 16@2@TOOLBAR_HISTORY@@1@@
-#T 17@2@TOOLBAR_SSL_CERT@@2@@
-#O 1@26@TRUSTED@@
-#c 29167@
+#T 18@1@MAINMENU@@64@@
+#O 4@32@T_FILE@@
+#O 5@32@T_EDIT@@
+#O 6@32@T_VIEW@@
+#O 7@32@T_NAVIGATE@@
+#O 8@32@T_UTIL@@
+#O 9@32@T_HELP@@
+#O 12@28@M_ABOUT@@
+#O 21@28@M_NEWWIN@@
+#O 22@28@M_OPENFILE@@
+#O 23@28@M_OPENURL@@
+#O 24@28@M_CLOSEWIN@@
+#O 25@28@SEP0@@
+#O 26@28@M_SAVEPAGE@@
+#O 27@28@SEP1@@
+#O 28@28@M_QUIT@@
+#O 30@28@M_CUT@@
+#O 31@28@M_COPY@@
+#O 32@28@M_PASTE@@
+#O 33@28@SEP3@@
+#O 34@28@M_FIND@@
+#O 36@28@M_STOP@@
+#O 37@28@M_RELOAD@@
+#O 39@28@M_SCALE@@
+#O 41@28@M_TOOLBARS@@
+#O 43@28@M_SAVEWIN@@
+#O 44@28@M_DEBUG_RENDER@@
+#O 45@28@M_BG_IMAGES@@
+#O 46@28@M_FG_IMAGES@@
+#O 48@28@M_BACK@@
+#O 49@28@M_FORWARD@@
+#O 50@28@M_HOME@@
+#O 52@28@M_LHISTORY@@
+#O 53@28@M_GHISTORY@@
+#O 55@28@M_ADD_BOOKMARK@@
+#O 56@28@M_BOOKMARKS@@
+#O 58@28@M_COOKIES@@
+#O 60@28@M_CHOICES@@
+#O 61@28@M_VLOG@@
+#O 63@28@M_HELP_CONTENT@@
+#c 20589@
diff --git a/atari/toolbar.c b/atari/toolbar.c
index 4a63787..9a3412e 100644
--- a/atari/toolbar.c
+++ b/atari/toolbar.c
@@ -37,7 +37,9 @@
#include "desktop/plot_style.h"
#include "desktop/plotters.h"
#include "desktop/tree.h"
+#include "desktop/hotlist.h"
#include "utils/nsoption.h"
+#include "utils/nsurl.h"
#include "utils/utf8.h"
#include "atari/clipboard.h"
#include "atari/gui.h"
@@ -139,6 +141,18 @@ static struct s_tb_button tb_buttons[] =
toolbar_reload_click,
{0,0},
0, 0, 0, {0,0,0,0}
+ },
+ {
+ TOOLBAR_BT_FAVORITE,
+ toolbar_favorite_click,
+ {0,0},
+ 0, 0, 0, {0,0,0,0}
+ },
+ {
+ TOOLBAR_BT_CRYPTO,
+ toolbar_crypto_click,
+ {0,0},
+ 0, 0, 0, {0,0,0,0}
},
{ 0, 0, {0,0}, 0, -1, 0, {0,0,0,0}}
};
@@ -371,6 +385,7 @@ static int toolbar_calculate_height(struct s_toolbar *tb)
static void toolbar_reflow(struct s_toolbar *tb)
{
int i;
+ short offx, offy;
// position toolbar areas:
tb->form->ob_x = tb->area.g_x;
@@ -389,32 +404,39 @@ static void toolbar_reflow(struct s_toolbar *tb)
}
- // align the throbber area at right edge:
- tb->form[TOOLBAR_THROBBER_AREA].ob_x = tb->area.g_w
- - tb->form[TOOLBAR_THROBBER_AREA].ob_width;
-
- // align the search button:
- tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
- - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
+ // align TOOLBAR_AREA_RIGHT IBOX at right edge:
+ tb->form[TOOLBAR_AREA_RIGHT].ob_x = tb->area.g_w
+ - tb->form[TOOLBAR_AREA_RIGHT].ob_width;
// center the URL area:
tb->form[TOOLBAR_AREA_URL].ob_width = tb->area.g_w
- - (tb->form[TOOLBAR_AREA_BUTTONS].ob_width
- + tb->form[TOOLBAR_THROBBER_AREA].ob_width + 1);
+ - (tb->form[TOOLBAR_AREA_LEFT].ob_width
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_width);
+ // position throbber image above IBOX:
+ objc_offset(tb->form, TOOLBAR_THROBBER_AREA, &offx, &offy);
+ throbber_form[tb->throbber.index].ob_x = offx;
+ throbber_form[tb->throbber.index].ob_y = offy;
- // position throbber image:
- throbber_form[tb->throbber.index].ob_x = tb->area.g_x +
- tb->form[TOOLBAR_THROBBER_AREA].ob_x;
+ /*throbber_form[tb->throbber.index].ob_x = tb->area.g_x
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+ + tb->form[TOOLBAR_THROBBER_AREA].ob_x;*/
+/*
throbber_form[tb->throbber.index].ob_x = tb->area.g_x
- + tb->form[TOOLBAR_THROBBER_AREA].ob_x +
- ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
+ + tb->form[TOOLBAR_AREA_RIGHT].ob_x
+ + tb->form[TOOLBAR_THROBBER_AREA].ob_x
+ + ((tb->form[TOOLBAR_THROBBER_AREA].ob_width
- throbber_form[tb->throbber.index].ob_width) >> 1);
- throbber_form[tb->throbber.index].ob_y = tb->area.g_y +
- ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
+ throbber_form[tb->throbber.index].ob_y = tb->area.g_y
+ + ((tb->form[TOOLBAR_THROBBER_AREA].ob_height
- throbber_form[tb->throbber.index].ob_height) >> 1);
+ */
+
+ // align the search button:
+ tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_x = tb->area.g_w
+ - tb->form[TOOLBAR_SEARCH_ALIGN_RIGHT].ob_width;
// set button states:
for (i=0; i < tb->btcnt; i++ ) {
@@ -440,8 +462,6 @@ void toolbar_redraw(struct s_toolbar *tb, GRECT *clip)
if(tb->reflow == true)
toolbar_reflow(tb);
- //TODO: fix redraw under popup menu ... that not handled correctly somehow.
-
//dbg_grect("toolbar redraw clip", clip);
/* Redraw the AES objects: */
@@ -476,6 +496,9 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
struct s_tb_button * bt;
bool enable = false;
GRECT area;
+ nsurl * ns_url;
+ char * c_url;
+ size_t c_url_len;
assert(bw != NULL);
@@ -523,13 +546,56 @@ void toolbar_update_buttons(struct s_toolbar *tb, struct browser_window *bw,
}
}
+ if (button == TOOLBAR_BT_FAVORITE || button <= 0) {
+ bt = find_button(tb, TOOLBAR_BT_FAVORITE);
+ ns_url = toolbar_get_nsurl(tb);
+ if (ns_url != NULL) {
+ if (hotlist_has_url(ns_url)) {
+ bt->state = button_on;
+ tb->form[TOOLBAR_BT_FAVORITE].ob_state |= OS_SELECTED;
+ }
+ else {
+ bt->state = button_on;
+ tb->form[TOOLBAR_BT_FAVORITE].ob_state &= ~OS_SELECTED;
+ }
+ }
+ nsurl_unref(ns_url);
+ }
+
+ if (button == TOOLBAR_BT_CRYPTO|| button <= 0) {
+ bt = find_button(tb, TOOLBAR_BT_CRYPTO);
+ ns_url = toolbar_get_nsurl(tb);
+ if (ns_url != NULL &&
+ nsurl_get(ns_url, NSURL_SCHEME, &c_url, &c_url_len) == NSERROR_OK) {
+ if (strncasecmp("https", c_url, 5) == 0) {
+ bt->state = button_on;
+ // TODO: this check actually doesn't work - why?
+ if (urldb_get_cert_permissions(ns_url) == true) {
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+ }
+ else {
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state |= OS_SELECTED;
+ }
+ }
+ else {
+ bt->state = button_off;
+ tb->form[TOOLBAR_BT_CRYPTO].ob_state &= ~OS_SELECTED;
+ }
+ nsurl_unref(ns_url);
+ free(c_url);
+ }
+ }
+
if (tb->attached) {
if (button > 0) {
toolbar_get_grect(tb, button, &area);
window_schedule_redraw_grect(tb->owner, &area);
}
else {
- toolbar_get_grect(tb, TOOLBAR_AREA_BUTTONS, &area);
+ toolbar_get_grect(tb, TOOLBAR_AREA_LEFT, &area);
+ window_schedule_redraw_grect(tb->owner, &area);
+
+ toolbar_get_grect(tb, TOOLBAR_AREA_RIGHT, &area);
window_schedule_redraw_grect(tb->owner, &area);
}
}
@@ -707,18 +773,12 @@ bool toolbar_key_input(struct s_toolbar *tb, short nkc)
char tmp_url[PATH_MAX];
if ( textarea_get_text( tb->url.textarea, tmp_url, PATH_MAX) > 0 ) {
window_set_focus(tb->owner, BROWSER, gw->browser);
-
if (nsurl_create((const char*)&tmp_url, &url) != NSERROR_OK) {
warn_user("NoMemory", 0);
} else {
- browser_window_navigate(gw->browser->bw,
- url,
- NULL,
- BROWSER_WINDOW_HISTORY |
- BROWSER_WINDOW_VERIFIABLE,
- NULL,
- NULL,
- NULL);
+ browser_window_navigate(gw->browser->bw, url, NULL,
+ BROWSER_WINDOW_HISTORY | BROWSER_WINDOW_VERIFIABLE,
+ NULL, NULL, NULL);
nsurl_unref(url);
}
@@ -902,6 +962,36 @@ struct textarea *toolbar_get_textarea(struct s_toolbar *tb,
return(tb->url.textarea);
}
+char *toolbar_get_url(struct s_toolbar *tb)
+{
+ char * c_url = NULL;
+ int c_url_len = 0;
+
+ c_url_len = textarea_get_text(tb->url.textarea, NULL, 0);
+
+ if (c_url_len > -1) {
+ c_url = malloc(c_url_len+1);
+ textarea_get_text(tb->url.textarea, c_url, c_url_len+1);
+ }
+
+ return(c_url);
+}
+
+nsurl * toolbar_get_nsurl(struct s_toolbar * tb)
+{
+
+ nsurl * ns_url = NULL;
+ char * c_url;
+
+ c_url = toolbar_get_url(tb);
+ if (c_url) {
+ nsurl_create(c_url, &ns_url);
+ }
+
+ return(ns_url);
+}
+
+
OBJECT *toolbar_get_form(struct s_toolbar *tb)
{
return(tb->form);
@@ -997,3 +1087,35 @@ void toolbar_stop_click(struct s_toolbar *tb)
browser_window_stop(bw);
}
+void toolbar_favorite_click(struct s_toolbar *tb)
+{
+ nsurl * ns_url = NULL;
+ char * c_url;
+ int c_url_len = 0;
+
+ c_url = toolbar_get_url(tb);
+ c_url_len = strlen(c_url);
+
+ nsurl_create(c_url, &ns_url);
+
+ if (hotlist_has_url(ns_url)) {
+ char msg[c_url_len+100];
+ snprintf(msg, c_url_len+100, "Really delete from favorites: \"%s\"",
+ c_url);
+ if(gemtk_msg_box_show(GEMTK_MSG_BOX_CONFIRM, msg)) {
+ hotlist_remove_url(ns_url);
+ }
+ }
+ else {
+ hotlist_add_url(ns_url);
+ }
+
+ nsurl_unref(ns_url);
+ free(c_url);
+}
+
+void toolbar_crypto_click(struct s_toolbar *tb)
+{
+
+}
+
--
NetSurf Browser
9 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.0-768-gb96562b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b96562b35c0e62604b5b2...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b96562b35c0e62604b5b252...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b96562b35c0e62604b5b25261...
The branch, master has been updated
via b96562b35c0e62604b5b25261319f5291be43553 (commit)
from d3c8185eca703201db5bcc74fe0f3ad04bcbc71a (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=b96562b35c0e62604b5...
commit b96562b35c0e62604b5b25261319f5291be43553
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Improve Keyboard Shortcut parsing.
Handle standard keyboard shortcut format.
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 183387e..79baf1b 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <cflib.h>
#include "utils/log.h"
#include "utils/messages.h"
@@ -537,31 +538,58 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
struct s_accelerator * accel = &mi->accel;
int i, l=0, x=-1;
char str[255];
+ bool is_std_shortcut = false;
get_string(h_gem_menu, mi->rid, str);
i = l = strlen(str);
while (i > 2) {
+
+ if ((strncmp(" ", &str[i], 2) == 0) && (strlen(&str[i]) > 2)) {
+ // "Standard" Keyboard Shortcut Element found:
+ x = i+2;
+ is_std_shortcut = true;
+ break;
+ }
+
if( str[i] == '['){
+ // "Custom" Keyboard Shortcut Element found (identified by [):
x = i;
break;
}
i--;
}
+
+ // Parse keyboard shortcut value:
if( x > -1 ){
- mi->menustr = malloc( l+1 );
- strcpy(mi->menustr, str );
- mi->menustr[x]=' ';
- x++;
- if( str[x] == '@' ){
+
+ if (is_std_shortcut == false) {
+ // create a new menu string to hide the "[" mark:
+ mi->menustr = malloc( l+1 );
+ strcpy(mi->menustr, str);
+ mi->menustr[x]=' ';
+ x++;
+ }
+
+ // find & register modifiers:
+ if (str[x] == '@') {
accel->mod = K_ALT;
- mi->menustr[x] = 0x07;
+ if (is_std_shortcut == false) {
+ // only modify menu items when it is malloc'd:
+ mi->menustr[x] = 0x07;
+ }
x++;
}
- else if( str[x] == '^' ) {
+ else if (str[x] == '^') {
accel->mod = K_CTRL;
x++;
}
+ else if (str[x] == 0x01) { // the arrow up chracter (atari-st encoding)
+ accel->mod = K_LSHIFT;
+ x++;
+ }
+
+ // find keycodes / chracters:
if( str[x] <= 28 ){
// parse symbol
unsigned short keycode=0;
@@ -585,10 +613,24 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
if( (fkey >= 0) && (fkey <= 10) ){
accel->keycode = NK_F1 - 1 + fkey;
}
- } else {
+ }
+ else if (strncmp(&str[x], "Home", 4) == 0) {
+ accel->keycode = NK_CLRHOME;
+ }
+ else if (strncmp(&str[x], "Undo", 4) == 0) {
+ accel->keycode = NK_UNDO;
+ }
+ else if (strncmp(&str[x], "Help", 4) == 0) {
+ accel->keycode = NK_HELP;
+ }
+ else {
accel->ascii = str[x];
}
}
+
+ LOG(("Registered keyboard shortcut for \"%s\" => mod: %d, "
+ "keycode: %d, ascii: %c\n", str, accel->mod, accel->keycode,
+ accel->ascii));
}
}
-----------------------------------------------------------------------
Summary of changes:
atari/deskmenu.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 50 insertions(+), 8 deletions(-)
diff --git a/atari/deskmenu.c b/atari/deskmenu.c
index 183387e..79baf1b 100644
--- a/atari/deskmenu.c
+++ b/atari/deskmenu.c
@@ -1,4 +1,5 @@
#include <stdlib.h>
+#include <cflib.h>
#include "utils/log.h"
#include "utils/messages.h"
@@ -537,31 +538,58 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
struct s_accelerator * accel = &mi->accel;
int i, l=0, x=-1;
char str[255];
+ bool is_std_shortcut = false;
get_string(h_gem_menu, mi->rid, str);
i = l = strlen(str);
while (i > 2) {
+
+ if ((strncmp(" ", &str[i], 2) == 0) && (strlen(&str[i]) > 2)) {
+ // "Standard" Keyboard Shortcut Element found:
+ x = i+2;
+ is_std_shortcut = true;
+ break;
+ }
+
if( str[i] == '['){
+ // "Custom" Keyboard Shortcut Element found (identified by [):
x = i;
break;
}
i--;
}
+
+ // Parse keyboard shortcut value:
if( x > -1 ){
- mi->menustr = malloc( l+1 );
- strcpy(mi->menustr, str );
- mi->menustr[x]=' ';
- x++;
- if( str[x] == '@' ){
+
+ if (is_std_shortcut == false) {
+ // create a new menu string to hide the "[" mark:
+ mi->menustr = malloc( l+1 );
+ strcpy(mi->menustr, str);
+ mi->menustr[x]=' ';
+ x++;
+ }
+
+ // find & register modifiers:
+ if (str[x] == '@') {
accel->mod = K_ALT;
- mi->menustr[x] = 0x07;
+ if (is_std_shortcut == false) {
+ // only modify menu items when it is malloc'd:
+ mi->menustr[x] = 0x07;
+ }
x++;
}
- else if( str[x] == '^' ) {
+ else if (str[x] == '^') {
accel->mod = K_CTRL;
x++;
}
+ else if (str[x] == 0x01) { // the arrow up chracter (atari-st encoding)
+ accel->mod = K_LSHIFT;
+ x++;
+ }
+
+ // find keycodes / chracters:
if( str[x] <= 28 ){
// parse symbol
unsigned short keycode=0;
@@ -585,10 +613,24 @@ static void register_menu_str( struct s_menu_item_evnt * mi )
if( (fkey >= 0) && (fkey <= 10) ){
accel->keycode = NK_F1 - 1 + fkey;
}
- } else {
+ }
+ else if (strncmp(&str[x], "Home", 4) == 0) {
+ accel->keycode = NK_CLRHOME;
+ }
+ else if (strncmp(&str[x], "Undo", 4) == 0) {
+ accel->keycode = NK_UNDO;
+ }
+ else if (strncmp(&str[x], "Help", 4) == 0) {
+ accel->keycode = NK_HELP;
+ }
+ else {
accel->ascii = str[x];
}
}
+
+ LOG(("Registered keyboard shortcut for \"%s\" => mod: %d, "
+ "keycode: %d, ascii: %c\n", str, accel->mod, accel->keycode,
+ accel->ascii));
}
}
--
NetSurf Browser
9 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.0-767-gd3c8185
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/d3c8185eca703201db5bc...
...commit http://git.netsurf-browser.org/netsurf.git/commit/d3c8185eca703201db5bcc7...
...tree http://git.netsurf-browser.org/netsurf.git/tree/d3c8185eca703201db5bcc74f...
The branch, master has been updated
via d3c8185eca703201db5bcc74fe0f3ad04bcbc71a (commit)
from 24e5b2ec167b0e9a751c3b7a01f6ddae4ffd0e49 (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=d3c8185eca703201db5...
commit d3c8185eca703201db5bcc74fe0f3ad04bcbc71a
Author: Ole Loots <ole(a)monochrom.net>
Commit: Ole Loots <ole(a)monochrom.net>
Added comments
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index c81ea34..2170dec 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -123,6 +123,7 @@ void context_popup(struct gui_window * gw, short x, short y)
const char * data;
FILE * fp_tmpfile;
char cmdline[128];
+ /* skip first byte, which must hold length of commandline: */
char * tempfile = &cmdline[1];
int err = 0;
char * editor, *lastslash;
diff --git a/atari/gemtk/msgbox.c b/atari/gemtk/msgbox.c
index 050b139..89ca75a 100644
--- a/atari/gemtk/msgbox.c
+++ b/atari/gemtk/msgbox.c
@@ -26,6 +26,14 @@
# define min(x,y) ((x<y) ? x : y )
#endif
+/***
+ * Display an message box
+ *
+ * \param type Valid values: GEMTK_MSG_BOX_CONFIRM, GEMTK_MSG_BOX_ALERT
+ * \param msg The message / query to display
+ * \return 0 on "No"
+ *
+ */
short gemtk_msg_box_show(short type, const char * msg)
{
#define GEMTK_MSG_BOX_STR_SIZE 256
-----------------------------------------------------------------------
Summary of changes:
atari/ctxmenu.c | 1 +
atari/gemtk/msgbox.c | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/atari/ctxmenu.c b/atari/ctxmenu.c
index c81ea34..2170dec 100644
--- a/atari/ctxmenu.c
+++ b/atari/ctxmenu.c
@@ -123,6 +123,7 @@ void context_popup(struct gui_window * gw, short x, short y)
const char * data;
FILE * fp_tmpfile;
char cmdline[128];
+ /* skip first byte, which must hold length of commandline: */
char * tempfile = &cmdline[1];
int err = 0;
char * editor, *lastslash;
diff --git a/atari/gemtk/msgbox.c b/atari/gemtk/msgbox.c
index 050b139..89ca75a 100644
--- a/atari/gemtk/msgbox.c
+++ b/atari/gemtk/msgbox.c
@@ -26,6 +26,14 @@
# define min(x,y) ((x<y) ? x : y )
#endif
+/***
+ * Display an message box
+ *
+ * \param type Valid values: GEMTK_MSG_BOX_CONFIRM, GEMTK_MSG_BOX_ALERT
+ * \param msg The message / query to display
+ * \return 0 on "No"
+ *
+ */
short gemtk_msg_box_show(short type, const char * msg)
{
#define GEMTK_MSG_BOX_STR_SIZE 256
--
NetSurf Browser
9 years, 10 months
- 1
- 0
toolchains: branch master updated. 1ca95b6aad5fc7bde21c68b9fd876f8d4c0154e7
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/1ca95b6aad5fc7bde2...
...commit http://git.netsurf-browser.org/toolchains.git/commit/1ca95b6aad5fc7bde21c...
...tree http://git.netsurf-browser.org/toolchains.git/tree/1ca95b6aad5fc7bde21c68...
The branch, master has been updated
via 1ca95b6aad5fc7bde21c68b9fd876f8d4c0154e7 (commit)
from 010abeda3f9cf3f49e566e11b905fc141b57f201 (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=1ca95b6aad5fc7bd...
commit 1ca95b6aad5fc7bde21c68b9fd876f8d4c0154e7
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
change all tar commands so they use the "any" decompression switch to avoid having to be explicit
diff --git a/sdk/Makefile b/sdk/Makefile
index 1da08d7..a13eb65 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -158,7 +158,7 @@ $(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d
$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
mkdir -p $(BUILDDIR)/zlib
- cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
+ cd $(BUILDDIR)/zlib && tar xaf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/zlib/$(TARGET)),)
for p in `ls $(RECIPES)/patches/zlib/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
@@ -171,7 +171,7 @@ $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz:
# libiconv
$(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d
mkdir -p $(BUILDDIR)/libiconv
- cd $(BUILDDIR)/libiconv && tar xzf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
+ cd $(BUILDDIR)/libiconv && tar xaf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
for p in `ls $(RECIPES)/patches/libiconv/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libiconv/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libiconv/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
@@ -189,7 +189,7 @@ $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
# libgnurx
$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
mkdir -p $(BUILDDIR)/libgnurx
- cd $(BUILDDIR)/libgnurx && tar xzf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ cd $(BUILDDIR)/libgnurx && tar xaf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
for p in `ls $(RECIPES)/patches/libgnurx/*.p` ; do patch -d $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) -p0 <$$p ; done
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET)
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) make
@@ -293,7 +293,7 @@ $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2:
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
- cd $(BUILDDIR)/libtre && tar xjf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
+ cd $(BUILDDIR)/libtre && tar xaf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) make install
cp $(RECIPES)/files/libtre/regex.h $(GCCSDK_INSTALL_ENV)/include/regex.h
@@ -308,7 +308,7 @@ $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2:
# libpbl
$(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d
mkdir -p $(BUILDDIR)/libpbl
- cd $(BUILDDIR)/libpbl && tar xzf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
+ cd $(BUILDDIR)/libpbl && tar xaf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
for p in `ls $(RECIPES)/patches/libpbl/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libpbl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpbl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
@@ -325,7 +325,7 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
# libXML2
$(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2-src.d
mkdir -p $(BUILDDIR)/libxml2
- cd $(BUILDDIR)/libxml2 && tar xzf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
+ cd $(BUILDDIR)/libxml2 && tar xaf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
for p in `ls $(RECIPES)/patches/libxml2/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
@@ -343,7 +343,7 @@ $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz:
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d
mkdir -p $(BUILDDIR)/openssl
- cd $(BUILDDIR)/openssl && tar xzf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
+ cd $(BUILDDIR)/openssl && tar xaf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
for p in `ls $(RECIPES)/patches/openssl/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
@@ -361,7 +361,7 @@ $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
# libPNG
$(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libpng-src.d
mkdir -p $(BUILDDIR)/libpng
- cd $(BUILDDIR)/libpng && tar xzf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
+ cd $(BUILDDIR)/libpng && tar xaf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
ifneq ($(realpath $(RECIPES)/patches/libpng/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpng/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) -p0 <$$p ; done
endif
@@ -378,7 +378,7 @@ $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz:
# libjpeg
$(BUILDSTEPS)/libjpeg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-src.d
mkdir -p $(BUILDDIR)/libjpeg
- cd $(BUILDDIR)/libjpeg && tar xzf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
+ cd $(BUILDDIR)/libjpeg && tar xaf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
for p in `ls $(RECIPES)/patches/libjpeg/*.p` ; do patch -d $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) -p0 <$$p ; done
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) make install
@@ -393,7 +393,7 @@ $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz:
# liblcms
$(BUILDSTEPS)/liblcms.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms-src.d
mkdir -p $(BUILDDIR)/liblcms
- cd $(BUILDDIR)/liblcms && tar xzf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
+ cd $(BUILDDIR)/liblcms && tar xaf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
for p in `ls $(RECIPES)/patches/liblcms/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/liblcms/$(TARGET)),)
for p in `ls $(RECIPES)/patches/liblcms/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
@@ -412,7 +412,7 @@ $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz:
# libMNG
$(BUILDSTEPS)/libmng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms.d $(BUILDSTEPS)/libmng-src.d
mkdir -p $(BUILDDIR)/libmng
- cd $(BUILDDIR)/libmng && tar xzf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
+ cd $(BUILDDIR)/libmng && tar xaf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
for p in `ls $(RECIPES)/patches/libmng/*.p` ; do patch -d $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) -p0 <$$p ; done
cp $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/makefiles/makefile.unix $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/Makefile
cd $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) && $(env) make install
@@ -427,7 +427,7 @@ $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz:
# libcares
$(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d
mkdir -p $(BUILDDIR)/libcares
- cd $(BUILDDIR)/libcares && tar xzf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
+ cd $(BUILDDIR)/libcares && tar xaf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
for p in `ls $(RECIPES)/patches/libcares/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
@@ -451,7 +451,7 @@ $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
$(BUILDSTEPS)/libcurl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
mkdir -p $(BUILDDIR)/libcurl
- cd $(BUILDDIR)/libcurl && tar xjf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
+ cd $(BUILDDIR)/libcurl && tar xaf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
for p in `ls $(RECIPES)/patches/libcurl/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcurl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcurl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
@@ -465,7 +465,7 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
# libexpat
$(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d
mkdir -p $(BUILDDIR)/libexpat
- cd $(BUILDDIR)/libexpat && tar xzf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
+ cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install
touch $@
@@ -487,7 +487,7 @@ $(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
$(BUILDSTEPS)/nspr-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
$(RM) -rf $(BUILDDIR)/nspr
mkdir -p $(BUILDDIR)/nspr
- cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ cd $(BUILDDIR)/nspr && tar xaf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
touch $@
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/sdk/Makefile b/sdk/Makefile
index 1da08d7..a13eb65 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -158,7 +158,7 @@ $(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d
$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
mkdir -p $(BUILDDIR)/zlib
- cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
+ cd $(BUILDDIR)/zlib && tar xaf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz
for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/zlib/$(TARGET)),)
for p in `ls $(RECIPES)/patches/zlib/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done
@@ -171,7 +171,7 @@ $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz:
# libiconv
$(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d
mkdir -p $(BUILDDIR)/libiconv
- cd $(BUILDDIR)/libiconv && tar xzf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
+ cd $(BUILDDIR)/libiconv && tar xaf $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz
for p in `ls $(RECIPES)/patches/libiconv/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libiconv/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libiconv/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libiconv/libiconv-$(VERSION_LIBICONV) -p0 <$$p ; done
@@ -189,7 +189,7 @@ $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz:
# libgnurx
$(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d
mkdir -p $(BUILDDIR)/libgnurx
- cd $(BUILDDIR)/libgnurx && tar xzf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
+ cd $(BUILDDIR)/libgnurx && tar xaf $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz
for p in `ls $(RECIPES)/patches/libgnurx/*.p` ; do patch -d $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) -p0 <$$p ; done
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET)
cd $(BUILDDIR)/libgnurx/mingw-libgnurx-$(VERSION_LIBGNURX) && $(env) make
@@ -293,7 +293,7 @@ $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2:
# regex
$(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d
mkdir -p $(BUILDDIR)/libtre
- cd $(BUILDDIR)/libtre && tar xjf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
+ cd $(BUILDDIR)/libtre && tar xaf $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libtre/tre-$(VERSION_LIBTRE) && $(env) make install
cp $(RECIPES)/files/libtre/regex.h $(GCCSDK_INSTALL_ENV)/include/regex.h
@@ -308,7 +308,7 @@ $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2:
# libpbl
$(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d
mkdir -p $(BUILDDIR)/libpbl
- cd $(BUILDDIR)/libpbl && tar xzf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
+ cd $(BUILDDIR)/libpbl && tar xaf $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz
for p in `ls $(RECIPES)/patches/libpbl/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libpbl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpbl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpbl/pbl_$(VERSION_LIBPBL)_04 -p0 <$$p ; done
@@ -325,7 +325,7 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
# libXML2
$(BUILDSTEPS)/libxml2.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libxml2-src.d
mkdir -p $(BUILDDIR)/libxml2
- cd $(BUILDDIR)/libxml2 && tar xzf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
+ cd $(BUILDDIR)/libxml2 && tar xaf $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz
for p in `ls $(RECIPES)/patches/libxml2/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libxml2/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libxml2/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libxml2/libxml2-$(VERSION_LIBXML) -p0 <$$p ; done
@@ -343,7 +343,7 @@ $(SOURCEDIR)/libxml2-$(VERSION_LIBXML).tar.gz:
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d
mkdir -p $(BUILDDIR)/openssl
- cd $(BUILDDIR)/openssl && tar xzf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
+ cd $(BUILDDIR)/openssl && tar xaf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
for p in `ls $(RECIPES)/patches/openssl/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
@@ -361,7 +361,7 @@ $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
# libPNG
$(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libpng-src.d
mkdir -p $(BUILDDIR)/libpng
- cd $(BUILDDIR)/libpng && tar xzf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
+ cd $(BUILDDIR)/libpng && tar xaf $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz
ifneq ($(realpath $(RECIPES)/patches/libpng/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libpng/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libpng/libpng-$(VERSION_LIBPNG) -p0 <$$p ; done
endif
@@ -378,7 +378,7 @@ $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz:
# libjpeg
$(BUILDSTEPS)/libjpeg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-src.d
mkdir -p $(BUILDDIR)/libjpeg
- cd $(BUILDDIR)/libjpeg && tar xzf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
+ cd $(BUILDDIR)/libjpeg && tar xaf $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz
for p in `ls $(RECIPES)/patches/libjpeg/*.p` ; do patch -d $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) -p0 <$$p ; done
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libjpeg/jpeg-$(VERSION_LIBJPEG) && $(env) make install
@@ -393,7 +393,7 @@ $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz:
# liblcms
$(BUILDSTEPS)/liblcms.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms-src.d
mkdir -p $(BUILDDIR)/liblcms
- cd $(BUILDDIR)/liblcms && tar xzf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
+ cd $(BUILDDIR)/liblcms && tar xaf $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz
for p in `ls $(RECIPES)/patches/liblcms/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/liblcms/$(TARGET)),)
for p in `ls $(RECIPES)/patches/liblcms/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/liblcms/lcms2-$(VERSION_LIBLCMS) -p0 <$$p ; done
@@ -412,7 +412,7 @@ $(SOURCEDIR)/lcms2-$(VERSION_LIBLCMS).tar.gz:
# libMNG
$(BUILDSTEPS)/libmng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libjpeg.d $(BUILDSTEPS)/liblcms.d $(BUILDSTEPS)/libmng-src.d
mkdir -p $(BUILDDIR)/libmng
- cd $(BUILDDIR)/libmng && tar xzf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
+ cd $(BUILDDIR)/libmng && tar xaf $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz
for p in `ls $(RECIPES)/patches/libmng/*.p` ; do patch -d $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) -p0 <$$p ; done
cp $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/makefiles/makefile.unix $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG)/Makefile
cd $(BUILDDIR)/libmng/libmng-$(VERSION_LIBMNG) && $(env) make install
@@ -427,7 +427,7 @@ $(SOURCEDIR)/libmng-$(VERSION_LIBMNG).tar.gz:
# libcares
$(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d
mkdir -p $(BUILDDIR)/libcares
- cd $(BUILDDIR)/libcares && tar xzf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
+ cd $(BUILDDIR)/libcares && tar xaf $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz
for p in `ls $(RECIPES)/patches/libcares/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done
@@ -451,7 +451,7 @@ $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDST
$(BUILDSTEPS)/libcurl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
mkdir -p $(BUILDDIR)/libcurl
- cd $(BUILDDIR)/libcurl && tar xjf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
+ cd $(BUILDDIR)/libcurl && tar xaf $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2
for p in `ls $(RECIPES)/patches/libcurl/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
ifneq ($(realpath $(RECIPES)/patches/libcurl/$(TARGET)),)
for p in `ls $(RECIPES)/patches/libcurl/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) -p0 <$$p ; done
@@ -465,7 +465,7 @@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2:
# libexpat
$(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d
mkdir -p $(BUILDDIR)/libexpat
- cd $(BUILDDIR)/libexpat && tar xzf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
+ cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.gz
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared
cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install
touch $@
@@ -487,7 +487,7 @@ $(BUILDSTEPS)/nspr.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/nspr-src.d
$(BUILDSTEPS)/nspr-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
$(RM) -rf $(BUILDDIR)/nspr
mkdir -p $(BUILDDIR)/nspr
- cd $(BUILDDIR)/nspr && tar xzf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
+ cd $(BUILDDIR)/nspr && tar xaf $(SOURCEDIR)/nspr-$(VERSION_NSPR).tar.gz
for p in `ls $(RECIPES)/patches/nspr/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/nspr/nspr-$(VERSION_NSPR) -p0 <$$p ; done
touch $@
--
Cross-compilation toolchains and environments
9 years, 10 months
- 1
- 0