r2158 - in branches/minimal: . doc packages/libxml2 packages/pkgconfig packages/speech-dispatcher packages/speechd-up packages/w3m

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Sat Dec 29 07:05:22 PST 2007


Author: alexander
Date: 2007-12-29 08:05:22 -0700 (Sat, 29 Dec 2007)
New Revision: 2158

Added:
   branches/minimal/packages/speechd-up/speechd-up-0.4-onechar-1.patch
   branches/minimal/packages/w3m/w3m-0.5.2-gpm_fix-1.patch
Removed:
   branches/minimal/packages/speech-dispatcher/speech-dispatcher-0.6.4-host-1.patch
Modified:
   branches/minimal/Makefile
   branches/minimal/doc/README.txt
   branches/minimal/packages/libxml2/Makefile
   branches/minimal/packages/pkgconfig/Makefile
   branches/minimal/packages/speech-dispatcher/Makefile
   branches/minimal/packages/speechd-up/Makefile
   branches/minimal/packages/w3m/Makefile
Log:
Merged applicable changes from trunk


Modified: branches/minimal/Makefile
===================================================================
--- branches/minimal/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -395,7 +395,7 @@
 	@sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/boot/isolinux/boot.msg
 	@sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/etc/issue*
 	@install -m644 doc/lfscd-remastering-howto.txt $(MP)/root
-	@sed -e 's/\[version\]/$(VERSION)/' -e 's/\\_/_/g' \
+	@sed -e 's/\[Version\]/$(VERSION)/' -e 's/\\_/_/g' \
 	    doc/README.txt >$(MP)/root/README.txt
 	@install -m600 root/.bashrc $(MP)/root/.bashrc
 	@install -m755 scripts/{net-setup,greeting,livecd-login} $(MP)/usr/bin/ 

Modified: branches/minimal/doc/README.txt
===================================================================
--- branches/minimal/doc/README.txt	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/doc/README.txt	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,6 +1,6 @@
 Official Linux From Scratch LiveCD
 ==================================
-Version: [version]
+Version: [Version]
 
 
 PACKAGES

Modified: branches/minimal/packages/libxml2/Makefile
===================================================================
--- branches/minimal/packages/libxml2/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/libxml2/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,5 +1,8 @@
 # LibXML2 Makefile
 
+# Don't upgrade to 2.6.30 - will segfault on x86_64
+# see http://bugs.debian.org/439967 and its duplicates
+
 NM= libxml2
 VRS= 2.6.27
 DIR= $(NM)-$(VRS)

Modified: branches/minimal/packages/pkgconfig/Makefile
===================================================================
--- branches/minimal/packages/pkgconfig/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/pkgconfig/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,12 +1,12 @@
 # Pkgconfig Makefile
 
 NM= pkg-config
-VRS= 0.21
+VRS= 0.22
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://pkgconfig.freedesktop.org/releases/$(FILE)
-SHA-$(FILE)= b2508ba8404cad46ec42f6f58cbca43ae59d715f
+SHA-$(FILE)= 3ec40bda9864d7aa3c912c6ae87a750fd8b6e420
 
 # Targets
 

Modified: branches/minimal/packages/speech-dispatcher/Makefile
===================================================================
--- branches/minimal/packages/speech-dispatcher/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/speech-dispatcher/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,14 +1,13 @@
 # speech-dispatcher Makefile
 
 NM= speech-dispatcher
-VRS= 0.6.4
+VRS= 0.6.5
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://www.freebsoft.org/pub/projects/speechd/$(FILE)
-SHA-$(FILE)= 9350cffa71bb1d960cefe0dae66af5bfe9036570
+SHA-$(FILE)= 5f2cd4964bf96e49e41bc6fe908f8f482f9ea0e7
 
-PATCH1= $(DIR)-host-1.patch
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -21,12 +20,10 @@
 	$(std_build)
 
 compile-stage2:
-	patch -Np1 -i ../$(PATCH1)
 	sed -i 	-e 's/LogLevel  3/LogLevel  0/' \
 		-e 's/# DefaultLanguage  "en"/DefaultLanguage  "en"/' \
 		-e 's/^AddModule/#Addmodule/' \
 		-e 's/#\(.*sd_espeak.*\)$$/\1/' \
-		-e 's/DefaultModule flite/DefaultModule espeak/' \
 		config/speechd.conf.in
 	./configure --prefix=/usr --sysconfdir=/etc
 	make

Deleted: branches/minimal/packages/speech-dispatcher/speech-dispatcher-0.6.4-host-1.patch
===================================================================
--- branches/minimal/packages/speech-dispatcher/speech-dispatcher-0.6.4-host-1.patch	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/speech-dispatcher/speech-dispatcher-0.6.4-host-1.patch	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,154 +0,0 @@
-diff -ur speech-dispatcher-0.6.4/config/speechd.conf.in speech-dispatcher-0.6.4.new/config/speechd.conf.in
---- speech-dispatcher-0.6.4/config/speechd.conf.in	2007-07-14 11:31:39.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/config/speechd.conf.in	2007-10-19 19:29:25.000000000 +0600
-@@ -4,6 +4,11 @@
- 
- # -----SYSTEM OPTIONS-----
- 
-+# IP address on which Speech Dispatcher should be available
-+# to clients
-+
-+Host 127.0.0.1
-+
- # Port on which Speech Dispatcher should be available
- # to clients.
- 
-diff -ur speech-dispatcher-0.6.4/src/server/config.c speech-dispatcher-0.6.4.new/src/server/config.c
---- speech-dispatcher-0.6.4/src/server/config.c	2007-06-22 02:23:29.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/src/server/config.c	2007-10-19 19:29:25.000000000 +0600
-@@ -191,6 +191,18 @@
- }
- 
- 
-+DOTCONF_CB(cb_Host)
-+{
-+    in_addr_t ip;
-+    assert(cmd->data.str != NULL);
-+    
-+    ip = inet_addr(cmd->data.str);
-+    if(ip == -1) FATAL("Invalid IP address in the Host directive!");
-+    SpeechdOptions.host = ip;
-+    SpeechdOptions.host_set = 1;
-+    return NULL;
-+}
-+
- DOTCONF_CB(cb_LogFile)
- {
-     assert(cmd->data.str != NULL);
-@@ -350,6 +362,7 @@
- 
-     cl_spec_section = NULL;
-    
-+    ADD_CONFIG_OPTION(Host, ARG_STR);
-     ADD_CONFIG_OPTION(Port, ARG_INT);
-     ADD_CONFIG_OPTION(LogFile, ARG_STR);
-     ADD_CONFIG_OPTION(CustomLogFile, ARG_LIST);
-@@ -402,6 +415,9 @@
-     if (!SpeechdOptions.log_level_set) SpeechdOptions.log_level = 3;    
-     if (!SpeechdOptions.port_set) SpeechdOptions.port = SPEECHD_DEFAULT_PORT;
- 
-+    /* for compatibility with old buggy versions - INADDR_LOOPBACK is more secure */
-+    if (!SpeechdOptions.host_set) SpeechdOptions.host = htonl(INADDR_ANY);
-+
-     logfile = stderr;
-     custom_logfile = NULL;    
- }
-diff -ur speech-dispatcher-0.6.4/src/server/options.c speech-dispatcher-0.6.4.new/src/server/options.c
---- speech-dispatcher-0.6.4/src/server/options.c	2006-07-25 17:46:19.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/src/server/options.c	2007-10-19 19:29:25.000000000 +0600
-@@ -34,11 +34,12 @@
-     assert(argv);
-     assert(argv[0]);
- 
--    printf("Usage: %s [-{d|s}] [-l {1|2|3|4|5}] [-p=port] | [-v] | [-h]\n", argv[0]);
-+    printf("Usage: %s [-{d|s}] [-l {1|2|3|4|5}] [-H=host] [-p=port] | [-v] | [-h]\n", argv[0]);
-     printf("Speech Dispatcher -- Common interface for Speech Synthesis (GNU GPL)\n\n");
-     printf("-d, --run-daemon     -      Run as a daemon\n"
-     "-s, --run-single     -      Run as single application\n"
-     "-l, --log-level      -      Set log level (1..5)\n"
-+    "-H, --host           -      Specify IP address to listen on\n"
-     "-p, --port           -      Specify a port number\n"
-     "-P, --pid-file       -      Set path to pid file\n"
-     "-v, --version        -      Report version of this program\n"
-@@ -71,6 +72,14 @@
-         SpeechdOptions.param = val; \
-     }
- 
-+#define SPD_OPTION_SET_IP(param) \
-+    ip = inet_addr(optarg); \
-+    if(ip != -1){ \
-+        SpeechdOptions.param ## _set = 1; \
-+        SpeechdOptions.param = ip; \
-+    }
-+
-+
- #define SPD_OPTION_SET_STR(param) \
-     SpeechdOptions.param = optarg
- 
-@@ -81,6 +90,7 @@
-     int c_opt;
-     int option_index;
-     int val;
-+    in_addr_t ip;
- 
-     assert (argc>0);
-     assert(argv);
-@@ -101,6 +111,9 @@
-         case 'l':
-             SPD_OPTION_SET_INT(log_level);	   
-             break;
-+        case 'H':
-+            SPD_OPTION_SET_IP(host);
-+            break;
-         case 'p':
-             SPD_OPTION_SET_INT(port);
-             break;
-@@ -123,3 +136,4 @@
-     }
- }
- #undef SPD_OPTION_SET_INT
-+#undef SPD_OPTION_SET_IP
-diff -ur speech-dispatcher-0.6.4/src/server/options.h speech-dispatcher-0.6.4.new/src/server/options.h
---- speech-dispatcher-0.6.4/src/server/options.h	2006-07-11 22:12:27.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/src/server/options.h	2007-10-19 19:29:25.000000000 +0600
-@@ -27,6 +27,7 @@
-     {"run-daemon", 0, 0, 'd'},
-     {"run-single", 0, 0, 's'},
-     {"log-level", 1, 0, 'l'},
-+    {"host", 1, 0, 'H'},
-     {"port", 1, 0, 'p'},
-     {"pid-file", 1, 0, 'P'},
-     {"version", 0, 0, 'v'},
-@@ -34,7 +35,7 @@
-     {0, 0, 0, 0}
- };
- 
--static char* spd_short_options = "dsl:p:P:vh";
-+static char* spd_short_options = "dsl:H:p:P:vh";
- 
- void options_print_help(char *argv[]);
- void options_print_version(void);
-diff -ur speech-dispatcher-0.6.4/src/server/speechd.c speech-dispatcher-0.6.4.new/src/server/speechd.c
---- speech-dispatcher-0.6.4/src/server/speechd.c	2007-06-22 02:30:57.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/src/server/speechd.c	2007-10-19 19:29:53.000000000 +0600
-@@ -654,7 +654,7 @@
-     }
- 
-     server_address.sin_family = AF_INET;
--    server_address.sin_addr.s_addr = htonl(INADDR_ANY);
-+    server_address.sin_addr.s_addr = SpeechdOptions.host;
-     server_address.sin_port = htons(SpeechdOptions.port);
- 
-     MSG(3,"Openning socket connection");
-diff -ur speech-dispatcher-0.6.4/src/server/speechd.h speech-dispatcher-0.6.4.new/src/server/speechd.h
---- speech-dispatcher-0.6.4/src/server/speechd.h	2007-06-22 02:31:01.000000000 +0600
-+++ speech-dispatcher-0.6.4.new/src/server/speechd.h	2007-10-19 19:29:25.000000000 +0600
-@@ -108,6 +108,8 @@
- struct{
-     int port, port_set;
-     int log_level, log_level_set;
-+    in_addr_t host;
-+    int host_set;
-     char *pid_file;
-     int max_history_messages;	/* Maximum of messages in history before they expire */
- }SpeechdOptions;

Modified: branches/minimal/packages/speechd-up/Makefile
===================================================================
--- branches/minimal/packages/speechd-up/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/speechd-up/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -8,6 +8,8 @@
 URL-$(FILE)= http://www.freebsoft.org/pub/projects/speechd-up/$(FILE)
 SHA-$(FILE)= ad31c9a15fd8f5616aff4d35713f736ad8266a92
 
+PATCH1= speechd-up-0.4-onechar-1.patch
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -20,6 +22,7 @@
 	$(std_build)
 
 compile-stage2:
+	patch -Np1 -i ../$(PATCH1)
 	./configure --prefix=/usr --sysconfdir=/etc
 	make
 	make install

Copied: branches/minimal/packages/speechd-up/speechd-up-0.4-onechar-1.patch (from rev 2157, trunk/packages/speechd-up/speechd-up-0.4-onechar-1.patch)
===================================================================
--- branches/minimal/packages/speechd-up/speechd-up-0.4-onechar-1.patch	                        (rev 0)
+++ branches/minimal/packages/speechd-up/speechd-up-0.4-onechar-1.patch	2007-12-29 15:05:22 UTC (rev 2158)
@@ -0,0 +1,35 @@
+diff -ur speechd-up-0.4.bak/speechd-up.c speechd-up-0.4/speechd-up.c
+--- speechd-up-0.4.bak/speechd-up.c	2006-10-21 20:01:34.000000000 +0600
++++ speechd-up-0.4/speechd-up.c	2007-12-28 21:09:40.000000000 +0500
+@@ -324,7 +324,7 @@
+ 
+     /* It seems there is a bug in libspeechd function spd_say_char() */
+     {
+-	snprintf(cmd, 14, "KEY %s", cuu);
++	snprintf(cmd, 14, "CHAR %s", cuu);
+ 	DBG(5, "Saying single character CMD:|%s|", cmd);
+ 	spd_execute_command(conn, "SET SELF PRIORITY TEXT");
+ 	spd_execute_command(conn, cmd);
+@@ -375,18 +375,20 @@
+ 	   make pointer _c_ point to it. If it is the only character
+ 	   in the string, _characters_ is 1, otherwise different. */
+ 	for (i=0; i<=bytes-1; i++){
+-	    if (buf[i] != ' '){
++	    if (buf[i] != ' ' && buf[i] != 24){
+ 		c=buf+i;
+ 		characters++;
+ 		if (characters>1) break;
+ 	    }
+-	    if ((unsigned) buf[i] < 32){
++	    if ((unsigned) buf[i] < 32 && (unsigned) buf[i] != 24){
+ 		characters = -1; break;
+ 	    }
+ 
+ 	}
+ 
+ 	if (characters == 1){
++	    if (buf[0] == 24)
++	        spd_cancel(conn);
+ 	    say_single_character(c, bytes-i, cd);
+ 	    iconv_close(cd);
+ 	    return 0;

Modified: branches/minimal/packages/w3m/Makefile
===================================================================
--- branches/minimal/packages/w3m/Makefile	2007-12-29 14:49:03 UTC (rev 2157)
+++ branches/minimal/packages/w3m/Makefile	2007-12-29 15:05:22 UTC (rev 2158)
@@ -1,16 +1,15 @@
 # W3M Makefile
 
 NM= w3m
-VRS= 0.5.1
+VRS= 0.5.2
 DIR= $(NM)-$(VRS)
 
 FILE= $(DIR).tar.gz
 URL-$(FILE)= http://heanet.dl.sourceforge.net/sourceforge/$(NM)/$(FILE)
-SHA-$(FILE)= 7da299648c236772bcde9b0e92e23346c8af0aca
+SHA-$(FILE)= 484522547ae6dbb342d3858a2a53a65451e273f9
 
 PATCH1= $(DIR)-gpm_fix-1.patch
-URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
-SHA-$(PATCH1)= 3480a66f8bcdb1d97d082f5c8a9ef7892914c9f1
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -19,22 +18,21 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE) $(PATCH1)
+stage2: Makefile $(FILE)
 	$(std_build)
 
 compile-stage2:
 	patch -Np1 -i ../$(PATCH1)
 	autoconf
 	./configure --prefix=/usr --libexecdir=/usr/lib --sysconfdir=/etc \
-	    --datarootdir=/usr/share --enable-image \
-	    --with-mailer=/usr/bin/mutt --with-browser=/usr/bin/mozilla
-	make datarootdir=/usr/share
-	make datarootdir=/usr/share install
+	    --enable-image \
+	    --with-mailer=/usr/bin/mutt --with-browser=/usr/bin/seamonkey
+	make
+	make install
 	install -v -D -m 644 doc/keymap.default /etc/w3m/keymap
 	install -v -D -m 644 doc/menu.default /etc/w3m/menu
 	install -v -d -m 755 /usr/share/doc/w3m-$(VRS)/html
-	install -v -m 644 doc/{HISTORY,READM*,keymap.*,menu.*} /usr/share/doc/$(DIR)
-	install -v -m 644 doc/*.html /usr/share/doc/$(DIR)/html
+	install -v -m 644 doc/{HISTORY,READM*,keymap.*,menu.*,*.html} /usr/share/doc/$(DIR)
 
 clean:
 	-rm -rf $(DIR)

Copied: branches/minimal/packages/w3m/w3m-0.5.2-gpm_fix-1.patch (from rev 2157, trunk/packages/w3m/w3m-0.5.2-gpm_fix-1.patch)
===================================================================
--- branches/minimal/packages/w3m/w3m-0.5.2-gpm_fix-1.patch	                        (rev 0)
+++ branches/minimal/packages/w3m/w3m-0.5.2-gpm_fix-1.patch	2007-12-29 15:05:22 UTC (rev 2158)
@@ -0,0 +1,131 @@
+Submitted by: Alexander E. Patrakov
+Date: 2005-09-24
+Initial Package Version: 0.5.1
+Upstream Status: Will submit
+Origin: Alexander E. Patrakov
+Description: fixes w3m compilation failure when GPM is built --without-curses
+
+diff -urN w3m-0.5.2/configure.ac w3m-0.5.2.fixed/configure.ac
+--- w3m-0.5.2/configure.ac	2004-04-29 00:19:25.000000000 +0600
++++ w3m-0.5.2.fixed/configure.ac	2005-09-24 16:39:11.000000000 +0600
+@@ -97,6 +97,7 @@
+  AC_SUBST(USE_W3M)
+  AC_CHECK_LIB(gpm, Gpm_Open, [AC_DEFINE(USE_GPM)
+    		W3M_LIBS="$W3M_LIBS -lgpm"])
++ AC_CHECK_LIB(gpm, Gpm_Wgetch, AC_DEFINE(HAVE_GPM_WGETCH))
+  AC_SUBST(USE_SYSMOUSE)
+  AC_TRY_CPP([#include <machine/console.h>
+    MOUSE_GETINFO], [AC_DEFINE(USE_SYSMOUSE)])
+diff -urN w3m-0.5.2/gpm-libcurses.c w3m-0.5.2.fixed/gpm-libcurses.c
+--- w3m-0.5.2/gpm-libcurses.c	1970-01-01 05:00:00.000000000 +0500
++++ w3m-0.5.2.fixed/gpm-libcurses.c	2005-09-24 18:18:30.000000000 +0600
+@@ -0,0 +1,84 @@
++/*
++ * libcurses.c - client library - curses level (gpm-Linux)
++ *
++ * Copied from GPM by Alexander E. Patrakov
++ * Copyright 1994,1995   rubini at linux.it (Alessandro Rubini)
++ * Copyright 2002        nico at schottelius.org (Nico Schottelius)
++ * 
++ *   This program is free software; you can redistribute it and/or modify
++ *   it under the terms of the GNU General Public License as published by
++ *   the Free Software Foundation; either version 2 of the License, or
++ *   (at your option) any later version.
++ *
++ *   This program is distributed in the hope that it will be useful,
++ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *   GNU General Public License for more details.
++ *
++ *   You should have received a copy of the GNU General Public License
++ *   along with this program; if not, write to the Free Software
++ *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
++ ********/
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <unistd.h>        /* select(); */
++#include <sys/time.h>      /* timeval */
++#include <sys/types.h>     /* socket() */
++
++#include "config.h"
++#if defined(USE_GPM) && !defined(HAVE_GPM_WGETCH)
++
++extern int getch();
++
++#include <gpm.h>
++#include <errno.h>
++
++#define SELECT_TIME 86400 /* one day */
++
++int Gpm_Wgetch(void * dummy)
++{
++fd_set selSet;
++int max, flag, result;
++int fd=STDIN_FILENO;
++static Gpm_Event ev;
++
++  if (!gpm_flag || gpm_fd==-1) return getch();
++  if (gpm_morekeys) return (*gpm_handler)(&ev,gpm_data);
++  gpm_hflag=0;
++
++  max = (gpm_fd>fd) ? gpm_fd : fd;
++
++/*...................................................................*/
++  if (gpm_fd>=0)                                            /* linux */
++    while(1)
++      {
++      if (gpm_visiblepointer) GPM_DRAWPOINTER(&ev);
++      do
++	{
++	FD_ZERO(&selSet);
++	FD_SET(fd,&selSet);
++	FD_SET(gpm_fd,&selSet);
++	gpm_timeout.tv_sec=SELECT_TIME;
++	errno = 0;
++	flag=select(max+1,&selSet,(fd_set *)NULL,(fd_set *)NULL,&gpm_timeout);
++	}
++      while (!flag);
++
++      if (flag==-1)
++	continue;
++
++      if (FD_ISSET(fd,&selSet))
++	return getch();
++      
++      if (Gpm_GetEvent(&ev) && gpm_handler
++	  && (result=(*gpm_handler)(&ev,gpm_data)))
++	{
++	gpm_hflag=1;
++	return result;
++	}
++      }
++  return 0;
++}
++#endif
++
+diff -urN w3m-0.5.2/Makefile.in w3m-0.5.2.fixed/Makefile.in
+--- w3m-0.5.2/Makefile.in	2004-04-26 23:04:48.000000000 +0600
++++ w3m-0.5.2.fixed/Makefile.in	2005-09-24 16:48:54.000000000 +0600
+@@ -85,11 +85,11 @@
+ SRCS=main.c file.c buffer.c display.c etc.c search.c linein.c table.c local.c \
+ 	form.c map.c frame.c rc.c menu.c mailcap.c image.c \
+ 	symbol.c entity.c terms.c url.c ftp.c mimehead.c regex.c news.c \
+-	func.c cookie.c history.c backend.c $(KEYBIND_SRC)
++	func.c cookie.c history.c backend.c gpm-libcurses.c $(KEYBIND_SRC)
+ OBJS=main.o file.o buffer.o display.o etc.o search.o linein.o table.o local.o\
+ 	form.o map.o frame.o rc.o menu.o mailcap.o image.o \
+ 	symbol.o entity.o terms.o url.o ftp.o mimehead.o regex.o news.o \
+-	func.o cookie.o history.o backend.o $(KEYBIND_OBJ)
++	func.o cookie.o history.o backend.o gpm-libcurses.o $(KEYBIND_OBJ)
+ LSRCS=anchor.c parsetagx.c tagtable.c istream.c
+ LOBJS=anchor.o parsetagx.o tagtable.o istream.o
+ LLOBJS=version.o
+diff -urN w3m-0.5.2/config.h.in w3m-0.5.2.fixed/config.h.in
+--- w3m-0.5.2/config.h.in	2004-04-04 22:47:20.000000000 +0600
++++ w3m-0.5.2.fixed/config.h.in	2005-09-24 16:50:43.000000000 +0600
+@@ -231,3 +231,4 @@
+ #define INFLATE_NAME "inflate"
+ 
++#undef HAVE_GPM_WGETCH
+ #endif /* CONFIG_H_SEEN */




More information about the livecd mailing list