r2149 - in trunk: . packages packages/w3m

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Dec 28 23:09:26 PST 2007


Author: alexander
Date: 2007-12-29 00:09:26 -0700 (Sat, 29 Dec 2007)
New Revision: 2149

Added:
   trunk/packages/w3m/w3m-0.5.2-gpm_fix-1.patch
Removed:
   trunk/packages/imlib/
   trunk/packages/imlib2/
Modified:
   trunk/Makefile
   trunk/packages/w3m/Makefile
Log:
Updated w3m, removed imlib, because w3m can use gtk2 for image loading


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-12-29 06:57:32 UTC (rev 2148)
+++ trunk/Makefile	2007-12-29 07:09:26 UTC (rev 2149)
@@ -267,9 +267,9 @@
 	ch-Xorg-font ch-Xorg-driver ch-xorg-udev-rules ch-XML-Parser ch-xkeyboard-config \
 	ch-synaptics ch-inputattach ch-fonts-thai \
 	ch-freefont ch-fonts-dejavu ch-fonts-kochi ch-fonts-firefly ch-fonts-baekmuk \
-	ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib ch-imlib ch-imlib2 \
-	ch-gc ch-w3m ch-lftp ch-cairo ch-hicolor-icon-theme \
-	ch-pango ch-atk ch-gtk2 ch-cvs ch-popt ch-samba ch-libIDL ch-seamonkey \
+	ch-libjpeg ch-libtiff ch-openssh ch-glib2 ch-giflib \
+	ch-gc ch-lftp ch-cairo ch-hicolor-icon-theme \
+	ch-pango ch-atk ch-gtk2 ch-w3m ch-cvs ch-popt ch-samba ch-libIDL ch-seamonkey \
 	ch-alsa-lib ch-alsa-utils ch-alsa-firmware \
 	ch-libogg ch-libvorbis ch-speex ch-flac ch-libdvdcss ch-libtheora ch-xine-lib \
 	ch-pciutils ch-libusb ch-usbutils ch-dbus ch-dbus-glib ch-parted \

Modified: trunk/packages/w3m/Makefile
===================================================================
--- trunk/packages/w3m/Makefile	2007-12-29 06:57:32 UTC (rev 2148)
+++ trunk/packages/w3m/Makefile	2007-12-29 07:09:26 UTC (rev 2149)
@@ -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)

Added: trunk/packages/w3m/w3m-0.5.2-gpm_fix-1.patch
===================================================================
--- trunk/packages/w3m/w3m-0.5.2-gpm_fix-1.patch	                        (rev 0)
+++ trunk/packages/w3m/w3m-0.5.2-gpm_fix-1.patch	2007-12-29 07:09:26 UTC (rev 2149)
@@ -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