From 22f8ce521a36313565bb4df5ea1352ba283a44be Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <mail@waldemar-brodkorb.de>
Date: Thu, 4 Oct 2012 15:55:17 +0200
Subject: update to latest upstream

---
 package/dillo/Makefile                |  7 ++++---
 package/dillo/patches/patch-configure | 20 ++++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 package/dillo/patches/patch-configure

(limited to 'package/dillo')

diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index fd30af5c2..42e806fc8 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,9 +4,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		dillo
-PKG_VERSION:=		3.0
+PKG_VERSION:=		3.0.2
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		448f44a923222270cb0c84e55adc1be1
+PKG_MD5SUM:=		81b82112cefcc7d54fe2972a21f42930
 PKG_DESCR:=		small graphical web browser
 PKG_SECTION:=		x11/apps
 PKG_DEPENDS:=		libfltk libxi libiconv libpng zlib libjpeg
@@ -25,7 +25,8 @@ include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-TARGET_LDFLAGS+=	-liconv -lpng
+TARGET_LDFLAGS+=	-liconv -lpng15
+CONFIGURE_ARGS+=	--disable-xft
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
new file mode 100644
index 000000000..6cf0ffc92
--- /dev/null
+++ b/package/dillo/patches/patch-configure
@@ -0,0 +1,20 @@
+--- dillo-3.0.2.orig/configure	2011-11-30 12:08:21.000000000 +0100
++++ dillo-3.0.2/configure	2012-09-22 19:06:27.000000000 +0200
+@@ -5690,7 +5690,7 @@ if test "x$enable_png" = "xyes"; then
+ $as_echo_n "checking for libpng-config... " >&6; }
+ 
+   if test -z "$PNG_CONFIG"; then
+-    PNG_CONFIG=`which libpng14-config`
++    PNG_CONFIG=`which libpng-config`
+     if test -z "$PNG_CONFIG"; then
+       PNG_CONFIG=`which libpng12-config`
+     fi
+@@ -5717,7 +5717,7 @@ $as_echo "missing" >&6; }
+ $as_echo_n "checking for libpng version... " >&6; }
+     png_version=`$PNG_CONFIG --version`
+     case $png_version in
+-      1.4.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
++      1.5.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;
+       1.2.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;
-- 
cgit v1.2.3