From 2b645ddd14e789d1e9b2bc8139e886e602f3e2de Mon Sep 17 00:00:00 2001
From: kyak <bas@bmail.ru>
Date: Fri, 25 Feb 2011 22:41:33 +0300
Subject: [PATCH] w3m: build-in image support (not without ugly hacks)

---
 w3m/Makefile                       | 19 +++++++++++++++----
 w3m/patches/004-gdk-override.patch | 12 ++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 w3m/patches/004-gdk-override.patch

diff --git a/w3m/Makefile b/w3m/Makefile
index a47b855..e6f789e 100644
--- a/w3m/Makefile
+++ b/w3m/Makefile
@@ -9,13 +9,14 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=w3m
 PKG_VERSION:=0.5.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
 PKG_MD5SUM:=ba06992d3207666ed1bf2dcf7c72bf58
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
 define Package/w3m
     TITLE:=w3m
@@ -23,7 +24,7 @@ define Package/w3m
     SECTION:=network
     CATEGORY:=Network
     URL:=http://w3m.sourceforge.net/
-    DEPENDS:=+libopenssl +gc +libncursesw
+    DEPENDS:=+libopenssl +gc +libncursesw +gtk2
 endef
 
 define Package/w3m/description
@@ -39,14 +40,24 @@ endef
 CONFIGURE_ARGS += --with-ssl=$(STAGING_DIR)/usr \
 		  --with-gc=$(STAGING_DIR)/usr/lib \
 		  --disable-xface \
-		  --with-imagelib="gtk2 gdk-pixbuf"
+		  --with-imagelib="gtk2" \
+		  --enable-image="fb"
 
 CONFIGURE_VARS += ac_cv_lib_gc_GC_init=yes
 
+TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/glib-2.0 \
+	       -I$(STAGING_DIR)/usr/include/gtk-2.0 \
+	       -I$(STAGING_DIR)/usr/include/pango-1.0 \
+	       -I$(STAGING_DIR)/usr/include/cairo
+
+TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+		$(INTL_LDFLAGS) $(ICONV_LDFLAGS) \
+		-lintl -lglib-2.0 -liconv -lgdk_pixbuf-2.0
 
 define Package/w3m/install
-	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/w3m
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/w3m $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/w3mimgdisplay $(1)/usr/lib/w3m
 endef
 
 $(eval $(call BuildPackage,w3m))
diff --git a/w3m/patches/004-gdk-override.patch b/w3m/patches/004-gdk-override.patch
new file mode 100644
index 0000000..94064cf
--- /dev/null
+++ b/w3m/patches/004-gdk-override.patch
@@ -0,0 +1,12 @@
+diff -ur w3m-0.5.2.orig/configure w3m-0.5.2/configure
+--- w3m-0.5.2.orig/configure	2011-02-25 21:51:15.648183991 +0300
++++ w3m-0.5.2/configure	2011-02-25 22:03:24.676058666 +0300
+@@ -5626,7 +5626,7 @@
+  else
+    { echo "$as_me:$LINENO: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 2.0.0)" >&5
+ echo "$as_me: WARNING: GdkPixbuf is not installed.  Install GdkPixbuf (version >= 2.0.0)" >&2;}
+-   have_gdkpixbuf="no"; have_gtk2="no"
++   have_gdkpixbuf="yes"; have_gtk2="yes"
+  fi
+   fi
+   if test x"$with_gdkpixbuf" = xyes; then