toolchains: branch master updated. 6f7b04741e1f7354ee332fb5af681540757188f9
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/6f7b04741e1f7354ee...
...commit http://git.netsurf-browser.org/toolchains.git/commit/6f7b04741e1f7354ee33...
...tree http://git.netsurf-browser.org/toolchains.git/tree/6f7b04741e1f7354ee332f...
The branch, master has been updated
via 6f7b04741e1f7354ee332fb5af681540757188f9 (commit)
from 0eadab86611f2881c3ca02a1d1438a96fd126995 (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=6f7b04741e1f7354...
commit 6f7b04741e1f7354ee332fb5af681540757188f9
Author: Daniel Silverstone <dsilvers(a)digital-scurf.org>
Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org>
amigaos3: Add patch so toolchain can build on newer Debian
Signed-off-by: Daniel Silverstone <dsilvers(a)digital-scurf.org>
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 066c0dd..5c66cdd 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -208,6 +208,7 @@ $(BUILDSTEPS)/bison.d: $(BUILDSTEPS)/srcdir-bison.d
$(BUILDSTEPS)/srcdir-bison.d: $(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d
tar axf $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
mv bison-$(UPSTREAM_BISON_VERSION) $(BISON_SRCDIR)
+ for p in `ls $(RECIPES)/patches/bison/*.p` ; do patch -d $(BISON_SRCDIR) -p0 <$$p ; done
touch $@
$(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
diff --git a/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p
new file mode 100644
index 0000000..a47a2f9
--- /dev/null
+++ b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p
@@ -0,0 +1,11 @@
+--- lib/fseterr.c.old 2020-03-11 10:08:25.275228721 +0000
++++ lib/fseterr.c 2020-03-11 10:08:35.199250194 +0000
+@@ -29,7 +29,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+ fp_->_flags |= __SERR;
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 1 +
m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p | 11 +++++++++++
2 files changed, 12 insertions(+)
create mode 100644 m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 066c0dd..5c66cdd 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -208,6 +208,7 @@ $(BUILDSTEPS)/bison.d: $(BUILDSTEPS)/srcdir-bison.d
$(BUILDSTEPS)/srcdir-bison.d: $(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d
tar axf $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
mv bison-$(UPSTREAM_BISON_VERSION) $(BISON_SRCDIR)
+ for p in `ls $(RECIPES)/patches/bison/*.p` ; do patch -d $(BISON_SRCDIR) -p0 <$$p ; done
touch $@
$(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
diff --git a/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p
new file mode 100644
index 0000000..a47a2f9
--- /dev/null
+++ b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p
@@ -0,0 +1,11 @@
+--- lib/fseterr.c.old 2020-03-11 10:08:25.275228721 +0000
++++ lib/fseterr.c 2020-03-11 10:08:35.199250194 +0000
+@@ -29,7 +29,7 @@
+ /* Most systems provide FILE as a struct and the necessary bitmask in
+ <stdio.h>, because they need it for implementing getc() and putc() as
+ fast macros. */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
+ fp->_flags |= _IO_ERR_SEEN;
+ #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */
+ fp_->_flags |= __SERR;
--
Cross-compilation toolchains and environments
2 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.9-541-g2c549b2
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/2c549b28fb508b859702f...
...commit http://git.netsurf-browser.org/netsurf.git/commit/2c549b28fb508b859702f0c...
...tree http://git.netsurf-browser.org/netsurf.git/tree/2c549b28fb508b859702f0c2e...
The branch, master has been updated
via 2c549b28fb508b859702f0c2e1122c6ccd3aa34c (commit)
via f59c415ef766d2395bf6680680b3f52efa47d7e1 (commit)
from 72ff12b3ae1c66629042ce906abf8850c49700db (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=2c549b28fb508b85970...
commit 2c549b28fb508b859702f0c2e1122c6ccd3aa34c
Author: Vincent Sanders <vince(a)kyllikki.org>
Commit: Vincent Sanders <vince(a)kyllikki.org>
add page information ui elements to GTK frontend
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 1cc8c62..b3568c6 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -224,6 +224,10 @@ nsgtk_cw_motion_notify_event(GtkWidget *widget,
struct nsgtk_corewindow_mouse *mouse = &nsgtk_cw->mouse_state;
if (mouse->pressed == false) {
+ nsgtk_cw->mouse(nsgtk_cw,
+ BROWSER_MOUSE_HOVER,
+ event->x,
+ event->y);
return TRUE;
}
@@ -610,18 +614,20 @@ static nserror
nsgtk_cw_set_scroll(struct core_window *cw, int x, int y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
- assert(vadj != NULL);
- assert(hadj != NULL);
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- gtk_adjustment_set_value(vadj, y);
- gtk_adjustment_set_value(hadj, x);
+ assert(vadj != NULL);
+ assert(hadj != NULL);
+ gtk_adjustment_set_value(vadj, y);
+ gtk_adjustment_set_value(hadj, x);
+ }
return NSERROR_OK;
}
@@ -636,18 +642,23 @@ static nserror
nsgtk_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
- assert(vadj != NULL);
- assert(hadj != NULL);
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- *y = (int)(gtk_adjustment_get_value(vadj));
- *x = (int)(gtk_adjustment_get_value(hadj));
+ assert(vadj != NULL);
+ assert(hadj != NULL);
+ *y = (int)(gtk_adjustment_get_value(vadj));
+ *x = (int)(gtk_adjustment_get_value(hadj));
+ } else {
+ *x = 0;
+ *y = 0;
+ }
return NSERROR_OK;
}
@@ -664,18 +675,25 @@ nsgtk_cw_get_window_dimensions(const struct core_window *cw,
int *width, int *height)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- gdouble page;
-
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- g_object_get(hadj, "page-size", &page, NULL);
- *width = page;
-
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- g_object_get(vadj, "page-size", &page, NULL);
- *height = page;
-
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
+ gdouble page;
+
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ g_object_get(hadj, "page-size", &page, NULL);
+ *width = page;
+
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ g_object_get(vadj, "page-size", &page, NULL);
+ *height = page;
+ } else {
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(GTK_WIDGET(nsgtk_cw->drawing_area),
+ &allocation);
+ *width = allocation.width;
+ *height = allocation.height;
+ }
return NSERROR_OK;
}
diff --git a/frontends/gtk/page_info.c b/frontends/gtk/page_info.c
index 5e887b5..b7ed7ed 100644
--- a/frontends/gtk/page_info.c
+++ b/frontends/gtk/page_info.c
@@ -26,6 +26,7 @@
#include <gtk/gtk.h>
#include "utils/log.h"
+#include "utils/messages.h"
#include "netsurf/keypress.h"
#include "netsurf/plotters.h"
#include "netsurf/browser_window.h"
@@ -46,51 +47,29 @@ struct nsgtk_pi_window {
struct nsgtk_corewindow core;
/** GTK builder for window */
GtkBuilder *builder;
- /** GTK dialog window being shown */
- GtkDialog *dlg;
+ /** GTK window being shown */
+ GtkWindow *dlg;
/** Core page-info window */
struct page_info *pi;
};
/**
- * destroy a previously created certificate view
+ * destroy a previously created page information window
*/
-static nserror nsgtk_pi_destroy(struct nsgtk_pi_window *pi_win)
+static gboolean
+nsgtk_pi_delete_event(GtkWidget *w, GdkEvent *event, gpointer data)
{
- nserror res;
+ struct nsgtk_pi_window *pi_win;
+ pi_win = (struct nsgtk_pi_window *)data;
page_info_destroy(pi_win->pi);
- res = nsgtk_corewindow_fini(&pi_win->core);
+
+ nsgtk_corewindow_fini(&pi_win->core);
gtk_widget_destroy(GTK_WIDGET(pi_win->dlg));
g_object_unref(G_OBJECT(pi_win->builder));
free(pi_win);
- return res;
-}
-
-static void
-nsgtk_pi_accept(GtkButton *w, gpointer data)
-{
- struct nsgtk_pi_window *pi_win;
- pi_win = (struct nsgtk_pi_window *)data;
-
- nsgtk_pi_destroy(pi_win);
-}
-
-static void
-nsgtk_pi_reject(GtkWidget *w, gpointer data)
-{
- struct nsgtk_pi_window *pi_win;
- pi_win = (struct nsgtk_pi_window *)data;
-
- nsgtk_pi_destroy(pi_win);
-}
-
-static gboolean
-nsgtk_pi_delete_event(GtkWidget *w, GdkEvent *event, gpointer data)
-{
- nsgtk_pi_reject(w, data);
return FALSE;
}
@@ -169,32 +148,29 @@ nserror nsgtk_page_info(struct browser_window *bw)
struct nsgtk_pi_window *ncwin;
nserror res;
- ncwin = malloc(sizeof(struct nsgtk_pi_window));
+ ncwin = calloc(1, sizeof(struct nsgtk_pi_window));
if (ncwin == NULL) {
return NSERROR_NOMEM;
}
- res = nsgtk_builder_new_from_resname("ssl", &ncwin->builder);
+ res = nsgtk_builder_new_from_resname("pageinfo", &ncwin->builder);
if (res != NSERROR_OK) {
- NSLOG(netsurf, INFO, "SSL UI builder init failed");
+ NSLOG(netsurf, CRITICAL, "Page Info UI builder init failed %s", messages_get_errorcode(res));
free(ncwin);
return res;
}
gtk_builder_connect_signals(ncwin->builder, NULL);
- ncwin->dlg = GTK_DIALOG(gtk_builder_get_object(ncwin->builder,
- "wndSSLProblem"));
+ ncwin->dlg = GTK_WINDOW(gtk_builder_get_object(ncwin->builder,
+ "PGIWindow"));
/* set parent for transient dialog */
gtk_window_set_transient_for(GTK_WINDOW(ncwin->dlg),
nsgtk_scaffolding_window(nsgtk_current_scaffolding()));
- ncwin->core.scrolled = GTK_SCROLLED_WINDOW(
- gtk_builder_get_object(ncwin->builder, "SSLScrolled"));
-
ncwin->core.drawing_area = GTK_DRAWING_AREA(
- gtk_builder_get_object(ncwin->builder, "SSLDrawingArea"));
+ gtk_builder_get_object(ncwin->builder, "PGIDrawingArea"));
/* make the delete event call our destructor */
g_signal_connect(G_OBJECT(ncwin->dlg),
@@ -202,20 +178,6 @@ nserror nsgtk_page_info(struct browser_window *bw)
G_CALLBACK(nsgtk_pi_delete_event),
ncwin);
- /* accept button */
- g_signal_connect(G_OBJECT(gtk_builder_get_object(ncwin->builder,
- "sslaccept")),
- "clicked",
- G_CALLBACK(nsgtk_pi_accept),
- ncwin);
-
- /* reject button */
- g_signal_connect(G_OBJECT(gtk_builder_get_object(ncwin->builder,
- "sslreject")),
- "clicked",
- G_CALLBACK(nsgtk_pi_reject),
- ncwin);
-
/* initialise GTK core window */
ncwin->core.draw = nsgtk_pi_draw;
ncwin->core.key = nsgtk_pi_key;
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 4335817..a41ca6c 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -12,11 +12,12 @@
<file>hotlist.gtk2.ui</file>
<file>netsurf.gtk3.ui</file>
<file>ssl.gtk2.ui</file>
+ <file>ssl.gtk3.ui</file>
+ <file>pageinfo.gtk3.ui</file>
<file>toolbar.gtk3.ui</file>
<file>downloads.gtk2.ui</file>
<file>hotlist.gtk3.ui</file>
<file>options.gtk2.ui</file>
- <file>ssl.gtk3.ui</file>
<file>viewdata.gtk2.ui</file>
<file>downloads.gtk3.ui</file>
<file>options.gtk3.ui</file>
diff --git a/frontends/gtk/res/pageinfo.gtk2.ui b/frontends/gtk/res/pageinfo.gtk2.ui
new file mode 100644
index 0000000..b690d9c
--- /dev/null
+++ b/frontends/gtk/res/pageinfo.gtk2.ui
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.24"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkWindow" id="PGIWindow">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea" id="PGIDrawingArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/frontends/gtk/res/pageinfo.gtk3.ui b/frontends/gtk/res/pageinfo.gtk3.ui
new file mode 100644
index 0000000..6ea876e
--- /dev/null
+++ b/frontends/gtk/res/pageinfo.gtk3.ui
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="PGIWindow">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="resizable">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="PGIDrawingArea">
+ <property name="name">PGIDrawingArea</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c
index a60119a..18f0e37 100644
--- a/frontends/gtk/resources.c
+++ b/frontends/gtk/resources.c
@@ -87,6 +87,7 @@ static struct nsgtk_resource_s ui_resource[] = {
RES_ENTRY("cookies"),
RES_ENTRY("viewdata"),
RES_ENTRY("warning"),
+ RES_ENTRY("pageinfo"),
{ NULL, 0, NSGTK_RESOURCE_FILE, NULL },
};
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=f59c415ef766d2395bf...
commit f59c415ef766d2395bf6680680b3f52efa47d7e1
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Vincent Sanders <vince(a)kyllikki.org>
GTK: Initial page-info display.
diff --git a/frontends/gtk/page_info.c b/frontends/gtk/page_info.c
index 2892788..5e887b5 100644
--- a/frontends/gtk/page_info.c
+++ b/frontends/gtk/page_info.c
@@ -29,7 +29,7 @@
#include "netsurf/keypress.h"
#include "netsurf/plotters.h"
#include "netsurf/browser_window.h"
-#include "desktop/sslcert_viewer.h"
+#include "desktop/page-info.h"
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
@@ -48,8 +48,8 @@ struct nsgtk_pi_window {
GtkBuilder *builder;
/** GTK dialog window being shown */
GtkDialog *dlg;
- /** SSL certificate viewer context data */
- struct sslcert_session_data *ssl_data;
+ /** Core page-info window */
+ struct page_info *pi;
};
@@ -60,13 +60,12 @@ static nserror nsgtk_pi_destroy(struct nsgtk_pi_window *pi_win)
{
nserror res;
- res = sslcert_viewer_fini(pi_win->ssl_data);
- if (res == NSERROR_OK) {
- res = nsgtk_corewindow_fini(&pi_win->core);
- gtk_widget_destroy(GTK_WIDGET(pi_win->dlg));
- g_object_unref(G_OBJECT(pi_win->builder));
- free(pi_win);
- }
+ page_info_destroy(pi_win->pi);
+ res = nsgtk_corewindow_fini(&pi_win->core);
+ gtk_widget_destroy(GTK_WIDGET(pi_win->dlg));
+ g_object_unref(G_OBJECT(pi_win->builder));
+ free(pi_win);
+
return res;
}
@@ -76,8 +75,6 @@ nsgtk_pi_accept(GtkButton *w, gpointer data)
struct nsgtk_pi_window *pi_win;
pi_win = (struct nsgtk_pi_window *)data;
- sslcert_viewer_accept(pi_win->ssl_data);
-
nsgtk_pi_destroy(pi_win);
}
@@ -87,8 +84,6 @@ nsgtk_pi_reject(GtkWidget *w, gpointer data)
struct nsgtk_pi_window *pi_win;
pi_win = (struct nsgtk_pi_window *)data;
- sslcert_viewer_reject(pi_win->ssl_data);
-
nsgtk_pi_destroy(pi_win);
}
@@ -117,7 +112,7 @@ nsgtk_pi_mouse(struct nsgtk_corewindow *nsgtk_cw,
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- sslcert_viewer_mouse_action(pi_win->ssl_data, mouse_state, x, y);
+ page_info_mouse_action(pi_win->pi, mouse_state, x, y);
return NSERROR_OK;
}
@@ -137,7 +132,7 @@ nsgtk_pi_key(struct nsgtk_corewindow *nsgtk_cw, uint32_t nskey)
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- if (sslcert_viewer_keypress(pi_win->ssl_data, nskey)) {
+ if (page_info_keypress(pi_win->pi, nskey)) {
return NSERROR_OK;
}
return NSERROR_NOT_IMPLEMENTED;
@@ -163,32 +158,17 @@ nsgtk_pi_draw(struct nsgtk_corewindow *nsgtk_cw, struct rect *r)
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- sslcert_viewer_redraw(pi_win->ssl_data, 0, 0, r, &ctx);
+ page_info_redraw(pi_win->pi, 0, 0, r, &ctx);
return NSERROR_OK;
}
-static nserror dummy_cb(bool proceed, void *pw)
-{
- return NSERROR_OK;
-}
-
/* exported interface documented in gtk/page_info.h */
nserror nsgtk_page_info(struct browser_window *bw)
{
struct nsgtk_pi_window *ncwin;
nserror res;
- struct cert_chain *chain;
- struct nsurl *url;
-
- res = browser_window_get_ssl_chain(bw, &chain);
- if (res != NSERROR_OK) {
- NSLOG(netsurf, WARNING, "Unable to get certificate chain");
- return NSERROR_INVALID;
- }
- url = browser_window_access_url(bw);
-
ncwin = malloc(sizeof(struct nsgtk_pi_window));
if (ncwin == NULL) {
return NSERROR_NOMEM;
@@ -248,18 +228,9 @@ nserror nsgtk_page_info(struct browser_window *bw)
return res;
}
- /* initialise certificate viewing interface */
- res = sslcert_viewer_create_session_data(
- url, dummy_cb, NULL, chain, &ncwin->ssl_data);
- if (res != NSERROR_OK) {
- g_object_unref(G_OBJECT(ncwin->dlg));
- free(ncwin);
- return res;
- }
-
- res = sslcert_viewer_init(ncwin->core.cb_table,
- (struct core_window *)ncwin,
- ncwin->ssl_data);
+ res = page_info_create(ncwin->core.cb_table,
+ (struct core_window *)ncwin,
+ bw, &ncwin->pi);
if (res != NSERROR_OK) {
g_object_unref(G_OBJECT(ncwin->dlg));
free(ncwin);
-----------------------------------------------------------------------
Summary of changes:
frontends/gtk/corewindow.c | 74 +++++++++++--------
frontends/gtk/page_info.c | 119 +++++++------------------------
frontends/gtk/res/netsurf.gresource.xml | 3 +-
frontends/gtk/res/pageinfo.gtk2.ui | 15 ++++
frontends/gtk/res/pageinfo.gtk3.ui | 21 ++++++
frontends/gtk/resources.c | 1 +
6 files changed, 111 insertions(+), 122 deletions(-)
create mode 100644 frontends/gtk/res/pageinfo.gtk2.ui
create mode 100644 frontends/gtk/res/pageinfo.gtk3.ui
diff --git a/frontends/gtk/corewindow.c b/frontends/gtk/corewindow.c
index 1cc8c62..b3568c6 100644
--- a/frontends/gtk/corewindow.c
+++ b/frontends/gtk/corewindow.c
@@ -224,6 +224,10 @@ nsgtk_cw_motion_notify_event(GtkWidget *widget,
struct nsgtk_corewindow_mouse *mouse = &nsgtk_cw->mouse_state;
if (mouse->pressed == false) {
+ nsgtk_cw->mouse(nsgtk_cw,
+ BROWSER_MOUSE_HOVER,
+ event->x,
+ event->y);
return TRUE;
}
@@ -610,18 +614,20 @@ static nserror
nsgtk_cw_set_scroll(struct core_window *cw, int x, int y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
- assert(vadj != NULL);
- assert(hadj != NULL);
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- gtk_adjustment_set_value(vadj, y);
- gtk_adjustment_set_value(hadj, x);
+ assert(vadj != NULL);
+ assert(hadj != NULL);
+ gtk_adjustment_set_value(vadj, y);
+ gtk_adjustment_set_value(hadj, x);
+ }
return NSERROR_OK;
}
@@ -636,18 +642,23 @@ static nserror
nsgtk_cw_get_scroll(const struct core_window *cw, int *x, int *y)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
- assert(vadj != NULL);
- assert(hadj != NULL);
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- *y = (int)(gtk_adjustment_get_value(vadj));
- *x = (int)(gtk_adjustment_get_value(hadj));
+ assert(vadj != NULL);
+ assert(hadj != NULL);
+ *y = (int)(gtk_adjustment_get_value(vadj));
+ *x = (int)(gtk_adjustment_get_value(hadj));
+ } else {
+ *x = 0;
+ *y = 0;
+ }
return NSERROR_OK;
}
@@ -664,18 +675,25 @@ nsgtk_cw_get_window_dimensions(const struct core_window *cw,
int *width, int *height)
{
struct nsgtk_corewindow *nsgtk_cw = (struct nsgtk_corewindow *)cw;
- GtkAdjustment *vadj;
- GtkAdjustment *hadj;
- gdouble page;
-
- hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
- g_object_get(hadj, "page-size", &page, NULL);
- *width = page;
-
- vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
- g_object_get(vadj, "page-size", &page, NULL);
- *height = page;
-
+ if (nsgtk_cw->scrolled != NULL) {
+ GtkAdjustment *vadj;
+ GtkAdjustment *hadj;
+ gdouble page;
+
+ hadj = gtk_scrolled_window_get_hadjustment(nsgtk_cw->scrolled);
+ g_object_get(hadj, "page-size", &page, NULL);
+ *width = page;
+
+ vadj = gtk_scrolled_window_get_vadjustment(nsgtk_cw->scrolled);
+ g_object_get(vadj, "page-size", &page, NULL);
+ *height = page;
+ } else {
+ GtkAllocation allocation;
+ gtk_widget_get_allocation(GTK_WIDGET(nsgtk_cw->drawing_area),
+ &allocation);
+ *width = allocation.width;
+ *height = allocation.height;
+ }
return NSERROR_OK;
}
diff --git a/frontends/gtk/page_info.c b/frontends/gtk/page_info.c
index 2892788..b7ed7ed 100644
--- a/frontends/gtk/page_info.c
+++ b/frontends/gtk/page_info.c
@@ -26,10 +26,11 @@
#include <gtk/gtk.h>
#include "utils/log.h"
+#include "utils/messages.h"
#include "netsurf/keypress.h"
#include "netsurf/plotters.h"
#include "netsurf/browser_window.h"
-#include "desktop/sslcert_viewer.h"
+#include "desktop/page-info.h"
#include "gtk/plotters.h"
#include "gtk/scaffolding.h"
@@ -46,56 +47,29 @@ struct nsgtk_pi_window {
struct nsgtk_corewindow core;
/** GTK builder for window */
GtkBuilder *builder;
- /** GTK dialog window being shown */
- GtkDialog *dlg;
- /** SSL certificate viewer context data */
- struct sslcert_session_data *ssl_data;
+ /** GTK window being shown */
+ GtkWindow *dlg;
+ /** Core page-info window */
+ struct page_info *pi;
};
/**
- * destroy a previously created certificate view
+ * destroy a previously created page information window
*/
-static nserror nsgtk_pi_destroy(struct nsgtk_pi_window *pi_win)
-{
- nserror res;
-
- res = sslcert_viewer_fini(pi_win->ssl_data);
- if (res == NSERROR_OK) {
- res = nsgtk_corewindow_fini(&pi_win->core);
- gtk_widget_destroy(GTK_WIDGET(pi_win->dlg));
- g_object_unref(G_OBJECT(pi_win->builder));
- free(pi_win);
- }
- return res;
-}
-
-static void
-nsgtk_pi_accept(GtkButton *w, gpointer data)
-{
- struct nsgtk_pi_window *pi_win;
- pi_win = (struct nsgtk_pi_window *)data;
-
- sslcert_viewer_accept(pi_win->ssl_data);
-
- nsgtk_pi_destroy(pi_win);
-}
-
-static void
-nsgtk_pi_reject(GtkWidget *w, gpointer data)
+static gboolean
+nsgtk_pi_delete_event(GtkWidget *w, GdkEvent *event, gpointer data)
{
struct nsgtk_pi_window *pi_win;
pi_win = (struct nsgtk_pi_window *)data;
- sslcert_viewer_reject(pi_win->ssl_data);
+ page_info_destroy(pi_win->pi);
- nsgtk_pi_destroy(pi_win);
-}
+ nsgtk_corewindow_fini(&pi_win->core);
+ gtk_widget_destroy(GTK_WIDGET(pi_win->dlg));
+ g_object_unref(G_OBJECT(pi_win->builder));
+ free(pi_win);
-static gboolean
-nsgtk_pi_delete_event(GtkWidget *w, GdkEvent *event, gpointer data)
-{
- nsgtk_pi_reject(w, data);
return FALSE;
}
@@ -117,7 +91,7 @@ nsgtk_pi_mouse(struct nsgtk_corewindow *nsgtk_cw,
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- sslcert_viewer_mouse_action(pi_win->ssl_data, mouse_state, x, y);
+ page_info_mouse_action(pi_win->pi, mouse_state, x, y);
return NSERROR_OK;
}
@@ -137,7 +111,7 @@ nsgtk_pi_key(struct nsgtk_corewindow *nsgtk_cw, uint32_t nskey)
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- if (sslcert_viewer_keypress(pi_win->ssl_data, nskey)) {
+ if (page_info_keypress(pi_win->pi, nskey)) {
return NSERROR_OK;
}
return NSERROR_NOT_IMPLEMENTED;
@@ -163,58 +137,40 @@ nsgtk_pi_draw(struct nsgtk_corewindow *nsgtk_cw, struct rect *r)
/* technically degenerate container of */
pi_win = (struct nsgtk_pi_window *)nsgtk_cw;
- sslcert_viewer_redraw(pi_win->ssl_data, 0, 0, r, &ctx);
+ page_info_redraw(pi_win->pi, 0, 0, r, &ctx);
return NSERROR_OK;
}
-static nserror dummy_cb(bool proceed, void *pw)
-{
- return NSERROR_OK;
-}
-
/* exported interface documented in gtk/page_info.h */
nserror nsgtk_page_info(struct browser_window *bw)
{
struct nsgtk_pi_window *ncwin;
nserror res;
- struct cert_chain *chain;
- struct nsurl *url;
-
- res = browser_window_get_ssl_chain(bw, &chain);
- if (res != NSERROR_OK) {
- NSLOG(netsurf, WARNING, "Unable to get certificate chain");
- return NSERROR_INVALID;
- }
- url = browser_window_access_url(bw);
-
- ncwin = malloc(sizeof(struct nsgtk_pi_window));
+ ncwin = calloc(1, sizeof(struct nsgtk_pi_window));
if (ncwin == NULL) {
return NSERROR_NOMEM;
}
- res = nsgtk_builder_new_from_resname("ssl", &ncwin->builder);
+ res = nsgtk_builder_new_from_resname("pageinfo", &ncwin->builder);
if (res != NSERROR_OK) {
- NSLOG(netsurf, INFO, "SSL UI builder init failed");
+ NSLOG(netsurf, CRITICAL, "Page Info UI builder init failed %s", messages_get_errorcode(res));
free(ncwin);
return res;
}
gtk_builder_connect_signals(ncwin->builder, NULL);
- ncwin->dlg = GTK_DIALOG(gtk_builder_get_object(ncwin->builder,
- "wndSSLProblem"));
+ ncwin->dlg = GTK_WINDOW(gtk_builder_get_object(ncwin->builder,
+ "PGIWindow"));
/* set parent for transient dialog */
gtk_window_set_transient_for(GTK_WINDOW(ncwin->dlg),
nsgtk_scaffolding_window(nsgtk_current_scaffolding()));
- ncwin->core.scrolled = GTK_SCROLLED_WINDOW(
- gtk_builder_get_object(ncwin->builder, "SSLScrolled"));
-
ncwin->core.drawing_area = GTK_DRAWING_AREA(
- gtk_builder_get_object(ncwin->builder, "SSLDrawingArea"));
+ gtk_builder_get_object(ncwin->builder, "PGIDrawingArea"));
/* make the delete event call our destructor */
g_signal_connect(G_OBJECT(ncwin->dlg),
@@ -222,20 +178,6 @@ nserror nsgtk_page_info(struct browser_window *bw)
G_CALLBACK(nsgtk_pi_delete_event),
ncwin);
- /* accept button */
- g_signal_connect(G_OBJECT(gtk_builder_get_object(ncwin->builder,
- "sslaccept")),
- "clicked",
- G_CALLBACK(nsgtk_pi_accept),
- ncwin);
-
- /* reject button */
- g_signal_connect(G_OBJECT(gtk_builder_get_object(ncwin->builder,
- "sslreject")),
- "clicked",
- G_CALLBACK(nsgtk_pi_reject),
- ncwin);
-
/* initialise GTK core window */
ncwin->core.draw = nsgtk_pi_draw;
ncwin->core.key = nsgtk_pi_key;
@@ -248,18 +190,9 @@ nserror nsgtk_page_info(struct browser_window *bw)
return res;
}
- /* initialise certificate viewing interface */
- res = sslcert_viewer_create_session_data(
- url, dummy_cb, NULL, chain, &ncwin->ssl_data);
- if (res != NSERROR_OK) {
- g_object_unref(G_OBJECT(ncwin->dlg));
- free(ncwin);
- return res;
- }
-
- res = sslcert_viewer_init(ncwin->core.cb_table,
- (struct core_window *)ncwin,
- ncwin->ssl_data);
+ res = page_info_create(ncwin->core.cb_table,
+ (struct core_window *)ncwin,
+ bw, &ncwin->pi);
if (res != NSERROR_OK) {
g_object_unref(G_OBJECT(ncwin->dlg));
free(ncwin);
diff --git a/frontends/gtk/res/netsurf.gresource.xml b/frontends/gtk/res/netsurf.gresource.xml
index 4335817..a41ca6c 100644
--- a/frontends/gtk/res/netsurf.gresource.xml
+++ b/frontends/gtk/res/netsurf.gresource.xml
@@ -12,11 +12,12 @@
<file>hotlist.gtk2.ui</file>
<file>netsurf.gtk3.ui</file>
<file>ssl.gtk2.ui</file>
+ <file>ssl.gtk3.ui</file>
+ <file>pageinfo.gtk3.ui</file>
<file>toolbar.gtk3.ui</file>
<file>downloads.gtk2.ui</file>
<file>hotlist.gtk3.ui</file>
<file>options.gtk2.ui</file>
- <file>ssl.gtk3.ui</file>
<file>viewdata.gtk2.ui</file>
<file>downloads.gtk3.ui</file>
<file>options.gtk3.ui</file>
diff --git a/frontends/gtk/res/pageinfo.gtk2.ui b/frontends/gtk/res/pageinfo.gtk2.ui
new file mode 100644
index 0000000..b690d9c
--- /dev/null
+++ b/frontends/gtk/res/pageinfo.gtk2.ui
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="2.24"/>
+ <!-- interface-naming-policy project-wide -->
+ <object class="GtkWindow" id="PGIWindow">
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkDrawingArea" id="PGIDrawingArea">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/frontends/gtk/res/pageinfo.gtk3.ui b/frontends/gtk/res/pageinfo.gtk3.ui
new file mode 100644
index 0000000..6ea876e
--- /dev/null
+++ b/frontends/gtk/res/pageinfo.gtk3.ui
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface>
+ <requires lib="gtk+" version="3.20"/>
+ <object class="GtkWindow" id="PGIWindow">
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="resizable">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkDrawingArea" id="PGIDrawingArea">
+ <property name="name">PGIDrawingArea</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK | GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+ </object>
+ </child>
+ </object>
+</interface>
diff --git a/frontends/gtk/resources.c b/frontends/gtk/resources.c
index a60119a..18f0e37 100644
--- a/frontends/gtk/resources.c
+++ b/frontends/gtk/resources.c
@@ -87,6 +87,7 @@ static struct nsgtk_resource_s ui_resource[] = {
RES_ENTRY("cookies"),
RES_ENTRY("viewdata"),
RES_ENTRY("warning"),
+ RES_ENTRY("pageinfo"),
{ NULL, 0, NSGTK_RESOURCE_FILE, NULL },
};
--
NetSurf Browser
2 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.9-539-g72ff12b
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/72ff12b3ae1c66629042c...
...commit http://git.netsurf-browser.org/netsurf.git/commit/72ff12b3ae1c66629042ce9...
...tree http://git.netsurf-browser.org/netsurf.git/tree/72ff12b3ae1c66629042ce906...
The branch, master has been updated
via 72ff12b3ae1c66629042ce906abf8850c49700db (commit)
from b37145434425e4cd76ce844f9bae9538c50d75ae (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=72ff12b3ae1c6662904...
commit 72ff12b3ae1c66629042ce906abf8850c49700db
Author: Michael Drake <michael.drake(a)codethink.co.uk>
Commit: Michael Drake <michael.drake(a)codethink.co.uk>
Docs: Update for nsgtk3 rename.
diff --git a/docs/PACKAGING-GTK b/docs/PACKAGING-GTK
index 7436f23..4eab25b 100644
--- a/docs/PACKAGING-GTK
+++ b/docs/PACKAGING-GTK
@@ -29,11 +29,8 @@
checkouts smaller and making sure changes to one set of resources updates
the other.
- The binary that the build system produces is called "nsgtk". There is also
- a shell script called "netsurf" that will set up the environment and launch
- the nsgtk binary. Do not ship this shell script with your package. It is
- included only as a convience for launching NetSurf from the build tree.
- Instead, you should move nsgtk to /usr/bin/netsurf (or wherever your
+ The binary that the build system produces is called "nsgtk3".
+ You should install nsgtk3 to `/usr/bin/netsurf` (or wherever your
distribution's packaging policy suggests) and copy the contents of
gtk/res/ (dereferencing the symlinks, obviously) to /usr/share/netsurf (or
wherever your packaging policy suggests).
diff --git a/docs/building-GTK.md b/docs/building-GTK.md
index dd1b7e2..aa898a0 100644
--- a/docs/building-GTK.md
+++ b/docs/building-GTK.md
@@ -171,13 +171,10 @@ below. Or turn off the complaining features in a Makefile.config
file. You may need to "make clean" before attempting to build after
installing the dependencies.
-Run NetSurf by executing the "test-nsgtk" shell script:
+Run NetSurf by executing "nsgtk3":
- $ ./test-nsgtk
+ $ ./nsgtk3
-This script makes it easy to run the nsgtk binary from the build tree. It
-sets up some environment variables which enable NetSurf to find its
-resources.
### Builtin resources
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 6450b81..652c3e3 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -77,7 +77,7 @@ To build the native front end (the GTK front end on Linux, BSDs, etc)
you could do:
$ make
- $ ./nsgtk
+ $ ./nsgtk3
To build the framebuffer front end, you could do:
-----------------------------------------------------------------------
Summary of changes:
docs/PACKAGING-GTK | 7 ++-----
docs/building-GTK.md | 7 ++-----
docs/quick-start.md | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/docs/PACKAGING-GTK b/docs/PACKAGING-GTK
index 7436f23..4eab25b 100644
--- a/docs/PACKAGING-GTK
+++ b/docs/PACKAGING-GTK
@@ -29,11 +29,8 @@
checkouts smaller and making sure changes to one set of resources updates
the other.
- The binary that the build system produces is called "nsgtk". There is also
- a shell script called "netsurf" that will set up the environment and launch
- the nsgtk binary. Do not ship this shell script with your package. It is
- included only as a convience for launching NetSurf from the build tree.
- Instead, you should move nsgtk to /usr/bin/netsurf (or wherever your
+ The binary that the build system produces is called "nsgtk3".
+ You should install nsgtk3 to `/usr/bin/netsurf` (or wherever your
distribution's packaging policy suggests) and copy the contents of
gtk/res/ (dereferencing the symlinks, obviously) to /usr/share/netsurf (or
wherever your packaging policy suggests).
diff --git a/docs/building-GTK.md b/docs/building-GTK.md
index dd1b7e2..aa898a0 100644
--- a/docs/building-GTK.md
+++ b/docs/building-GTK.md
@@ -171,13 +171,10 @@ below. Or turn off the complaining features in a Makefile.config
file. You may need to "make clean" before attempting to build after
installing the dependencies.
-Run NetSurf by executing the "test-nsgtk" shell script:
+Run NetSurf by executing "nsgtk3":
- $ ./test-nsgtk
+ $ ./nsgtk3
-This script makes it easy to run the nsgtk binary from the build tree. It
-sets up some environment variables which enable NetSurf to find its
-resources.
### Builtin resources
diff --git a/docs/quick-start.md b/docs/quick-start.md
index 6450b81..652c3e3 100644
--- a/docs/quick-start.md
+++ b/docs/quick-start.md
@@ -77,7 +77,7 @@ To build the native front end (the GTK front end on Linux, BSDs, etc)
you could do:
$ make
- $ ./nsgtk
+ $ ./nsgtk3
To build the framebuffer front end, you could do:
--
NetSurf Browser
2 years, 10 months
- 1
- 0
netsurf: branch master updated. release/3.9-538-gb371454
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/netsurf.git/shortlog/b37145434425e4cd76ce8...
...commit http://git.netsurf-browser.org/netsurf.git/commit/b37145434425e4cd76ce844...
...tree http://git.netsurf-browser.org/netsurf.git/tree/b37145434425e4cd76ce844f9...
The branch, master has been updated
via b37145434425e4cd76ce844f9bae9538c50d75ae (commit)
via 47b689c5e9d4ab4ecc7c629951c1a4534d0a0733 (commit)
via 9664a8ac76802ff1c6700c1e748b38b3de9baef1 (commit)
via 962431dd3df0062e5762165eb69dfc23608c8aad (commit)
from 0e6ba162b22ca64b323ed9071c64a3e31b93c0f6 (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=b37145434425e4cd76c...
commit b37145434425e4cd76ce844f9bae9538c50d75ae
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
AmiSSL implies OpenSSL
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index a88fc1d..ff4f85b 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -DWITH_OPENSSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=47b689c5e9d4ab4ecc7...
commit 47b689c5e9d4ab4ecc7c629951c1a4534d0a0733
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Use nsamiga as defined in makefile
diff --git a/utils/file.c b/utils/file.c
index c963719..c460e49 100644
--- a/utils/file.c
+++ b/utils/file.c
@@ -38,7 +38,7 @@
#include "utils/file.h"
#include "utils/dirent.h"
-#ifdef __AMIGA__
+#ifdef nsamiga
#include "frontends/amiga/os3support.h"
#endif
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=9664a8ac76802ff1c67...
commit 9664a8ac76802ff1c6700c1e748b38b3de9baef1
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Mod os3support files so file.c builds
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 645496b..98843c7 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#include <dirent.h>
#include <proto/bullet.h>
#include <proto/exec.h>
@@ -182,6 +181,12 @@ char *strsep(char **s1, const char *s2)
return p1;
}
+int alphasort(const struct dirent **d1, const struct dirent **d2)
+{
+ /*\todo stub function, needs writing, preferably into clib2 */
+ return 0;
+}
+
int scandir(const char *dir, struct dirent ***namelist,
int (*filter)(const struct dirent *),
int (*compar)(const struct dirent **, const struct dirent **))
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index fde032a..dc4e065 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -27,6 +27,7 @@
#ifndef __amigaos4__
#include <stdint.h>
+#include <dirent.h>
#include <proto/exec.h>
#include <proto/dos.h>
@@ -257,6 +258,10 @@ char *ASPrintf(const char *fmt, ...);
/* C */
char *strlwr(char *str);
+int alphasort(const struct dirent **d1, const struct dirent **d2);
+int scandir(const char *dir, struct dirent ***namelist,
+ int (*filter)(const struct dirent *),
+ int (*compar)(const struct dirent **, const struct dirent **));
#endif
#endif
diff --git a/utils/file.c b/utils/file.c
index 7eff6a7..c963719 100644
--- a/utils/file.c
+++ b/utils/file.c
@@ -38,6 +38,10 @@
#include "utils/file.h"
#include "utils/dirent.h"
+#ifdef __AMIGA__
+#include "frontends/amiga/os3support.h"
+#endif
+
/**
* Generate a posix path from one or more component elemnts.
*
commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=962431dd3df0062e576...
commit 962431dd3df0062e5762165eb69dfc23608c8aad
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Rename mask to msk
There's something about "mask" which causes the version of GCC we use for the m68k-amigaos build to misinterpret the code
diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h
index fee7a10..6f2977f 100644
--- a/include/netsurf/plot_style.h
+++ b/include/netsurf/plot_style.h
@@ -214,7 +214,7 @@ static inline colour colour_engorge_component(
bool dark,
enum plot_colour_component comp)
{
- static const colour mask[PLOT_COLOUR_COMPONENT_ALPHA] = {
+ static const colour msk[PLOT_COLOUR_COMPONENT_ALPHA] = {
[PLOT_COLOUR_COMPONENT_RED] = 0x0000ff,
[PLOT_COLOUR_COMPONENT_GREEN] = 0x00ff00,
[PLOT_COLOUR_COMPONENT_BLUE] = 0xff0000,
@@ -224,7 +224,7 @@ static inline colour colour_engorge_component(
assert(comp < PLOT_COLOUR_COMPONENT_ALPHA);
- return (mask[comp] & l) | (~mask[comp] & d);
+ return (msk[comp] & l) | (~msk[comp] & d);
}
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 2 +-
frontends/amiga/os3support.c | 7 ++++++-
frontends/amiga/os3support.h | 5 +++++
include/netsurf/plot_style.h | 4 ++--
utils/file.c | 4 ++++
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index a88fc1d..ff4f85b 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -12,7 +12,7 @@ endif
$(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
$(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
+$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -DWITH_OPENSSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I$(GCCSDK_INSTALL_ENV)/netinclude,-lamisslauto,AmiSSL))
CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
diff --git a/frontends/amiga/os3support.c b/frontends/amiga/os3support.c
index 645496b..98843c7 100644
--- a/frontends/amiga/os3support.c
+++ b/frontends/amiga/os3support.c
@@ -28,7 +28,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
-#include <dirent.h>
#include <proto/bullet.h>
#include <proto/exec.h>
@@ -182,6 +181,12 @@ char *strsep(char **s1, const char *s2)
return p1;
}
+int alphasort(const struct dirent **d1, const struct dirent **d2)
+{
+ /*\todo stub function, needs writing, preferably into clib2 */
+ return 0;
+}
+
int scandir(const char *dir, struct dirent ***namelist,
int (*filter)(const struct dirent *),
int (*compar)(const struct dirent **, const struct dirent **))
diff --git a/frontends/amiga/os3support.h b/frontends/amiga/os3support.h
index fde032a..dc4e065 100644
--- a/frontends/amiga/os3support.h
+++ b/frontends/amiga/os3support.h
@@ -27,6 +27,7 @@
#ifndef __amigaos4__
#include <stdint.h>
+#include <dirent.h>
#include <proto/exec.h>
#include <proto/dos.h>
@@ -257,6 +258,10 @@ char *ASPrintf(const char *fmt, ...);
/* C */
char *strlwr(char *str);
+int alphasort(const struct dirent **d1, const struct dirent **d2);
+int scandir(const char *dir, struct dirent ***namelist,
+ int (*filter)(const struct dirent *),
+ int (*compar)(const struct dirent **, const struct dirent **));
#endif
#endif
diff --git a/include/netsurf/plot_style.h b/include/netsurf/plot_style.h
index fee7a10..6f2977f 100644
--- a/include/netsurf/plot_style.h
+++ b/include/netsurf/plot_style.h
@@ -214,7 +214,7 @@ static inline colour colour_engorge_component(
bool dark,
enum plot_colour_component comp)
{
- static const colour mask[PLOT_COLOUR_COMPONENT_ALPHA] = {
+ static const colour msk[PLOT_COLOUR_COMPONENT_ALPHA] = {
[PLOT_COLOUR_COMPONENT_RED] = 0x0000ff,
[PLOT_COLOUR_COMPONENT_GREEN] = 0x00ff00,
[PLOT_COLOUR_COMPONENT_BLUE] = 0xff0000,
@@ -224,7 +224,7 @@ static inline colour colour_engorge_component(
assert(comp < PLOT_COLOUR_COMPONENT_ALPHA);
- return (mask[comp] & l) | (~mask[comp] & d);
+ return (msk[comp] & l) | (~msk[comp] & d);
}
diff --git a/utils/file.c b/utils/file.c
index 7eff6a7..c460e49 100644
--- a/utils/file.c
+++ b/utils/file.c
@@ -38,6 +38,10 @@
#include "utils/file.h"
#include "utils/dirent.h"
+#ifdef nsamiga
+#include "frontends/amiga/os3support.h"
+#endif
+
/**
* Generate a posix path from one or more component elemnts.
*
--
NetSurf Browser
2 years, 11 months
- 1
- 0
toolchains: branch master updated. 0eadab86611f2881c3ca02a1d1438a96fd126995
by NetSurf Browser Project
Gitweb links:
...log http://git.netsurf-browser.org/toolchains.git/shortlog/0eadab86611f2881c3...
...commit http://git.netsurf-browser.org/toolchains.git/commit/0eadab86611f2881c3ca...
...tree http://git.netsurf-browser.org/toolchains.git/tree/0eadab86611f2881c3ca02...
The branch, master has been updated
via 0eadab86611f2881c3ca02a1d1438a96fd126995 (commit)
via 998e25a87d4230424a4cad2f4c6ce82d50f75840 (commit)
from d2981349612e42e1aa9777b9b02e8d109a11e56c (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=0eadab86611f2881...
commit 0eadab86611f2881c3ca02a1d1438a96fd126995
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Ensure IPv6 disabled on Amiga platforms
diff --git a/sdk/Makefile b/sdk/Makefile
index 125dfce..d8c4bc7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,7 +128,7 @@ endif
ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg-turbo.d)
EXTRAARGS_LIBCARES := --disable-shared
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver LIBS=-lpthread
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver --disable-ipv6 LIBS=-lpthread
endif
ifeq ($(TARGET),i686-w64-mingw32)
@@ -142,7 +142,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt --disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=998e25a87d423042...
commit 998e25a87d4230424a4cad2f4c6ce82d50f75840
Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk>
Fix libiconv patches
srclib.time.in.h needs patching because the clib2 includes define tv_sec to tv_secs
diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
new file mode 100644
index 0000000..1ea2d0e
--- /dev/null
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
@@ -0,0 +1,11 @@
+--- srclib/time.in.h 2019-01-06 08:51:41.000000000 +0000
++++ srclib/time.in.h 2020-03-06 19:46:37.429016156 +0000
+@@ -70,7 +70,7 @@ extern "C" {
+ # define timespec rpl_timespec
+ struct timespec
+ {
+- time_t tv_sec;
++ time_t tv_secs;
+ long int tv_nsec;
+ };
+ # define GNULIB_defined_struct_timespec 1
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
-----------------------------------------------------------------------
Summary of changes:
sdk/Makefile | 4 ++--
.../libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p | 8 ++++----
.../libiconv/m68k-unknown-amigaos/srclib.time.in.h.p | 11 +++++++++++
.../patches/libiconv/ppc-amigaos/srclib.getprogname.c.p | 8 ++++----
4 files changed, 21 insertions(+), 10 deletions(-)
create mode 100644 sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
diff --git a/sdk/Makefile b/sdk/Makefile
index 125dfce..d8c4bc7 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -128,7 +128,7 @@ endif
ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg-turbo.d)
EXTRAARGS_LIBCARES := --disable-shared
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver LIBS=-lpthread
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver --disable-ipv6 LIBS=-lpthread
endif
ifeq ($(TARGET),i686-w64-mingw32)
@@ -142,7 +142,7 @@ endif
ifeq ($(TARGET),m68k-unknown-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d)
EXTRAARGS_LIBCARES := --disable-shared --without-random
- EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt
+ EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-amissl --with-zlib --disable-rt --disable-ipv6
LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024"
LIBJPEG_ENV := LDFLAGS="-lm"
LIBJPEG_TURBO_ENV := LDFLAGS="-lm"
diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
new file mode 100644
index 0000000..1ea2d0e
--- /dev/null
+++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p
@@ -0,0 +1,11 @@
+--- srclib/time.in.h 2019-01-06 08:51:41.000000000 +0000
++++ srclib/time.in.h 2020-03-06 19:46:37.429016156 +0000
+@@ -70,7 +70,7 @@ extern "C" {
+ # define timespec rpl_timespec
+ struct timespec
+ {
+- time_t tv_sec;
++ time_t tv_secs;
+ long int tv_nsec;
+ };
+ # define GNULIB_defined_struct_timespec 1
diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
index 3d7938d..314a4b1 100644
--- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
+++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p
@@ -1,8 +1,8 @@
---- srclib/getprogname.c 2017-01-01 23:02:21.000000000 +0000
-+++ srclib/getprogname.c 2017-03-26 23:21:25.532012988 +0100
-@@ -144,7 +144,7 @@ getprogname (void)
+--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100
++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000
+@@ -245,7 +245,7 @@ getprogname (void)
}
- return p;
+ return NULL;
# else
-# error "getprogname module not ported to this OS"
+ const char *p = ""; /* this is never used for anything important */
--
Cross-compilation toolchains and environments
2 years, 11 months
- 1
- 0