Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/eb88c92749255e89350a988716ae14ebea9896a0
...commit
http://git.netsurf-browser.org/netsurf.git/commit/eb88c92749255e89350a988716ae14ebea9896a0
...tree
http://git.netsurf-browser.org/netsurf.git/tree/eb88c92749255e89350a988716ae14ebea9896a0
The branch, master has been updated
via eb88c92749255e89350a988716ae14ebea9896a0 (commit)
via 1d73269a49bfbbcf0e42dd88a11c0861e3e967e6 (commit)
via 2c953cdf97171ab84e2756f59073839ea20ca74c (commit)
from b9cb2cab0bf34f34dfcfb3b59fa659a41ed7c54c (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=eb88c92749255e89350a988716ae14ebea9896a0
commit eb88c92749255e89350a988716ae14ebea9896a0
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
html: css fetcher: Fix passing LWC borrow to fetcher_add, which consumes.
Fixes abort on exit when corestring finalisation tried to unref
what should have been the final ref:
$ ./nsgtk3
corrupted double-linked list
Aborted (core dumped)
diff --git a/content/handlers/html/html_css_fetcher.c
b/content/handlers/html/html_css_fetcher.c
index 71fd78f..ae20879 100644
--- a/content/handlers/html/html_css_fetcher.c
+++ b/content/handlers/html/html_css_fetcher.c
@@ -296,7 +296,8 @@ nserror html_css_fetcher_register(void)
.finalise = html_css_fetcher_finalise
};
- return fetcher_add(corestring_lwc_x_ns_css, &html_css_fetcher_ops);
+ return fetcher_add(lwc_string_ref(corestring_lwc_x_ns_css),
+ &html_css_fetcher_ops);
}
/* exported interface documented in html_internal.h */
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=1d73269a49bfbbcf0e42dd88a11c0861e3e967e6
commit 1d73269a49bfbbcf0e42dd88a11c0861e3e967e6
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Buildsystem: Change default nsgtk build from gtk2 to gtk3.
diff --git a/Makefile b/Makefile
index 899dfee..166bf81 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ endif
# Default target is GTK backend
ifeq ($(TARGET),)
- TARGET := gtk2
+ TARGET := gtk3
endif
# valid values for the TARGET
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2c953cdf97171ab84e2756f59073839ea20ca74c
commit 2c953cdf97171ab84e2756f59073839ea20ca74c
Author: Michael Drake <[email protected]>
Commit: Michael Drake <[email protected]>
Buildsystem: GTK: Change gtk target to gtk2, which builds nsgtk2.
diff --git a/Makefile b/Makefile
index ebde9dc..899dfee 100644
--- a/Makefile
+++ b/Makefile
@@ -105,11 +105,11 @@ endif
# Default target is GTK backend
ifeq ($(TARGET),)
- TARGET := gtk
+ TARGET := gtk2
endif
# valid values for the TARGET
-VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari
monkey
+VLDTARGET := riscos gtk2 gtk3 beos amiga amigaos3 framebuffer windows atari
monkey
# Check for valid TARGET
ifeq ($(filter $(VLDTARGET),$(TARGET)),)
@@ -301,7 +301,8 @@ else
override NETSURF_GTK_MAJOR := 3
SUBTARGET = $(NETSURF_GTK_MAJOR)
else
- ifeq ($(TARGET),gtk)
+ ifeq ($(TARGET),gtk2)
+ override TARGET := gtk
ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
override NETSURF_GTK_MAJOR := 2
else
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index ae2e856..ec9889e 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -59,13 +59,7 @@ LDFLAGS += -lm
NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR)
# The gtk binary target.
-ifeq ($(NETSURF_GTK_MAJOR),2)
- # gtk2 builds have no major suffix
- EXETARGET := nsgtk
-else
- # gtk3 and later builds use the major version suffix
- EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
-endif
+EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
# The filter and target for split messages
MESSAGES_FILTER=gtk
-----------------------------------------------------------------------
Summary of changes:
Makefile | 7 ++++---
content/handlers/html/html_css_fetcher.c | 3 ++-
frontends/gtk/Makefile | 8 +-------
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index ebde9dc..166bf81 100644
--- a/Makefile
+++ b/Makefile
@@ -105,11 +105,11 @@ endif
# Default target is GTK backend
ifeq ($(TARGET),)
- TARGET := gtk
+ TARGET := gtk3
endif
# valid values for the TARGET
-VLDTARGET := riscos gtk gtk3 beos amiga amigaos3 framebuffer windows atari
monkey
+VLDTARGET := riscos gtk2 gtk3 beos amiga amigaos3 framebuffer windows atari
monkey
# Check for valid TARGET
ifeq ($(filter $(VLDTARGET),$(TARGET)),)
@@ -301,7 +301,8 @@ else
override NETSURF_GTK_MAJOR := 3
SUBTARGET = $(NETSURF_GTK_MAJOR)
else
- ifeq ($(TARGET),gtk)
+ ifeq ($(TARGET),gtk2)
+ override TARGET := gtk
ifeq ($(origin NETSURF_GTK_MAJOR),undefined)
override NETSURF_GTK_MAJOR := 2
else
diff --git a/content/handlers/html/html_css_fetcher.c
b/content/handlers/html/html_css_fetcher.c
index 71fd78f..ae20879 100644
--- a/content/handlers/html/html_css_fetcher.c
+++ b/content/handlers/html/html_css_fetcher.c
@@ -296,7 +296,8 @@ nserror html_css_fetcher_register(void)
.finalise = html_css_fetcher_finalise
};
- return fetcher_add(corestring_lwc_x_ns_css, &html_css_fetcher_ops);
+ return fetcher_add(lwc_string_ref(corestring_lwc_x_ns_css),
+ &html_css_fetcher_ops);
}
/* exported interface documented in html_internal.h */
diff --git a/frontends/gtk/Makefile b/frontends/gtk/Makefile
index ae2e856..ec9889e 100644
--- a/frontends/gtk/Makefile
+++ b/frontends/gtk/Makefile
@@ -59,13 +59,7 @@ LDFLAGS += -lm
NSGTK_RESOURCES_DIR := $(FRONTEND_RESOURCES_DIR)
# The gtk binary target.
-ifeq ($(NETSURF_GTK_MAJOR),2)
- # gtk2 builds have no major suffix
- EXETARGET := nsgtk
-else
- # gtk3 and later builds use the major version suffix
- EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
-endif
+EXETARGET := nsgtk$(NETSURF_GTK_MAJOR)
# The filter and target for split messages
MESSAGES_FILTER=gtk
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
