Merge branch 'master' of git://git.netsurf-browser.org/netsurf

4 files changed, 50 insertions, 16 deletions

diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index f830ba200..f0eabf86e 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -28,7 +28,7 @@ ifeq ($(HOST),amiga)
   $(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 pkg_config_find_and_add,AMIGA_CAIRO,cairo,Cairo))
+  $(eval $(call feature_enabled,AMIGA_CAIRO,-DNS_AMIGA_CAIRO,,Cairo))
   $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon))
   $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes))
 
@@ -36,9 +36,9 @@ ifeq ($(HOST),amiga)
   LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -ltre -lintl -lauto -lpbl
   LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
 
-  ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes)
-    CFLAGS += -I /SDK/local/common/include/cairo
-    LDFLAGS += -use-dynld
+  ifeq ($(NETSURF_USE_AMIGA_CAIRO),YES)
+    CFLAGS +=  -I /SDK/local/common/include/cairo
+    LDFLAGS += -use-dynld -ldl -lcairo -lpixman-1 -lfreetype -lfontconfig -lpng -lexpat
     EXETARGET := NetSurf
   else
     EXETARGET := NetSurf-Static
diff --git a/amiga/arexx.c b/amiga/arexx.c
index 06e82acfa..c3279ad3d 100755
--- a/amiga/arexx.c
+++ b/amiga/arexx.c
@@ -21,8 +21,9 @@
 #include "amiga/arexx.h"
 #include "amiga/download.h"
 #include "amiga/gui.h"
-#include "desktop/options.h"
+#include "amiga/hotlist.h"
 #include "amiga/theme.h"
+#include "desktop/options.h"
 
 #include "desktop/browser_private.h"
 
@@ -58,7 +59,8 @@ enum
 	RX_RELOAD,
 	RX_WINDOWS,
 	RX_ACTIVE,
-	RX_CLOSE
+	RX_CLOSE,
+	RX_HOTLIST
 };
 
 STATIC char result[100];
@@ -78,6 +80,7 @@ STATIC VOID rx_reload(struct ARexxCmd *, struct RexxMsg *);
 STATIC VOID rx_windows(struct ARexxCmd *, struct RexxMsg *);
 STATIC VOID rx_active(struct ARexxCmd *, struct RexxMsg *);
 STATIC VOID rx_close(struct ARexxCmd *, struct RexxMsg *);
+STATIC VOID rx_hotlist(struct ARexxCmd *, struct RexxMsg *);
 
 STATIC struct ARexxCmd Commands[] =
 {
@@ -96,6 +99,7 @@ STATIC struct ARexxCmd Commands[] =
 	{"WINDOWS",	RX_WINDOWS,	rx_windows,	"W=WINDOW/K/N", 		0, 	NULL, 	0, 	0, 	NULL },
 	{"ACTIVE",	RX_ACTIVE,	rx_active,	"T=TAB/S", 		0, 	NULL, 	0, 	0, 	NULL },
 	{"CLOSE",	RX_CLOSE,	rx_close,	"W=WINDOW/K/N,T=TAB/K/N", 		0, 	NULL, 	0, 	0, 	NULL },
+	{"HOTLIST",	RX_HOTLIST,	rx_hotlist,	"A=ACTION/A", 		0, 	NULL, 	0, 	0, 	NULL },
 	{ NULL, 		0, 				NULL, 		NULL, 		0, 	NULL, 	0, 	0, 	NULL }
 };
 
@@ -572,3 +576,14 @@ STATIC VOID rx_close(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((un
 
 	if(bw) browser_window_destroy(bw);
 }
+
+STATIC VOID rx_hotlist(struct ARexxCmd *cmd, struct RexxMsg *rxm __attribute__((unused)))
+{
+	cmd->ac_RC = 0;
+
+	if(strcasecmp((char *)cmd->ac_ArgList[0], "OPEN") == 0) {
+		ami_tree_open(hotlist_window, AMI_TREE_HOTLIST);
+	} else if(strcasecmp((char *)cmd->ac_ArgList[0], "CLOSE") == 0) {
+		ami_tree_close(hotlist_window);
+	}
+}
diff --git a/amiga/font_scan.c b/amiga/font_scan.c
index 33a9c54aa..549ea5064 100644
--- a/amiga/font_scan.c
+++ b/amiga/font_scan.c
@@ -300,14 +300,16 @@ ULONG ami_font_scan_list(struct MinList *list)
 
 		for(i = 0; i < afh->afh_NumEntries; i++) {
 			if(af[i].af_Attr.ta_Style == FS_NORMAL) {
-				node = (struct nsObject *)FindIName((struct List *)list,
-							af[i].af_Attr.ta_Name);
-				if(node == NULL) {
-					node = AddObject(list, AMINS_UNKNOWN);
-					if(node) {
-						node->dtz_Node.ln_Name = strdup(af[i].af_Attr.ta_Name);
-						found++;
-						LOG(("Added %s\n", af[i].af_Attr.ta_Name));
+				if(af[i].af_Attr.ta_Name != NULL) {
+					node = (struct nsObject *)FindIName((struct List *)list,
+								af[i].af_Attr.ta_Name);
+					if(node == NULL) {
+						node = AddObject(list, AMINS_UNKNOWN);
+						if(node) {
+							node->dtz_Node.ln_Name = strdup(af[i].af_Attr.ta_Name);
+							found++;
+							LOG(("Added %s\n", af[i].af_Attr.ta_Name));
+						}
 					}
 				}
 			}
diff --git a/cocoa/Makefile.target b/cocoa/Makefile.target
index 635790a61..82900b6b0 100644
--- a/cocoa/Makefile.target
+++ b/cocoa/Makefile.target
@@ -41,7 +41,9 @@ endif
   CFLAGS += -I/usr/include/libxml2
   CFLAGS += -include cocoa/Prefix.pch
 
-  VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)
+#  VERSION_FULL := $(shell sed -n '/\"/{s/.*"\(.*\)\".*/\1/;p;}' desktop/version.c)
+# TODO: this needs fixing properly everywhere
+  VERSION_FULL := "3.0 (Dev)"
   VERSION_MAJ := $(shell sed -n '/_major/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
   VERSION_MIN := $(shell sed -n '/_minor/{s/.* = \([0-9]*\).*/\1/;p;}' desktop/version.c)
 
@@ -218,12 +220,27 @@ NetSurf.app/Contents/Info.plist: cocoa/res/NetSurf-Info.plist cocoa/Makefile.tar
 
 package-cocoa: NetSurf.dmg
 
+.INTERMEDIATE: NetSurf.tmp.dmg
+
 NetSurf.tmp.dmg: NetSurf.app
 	hdiutil create -size 8m -fs HFS+ -volname "NetSurf" $@
+	sleep 2
 	hdiutil attach $@
-	cp -a $^ /Volumes/NetSurf/
+	sleep 2
+	cp -pPR $^ /Volumes/NetSurf/
 	hdiutil detach $$(echo $$(hdiutil attach $@ | cut -f 1)  | cut -f 1 -d ' ')
+	sleep 2
 
 NetSurf.dmg: NetSurf.tmp.dmg
 	hdiutil convert $^ -format UDZO -o $@
 
+CLEANS += clean-package-cocoa
+
+clean-package-cocoa:
+	$(VQ)echo "   CLEAN: NetSurf.tmp.dmg"
+	$(Q)$(RM) NetSurf.tmp.dmg
+	$(VQ)echo "   CLEAN: NetSurf.dmg"
+	$(Q)$(RM) NetSurf.dmg 
+	$(VQ)echo "   CLEAN: NetSurf.app"
+	$(Q)$(RM) -r NetSurf.app 
+