Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/d3cfbc30778647d287e9ee47359f18de716c9633
...commit
http://git.netsurf-browser.org/netsurf.git/commit/d3cfbc30778647d287e9ee47359f18de716c9633
...tree
http://git.netsurf-browser.org/netsurf.git/tree/d3cfbc30778647d287e9ee47359f18de716c9633
The branch, master has been updated
via d3cfbc30778647d287e9ee47359f18de716c9633 (commit)
via 7051b9e563f7cdf5e09e65a33b5ac0152061e541 (commit)
from 14bf4b47a5ea36ba329e5910f3aa1d26cc452be9 (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=d3cfbc30778647d287e9ee47359f18de716c9633
commit d3cfbc30778647d287e9ee47359f18de716c9633
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Remove old native build lines from makefile
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 2b727ca..d5433c8 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -10,44 +10,20 @@ else
CFLAGS += -msoft-float -m68020-60 -O2 -DPATH_MAX=1024 -D__m68k__
endif
-NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
-NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
-
-ifeq ($(HOST),amiga)
- $(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,Sprite
(librosprite)))
- $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
- $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
- $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
- $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG
(libsvgtiny)))
- $(eval $(call feature_enabled,VIDEO,-DWITH_VIDEO -I
/SDK/local/newlib/include/glib-2.0,-lgstreamer-0.10 -lglib-2.0 -lgobject-2.0
-lgmodule-2.0 -lgthread-2.0 -lintl -lffi,Video (libgstreamer)))
- $(eval $(call feature_enabled,JS,-DXP_UNIX -DWITH_JS
-DJS_VERSION=185,-lstdc++ -lmozjs185,JavaScript))
- $(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=170
-DJSVERSION_LATEST=170 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs
-lfdlibm,JavaScript))
- $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
- $(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-
- CFLAGS += -I /SDK/local/common/include/libpng12
- LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lpbl
- LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
-else
- $(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,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
+$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
- CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
- CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
+CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
+CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
- LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
- LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
+LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
+LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
- LDFLAGS += -lpbl -liconv
+LDFLAGS += -lpbl -liconv
- ifeq ($(SUBTARGET),os3)
- LDFLAGS += -lamiga -lm
- endif
+ifeq ($(SUBTARGET),os3)
+ LDFLAGS += -lamiga -lm
endif
EXETARGET := NetSurf
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=7051b9e563f7cdf5e09e65a33b5ac0152061e541
commit 7051b9e563f7cdf5e09e65a33b5ac0152061e541
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Use libiconv instead of newlib's iconv
Requires invalid input to be explicitly ignored, as unlike newlib invalid
characters are not replaced with '?'
Fixes bug 2440
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 0674a9d..1864981 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -4,11 +4,7 @@
# Force using glibc internal iconv implementation instead of external libiconv
# Valid options: YES, NO
-ifneq ($(SUBTARGET),os3)
- NETSURF_USE_LIBICONV_PLUG := YES
-else
- NETSURF_USE_LIBICONV_PLUG := NO
-endif
+NETSURF_USE_LIBICONV_PLUG := NO
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index d48e073..5d05e95 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -16,10 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "amiga/os3support.h"
+
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <proto/exec.h>
+#include <proto/utility.h>
+
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "netsurf/utf8.h"
@@ -33,7 +38,13 @@ nserror utf8_from_local_encoding(const char *string, size_t
len, char **result)
nserror utf8_to_local_encoding(const char *string, size_t len, char **result)
{
- return utf8_to_enc(string, nsoption_charp(local_charset), len, result);
+ nserror err = NSERROR_NOMEM;
+ char *local_charset = ASPrintf("%s//IGNORE",
nsoption_charp(local_charset));
+ if(local_charset) {
+ err = utf8_to_enc(string, local_charset, len, result);
+ FreeVec(local_charset);
+ }
+ return err;
}
void ami_utf8_free(char *ptr)
@@ -44,7 +55,6 @@ void ami_utf8_free(char *ptr)
char *ami_utf8_easy(const char *string)
{
char *localtext;
-
if(utf8_to_local_encoding(string, strlen(string), &localtext) ==
NSERROR_OK) {
return localtext;
} else {
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/Makefile | 44 +++++++++----------------------------
frontends/amiga/Makefile.defaults | 6 +----
frontends/amiga/utf8.c | 14 ++++++++++--
3 files changed, 23 insertions(+), 41 deletions(-)
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile
index 2b727ca..d5433c8 100644
--- a/frontends/amiga/Makefile
+++ b/frontends/amiga/Makefile
@@ -10,44 +10,20 @@ else
CFLAGS += -msoft-float -m68020-60 -O2 -DPATH_MAX=1024 -D__m68k__
endif
-NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
-NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP
-NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF
-NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG
-NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG
-NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO
-
-ifeq ($(HOST),amiga)
- $(eval $(call feature_enabled,ROSPRITE,-DWITH_NSSPRITE,-lrosprite,Sprite
(librosprite)))
- $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,BMP (libnsbmp)))
- $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,GIF (libnsgif)))
- $(eval $(call feature_enabled,PNG,-DWITH_PNG,-lpng,PNG (libpng) ))
- $(eval $(call feature_enabled,NSSVG,-DWITH_NS_SVG,-lsvgtiny,SVG
(libsvgtiny)))
- $(eval $(call feature_enabled,VIDEO,-DWITH_VIDEO -I
/SDK/local/newlib/include/glib-2.0,-lgstreamer-0.10 -lglib-2.0 -lgobject-2.0
-lgmodule-2.0 -lgthread-2.0 -lintl -lffi,Video (libgstreamer)))
- $(eval $(call feature_enabled,JS,-DXP_UNIX -DWITH_JS
-DJS_VERSION=185,-lstdc++ -lmozjs185,JavaScript))
- $(eval $(call feature_enabled,MOZJS,-DXP_AMIGA -DWITH_MOZJS -DJS_VERSION=170
-DJSVERSION_LATEST=170 -DJSOPTION_JIT=0 -DJSCLASS_GLOBAL_FLAGS=0,-ljs
-lfdlibm,JavaScript))
- $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
- $(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
-
- CFLAGS += -I /SDK/local/common/include/libpng12
- LDFLAGS += -lcurl -lrtmp -lpthread -ltre -lintl -lpbl
- LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
-else
- $(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,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
+$(eval $(call
feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
- CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
- CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
+CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include
+CFLAGS += $(shell $(PKG_CONFIG) --cflags tre)
- LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
- LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
- LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
+LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl)
+LDFLAGS += $(shell $(PKG_CONFIG) --libs tre)
+LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib
- LDFLAGS += -lpbl -liconv
+LDFLAGS += -lpbl -liconv
- ifeq ($(SUBTARGET),os3)
- LDFLAGS += -lamiga -lm
- endif
+ifeq ($(SUBTARGET),os3)
+ LDFLAGS += -lamiga -lm
endif
EXETARGET := NetSurf
diff --git a/frontends/amiga/Makefile.defaults
b/frontends/amiga/Makefile.defaults
index 0674a9d..1864981 100644
--- a/frontends/amiga/Makefile.defaults
+++ b/frontends/amiga/Makefile.defaults
@@ -4,11 +4,7 @@
# Force using glibc internal iconv implementation instead of external libiconv
# Valid options: YES, NO
-ifneq ($(SUBTARGET),os3)
- NETSURF_USE_LIBICONV_PLUG := YES
-else
- NETSURF_USE_LIBICONV_PLUG := NO
-endif
+NETSURF_USE_LIBICONV_PLUG := NO
# Enable NetSurf's use of librosprite for displaying RISC OS Sprites
# Valid options: YES, NO, AUTO
diff --git a/frontends/amiga/utf8.c b/frontends/amiga/utf8.c
index d48e073..5d05e95 100755
--- a/frontends/amiga/utf8.c
+++ b/frontends/amiga/utf8.c
@@ -16,10 +16,15 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "amiga/os3support.h"
+
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
+#include <proto/exec.h>
+#include <proto/utility.h>
+
#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "netsurf/utf8.h"
@@ -33,7 +38,13 @@ nserror utf8_from_local_encoding(const char *string, size_t
len, char **result)
nserror utf8_to_local_encoding(const char *string, size_t len, char **result)
{
- return utf8_to_enc(string, nsoption_charp(local_charset), len, result);
+ nserror err = NSERROR_NOMEM;
+ char *local_charset = ASPrintf("%s//IGNORE",
nsoption_charp(local_charset));
+ if(local_charset) {
+ err = utf8_to_enc(string, local_charset, len, result);
+ FreeVec(local_charset);
+ }
+ return err;
}
void ami_utf8_free(char *ptr)
@@ -44,7 +55,6 @@ void ami_utf8_free(char *ptr)
char *ami_utf8_easy(const char *string)
{
char *localtext;
-
if(utf8_to_local_encoding(string, strlen(string), &localtext) ==
NSERROR_OK) {
return localtext;
} else {
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
