w3m/w3m.patch@300d43423c2e (annotated)
w3m/w3m.patch
Wed, 08 Feb 2012 20:07:00 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 08 Feb 2012 20:07:00 +0200
- changeset 588
- 300d43423c2e
- permissions
- -rw-r--r--
Update version, adapt patch, correct PID writing, correct build on newer
FreeBSD releases, and most importantly introduce new patch to try to
avoid segfault caused by multiple network interfaces with the same (or
no) address. This is common when configuring bridges and tunnels.
| michael@419 | 1 | Index: Makefile.in |
| michael@419 | 2 | --- Makefile.in.orig 2007-05-29 14:01:04 +0200 |
| michael@419 | 3 | +++ Makefile.in 2009-12-24 22:39:59 +0100 |
| michael@419 | 4 | @@ -119,7 +119,7 @@ |
| michael@419 | 5 | |
| michael@419 | 6 | DEFUNS=$(top_srcdir)/main.c $(top_srcdir)/menu.c |
| michael@419 | 7 | SCRIPTSUBDIRS= scripts |
| michael@419 | 8 | -SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc po |
| michael@419 | 9 | +SUBDIRS = $(SCRIPTSUBDIRS) w3mimg libwc |
| michael@419 | 10 | .PHONY: $(SUBDIRS) |
| michael@419 | 11 | |
| michael@419 | 12 | all: $(TARGETS) all-scripts $(NLSTARGET) |
| michael@419 | 13 | @@ -134,7 +134,7 @@ |
| michael@419 | 14 | $(OBJS) $(LOBJS): fm.h funcname1.h |
| michael@419 | 15 | |
| michael@419 | 16 | tagtable.c: tagtable.tab mktable$(EXT) html.h |
| michael@419 | 17 | - ./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ |
| michael@419 | 18 | + -./mktable$(EXT) 100 $(srcdir)/tagtable.tab > $@ |
| michael@419 | 19 | |
| michael@419 | 20 | indep.o: indep.c fm.h funcname1.h |
| michael@419 | 21 | func.o: funcname.c functable.c funcname1.h |
| michael@419 | 22 | @@ -167,7 +167,7 @@ |
| michael@419 | 23 | |
| michael@419 | 24 | functable.c: funcname.tab mktable$(EXT) |
| michael@419 | 25 | sort funcname.tab | $(AWK) -f $(top_srcdir)/functable.awk > functable.tab |
| michael@419 | 26 | - ./mktable$(EXT) 100 functable.tab > $@ |
| michael@419 | 27 | + -./mktable$(EXT) 100 functable.tab > $@ |
| michael@419 | 28 | -rm -f functable.tab |
| michael@419 | 29 | |
| michael@419 | 30 | mktable$(EXT): mktable.o dummy.o $(ALIB) |
| michael@419 | 31 | Index: main.c |
| michael@419 | 32 | --- main.c.orig 2007-05-31 03:19:50 +0200 |
| michael@419 | 33 | +++ main.c 2009-12-25 10:21:26 +0100 |
| michael@419 | 34 | @@ -842,7 +842,8 @@ |
| michael@419 | 35 | mySignal(SIGPIPE, SigPipe); |
| michael@419 | 36 | #endif |
| michael@419 | 37 | |
| michael@419 | 38 | - orig_GC_warn_proc = GC_set_warn_proc(wrap_GC_warn_proc); |
| michael@419 | 39 | + orig_GC_warn_proc = GC_get_warn_proc(); |
| michael@419 | 40 | + GC_set_warn_proc(wrap_GC_warn_proc); |
| michael@419 | 41 | err_msg = Strnew(); |
| michael@419 | 42 | if (load_argc == 0) { |
| michael@419 | 43 | /* no URL specified */ |
