Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/1a170f9f322416e14b0b1... ...commit http://git.netsurf-browser.org/netsurf.git/commit/1a170f9f322416e14b0b11b... ...tree http://git.netsurf-browser.org/netsurf.git/tree/1a170f9f322416e14b0b11b99... The branch, master has been updated via 1a170f9f322416e14b0b11b999b61efa6bcdf8fe (commit) via ac46ecbc1c2e756af6c2decfbd5e0a9d332fa781 (commit) from 35dbf07440cb6c5c26e1dbe2f7cd83ad95b745e1 (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=1a170f9f322416e14b0... commit 1a170f9f322416e14b0b11b999b61efa6bcdf8fe Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Re-instate accidental removal of pkg-config for curl/openssl diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index b71ae3c..421be0e 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -17,16 +17,18 @@ $(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCL CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) -#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) +LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl) LDFLAGS += $(shell $(PKG_CONFIG) --libs tre) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib LDFLAGS += -lpbl -liconv +ifeq ($(NETSURF_USE_OPENSSL),YES) + LDFLAGS += $(shell $(PKG_CONFIG) --static --libs openssl) +endif + ifeq ($(SUBTARGET),os3) LDFLAGS += -lamiga -lm -else - LDFLAGS += -lpthread endif EXETARGET := NetSurf commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=ac46ecbc1c2e756af6c... commit ac46ecbc1c2e756af6c2decfbd5e0a9d332fa781 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; Small Capital Q codepoint diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index 62c2dde..0b414c2 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 - 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2008 - 2019 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -82,7 +82,7 @@ const uint16 sc_table[] = { 0x006E, 0x0274, /* n */ 0x006F, 0x1D0F, /* o */ 0x0070, 0x1D18, /* p */ - 0x0071, 0xA7EE, /* q (proposed) (Adobe codepoint 0xF771) */ + 0x0071, 0xA7AF, /* q */ 0x0072, 0x0280, /* r */ 0x0073, 0xA731, /* s */ 0x0074, 0x1D1B, /* t */ ----------------------------------------------------------------------- Summary of changes: frontends/amiga/Makefile | 8 +++++--- frontends/amiga/font_bullet.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index b71ae3c..421be0e 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -17,16 +17,18 @@ $(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCL CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) -#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) +LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl) LDFLAGS += $(shell $(PKG_CONFIG) --libs tre) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib LDFLAGS += -lpbl -liconv +ifeq ($(NETSURF_USE_OPENSSL),YES) + LDFLAGS += $(shell $(PKG_CONFIG) --static --libs openssl) +endif + ifeq ($(SUBTARGET),os3) LDFLAGS += -lamiga -lm -else - LDFLAGS += -lpthread endif EXETARGET := NetSurf diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index 62c2dde..0b414c2 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -1,5 +1,5 @@ /* - * Copyright 2008 - 2016 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; + * Copyright 2008 - 2019 Chris Young <chris(a)unsatisfactorysoftware.co.uk&gt; * * This file is part of NetSurf, http://www.netsurf-browser.org/ * @@ -82,7 +82,7 @@ const uint16 sc_table[] = { 0x006E, 0x0274, /* n */ 0x006F, 0x1D0F, /* o */ 0x0070, 0x1D18, /* p */ - 0x0071, 0xA7EE, /* q (proposed) (Adobe codepoint 0xF771) */ + 0x0071, 0xA7AF, /* q */ 0x0072, 0x0280, /* r */ 0x0073, 0xA731, /* s */ 0x0074, 0x1D1B, /* t */ -- NetSurf Browser